espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2026-08-03 20:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
177 Commits 38 Branches 25 Tags
78c809142a3399a6623f009702bf2589386b7eff
Commit Graph

177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mateusz Grzywacz 8dadaac490 Merges https://github.com/espressif/esp-modbus/pull/35 
(coils/discrete) do not shift the readout/write by n%8 for RTU and TCP (#1)

Co-authored-by: Mateusz Grzywacz <mateusz.grzywacz@evalan.com>
 2023-09-29 17:04:18 +02:00
Alex Lisitsyn aa93eecf57 Merge branch 'bugfix/fix_tcp_slave_start_destroy_sequence' into 'master' 
modbus tcp master, slave fix start - destroy sequence

See merge request idf/esp-modbus!43
 2023-09-29 21:17:36 +08:00
Alex Lisitsyn 401dbc8f06 modbus tcp master, slave fix start - destroy sequence 2023-09-29 21:17:36 +08:00
Alex Lisitsyn 567fe19a8b Merge branch 'feature/docs_add_complex_parameter_description' into 'master' 
add ascii/bin parameter description into documentation

Closes IDFGH-11120

See merge request idf/esp-modbus!49
 2023-09-29 20:12:01 +08:00
Alex Lisitsyn 3c9106aaf2 add ascii/bin parameter description into documentation 2023-09-29 20:12:01 +08:00
Alex Lisitsyn 38f64e5299 Merge branch 'bugfix/fix_master_event_close_sequence' into 'master' 
fix master event close issue

Closes IDFGH-11055

See merge request idf/esp-modbus!45
 2023-09-29 18:13:32 +08:00
aleks 7a19da9016 fix master event close issue 2023-09-26 14:22:34 +00:00
Alex Lisitsyn 5fa0b710d1 Merge branch 'feature/change_test_env_image' into 'master' 
fix test image and configuration for all esp-idf builds

Closes IDF-8272

See merge request idf/esp-modbus!48
 2023-09-26 22:21:23 +08:00
Alex Lisitsyn 10618c3d64 fix test image and configuration for all esp-idf builds 2023-09-26 22:21:23 +08:00
Alex Lisitsyn d311198e26 Merge branch 'bugfix/modbus_master_fix_event_loop_and_kconfig' into 'master' 
* Added modbus support for target esp32h2 (IDF-7461)
* Fix master rtu, ascii deadlock when null received with CONFIG_FMB_TIMER_PORT_ENABLED enabled (IDFGH-9942)
* Fix Wno-format issues (IDF-6437)
* Fix incorrectly removed option CONFIG_FMB_TIMER_ISR_IN_IRAM (IDFGH-9807)
* Fix main state machine to handle timestamps of events posted

Closes IDFGH-10168

See merge request idf/esp-modbus!42
 2023-06-20 02:38:53 +08:00
Alex Lisitsyn bf34b5bb8d modbus master fix event loop and kconfig 2023-06-20 02:38:53 +08:00
Alex Lisitsyn 2d79f8cc67 Merge branch 'bugfix/fix_modbus_examples_print_format' into 'master' 
esp_modbus: Fix Wno-format issues

See merge request idf/esp-modbus!39
 2023-06-19 02:26:01 +08:00
aleks 906a437248 esp_modbus: Fix Wno-format issues 2023-06-15 16:05:44 +00:00
Alex Lisitsyn 680d2cb4a8 Merge branch 'bugfix/master_rtu_ascii_fix_deadlock_when_null_received' into 'master' 
Bugfix/master rtu ascii fix deadlock when null received

Closes IDFGH-9942

See merge request idf/esp-modbus!40
 2023-06-15 23:43:37 +08:00
Alex Lisitsyn 7cdafc2468 Bugfix/master rtu ascii fix deadlock when null received 2023-06-15 23:43:37 +08:00
Alex Lisitsyn e943cec30f Merge branch 'bugfix/modbus_fix_timer_in_iram_option' into 'master' 
fix incorrectly removed option CONFIG_FMB_TIMER_ISR_IN_IRAM

Closes IDFGH-9807

See merge request idf/esp-modbus!38
 2023-06-15 22:47:41 +08:00
aleks 7183cc5f52 fix incorrectly removed option CONFIG_FMB_TIMER_ISR_IN_IRAM 2023-06-15 14:57:29 +02:00
Alex Lisitsyn cd34b914d3 Merge branch 'feture/modbus_add_support_esp32h2' into 'master' 
modbus add support for target esp32h2

See merge request idf/esp-modbus!41
 2023-06-14 15:01:13 +08:00
Alex Lisitsyn 52b692293b modbus add support for esp32h2 2023-06-14 15:01:13 +08:00
Alex Lisitsyn 7d16826aef Merge branch 'bugfix/clean_build_artifacts_before_deploy' into 'master' 
skip build artifacts during component deploying

See merge request idf/esp-modbus!37
v1.0.10 		2023-03-01 22:30:22 +08:00
Alex Lisitsyn 1741a27a87 skip build artifacts during component deploying 2023-03-01 22:30:21 +08:00
Alex Lisitsyn 8e3771847f Merge branch 'bugfix/modbus_tcp_fix_uid_settings' into 'master' 
modbus tcp fix uid settings

Closes IDFGH-9119, IDFGH-8919, and IDFGH-9436

See merge request idf/esp-modbus!29
v1.0.9 		2023-02-28 16:29:12 +08:00
Alex Lisitsyn 2db0cfcf69 modbus tcp fix uid settings 2023-02-28 16:29:12 +08:00
Alex Lisitsyn 15e24c16b9 Merge branch 'bugfix/serial_master_fix_parity_check' into 'master' 
fix master parity flush buffer on fail

Closes IDFGH-9296

See merge request idf/esp-modbus!35
 2023-02-28 15:59:08 +08:00
aleks f18a0409a1 fix master parity flush buffer on fail 2023-02-27 15:39:28 +00:00
Alex Lisitsyn cea014cad1 Merge branch 'bugfix/fix_stuck_in_init_on_incorrect_data_input' into 'master' 
Bugfix/fix stuck in init on incorrect data input

Closes IDFGH-9193

See merge request idf/esp-modbus!30
 2023-02-24 22:05:40 +08:00
Alex Lisitsyn 234fbcf641 Bugfix/fix stuck in init on incorrect data input 2023-02-24 22:05:40 +08:00