feedc0de/esp-modbus
1
0
Fork 0
forked from espressif/esp-modbus
Code Pull Requests Activity

Commit Graph

  • ff8b978fba Merge branch 'bugfix/tcp_driver_fix_connection_issues' into 'main' v2.1.0 main Alex Lisitsyn 2025-06-16 10:38:12 +01:00
  • 6f01b858ee fix master-slave connection repair issues Alex Lisitsyn 2025-06-16 10:38:12 +01:00
  • 0f015336ef Merge branch 'bugfix/fix_port_deadlock_startup_issue' into 'main' Alex Lisitsyn 2025-06-12 06:46:48 +01:00
  • b459a0ee1e fix serial port deadlock startup issue in specific conditions Alex Lisitsyn 2025-06-12 06:46:48 +01:00
  • 9c7cc2833f Merge branch 'bugfix/fix_custom_command_guard' into 'main' Alex Lisitsyn 2025-06-12 06:35:11 +01:00
  • 498f01f67c Merge branch 'bugfix/object_counter_ensure_atomic_operation' into 'main' Alex Lisitsyn 2025-06-12 06:33:56 +01:00
  • 2b52d513b9 ensure atomic operations for instance counter Alex Lisitsyn 2025-06-12 06:33:56 +01:00
  • 63e5a08efb fix master compilation issue with mbm_rq_common aleks 2025-06-11 08:18:48 +02:00
  • 37b80d1702 Merge branch 'feature/master_data_dict_add_custom_commands_v2' into 'main' Alex Lisitsyn 2025-06-10 11:52:06 +01:00
  • 11895fbf54 Merge branch 'bugfix/fix_pipeline_size_issues' into 'main' Alex Lisitsyn 2025-06-10 11:51:06 +01:00
  • d505ef201e fix minor pipeline issues Alex Lisitsyn 2025-06-10 11:51:06 +01:00
  • eeeab170be Merge branch 'bugfix/object_counter_ensure_atomic_operation' into 'main' Alex Lisitsyn 2025-06-10 06:51:20 +01:00
  • a452d37f3f object counter ensure atomic operation Alex Lisitsyn 2025-06-10 06:51:20 +01:00
  • 37c750ec35 fix the custom commands support aleks 2025-03-05 10:19:59 +01:00
  • 38205ca78f add custom commands into master data dict v2 aleks 2025-01-10 12:54:07 +01:00
  • ba2b683d6d Merge branch 'bugfix/fix_transport_master_slave_destroy_sequence' into 'main' Alex Lisitsyn 2025-06-06 07:14:07 +01:00
  • 5164c74ad4 fix transport master-slave destroy sequence Alex Lisitsyn 2025-06-06 07:14:07 +01:00
  • a29476408c Merge branch 'bugfix/slave_fix_crash_on_incorrect_state_on_collision' into 'master' v1.0.18 Alex Lisitsyn 2025-04-26 04:05:29 +08:00
  • 12d540118e fix crash if incorrect state on collisions v1 Alex Lisitsyn 2025-04-26 04:05:29 +08:00
  • 2c3aeab127 Merge branch 'bugfix/master_fix_permission_bits' into 'master' Alex Lisitsyn 2025-04-26 00:42:40 +08:00
  • 8c62835036 Merge branch 'bugfix/fix_disconnect_timeout_handling_v1' into 'master' Alex Lisitsyn 2025-04-26 00:42:26 +08:00
  • b7386a09d0 slave fix incorrect disconnect timeout handling v1 Alex Lisitsyn 2025-04-26 00:42:26 +08:00
  • a8c7c36fb9 Merge branch 'bugfix/fix_slave_id_option_support' into 'master' Alex Lisitsyn 2025-04-26 00:41:47 +08:00
  • acd7c14457 fix the linking issues when slave id option is disabled v1 Alex Lisitsyn 2025-04-26 00:41:47 +08:00
  • 8acbb94f4d master fix permissions definition aleks 2025-04-25 17:08:20 +02:00
  • cbe96056f2 Merge branch 'feature/master_slave_add_custom_fc_handlers' into 'main' Alex Lisitsyn 2025-04-03 18:52:24 +08:00
  • 8215e3d0d2 feature add custom fc handlers for master and slave v2 Alex Lisitsyn 2025-04-03 18:52:24 +08:00
  • 20b3dbaa82 independent instance command handling using lists, fixes as per review and test feature/master_slave_add_custom_fc_handlers aleks 2025-03-12 10:33:11 +01:00
  • 439c767aed Merge branch 'bugfix/fix_example_tcp_slave_lock_section' into 'main' Alex Lisitsyn 2025-03-27 18:33:17 +08:00
  • 60de5afc2c tcp slave example fix critical section aleks 2025-03-25 10:31:19 +01:00
  • ddb731578c update documentation aleks 2025-03-07 10:42:15 +01:00
  • 9246f742b2 update test aleks 2025-03-05 11:19:00 +01:00
  • d4af0e53e5 update examples aleks 2025-03-05 11:17:57 +01:00
  • fc8fc06fc5 mb master, slave add custom fc handlers aleks 2025-03-05 11:15:52 +01:00
  • a54f11355c allow small leak increase in the adapter tests for now aleks 2025-02-25 11:45:00 +01:00
  • ecb614e5e4 Merge branch 'bugfix/fix_master_tcp_stop_method_initialization' into 'main' v2.0.2 Alex Lisitsyn 2025-03-01 00:59:55 +08:00
  • 895e92795e Merge branch 'bugfix/mb_master_fix_unexpected_event_errors_on_timeout' into 'main' Alex Lisitsyn 2025-03-01 00:04:03 +08:00
  • de2ee7fb40 fix the mb_master unexpected event messages(timeout) severity to debug aleks 2025-02-28 10:35:24 +01:00
  • a93a0a328e bump the component version aleks 2025-02-27 11:39:47 +01:00
  • 877d331b4b Merge branch 'feature/add_slave_id_command_v2' into 'main' Alex Lisitsyn 2025-02-27 18:36:41 +08:00
  • 9890b3ce4d add slave report id command for master and slave (backport v2) Alex Lisitsyn 2025-02-27 18:36:41 +08:00
  • b331cd4ccf cpp test explicitly check the controller stop method aleks 2025-02-27 11:28:19 +01:00
  • d6f734001d Add missing stop function for TCP slave. Rimco 2025-02-27 10:49:14 +01:00
  • 931f554d36 Merge branch 'bugfix/fix_cpp_compilation_issues' into 'main' Alex Lisitsyn 2025-02-25 19:37:50 +08:00
  • 33c8838edd fix stack cpp compilation issues Alex Lisitsyn 2025-02-25 19:37:50 +08:00
  • 9b24aa41a7 Merge branch 'bugfix/modbus_handle_disabled_comm_modes' into 'main' Alex Lisitsyn 2025-02-19 22:37:25 +08:00
  • 7991e2f82e Merge branch 'bugfix/loop_instance_unregister_with_fail_leak' into 'main' Alex Lisitsyn 2025-02-18 19:09:46 +08:00
  • 0a96f62ed6 esp-event event handler unregister function causes memory leak Alex Lisitsyn 2025-02-18 19:09:45 +08:00
  • c5f0de2db4 Merge branch 'feature/fix_input_reg_max_reg_count_v2' into 'main' Alex Lisitsyn 2025-02-17 21:25:37 +08:00
  • 138382bf0d add cpp test-app, fix atomcs issue (+workaround v5.0) bugfix/fix_cpp_compilation_issues aleks 2025-02-07 16:46:49 +01:00
  • a2a16545fc fix cpp compilation issues aleks 2025-02-05 12:02:04 +01:00
  • 4b07c64437 Merge branch 'feature/fix_component_v201_release_issues_windows' into 'main' Alex Lisitsyn 2025-01-27 19:56:37 +08:00
  • 8493a17ad9 fix component release issues under windows Alex Lisitsyn 2025-01-27 19:56:36 +08:00
  • 12dc0b46eb add custom commands into master data dict v2 feature/master_data_dict_add_custom_commands_v2 aleks 2025-01-10 12:54:07 +01:00
  • 548359fc09 fix read input regs max number aleks 2025-01-07 12:31:42 +01:00
  • 5c0d66a8c0 fix modbus handling of disabled comm modes aleks 2025-01-03 11:39:32 +01:00
  • 3117942fe3 Merge branch 'release/v2.0' into 'main' v2.0.1 Alex Lisitsyn 2024-12-20 16:15:05 +08:00
  • 65322a7a3c make the main branch as an component release branch release/v2.0 aleks 2024-12-18 11:31:13 +01:00
  • adbfa28e59 fix documentation aleks 2024-12-18 11:27:52 +01:00
  • 3525460deb fix version in tests aleks 2024-12-18 11:26:10 +01:00
  • c03027a5d5 fix the mdns resolver error handling aleks 2024-12-18 10:31:36 +01:00
  • d96a678f6a make the main branch as an component release branch v2.0.0-beta.2 aleks 2024-12-09 11:42:16 +01:00
  • 4d110da2a7 Merge branch 'feature/modbus_add_slave_conformance_testing' into 'release/v2.0' Alex Lisitsyn 2024-12-07 00:19:49 +08:00
  • db543b9e50 add initial conformance testing with robot framework Alex Lisitsyn 2024-12-07 00:19:49 +08:00
  • e8317c2822 Merge branch 'feature/add_slave_id_command' into 'master' v1.0.17 Alex Lisitsyn 2024-12-06 19:25:23 +08:00
  • db57bd6251 add the command 0x11 - get slave info Alex Lisitsyn 2024-12-06 19:25:22 +08:00
  • 5a36ece1a0 Merge branch 'bugfix/fix_modbus_slave_serial_mode' into 'master' Alex Lisitsyn 2024-12-05 17:47:13 +08:00
  • 9aadaaf654 Merge branch 'bugfix/fix_slave_parity_err_propagation' into 'master' Alex Lisitsyn 2024-12-05 17:46:32 +08:00
  • 64777483e7 fix(modbus_slave): Fix the mode setup in modbus slave aleks 2024-12-02 14:55:50 +01:00
  • aaee69ecfb fix: flush uart queue on parity and frame error Florian Kogler 2024-10-15 07:36:25 +02:00
  • 63d370c359 Merge branch 'feature/fix_docs_preview_server_settings_v2' into 'release/v2.0' Alex Lisitsyn 2024-12-04 21:58:35 +08:00
  • 4d15696f7f Merge branch 'feature/fix_docs_preview_server_settings' into 'master' Alex Lisitsyn 2024-12-04 21:57:28 +08:00
  • cea5a860e6 fix docs preview deploy server settings aleks 2024-12-03 15:49:27 +01:00
  • 752be6eebc fix docs preview server settings v2 aleks 2024-12-03 16:38:24 +01:00
  • 0d66d9631b fix api lock sequence feature/add_slave_id_command aleks 2024-10-23 21:46:34 +02:00
  • 50ba25f55c fix slave id handling in master and slave aleks 2024-10-22 12:10:46 +02:00
  • 0fa0d73b20 add the 0x11 command - get slave info aleks 2024-10-13 20:54:28 +02:00
  • a0ac975aca Merge branch 'bugfix/fix_docs_enable_extended_data_types_conversion_v2' into 'release/v2.0' Alex Lisitsyn 2024-09-30 20:19:38 +08:00
  • 738c6d9ce5 fix build docs, extended data types en option v2, mb_event check Alex Lisitsyn 2024-09-30 20:19:38 +08:00
  • d6f8978e98 Merge branch 'feature/add_support_target_esp32c61' into 'master' Alex Lisitsyn 2024-09-25 19:13:31 +08:00
  • faf68509d1 add support target esp32c61 Alex Lisitsyn 2024-09-25 19:13:30 +08:00
  • 2601e34e21 Merge branch 'bugfix/fix_modbus_tcp_slave_close_connections_on_destroy_v1' into 'master' Alex Lisitsyn 2024-09-23 18:59:08 +08:00
  • 3689bc6259 modbus master - slave tcp port fix close connections on destroy Alex Lisitsyn 2024-09-23 18:59:08 +08:00
  • e829315275 Merge branch 'bugfix/fix_doc_types_coversion_option_en' into 'master' Alex Lisitsyn 2024-09-20 21:14:34 +08:00
  • 4938cbee31 fix build docs, fix extended types enable option v1 Alex Lisitsyn 2024-09-20 21:14:34 +08:00
  • ea295ac957 Merge branch 'bugfix/fix_doc_types_coversion_option_en' into 'master' Alex Lisitsyn 2024-09-16 20:46:25 +08:00
  • 6b3ba11fd6 docs fix extended types enable option v1 Alex Lisitsyn 2024-09-16 20:46:25 +08:00
  • 801059b8ec Merge branch 'feature/component_add_support_policy_idf_v5.3_v1' into 'master' v1.0.16 Alex Lisitsyn 2024-09-11 22:18:21 +08:00
  • 3b10a452cc address modbus support policy for esp-idf v5.3, pipeline update Alex Lisitsyn 2024-09-11 22:18:21 +08:00
  • cce9629da2 Merge branch 'feature/modbus_tcp_master_slave_v2' into 'release/v2.0' v2.0.0-beta Alex Lisitsyn 2024-09-02 03:12:36 +08:00
  • 2e2be467f6 feature modbus tcp master slave v2 Alex Lisitsyn 2024-09-02 03:12:36 +08:00
  • 6edead8e9b Merge branch 'feature/add_support_target_esp32c5' into 'master' Alex Lisitsyn 2024-08-29 18:23:17 +08:00
  • b43909aa2e add support of esp32c5 target Alex Lisitsyn 2024-08-29 18:23:17 +08:00
  • d4345f8cd7 Merge branch 'bugfix/fix_closing_braces_cpp' into 'release/v2.0' Alex Lisitsyn 2024-08-26 19:23:43 +08:00
  • 7e53d81517 fix ci issues aleks 2024-08-26 12:10:31 +02:00
  • 538234a2e0 Removed extra closing braces to avoid C++ compiler error Daniel Schick 2024-08-07 16:05:22 +02:00
  • d0be4c9478 Merge branch 'feature/fix_input_reg_max_reg_count' into 'master' Alex Lisitsyn 2024-08-19 16:36:51 +08:00
  • 41d426ce3d modbus fix read input regs max number Alex Lisitsyn 2024-08-19 16:36:51 +08:00
  • 833250c6e7 Merge branch 'bugfix/modbus_fix_using_hostname' into 'master' Alex Lisitsyn 2024-08-16 22:22:59 +08:00
  • cab2708dcf Bugfix/modbus fix using of hostname Alex Lisitsyn 2024-08-16 22:22:59 +08:00