iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230 from biveraxe/ver4dev

Browse Source 
Дорабатываем режим 2 для экрана Nextion
This commit is contained in:
Ilya Belyakov
2022-11-07 12:05:16 +03:00
committed by GitHub
parent 2bf726b617 875cc933b3
commit ca0d9a4a5d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/sensors/UART/Uart.cpp
View File

@@ -53,6 +53,10 @@ class UART : public IoTItem {
break; break;
case 2: // формат команд от Nextion ID=Value case 2: // формат команд от Nextion ID=Value
if (msg.indexOf("=") == -1) { // если входящее сообщение не по формату, то работаем как в режиме 0
setValue(msg);
break;
}
String id = selectToMarker(msg, "="); String id = selectToMarker(msg, "=");
String valStr = selectToMarkerLast(msg, "="); String valStr = selectToMarkerLast(msg, "=");
valStr.replace("\"", ""); valStr.replace("\"", "");
@@ -100,7 +104,7 @@ class UART : public IoTItem {
printStr += eventItem->getID(); printStr += eventItem->getID();
printStr += "="; printStr += "=";
if (eventItem->value.isDecimal) if (eventItem->value.isDecimal)
printStr += eventItem->value.valD; printStr += eventItem->getRoundValue();
else { else {
printStr += "\""; printStr += "\"";
printStr += eventItem->value.valS; printStr += eventItem->value.valS;