Commit Graph

49 Commits

Author SHA1 Message Date
Theo Arends 21c7edcb50 Add display of active drivers using command ``status 4`` 2023-12-27 22:03:56 +01:00
Theo Arends 433d69d4bc Fix serial resource checks
Fix serial resource checks (#20053)
2023-11-20 12:35:06 +01:00
Norbert a04995a3f4
Update xdrv_63_modbus_bridge.ino, brackets not needed. (#19759) 2023-10-16 09:42:55 +02:00
JeroenSt 91ba05ac3b
ModbusBridge write memleak fix (19733) (#19758)
Co-authored-by: JeroenSt <nospam@nospam.org>
2023-10-16 08:26:26 +02:00
chefpro 9fbb4a8b0b
Fix modbus receive handling for float types (#19697)
Co-authored-by: Peter Rustler <peter@rustlerit.de>
2023-10-08 13:14:53 +02:00
Jeroen f860722eba
Added Endianess Parameter (#18650)
https://github.com/arendst/Tasmota/discussions/18244

Co-authored-by: JeroenSt <nospam@nospam.org>
2023-05-14 14:18:45 +02:00
f-reiling 3a6cd9b63c
start modus tcp bridge automatically (#18634)
* added default port for modbus tcp bridge to start automatically

* updated ifdef style

* renamed define for modbus default port
2023-05-10 14:38:52 +02:00
Jeroen c5612a50fb
Fix for https://github.com/arendst/Tasmota/discussions/15703#discussioncomment-5713294 (#18534)
Added and fixed comments

Co-authored-by: JeroenSt <nospam@nospam.org>
2023-04-29 14:46:38 +02:00
Jeroen ee9d086aba
Solved: ModbusBridge reading int16 returns uint16 (#18524)
https://github.com/arendst/Tasmota/issues/18522

Co-authored-by: JeroenSt <nospam@nospam.org>
2023-04-26 22:27:53 +02:00
Jeroen a68bc49cab
Added option to output TCP requested modbus data to MQTT (#18231)
https://github.com/arendst/Tasmota/discussions/17369

Co-authored-by: JeroenSt <nospam@nospam.org>
2023-03-21 09:39:32 +01:00
Jeroen fbbb4eaf84
Fix for issue: https://github.com/arendst/Tasmota/issues/18088 (#18228)
Co-authored-by: JeroenSt <nospam@nospam.org>
2023-03-20 21:26:38 +01:00
Theo Arends bbde894628 Add serial Modbus transmit enable GPIOs
Add serial Modbus transmit enable GPIOs to all modbus energy drivers and modbus bridge (#17247)
2022-12-03 12:33:42 +01:00
Theo Arends c1ea8953cb Refactor uint8_t to uint32_t 2022-11-11 10:44:56 +01:00
Norbert Richter 050f2e7e61
Fix ModbusBridge buffer overflow (#16979) 2022-11-06 12:32:30 +01:00
Norbert Richter f76bed338b
Localize ModbusBridge global func/var names 2022-11-06 12:32:30 +01:00
Norbert Richter 31516f2d34
Add ModbusBridge malloc error notes 2022-11-06 12:32:30 +01:00
JeroenSt 728c108294 Removed logging and changed maximum number of coils/inputs 2022-08-27 10:54:41 +02:00
JeroenSt f57acac48b Fixed Modbus TCP function 1 & 2 not working 2022-08-27 10:40:02 +02:00
JeroenSt a19edd4983 Solved endian on uint16 2022-08-27 09:11:36 +02:00
JeroenSt 1ac5b6fd7f Rework in progress
ModbusTCP fully tested OK
Modbus via Commands:
function 1..5 tested ok
function 6 fail
function 15 & 16 not tested
2022-08-27 09:11:36 +02:00
JeroenSt 9c11eb41d4 Changed Modbus to also support nr of bytes
for functioncode 1,2 & 15.
https://ozeki.hu/p_5876-mobdbus-function-code-1-read-coils.html
2022-08-27 09:11:36 +02:00
JeroenSt 5bd28954fa Fixed reading functioncode 1 & 2 for ModbusTCP
Returned bytes need to be even (limitation of TasmotaModbus.cpp)
https://github.com/arendst/Tasmota/issues/9586
2022-08-27 09:11:36 +02:00
JeroenSt ffcdce6041 Fixed FC16
https://github.com/arendst/Tasmota/issues/9586#issuecomment-1226120239
2022-08-27 09:11:36 +02:00
JeroenSt d333948816 Solved ModbusTCP writing wrong registers 2022-08-27 09:11:36 +02:00
JeroenSt fea41407ac changed wrong copying of tcp data to writedata 2022-08-27 09:11:36 +02:00
JeroenSt a5782f2ca0 Added usefull url to comments 2022-08-27 09:11:36 +02:00
JeroenSt 2926a66fe0 Added returning of modbus error codes to TCP client
https://github.com/arendst/Tasmota/issues/9586#issuecomment-1225437630
2022-08-27 09:11:36 +02:00
JeroenSt 5f86569a9f Solved Issues mentioned in
https://github.com/arendst/Tasmota/issues/9586
2022-08-27 09:11:36 +02:00
JeroenSt a832af4dd2 added linefeed 2022-08-17 21:14:50 +02:00
JeroenSt 995b669f28 Removed debug logging 2022-08-17 20:12:26 +02:00
JeroenSt b8000fa788 Update for functioncode 5 and 6 and 15 2022-08-17 19:55:42 +02:00
JeroenSt 812fbff683 Fixed reading discrete inputs and coils
https://github.com/arendst/Tasmota/issues/9586#issuecomment-1217574286
2022-08-17 19:55:42 +02:00
JeroenSt cc2c219aa2 Modified reading of bits according to coil and input register specification 2022-08-17 19:55:42 +02:00
JeroenSt aabf188afb (u)int8 and (u)int32 are now also working 2022-08-17 19:55:42 +02:00
JeroenSt 1d4ff834ab Solved error in reading (u)int32 value and removed logging 2022-08-17 19:55:42 +02:00
JeroenSt fa3802cd67 Changed int and uint types 2022-08-17 19:55:42 +02:00
JeroenSt 3470a5d4cd Added Bit and Hex reading https://github.com/arendst/Tasmota/issues/9586#issuecomment-1216313774 2022-08-17 19:55:41 +02:00
JeroenSt a04a446654 work in progress 2022-08-17 19:55:41 +02:00
JeroenSt 96a1eb3ae5 In the first serie of tests this seems to work right. 2022-08-17 19:55:41 +02:00
JeroenSt 355e31ff2e Work in progress... 2022-08-17 19:55:41 +02:00
JeroenSt 92319eedd2 Work in progress... 2022-08-17 19:55:41 +02:00
JeroenSt 2c2a73506d Work in progress. 2022-08-17 19:55:41 +02:00
JeroenSt 9881183726 In progess: Developping modbus write functionality 2022-08-17 19:55:41 +02:00
JeroenSt cf20a9c1c8 Solved crash when modbusbridge was configured for the first time 2022-08-06 11:57:47 +02:00
JeroenSt 7fab74bc8f ModbusBridgeBegin was not called at (boot) init 2022-07-26 09:38:57 +02:00
JeroenSt 7e02b61e46 Baudrate and serial config for modbus_bridge are now persistent 2022-07-25 19:18:30 +02:00
JeroenSt bcaac8208f Adding modbus bridge TCP
Removed (u)int8 because modbus registers are always 16 bits and changed bit8 to bit
Solved memory leak, changed logging
Improved initialisation and configuring serial port
Solved bug that addresses above 4 didn't reply
Removed logging
Added mandatory comment to USE_MODBUS_TCP_BRIDGE
Using TasmotaModbus->Begin instead of begin
Added bytecount to modbus tcp reply message
Added comments
Put modustcp variables in ModbusBridgeTCP struct.
2022-07-25 14:42:55 +02:00
Theo Arends 79161d3c43 Fix BH1750 illuminance formula
Fix BH1750 illuminance formula (#16022)
2022-07-20 11:11:18 +02:00
Theo Arends 722406a461 Add support for Modbus bridge
Add support for Modbus bridge adding commands ``ModbusSend``, ``ModbusBaudrate`` and ``ModbusSerialConfig`` (#16013)
2022-07-20 10:41:02 +02:00