Commit Graph

204 Commits

Author SHA1 Message Date
Alex Lisitsyn 9aadaaf654 Merge branch 'bugfix/fix_slave_parity_err_propagation' into 'master'
fix: flush uart queue on parity and frame error

Closes IDFGH-13881

See merge request idf/esp-modbus!87
2024-12-05 17:46:32 +08:00
Florian Kogler aaee69ecfb fix: flush uart queue on parity and frame error
Signed-off-by: aleks <aleks@espressif.com>

Merges https://github.com/espressif/esp-modbus/pull/78
2024-12-04 15:17:23 +01:00
Alex Lisitsyn 4d15696f7f Merge branch 'feature/fix_docs_preview_server_settings' into 'master'
fix docs preview deploy server settings

Closes IDF-11808

See merge request idf/esp-modbus!85
2024-12-04 21:57:28 +08:00
aleks cea5a860e6 fix docs preview deploy server settings 2024-12-04 10:45:13 +01:00
Alex Lisitsyn d6f8978e98 Merge branch 'feature/add_support_target_esp32c61' into 'master'
add support target esp32c61

See merge request idf/esp-modbus!73
2024-09-25 19:13:31 +08:00
Alex Lisitsyn faf68509d1 add support target esp32c61 2024-09-25 19:13:30 +08:00
Alex Lisitsyn 2601e34e21 Merge branch 'bugfix/fix_modbus_tcp_slave_close_connections_on_destroy_v1' into 'master'
modbus tcp slave port fix close connections on destroy

See merge request idf/esp-modbus!80
2024-09-23 18:59:08 +08:00
Alex Lisitsyn 3689bc6259 modbus master - slave tcp port fix close connections on destroy 2024-09-23 18:59:08 +08:00
Alex Lisitsyn e829315275 Merge branch 'bugfix/fix_doc_types_coversion_option_en' into 'master'
docs fix extended types enable option v1

See merge request idf/esp-modbus!79
2024-09-20 21:14:34 +08:00
Alex Lisitsyn 4938cbee31 fix build docs, fix extended types enable option v1 2024-09-20 21:14:34 +08:00
Alex Lisitsyn ea295ac957 Merge branch 'bugfix/fix_doc_types_coversion_option_en' into 'master'
docs fix extended types enable option v1

See merge request idf/esp-modbus!77
2024-09-16 20:46:25 +08:00
Alex Lisitsyn 6b3ba11fd6 docs fix extended types enable option v1 2024-09-16 20:46:25 +08:00
Alex Lisitsyn 801059b8ec Merge branch 'feature/component_add_support_policy_idf_v5.3_v1' into 'master'
address modbus support policy for esp-idf v5.3

See merge request idf/esp-modbus!70
v1.0.16
2024-09-11 22:18:21 +08:00
Alex Lisitsyn 3b10a452cc address modbus support policy for esp-idf v5.3, pipeline update
component release v1.0.16:
* add custom modbus user error handler for master IDFGH-12757
* add support of esp32c5 target (IDF-10050)

* fix modbus using of hostname incorrectly after lwip update (IDF-10104)
* fix modbus read input registers max number (IDFGH-13284)
* fix extra closing braces to avoid C++ compiler error (IDFGH-13419)
* fix ci/cd issues and support policy (RDT-739)
2024-09-11 22:18:21 +08:00
Alex Lisitsyn 6edead8e9b Merge branch 'feature/add_support_target_esp32c5' into 'master'
add support of esp32c5 target

See merge request idf/esp-modbus!72
2024-08-29 18:23:17 +08:00
Alex Lisitsyn b43909aa2e add support of esp32c5 target 2024-08-29 18:23:17 +08:00
Alex Lisitsyn d0be4c9478 Merge branch 'feature/fix_input_reg_max_reg_count' into 'master'
modbus fix read input regs max number

Closes IDFGH-13284

See merge request idf/esp-modbus!74
2024-08-19 16:36:51 +08:00
Alex Lisitsyn 41d426ce3d modbus fix read input regs max number 2024-08-19 16:36:51 +08:00
Alex Lisitsyn 833250c6e7 Merge branch 'bugfix/modbus_fix_using_hostname' into 'master'
Bugfix/modbus fix using of hostname

See merge request idf/esp-modbus!71
2024-08-16 22:22:59 +08:00
Alex Lisitsyn cab2708dcf Bugfix/modbus fix using of hostname 2024-08-16 22:22:59 +08:00
Alex Lisitsyn 1eafc29df3 Merge branch 'feature/add_user_error_handler' into 'master'
feature add modbus user error handler

See merge request idf/esp-modbus!68
2024-06-07 20:46:16 +08:00
Alex Lisitsyn b643775c08 feature add modbus user error handler 2024-06-07 20:46:15 +08:00
Alex Lisitsyn 5e7a26b640 Merge branch 'bugfix/fix_component_upload_issues' into 'master'
fix component upload issues

See merge request idf/esp-modbus!67
v1.0.15
2024-04-30 22:39:48 +08:00
Alex Lisitsyn 01145ec7a2 fix component upload issues
This component is equivalent to version v1.0.14 with minor changes
2024-04-30 22:39:48 +08:00
Alex Lisitsyn 20c34b20d0 Merge branch 'bugfix/fix_master_broadcast_request_issue' into 'master'
fix master broadcast request issue

Closes IDFGH-12540

See merge request idf/esp-modbus!61
2024-04-30 15:27:36 +08:00
Alex Lisitsyn c63a6d7114 fix master broadcast request issue 2024-04-30 15:27:36 +08:00
Alex Lisitsyn e26c0c2f5a Merge branch 'feature/doc_extend_serial_port_options' into 'master'
doc: describe on how to override modbus serial comm opts

Closes IDFGH-11906, IDFGH-6341, IDFGH-9713, and IDFGH-12260

See merge request idf/esp-modbus!62
2024-04-29 22:44:08 +08:00
Alex Lisitsyn 78c809142a doc: describe on how to override modbus serial comm opts 2024-04-29 22:44:08 +08:00
Alex Lisitsyn 77d0155675 Merge branch 'bugfix/modbus_rtu_skips_first_packet_t35meas_is_disabled' into 'master'
Bugfix/modbus rtu skips first packet t35meas is disabled

Closes IDFGH-12105

See merge request idf/esp-modbus!58
2024-04-29 20:51:21 +08:00
Alex Lisitsyn a64720b677 Bugfix/modbus rtu skips first packet t35meas is disabled 2024-04-29 20:51:20 +08:00
Alex Lisitsyn 0f67f0bb82 Merge branch 'bugfix/fix_ci_issues_log_file' into 'master'
fix ci issues - log file and build time limitation

See merge request idf/esp-modbus!66
2024-04-29 17:14:33 +08:00
Alex Lisitsyn b968c36daf fix ci issues - log file and build time limitation 2024-04-29 17:14:32 +08:00
Alex Lisitsyn 4c98083acc Merge branch 'bugfix/test_fix_ci_issues' into 'master'
text tcp master slave fix ip resolution

See merge request idf/esp-modbus!64
2024-04-23 23:12:18 +08:00
aleks 2ee8330b3a text tcp master slave fix ip resolution 2024-04-23 09:58:39 +02:00
Alex Lisitsyn 8480ff7636 Merge branch 'feature/add_extended_float_support' into 'master'
modbus add extended float/uint support for custom and third party devices

See merge request idf/esp-modbus!59
2024-04-19 17:11:08 +08:00
Alex Lisitsyn 0cf6bb2c6a modbus add extended float/integer support for custom and third party devices 2024-04-19 17:11:08 +08:00
Alex Lisitsyn 430217563f Merge branch 'feature/modbus_add_esp32p4_target_support' into 'master'
modbus add esp32p4 target support

See merge request idf/esp-modbus!56
v1.0.13
2024-01-26 18:13:02 +08:00
Alex Lisitsyn 469eb71e07 modbus add esp32p4 target support 2024-01-26 18:13:02 +08:00
Alex Lisitsyn 94e9664aaa Merge branch 'bugfix/fix_serial_slave_delay_before_send' into 'master'
fix modbus slave wait before send option

Closes IDFGH-11279

See merge request idf/esp-modbus!54
2023-12-22 17:38:19 +08:00
Alex Lisitsyn e12c7ff02c fix modbus slave wait before send option 2023-12-22 17:38:18 +08:00
Alex Lisitsyn 64c5400492 Merge branch 'bugfix/fix_tcp_master_close_sockets' into 'master'
fix for closing tcp connections and watchdog timeout

Closes IDFGH-11539 and IDFGH-11690

See merge request idf/esp-modbus!53
2023-12-22 17:07:33 +08:00
aleks bf271f4286 modbus master tcp port: fix to close sockets correctly, minor additions for the PR
https://github.com/espressif/esp-modbus/pull/44
2023-12-21 00:39:38 +08:00
Floris Romeijn 135a8f8165 fix for closing tcp connections and watchdog timeout
Signed-off-by: aleks <aleks@espressif.com>
2023-12-21 00:39:38 +08:00
Alex Lisitsyn f0e78b6d27 Merge branch 'bugfix/fix_incorrect_settings_from_ci_config' into 'master'
fix sdkconfig settings for ci

See merge request idf/esp-modbus!55
2023-12-20 23:56:29 +08:00
aleks a889ada556 fix sdkconfig settings for ci 2023-12-20 12:07:36 +01:00
Alex Lisitsyn ea3f06cf2b Merge branch 'bugfix/fix_timer_use_isr_dispatch_method' into 'master'
fix timer use isr dispatch method

Closes IDFGH-11059

See merge request idf/esp-modbus!46
v1.0.12
2023-09-30 02:21:04 +08:00
Alex Lisitsyn 4fe2fe8bc6 fix timer use isr dispatch method 2023-09-30 02:21:04 +08:00
Alex Lisitsyn e24ea4e820 Merge branch 'bugfix/fix_coil_start_bit_readout' into 'master'
Modbus coils do not shift the readout by n%8  (merge PR #35)

Closes IDFGH-10998

See merge request idf/esp-modbus!50
2023-09-30 01:48:02 +08:00
aleks 8950d1ca1a test coils & discrete reg mapping 2023-09-29 17:04:18 +02:00
aleks a1e96033d8 fix mbc (tcp, serial) master coils callbacks 2023-09-29 17:04:18 +02:00