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
216 Commits 38 Branches 25 Tags
master
Commit Graph

51 Commits

Author SHA1 Message Date
Alex Lisitsyn a29476408c Merge branch 'bugfix/slave_fix_crash_on_incorrect_state_on_collision' into 'master' 
fix crash if incorrect state on collisions v1

Closes IDFGH-15008

See merge request idf/esp-modbus!115
 2025-04-26 04:05:29 +08:00
Alex Lisitsyn 12d540118e fix crash if incorrect state on collisions v1 2025-04-26 04:05:29 +08:00
Alex Lisitsyn 2c3aeab127 Merge branch 'bugfix/master_fix_permission_bits' into 'master' 
master fix permissions definition

Closes IDFGH-15187

See merge request idf/esp-modbus!117
 2025-04-26 00:42:40 +08:00
Alex Lisitsyn 8c62835036 Merge branch 'bugfix/fix_disconnect_timeout_handling_v1' into 'master' 
slave fix incorrect disconnect timeout handling v1

Closes IDFGH-14951

See merge request idf/esp-modbus!116
 2025-04-26 00:42:26 +08:00
Alex Lisitsyn b7386a09d0 slave fix incorrect disconnect timeout handling v1 2025-04-26 00:42:26 +08:00
Alex Lisitsyn acd7c14457 fix the linking issues when slave id option is disabled v1 2025-04-26 00:41:47 +08:00
aleks 8acbb94f4d master fix permissions definition 2025-04-25 17:08:20 +02:00
Alex Lisitsyn db57bd6251 add the command 0x11 - get slave info 2024-12-06 19:25:22 +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 3689bc6259 modbus master - slave tcp port fix close connections on destroy 2024-09-23 18:59:08 +08:00
Alex Lisitsyn 4938cbee31 fix build docs, fix extended types enable option v1 2024-09-20 21:14:34 +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 cab2708dcf Bugfix/modbus fix using of hostname 2024-08-16 22:22:59 +08:00
Alex Lisitsyn b643775c08 feature add modbus user error handler 2024-06-07 20:46:15 +08:00
Alex Lisitsyn c63a6d7114 fix master broadcast request issue 2024-04-30 15:27:36 +08:00
Alex Lisitsyn a64720b677 Bugfix/modbus rtu skips first packet t35meas is disabled 2024-04-29 20:51:20 +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 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
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 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
 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
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 401dbc8f06 modbus tcp master, slave fix start - destroy sequence 2023-09-29 21:17:36 +08:00
aleks 7a19da9016 fix master event close issue 2023-09-26 14:22:34 +00:00
Alex Lisitsyn bf34b5bb8d modbus master fix event loop and kconfig 2023-06-20 02:38:53 +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
aleks 7183cc5f52 fix incorrectly removed option CONFIG_FMB_TIMER_ISR_IN_IRAM 2023-06-15 14:57:29 +02: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
 2023-02-28 16:29:12 +08:00
Alex Lisitsyn 2db0cfcf69 modbus tcp fix uid settings 2023-02-28 16:29:12 +08:00
aleks f18a0409a1 fix master parity flush buffer on fail 2023-02-27 15:39:28 +00:00
Alex Lisitsyn 234fbcf641 Bugfix/fix stuck in init on incorrect data input 2023-02-24 22:05:40 +08:00
Alex Lisitsyn 3d386c942e bugfix next message shifting 2023-02-22 21:54:23 +08:00
aleks 2540becd42 fix rx sema destroy 2023-01-11 18:59:42 +00:00
Alex Lisitsyn cb1a315ee5 Add support for esp32c2 target 2023-01-12 02:10:03 +08:00
Alex Lisitsyn 0e1fe58fbf Merge branch 'feature/sync_subrepo_with_esp_idf' into 'master' 
fix synchronization issues of subrepo in esp-idf

Closes IDFCI-1541

See merge request idf/esp-modbus!23
 2022-12-08 22:54:28 +08:00
Alex Lisitsyn e18c4fb329 fix synchronization issues of subrepo in esp-idf 2022-12-08 22:54:28 +08:00
Alex Lisitsyn d42604ab82 Bugfix/freemodbus fix dereferencing to freed element issue 2022-12-08 22:32:29 +08:00
Alex Lisitsyn c5c6a7788d fix modbus serial event misalingnment 2022-12-06 22:33:06 +08:00
Alex Lisitsyn fc8a50297d Bugfix/fix resource release failure 2022-10-27 15:48:19 +08:00
Alex Lisitsyn b324ba8436 serial master: fix getting stuck when just one zero byte in response 2022-10-26 19:52:11 +08:00
aleks 1795c6476f fix modbus read dead slave cause wdt timeout 2022-07-15 21:17:15 +02:00
aleks 9f58c2518d modbus slave tcp fix the affinity option missing for server task 2022-07-15 19:18:49 +02:00
aleks 29254b2b86 master fix send fsm broadcast frame detection 2022-07-15 18:45:51 +02:00
Alexey Lapshin 96316533a6 fix tcp layer data corruption 2022-07-01 15:39:31 +08:00