jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 19:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

work in progress

Browse Source
This commit is contained in:
JeroenSt 2022-08-17 19:55:41 +02:00
parent 96a1eb3ae5
commit a04a446654
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasmota/tasmota_xdrv_driver/xdrv_63_modbus_bridge.ino
View File

@ -30,7 +30,7 @@
* -- Read Input Register -- * -- Read Input Register --
* ModbusSend {"deviceaddress": 1, "functioncode": 3, "startaddress": 1, "type":"uint16", "count":2} * ModbusSend {"deviceaddress": 1, "functioncode": 3, "startaddress": 1, "type":"uint16", "count":2}
* -- Write multiple coils -- * -- Write multiple coils --
* ModbusSend {"deviceaddress": 1, "functioncode": 15, "startaddress": 1, "type":"uint16", "count":14, "data":[1,2,3,4,5,6,7,8,9,10,11,12,13,14]} * ModbusSend {"deviceaddress": 1, "functioncode": 15, "startaddress": 1, "type":"uint16", "count":4, "values":[1,2,3,4]}
\*********************************************************************************************/ \*********************************************************************************************/
#define XDRV_63 63 #define XDRV_63 63
@ -52,7 +52,6 @@
#define D_JSON_MODBUS_TYPE "Type" // allready defined #define D_JSON_MODBUS_TYPE "Type" // allready defined
#define D_JSON_MODBUS_VALUES "Values" #define D_JSON_MODBUS_VALUES "Values"
#define D_JSON_MODBUS_LENGTH "Length" #define D_JSON_MODBUS_LENGTH "Length"
#define D_JSON_MODBUS_DATA "Data"
#ifndef USE_MODBUS_BRIDGE_TCP #ifndef USE_MODBUS_BRIDGE_TCP
const char kModbusBridgeCommands[] PROGMEM = "Modbus|" // Prefix const char kModbusBridgeCommands[] PROGMEM = "Modbus|" // Prefix
@ -575,7 +574,7 @@ void CmndModbusBridgeSend(void)
errorcode = ModbusBridgeError::wrongcount; errorcode = ModbusBridgeError::wrongcount;
// If write data is specified in JSON copy it into writeData array // If write data is specified in JSON copy it into writeData array
JsonParserArray jsonDataArray = root[PSTR(D_JSON_MODBUS_DATA)].getArray(); JsonParserArray jsonDataArray = root[PSTR(D_JSON_MODBUS_VALUES)].getArray();
if (jsonDataArray.isArray()) if (jsonDataArray.isArray())
{ {
if (modbusBridge.dataCount > 40) if (modbusBridge.dataCount > 40)
@ -586,7 +585,7 @@ void CmndModbusBridgeSend(void)
{ {
writeDataSize = jsonDataArray.size(); writeDataSize = jsonDataArray.size();
if (modbusBridge.dataCount != writeDataSize) if (modbusBridge.count != writeDataSize)
{ {
errorcode = ModbusBridgeError::wrongcount; errorcode = ModbusBridgeError::wrongcount;
} }