Commit Graph

  • 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
  • 1eafc29df3 Merge branch 'feature/add_user_error_handler' into 'master' Alex Lisitsyn 2024-06-07 20:46:16 +08:00
  • b643775c08 feature add modbus user error handler Alex Lisitsyn 2024-06-07 20:46:15 +08:00
  • 1978b071c1 modbus fix check of host name bugfix/modbus_fix_using_hostname aleks 2024-06-06 13:33:24 +02:00
  • f81ef8229e tests: add transaction time handling feature/add_user_error_handler aleks 2024-06-06 12:06:02 +02:00
  • cfa8767c18 fix atomic access to state variables aleks 2024-06-05 11:38:06 +02:00
  • 7a4e37ad82 update documentaion after review aleks 2024-05-27 10:26:42 +02:00
  • 437f2aa292 update as per review notes Alex Lisitsyn 2024-05-23 16:28:58 +08:00
  • d19b603b00 update documentation aleks 2024-05-16 13:23:49 +02:00
  • f50e220dae add the function to expose the transaction info aleks 2024-05-14 16:12:16 +02:00
  • 17de1dd9dd master add modbus buffer propagation aleks 2024-05-06 14:26:30 +02:00
  • 5e7a26b640 Merge branch 'bugfix/fix_component_upload_issues' into 'master' v1.0.15 Alex Lisitsyn 2024-04-30 22:39:48 +08:00
  • 01145ec7a2 fix component upload issues Alex Lisitsyn 2024-04-30 22:39:48 +08:00
  • 20c34b20d0 Merge branch 'bugfix/fix_master_broadcast_request_issue' into 'master' Alex Lisitsyn 2024-04-30 15:27:36 +08:00
  • c63a6d7114 fix master broadcast request issue Alex Lisitsyn 2024-04-30 15:27:36 +08:00
  • e26c0c2f5a Merge branch 'feature/doc_extend_serial_port_options' into 'master' Alex Lisitsyn 2024-04-29 22:44:08 +08:00
  • 78c809142a doc: describe on how to override modbus serial comm opts Alex Lisitsyn 2024-04-29 22:44:08 +08:00
  • db0fce4bda Merge branch 'bugfix/fix_documentation_issues' into 'release/v2.0' Alex Lisitsyn 2024-04-29 21:33:53 +08:00
  • 632145ce43 fix minor issues in the documentation Alex Lisitsyn 2024-04-29 21:33:53 +08:00
  • 77d0155675 Merge branch 'bugfix/modbus_rtu_skips_first_packet_t35meas_is_disabled' into 'master' Alex Lisitsyn 2024-04-29 20:51:21 +08:00
  • a64720b677 Bugfix/modbus rtu skips first packet t35meas is disabled Alex Lisitsyn 2024-04-29 20:51:20 +08:00
  • fcfc8756d8 increase the component version for release v1.0.14 aleks 2024-04-29 13:15:06 +02:00
  • 1c72b681fc add the comment to clarify broadcast read request restriction aleks 2024-04-26 16:18:54 +02:00
  • c52d2933d4 fix master fsm to allow broadcast request aleks 2024-04-12 16:06:11 +02:00
  • 0f67f0bb82 Merge branch 'bugfix/fix_ci_issues_log_file' into 'master' Alex Lisitsyn 2024-04-29 17:14:33 +08:00
  • b968c36daf fix ci issues - log file and build time limitation Alex Lisitsyn 2024-04-29 17:14:32 +08:00
  • 4c98083acc Merge branch 'bugfix/test_fix_ci_issues' into 'master' Alex Lisitsyn 2024-04-23 23:12:18 +08:00
  • 0534b6f18e fix issues in the documentation bugfix/fix_documentation_issues aleks 2024-04-23 14:18:53 +02:00
  • 2ee8330b3a text tcp master slave fix ip resolution aleks 2024-04-22 15:40:38 +02:00
  • 2b33f02bce Merge branch 'feature/add_extended_float_support_v2' into 'release/v2.0' Alex Lisitsyn 2024-04-19 17:36:32 +08:00
  • 6fd7c4a103 add extended float support to v2.0.x Alex Lisitsyn 2024-04-19 17:36:32 +08:00
  • 8480ff7636 Merge branch 'feature/add_extended_float_support' into 'master' Alex Lisitsyn 2024-04-19 17:11:08 +08:00
  • 0cf6bb2c6a modbus add extended float/integer support for custom and third party devices Alex Lisitsyn 2024-04-19 17:11:08 +08:00
  • b6372a2792 add support of esp32p4 aleks 2024-01-29 10:30:24 +01:00
  • 430217563f Merge branch 'feature/modbus_add_esp32p4_target_support' into 'master' v1.0.13 Alex Lisitsyn 2024-01-26 18:13:02 +08:00
  • 469eb71e07 modbus add esp32p4 target support Alex Lisitsyn 2024-01-26 18:13:02 +08:00
  • 94e9664aaa Merge branch 'bugfix/fix_serial_slave_delay_before_send' into 'master' Alex Lisitsyn 2023-12-22 17:38:19 +08:00
  • e12c7ff02c fix modbus slave wait before send option Alex Lisitsyn 2023-12-22 17:38:18 +08:00
  • 64c5400492 Merge branch 'bugfix/fix_tcp_master_close_sockets' into 'master' Alex Lisitsyn 2023-12-22 17:07:33 +08:00
  • bf271f4286 modbus master tcp port: fix to close sockets correctly, minor additions for the PR aleks 2023-12-18 12:13:20 +01:00
  • 135a8f8165 fix for closing tcp connections and watchdog timeout Floris Romeijn 2023-12-14 14:53:18 +01:00
  • f0e78b6d27 Merge branch 'bugfix/fix_incorrect_settings_from_ci_config' into 'master' Alex Lisitsyn 2023-12-20 23:56:29 +08:00
  • a889ada556 fix sdkconfig settings for ci aleks 2023-12-20 09:45:56 +01:00
  • edd29b3d3a update files for release aleks 2023-12-19 12:18:25 +01:00
  • ad93878c02 update files for release aleks 2023-12-19 12:18:25 +01:00
  • c343e08600 add test applications and unit tests aleks 2023-12-10 15:22:41 +01:00
  • 581573f6d4 add examples aleks 2023-12-10 15:18:39 +01:00
  • d3dddb0cbe add documentation aleks 2023-12-10 15:13:11 +01:00
  • 1a5c957e22 add modbus component files aleks 2023-12-10 15:10:43 +01:00
  • ea3f06cf2b Merge branch 'bugfix/fix_timer_use_isr_dispatch_method' into 'master' v1.0.12 Alex Lisitsyn 2023-09-30 02:21:04 +08:00
  • 4fe2fe8bc6 fix timer use isr dispatch method Alex Lisitsyn 2023-09-30 02:21:04 +08:00
  • e24ea4e820 Merge branch 'bugfix/fix_coil_start_bit_readout' into 'master' Alex Lisitsyn 2023-09-30 01:48:02 +08:00
  • 8950d1ca1a test coils & discrete reg mapping bugfix/fix_coil_start_bit_readout aleks 2023-09-29 10:03:35 +02:00
  • a1e96033d8 fix mbc (tcp, serial) master coils callbacks aleks 2023-09-13 16:25:30 +02:00
  • 8dadaac490 Merges https://github.com/espressif/esp-modbus/pull/35 Mateusz Grzywacz 2023-08-30 15:18:04 +02:00
  • aa93eecf57 Merge branch 'bugfix/fix_tcp_slave_start_destroy_sequence' into 'master' Alex Lisitsyn 2023-09-29 21:17:36 +08:00
  • 401dbc8f06 modbus tcp master, slave fix start - destroy sequence Alex Lisitsyn 2023-09-29 21:17:36 +08:00
  • 567fe19a8b Merge branch 'feature/docs_add_complex_parameter_description' into 'master' Alex Lisitsyn 2023-09-29 20:12:01 +08:00
  • 3c9106aaf2 add ascii/bin parameter description into documentation Alex Lisitsyn 2023-09-29 20:12:01 +08:00
  • b9140da683 fix timer use isr dispatch method bugfix/fix_timer_use_isr_dispatch_method aleks 2023-09-13 15:06:58 +02:00
  • 6cdcc8e337 change version of the component for release aleks 2023-09-29 10:53:08 +02:00
  • 38f64e5299 Merge branch 'bugfix/fix_master_event_close_sequence' into 'master' Alex Lisitsyn 2023-09-29 18:13:32 +08:00