From 889eb5f85bf9605dfe3ccc4054e9aaeb76cf64da Mon Sep 17 00:00:00 2001 From: Mit4el Date: Sat, 30 Nov 2024 21:11:02 +0300 Subject: [PATCH] fix display smi2 --- data_svelte/settings.json | 4 ++-- myProfile.json | 2 +- src/Main.cpp | 2 +- src/modules/display/Smi2_m/Smi2_m.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data_svelte/settings.json b/data_svelte/settings.json index b08c5c80..14c4c94a 100644 --- a/data_svelte/settings.json +++ b/data_svelte/settings.json @@ -14,7 +14,7 @@ "mqttUser": "rise", "mqttPass": "3hostel3", "serverip": "http://iotmanager.org", - "serverlocal": "http://192.168.1.2:5500", + "serverlocal": "http://192.168.1.2:5500", "log": 0, "mqttin": 0, "i2c": 0, @@ -22,7 +22,7 @@ "pinSDA": 0, "i2cFreq": 100000, "wg": "group1", - "debugTrace": 1, + "debugTraceMsgTlgrm": 1, "udps": 1, "settings_": "" } \ No newline at end of file diff --git a/myProfile.json b/myProfile.json index e8d1579c..52821839 100644 --- a/myProfile.json +++ b/myProfile.json @@ -22,7 +22,7 @@ "pinSDA": 0, "i2cFreq": 100000, "wg": "group1", - "debugTrace": 1 + "debugTraceMsgTlgrm": 1 }, "projectProp": { "platformio": { diff --git a/src/Main.cpp b/src/Main.cpp index bf22d2d5..99221627 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -221,7 +221,7 @@ void setup() { stopErrorMarker(SETUPINET_ERRORMARKER); bool postMsgTelegram; - if (!jsonRead(settingsFlashJson, "debugTrace", postMsgTelegram, false)) postMsgTelegram = 1; + if (!jsonRead(settingsFlashJson, "debugTraceMsgTlgrm", postMsgTelegram, false)) postMsgTelegram = 1; sendDebugTraceAndFreeMemory(postMsgTelegram); initErrorMarker(SETUPLAST_ERRORMARKER); diff --git a/src/modules/display/Smi2_m/Smi2_m.cpp b/src/modules/display/Smi2_m/Smi2_m.cpp index a93572cc..1d0194c9 100644 --- a/src/modules/display/Smi2_m/Smi2_m.cpp +++ b/src/modules/display/Smi2_m/Smi2_m.cpp @@ -45,7 +45,7 @@ class Smi2_m : public IoTItem { // Пакет,SLAVE адрес,функция модбус,адрес регистра,количесво запрашиваемых регистров,локальный адрес регистра. // Пакет,SLAVE адрес,функция модбус,адрес регистра,данные,локальный адрес регистра. smi->modbus_construct(&packets[PACKET1], 1, PRESET_MULTIPLE_REGISTERS, 4200, 1, 0); - smi->modbus_configure(&Serial, _baud, SERIAL_8N1, _rx, _tx, _pin, packets, TOTAL_NO_OF_PACKETS, regs); + smi->modbus_configure((HardwareSerial*)&Serial, _baud, SERIAL_8N1, _rx, _tx, _pin, &packets[PACKET1], (uint)TOTAL_NO_OF_PACKETS, ®s[0]); jsonRead(parameters, "id2show", _show); }