jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Localize ModbusBridge global func/var names

Browse Source
This commit is contained in:
Norbert Richter 2022-11-06 10:23:05 +01:00
parent 31516f2d34
commit f76bed338b
No known key found for this signature in database
GPG Key ID: 6628701A626FA674
1 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tasmota/tasmota_xdrv_driver/xdrv_63_modbus_bridge.ino
View File

@ -102,7 +102,7 @@ ModbusBridgeTCP modbusBridgeTCP;
#endif #endif
#include <TasmotaModbus.h> #include <TasmotaModbus.h>
TasmotaModbus *tasmotaModbus = nullptr; TasmotaModbus *modbusBridgeModbus = nullptr;
enum class ModbusBridgeError enum class ModbusBridgeError
{ {
@ -172,21 +172,13 @@ ModbusBridge modbusBridge;
/********************************************************************************************/ /********************************************************************************************/
// //
// Helper functions for data conversion between little and big endian // Helper functions
// //
uint16_t swap_endian16(uint16_t num) uint16_t ModbusBridgeSwapEndian16(uint16_t num)
{ {
return (num>>8) | (num<<8); return (num>>8) | (num<<8);
} }
uint32_t swap_endian32(uint32_t num)
{
return ((num>>24)&0xff) | // move byte 3 to byte 0
((num<<8)&0xff0000) | // move byte 1 to byte 2
((num>>8)&0xff00) | // move byte 2 to byte 1
((num<<24)&0xff000000); // byte 0 to byte 3
}
void ModbusBridgeAllocError(const char* s) void ModbusBridgeAllocError(const char* s)
{ {
AddLog(LOG_LEVEL_ERROR, PSTR("MBS: could not allocate %s buffer"), s); AddLog(LOG_LEVEL_ERROR, PSTR("MBS: could not allocate %s buffer"), s);
@ -203,7 +195,7 @@ bool ModbusBridgeBegin(void)
if (Settings->modbus_sconfig > TS_SERIAL_8O2) if (Settings->modbus_sconfig > TS_SERIAL_8O2)
Settings->modbus_sconfig = TS_SERIAL_8N1; Settings->modbus_sconfig = TS_SERIAL_8N1;
int result = tasmotaModbus->Begin(Settings->modbus_sbaudrate * 300, ConvertSerialConfig(Settings->modbus_sconfig)); // Reinitialize modbus port with new baud rate int result = modbusBridgeModbus->Begin(Settings->modbus_sbaudrate * 300, ConvertSerialConfig(Settings->modbus_sconfig)); // Reinitialize modbus port with new baud rate
if (result) if (result)
{ {
if (2 == result) if (2 == result)
@ -215,7 +207,7 @@ bool ModbusBridgeBegin(void)
return result; return result;
} }
void SetModbusBridgeConfig(uint32_t serial_config) void ModbusBridgeSetConfig(uint32_t serial_config)
{ {
if (serial_config > TS_SERIAL_8O2) if (serial_config > TS_SERIAL_8O2)
{ {
@ -228,7 +220,7 @@ void SetModbusBridgeConfig(uint32_t serial_config)
} }
} }
void SetModbusBridgeBaudrate(uint32_t baudrate) void ModbusBridgeSetBaudrate(uint32_t baudrate)
{ {
if ((baudrate >= 300) && (baudrate <= 115200)) if ((baudrate >= 300) && (baudrate <= 115200))
{ {
@ -246,7 +238,7 @@ void SetModbusBridgeBaudrate(uint32_t baudrate)
// //
void ModbusBridgeHandle(void) void ModbusBridgeHandle(void)
{ {
bool data_ready = tasmotaModbus->ReceiveReady(); bool data_ready = modbusBridgeModbus->ReceiveReady();
if (data_ready) if (data_ready)
{ {
uint8_t *buffer; uint8_t *buffer;
@ -258,7 +250,7 @@ void ModbusBridgeHandle(void)
return; return;
} }
memset(buffer, 0, 9 + modbusBridge.byteCount); memset(buffer, 0, 9 + modbusBridge.byteCount);
uint32_t error = tasmotaModbus->ReceiveBuffer(buffer, 0, modbusBridge.byteCount); uint32_t error = modbusBridgeModbus->ReceiveBuffer(buffer, 0, modbusBridge.byteCount);
#ifdef USE_MODBUS_BRIDGE_TCP #ifdef USE_MODBUS_BRIDGE_TCP
for (uint32_t i = 0; i < nitems(modbusBridgeTCP.client_tcp); i++) for (uint32_t i = 0; i < nitems(modbusBridgeTCP.client_tcp); i++)
@ -367,10 +359,10 @@ void ModbusBridgeHandle(void)
if (modbusBridge.type == ModbusBridgeType::mb_raw) if (modbusBridge.type == ModbusBridgeType::mb_raw)
{ {
Response_P(PSTR("{\"" D_JSON_MODBUS_RECEIVED "\":{\"RAW\":[")); Response_P(PSTR("{\"" D_JSON_MODBUS_RECEIVED "\":{\"RAW\":["));
for (uint8_t i = 0; i < tasmotaModbus->ReceiveCount(); i++) for (uint8_t i = 0; i < modbusBridgeModbus->ReceiveCount(); i++)
{ {
ResponseAppend_P(PSTR("%d"), buffer[i]); ResponseAppend_P(PSTR("%d"), buffer[i]);
if (i < tasmotaModbus->ReceiveCount() - 1) if (i < modbusBridgeModbus->ReceiveCount() - 1)
ResponseAppend_P(PSTR(",")); ResponseAppend_P(PSTR(","));
} }
ResponseAppend_P(PSTR("]}")); ResponseAppend_P(PSTR("]}"));
@ -380,10 +372,10 @@ void ModbusBridgeHandle(void)
else if (modbusBridge.type == ModbusBridgeType::mb_hex) else if (modbusBridge.type == ModbusBridgeType::mb_hex)
{ {
Response_P(PSTR("{\"" D_JSON_MODBUS_RECEIVED "\":{\"HEX\":[")); Response_P(PSTR("{\"" D_JSON_MODBUS_RECEIVED "\":{\"HEX\":["));
for (uint8_t i = 0; i < tasmotaModbus->ReceiveCount(); i++) for (uint8_t i = 0; i < modbusBridgeModbus->ReceiveCount(); i++)
{ {
ResponseAppend_P(PSTR("0x%02X"), buffer[i]); ResponseAppend_P(PSTR("0x%02X"), buffer[i]);
if (i < tasmotaModbus->ReceiveCount() - 1) if (i < modbusBridgeModbus->ReceiveCount() - 1)
ResponseAppend_P(PSTR(",")); ResponseAppend_P(PSTR(","));
} }
ResponseAppend_P(PSTR("]}")); ResponseAppend_P(PSTR("]}"));
@ -405,7 +397,7 @@ void ModbusBridgeHandle(void)
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_START_ADDRESS "\":%d,"), (buffer[2] << 8) + buffer[3]); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_START_ADDRESS "\":%d,"), (buffer[2] << 8) + buffer[3]);
dataOffset = 4; dataOffset = 4;
} }
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_LENGTH "\":%d,"), tasmotaModbus->ReceiveCount()); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_LENGTH "\":%d,"), modbusBridgeModbus->ReceiveCount());
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_COUNT "\":%d,"), modbusBridge.count); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_COUNT "\":%d,"), modbusBridge.count);
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_VALUES "\":[")); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_VALUES "\":["));
@ -539,7 +531,7 @@ void ModbusBridgeHandle(void)
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_DEVICE_ADDRESS "\":%d,"), buffer[0]); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_DEVICE_ADDRESS "\":%d,"), buffer[0]);
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_FUNCTION_CODE "\":%d,"), buffer[1]); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_FUNCTION_CODE "\":%d,"), buffer[1]);
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_START_ADDRESS "\":%d,"), (buffer[2] << 8) + buffer[3]); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_START_ADDRESS "\":%d,"), (buffer[2] << 8) + buffer[3]);
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_LENGTH "\":%d,"), tasmotaModbus->ReceiveCount()); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_LENGTH "\":%d,"), modbusBridgeModbus->ReceiveCount());
ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_COUNT "\":%d"), (buffer[4] << 8) + buffer[5]); ResponseAppend_P(PSTR("\"" D_JSON_MODBUS_COUNT "\":%d"), (buffer[4] << 8) + buffer[5]);
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
ResponseJsonEnd(); ResponseJsonEnd();
@ -566,7 +558,7 @@ void ModbusBridgeInit(void)
{ {
if (PinUsed(GPIO_MBR_RX) && PinUsed(GPIO_MBR_TX)) if (PinUsed(GPIO_MBR_RX) && PinUsed(GPIO_MBR_TX))
{ {
tasmotaModbus = new TasmotaModbus(Pin(GPIO_MBR_RX), Pin(GPIO_MBR_TX)); modbusBridgeModbus = new TasmotaModbus(Pin(GPIO_MBR_RX), Pin(GPIO_MBR_TX));
ModbusBridgeBegin(); ModbusBridgeBegin();
#ifdef USE_MODBUS_BRIDGE_TCP #ifdef USE_MODBUS_BRIDGE_TCP
// If TCP bridge is enabled allocate a TCP receive buffer // If TCP bridge is enabled allocate a TCP receive buffer
@ -591,7 +583,7 @@ void ModbusTCPHandle(void)
bool busy; // did we transfer some data? bool busy; // did we transfer some data?
int32_t buf_len; int32_t buf_len;
if (!tasmotaModbus) if (!modbusBridgeModbus)
return; return;
// check for a new client connection // check for a new client connection
@ -676,7 +668,7 @@ void ModbusTCPHandle(void)
} }
else else
{ {
// For functioncode 15 & 16 ignore bytecount, tasmotaModbus does calculate this // For functioncode 15 & 16 ignore bytecount, modbusBridgeModbus does calculate this
uint8_t dataStartByte = mbfunctioncode <= 6 ? 10 : 13; uint8_t dataStartByte = mbfunctioncode <= 6 ? 10 : 13;
uint16_t byteCount = (buf_len - dataStartByte); uint16_t byteCount = (buf_len - dataStartByte);
modbusBridge.byteCount = 2; modbusBridge.byteCount = 2;
@ -708,7 +700,7 @@ void ModbusTCPHandle(void)
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("MBS: MBRTCP to Modbus TransactionId:%d, deviceAddress:%d, functionCode:%d, startAddress:%d, count:%d, recvCount:%d, recvBytes:%d"), AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("MBS: MBRTCP to Modbus TransactionId:%d, deviceAddress:%d, functionCode:%d, startAddress:%d, count:%d, recvCount:%d, recvBytes:%d"),
modbusBridgeTCP.tcp_transaction_id, mbdeviceaddress, mbfunctioncode, mbstartaddress, count, modbusBridge.dataCount, modbusBridge.byteCount); modbusBridgeTCP.tcp_transaction_id, mbdeviceaddress, mbfunctioncode, mbstartaddress, count, modbusBridge.dataCount, modbusBridge.byteCount);
tasmotaModbus->Send(mbdeviceaddress, mbfunctioncode, mbstartaddress, count, writeData); modbusBridgeModbus->Send(mbdeviceaddress, mbfunctioncode, mbstartaddress, count, writeData);
free(writeData); free(writeData);
} }
@ -920,26 +912,26 @@ void CmndModbusBridgeSend(void)
break; break;
case ModbusBridgeType::mb_int16: case ModbusBridgeType::mb_int16:
writeData[jsonDataArrayPointer] = bitMode ? swap_endian16(jsonDataArray[jsonDataArrayPointer].getInt(0)) writeData[jsonDataArrayPointer] = bitMode ? ModbusBridgeSwapEndian16(jsonDataArray[jsonDataArrayPointer].getInt(0))
: (int16_t)jsonDataArray[jsonDataArrayPointer].getInt(0); : (int16_t)jsonDataArray[jsonDataArrayPointer].getInt(0);
break; break;
case ModbusBridgeType::mb_uint16: case ModbusBridgeType::mb_uint16:
writeData[jsonDataArrayPointer] = bitMode ? swap_endian16(jsonDataArray[jsonDataArrayPointer].getUInt(0)) writeData[jsonDataArrayPointer] = bitMode ? ModbusBridgeSwapEndian16(jsonDataArray[jsonDataArrayPointer].getUInt(0))
: (int16_t)jsonDataArray[jsonDataArrayPointer].getUInt(0); : (int16_t)jsonDataArray[jsonDataArrayPointer].getUInt(0);
break; break;
case ModbusBridgeType::mb_int32: case ModbusBridgeType::mb_int32:
writeData[(jsonDataArrayPointer * 2)] = bitMode ? swap_endian16(jsonDataArray[jsonDataArrayPointer].getInt(0)) writeData[(jsonDataArrayPointer * 2)] = bitMode ? ModbusBridgeSwapEndian16(jsonDataArray[jsonDataArrayPointer].getInt(0))
: (int16_t)(jsonDataArray[jsonDataArrayPointer].getInt(0) >> 16); : (int16_t)(jsonDataArray[jsonDataArrayPointer].getInt(0) >> 16);
writeData[(jsonDataArrayPointer * 2) + 1] = bitMode ? swap_endian16(jsonDataArray[jsonDataArrayPointer].getInt(0) >> 16) writeData[(jsonDataArrayPointer * 2) + 1] = bitMode ? ModbusBridgeSwapEndian16(jsonDataArray[jsonDataArrayPointer].getInt(0) >> 16)
: (uint16_t)(jsonDataArray[jsonDataArrayPointer].getInt(0)); : (uint16_t)(jsonDataArray[jsonDataArrayPointer].getInt(0));
break; break;
case ModbusBridgeType::mb_uint32: case ModbusBridgeType::mb_uint32:
writeData[(jsonDataArrayPointer * 2)] = bitMode ? swap_endian16(jsonDataArray[jsonDataArrayPointer].getUInt(0)) writeData[(jsonDataArrayPointer * 2)] = bitMode ? ModbusBridgeSwapEndian16(jsonDataArray[jsonDataArrayPointer].getUInt(0))
: (uint16_t)(jsonDataArray[jsonDataArrayPointer].getUInt(0) >> 16); : (uint16_t)(jsonDataArray[jsonDataArrayPointer].getUInt(0) >> 16);
writeData[(jsonDataArrayPointer * 2) + 1] = bitMode ? swap_endian16(jsonDataArray[jsonDataArrayPointer].getUInt(0) >> 16) writeData[(jsonDataArrayPointer * 2) + 1] = bitMode ? ModbusBridgeSwapEndian16(jsonDataArray[jsonDataArrayPointer].getUInt(0) >> 16)
: (uint16_t)(jsonDataArray[jsonDataArrayPointer].getUInt(0)); : (uint16_t)(jsonDataArray[jsonDataArrayPointer].getUInt(0));
break; break;
@ -971,7 +963,7 @@ void CmndModbusBridgeSend(void)
if ((modbusBridge.functionCode == ModbusBridgeFunctionCode::mb_writeSingleCoil) || (modbusBridge.functionCode == ModbusBridgeFunctionCode::mb_writeSingleRegister)) if ((modbusBridge.functionCode == ModbusBridgeFunctionCode::mb_writeSingleCoil) || (modbusBridge.functionCode == ModbusBridgeFunctionCode::mb_writeSingleRegister))
modbusBridge.dataCount = 1; modbusBridge.dataCount = 1;
uint8_t error = tasmotaModbus->Send(modbusBridge.deviceAddress, (uint8_t)modbusBridge.functionCode, modbusBridge.startAddress, modbusBridge.dataCount, writeData); uint8_t error = modbusBridgeModbus->Send(modbusBridge.deviceAddress, (uint8_t)modbusBridge.functionCode, modbusBridge.startAddress, modbusBridge.dataCount, writeData);
free(writeData); free(writeData);
if (error) if (error)
@ -984,7 +976,7 @@ void CmndModbusBridgeSend(void)
void CmndModbusBridgeSetBaudrate(void) void CmndModbusBridgeSetBaudrate(void)
{ {
SetModbusBridgeBaudrate(XdrvMailbox.payload); ModbusBridgeSetBaudrate(XdrvMailbox.payload);
ResponseCmndNumber(Settings->modbus_sbaudrate * 300); ResponseCmndNumber(Settings->modbus_sbaudrate * 300);
} }
@ -1000,7 +992,7 @@ void CmndModbusBridgeSetConfig(void)
{ // Use 0..23 as serial config option { // Use 0..23 as serial config option
if ((XdrvMailbox.payload >= TS_SERIAL_5N1) && (XdrvMailbox.payload <= TS_SERIAL_8O2)) if ((XdrvMailbox.payload >= TS_SERIAL_5N1) && (XdrvMailbox.payload <= TS_SERIAL_8O2))
{ {
SetModbusBridgeConfig(XdrvMailbox.payload); ModbusBridgeSetConfig(XdrvMailbox.payload);
} }
} }
else if ((XdrvMailbox.payload >= 5) && (XdrvMailbox.payload <= 8)) else if ((XdrvMailbox.payload >= 5) && (XdrvMailbox.payload <= 8))
@ -1008,7 +1000,7 @@ void CmndModbusBridgeSetConfig(void)
int8_t serial_config = ParseSerialConfig(XdrvMailbox.data); int8_t serial_config = ParseSerialConfig(XdrvMailbox.data);
if (serial_config >= 0) if (serial_config >= 0)
{ {
SetModbusBridgeConfig(serial_config); ModbusBridgeSetConfig(serial_config);
} }
} }
} }
@ -1023,7 +1015,7 @@ void CmndModbusBridgeSetConfig(void)
void CmndModbusTCPStart(void) void CmndModbusTCPStart(void)
{ {
if (!tasmotaModbus) if (!modbusBridgeModbus)
{ {
return; return;
} }
@ -1076,7 +1068,7 @@ void CmndModbusTCPConnect(void)
{ {
int32_t tcp_port = XdrvMailbox.payload; int32_t tcp_port = XdrvMailbox.payload;
if (!tasmotaModbus) if (!modbusBridgeModbus)
{ {
return; return;
} }
@ -1135,7 +1127,7 @@ bool Xdrv63(uint8_t function)
{ {
ModbusBridgeInit(); ModbusBridgeInit();
} }
else if (tasmotaModbus) else if (modbusBridgeModbus)
{ {
switch (function) switch (function)
{ {