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
103 Commits 38 Branches 25 Tags
1795c6476f4941474c27dfa2c24c5a51a0231756
Commit Graph

103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aleks 1795c6476f fix modbus read dead slave cause wdt timeout 2022-07-15 21:17:15 +02:00
Alex Lisitsyn 28ebfb1712 Merge branch 'bugfix/modbus_tcp_slave_fix_task_affinity' into 'master' 
modbus tcp slave fix task affinity

Closes IDFGH-7653

See merge request idf/esp-modbus!12
 2022-07-16 01:33:08 +08:00
aleks 9f58c2518d modbus slave tcp fix the affinity option missing for server task 2022-07-15 19:18:49 +02:00
Alex Lisitsyn 40a2161320 Merge branch 'bugfix/modbus_test_fix_include_mac_headers' into 'master' 
test fix include mac header

See merge request idf/esp-modbus!13
 2022-07-16 01:18:38 +08:00
aleks 4bc17965ac test fix include mac header 2022-07-15 19:04:19 +02:00
Alex Lisitsyn 72c889b2c9 Merge branch 'bugfix/modbus_serial_fsm_fix_address_offset' into 'master' 
Bugfix/modbus serial fsm fix address offset

See merge request idf/esp-modbus!18
 2022-07-16 01:02:27 +08:00
aleks 29254b2b86 master fix send fsm broadcast frame detection 2022-07-15 18:45:51 +02:00
Ivan Grokhotkov db34247764 Merge branch 'bugfix/fix_docker_image_uses_old_component_manager' into 'master' 
fix docker image uses incorrect version of component manager

See merge request idf/esp-modbus!19
 2022-07-15 23:52:16 +08:00
aleks a3cae7dca8 fix docker image uses incorrect component manager version 2022-07-15 16:58:00 +02:00
aleks d9397a9c85 fix mdns component dependency 2022-07-12 14:38:55 +02:00
Alex Lisitsyn 0faa194efd Merge branch 'fix/tcp_protocol_data_corruption' into 'master' 
fix tcp layer data corruption

Closes IDFCI-1286

See merge request idf/esp-modbus!14
v1.0.3 		2022-07-01 15:39:32 +08:00
Alexey Lapshin 96316533a6 fix tcp layer data corruption 2022-07-01 15:39:31 +08:00
Alex Lisitsyn a9b0ba2eda Merge branch 'bugfix/esp_netif_deps' into 'master' 
cmake: Add explicit dependency on esp_netif

See merge request idf/esp-modbus!11
 2022-06-23 20:38:36 +08:00
David Cermak 3892c77c26 version: Bump version number to 1.0.2 2022-06-20 09:59:56 +02:00
David Cermak 963c3dc5b0 cmake: Add explicit dependency on esp_netif 
esp_netif component is a private requeirements for some freemodbus
sources. This works without declaring a depencency, since esp_netif is
implicitely dependent on esp_event. This will be cleaned up in IDF v5.0.
This change makes the depencency explicit.
 2022-06-20 09:53:50 +02:00
Ivan Grokhotkov 436bc70b3d Merge branch 'bugfix/esp_timer_deps' into 'master' 
cmake: add dependency on esp_timer component

See merge request idf/esp-modbus!8
 2022-04-20 16:15:04 +08:00
Ivan Grokhotkov cc3a304fb7 version: release 1.0.1 v1.0.1 2022-04-20 07:23:50 +02:00
Ivan Grokhotkov 95dd8f1001 cmake: add dependency on esp_timer component 
Public header file of esp-modbus (freemodbus/port/port.h) includes
esp_timer.h, which is provided by esp_timer component. Currently
this works without declaring a dependency on esp_timer because
of a transitive dependency on esp_timer via freertos component.
This will be changed in IDF v5.0, where freertos will no longer
have a public dependency on esp_timer. This commit makes esp-modbus
compatible with that future change.
 2022-04-19 18:22:36 +02:00
Alex Lisitsyn 028bfd36c0 Merge branch 'feature/fix_docs_versions_not_included' into 'master' 
esp-modbus: fix docs versions is not included because of CORB

See merge request idf/esp-modbus!7
 2022-04-07 20:50:58 +08:00
Alex Lisitsyn c45653d92d esp-modbus: fix docs versions is not included because of CORB 2022-04-07 20:50:58 +08:00
Alex Lisitsyn c81e3643e9 Merge branch 'feature/add_component_license_readme_version_selector' into 'master' 
esp-modbus: add readme, license, documentation version selector

See merge request idf/esp-modbus!6
 2022-04-06 15:41:21 +08:00
aleks 28edd9f007 esp-modbus: add_component_license_readme_version_selector 2022-04-06 09:21:41 +02:00
Ivan Grokhotkov c59aa9f3cb Merge branch 'ci_remove_sync_job' into 'master' 
ci: remove github sync job

See merge request idf/esp-modbus!5
 2022-04-05 18:12:05 +08:00
Ivan Grokhotkov 74c129def9 Merge branch 'feature/add_github_actions' into 'master' 
Add Github actions for JIRA

See merge request idf/esp-modbus!4
 2022-04-05 18:02:09 +08:00
BOT d5e932844e Add Github actions for JIRA 2022-04-05 18:02:09 +08:00
Ivan Grokhotkov cbb7d2193a ci: remove github sync job 
Github sync is done using repository mirroring rules instead.
 2022-04-05 11:58:06 +02:00
Alex Lisitsyn 304a0a446a esp-modbus: initial component update 2022-04-05 15:33:17 +08:00
Alex Lisitsyn 3a377dfcac Merge branch 'feature/component_update' into 'master' 
esp-modbus: initial component update

See merge request idf/esp-modbus!1
 2022-04-05 15:33:17 +08:00
Chen Yudong d1a0493a79 CI: rename some tests to avoid duplicated test names 
* Original commit: espressif/esp-idf@4dc74c9c42
 2022-03-21 13:18:30 +01:00
Alex Lisitsyn 9716064cbb modbus: fix tcp slave destroy issues 
* Original commit: espressif/esp-idf@224901fed3
 2022-03-21 13:18:30 +01:00
Darian Leung ea81bd7fef freertos: Remove legacy data types 
This commit removes the usage of all legacy FreeRTOS data types that
are exposed via configENABLE_BACKWARD_COMPATIBILITY. Legacy types can
still be used by enabling CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY.


* Original commit: espressif/esp-idf@57fd78f5ba
 2022-03-21 13:18:30 +01:00
Alex Lisitsyn a0e61427d1 freemodbus: allow address gaps in master data dictionary (support of UID field in MBAP) 
* Original commit: espressif/esp-idf@e9cdb3e0d3
 2022-03-21 13:18:30 +01:00
morris 355ff75304 unit_tests: replace legacy timer group with gptimer 
* Original commit: espressif/esp-idf@705788a13f
 2022-03-21 13:18:29 +01:00
morris d34246462a soc: don't expose unstable soc header files in public api 
* Original commit: espressif/esp-idf@869bed1bb5
 2022-03-21 13:18:29 +01:00
aleks a54f2c11d9 freemodbus: fix port contains lgpl licensed files 
Initial version of freemodbus master port files have been added to ESP-IDF based on https://github.com/armink/FreeModbus_Slave-Master-RTT-STM32.
The overall repository license, at the time of adding these files, has been BSD 3-clause. However at that time, several port files carried LGPL license headers. As the author of these files confirmed in https://github.com/armink/FreeModbus_Slave-Master-RTT-STM32/issues/61#issuecomment-977828450, this wasn't intentional. ESP-IDF version of modbus master port has been rewritten to target FreeRTOS instead of RT-Thread, but the license headers remained from the original version. This commit corrects this, replacing the license of these files with BSD 3-clause.


* Original commit: espressif/esp-idf@b8c1d26f56
 2022-03-21 13:18:29 +01:00
Roland Dobai 13fa7753de Build & config: Remove leftover files from the unsupported "make" build system 
* Original commit: espressif/esp-idf@766aa57084
 2022-03-21 13:18:29 +01:00
Alex Lisitsyn 6d2cb13171 modbus: update to support other targets 
* Original commit: espressif/esp-idf@0586be45d2
 2022-03-21 13:18:29 +01:00
Alex Lisitsyn aebff14d74 freemodbus: fix tcp master long frame buffer issue 
* Original commit: espressif/esp-idf@0d393558d3
 2022-03-21 13:18:29 +01:00
aleks 509c47fc76 freemodbus: fix timer port to use esp_timer instead of group timer 
* Original commit: espressif/esp-idf@ee104f8de2
 2022-03-21 13:18:24 +01:00
Alex Lisitsyn 0ddd723239 Bugfix/modbus fix copyright headers 
* Original commit: espressif/esp-idf@bdf0298009
 2022-03-21 13:15:54 +01:00
morris 23e78eb821 gptimer: clean up hal and ll for driver-ng 
* Original commit: espressif/esp-idf@e2275b1f63
 2022-03-21 13:15:54 +01:00
Alex Lisitsyn 4fc2d83143 freemodbus: fix TCP stack/examples reinitialization sequence 
* Original commit: espressif/esp-idf@c965b48e77
 2022-03-21 13:15:54 +01:00
aleks 71ee6f844a freemodbus: update the modbus documentation doc-1641 
* Original commit: espressif/esp-idf@b9b2cab8f9
 2022-03-21 13:15:54 +01:00
Alex Lisitsyn b0b5ab017c freemodbus: fix issues when modbus master and slave work simultaneously 
fix slave destroy bug when master and slave init simultaneously
add additional timer group options for master
fix master and slave use the same timer group index (https://github.com/espressif/esp-idf/issues/4699)


* Original commit: espressif/esp-idf@9693ef4918
 2022-03-21 13:15:54 +01:00
Alex Lisitsyn 2bb90f1bbd add compile time checks for MB_MASTER_TCP_ENABLED 
Signed-off-by: AshUK <github.AshUK@outlook.com>


* Original commit: espressif/esp-idf@1aa7f27468
 2022-03-21 13:15:54 +01:00
aleks 9facdd9148 freemodbus: fix invalid error handling for duplicate param_key 
* Original commit: espressif/esp-idf@60ac95a6b2
 2022-03-21 13:15:54 +01:00
aleks ee9f8620d7 freemodbus: potential loss of significant bits and auto merge issues 
* Original commit: espressif/esp-idf@9457555173
 2022-03-21 13:15:54 +01:00
aleks ddd3e3394b freemodbus: add affinity option for modbus stack tasks 
Closes https://github.com/espressif/esp-idf/issues/6700


* Original commit: espressif/esp-idf@dfcc434910
 2022-03-21 13:15:54 +01:00
Alex Lisitsyn c0163bb01e freemodbus: fix uart_wait_tx_done() reenable tx_done interrupt 
fixes the issue with uart_wait_tx_done() when the task is suspended and transmission is done right before reenable tx_done interrupt


* Original commit: espressif/esp-idf@c801b3a182
 2022-03-21 13:15:54 +01:00
aleks 5a27d03531 freemodbus: increase max priority of modbus tasks 
allows to avoid issues with modbus processing when higher priority tasks are used in user application


* Original commit: espressif/esp-idf@59935e44c0
 2022-03-21 13:15:54 +01:00