diff --git a/include/Buffers.h b/include/Buffers.h index 78026740..4e08a379 100644 --- a/include/Buffers.h +++ b/include/Buffers.h @@ -1,7 +1,7 @@ -#pragma once -#include "Global.h" -#include "MqttClient.h" +//#pragma once +//#include "Global.h" +//#include "MqttClient.h" -void eventGen2(String eventName, String eventValue); -extern void spaceCmdExecute(String &cmdStr); -extern String getValueJson(String &key); \ No newline at end of file +//void eventGen2(String eventName, String eventValue); +//extern void spaceCmdExecute(String &cmdStr); +//extern String getValueJson(String &key); \ No newline at end of file diff --git a/src/Buffers.cpp b/src/Buffers.cpp index d8338cb2..79d31500 100644 --- a/src/Buffers.cpp +++ b/src/Buffers.cpp @@ -1,35 +1,35 @@ -#include "Buffers.h" +//#include "Buffers.h" //генеирует событие -void eventGen2(String eventName, String eventValue) { - if (!jsonReadBool(settingsFlashJson, "scen")) { - return; - } - String event = eventName + " " + eventValue + ","; - eventBuf += event; +// void eventGen2(String eventName, String eventValue) { +// if (!jsonReadBool(settingsFlashJson, "scen")) { +// return; +// } +// String event = eventName + " " + eventValue + ","; +// eventBuf += event; - SerialPrint("i", "Event add", eventName + " " + eventValue); +// SerialPrint("i", "Event add", eventName + " " + eventValue); - if (jsonReadBool(settingsFlashJson, "MqttOut")) { - if (eventName != "timenow") { - publishEvent(eventName, eventValue); - } - } -} +// if (jsonReadBool(settingsFlashJson, "MqttOut")) { +// if (eventName != "timenow") { +// publishEvent(eventName, eventValue); +// } +// } +// } -void spaceCmdExecute(String& cmdStr) { - cmdStr += "\r\n"; - cmdStr.replace("\r\n", "\n"); - cmdStr.replace("\r", "\n"); - while (cmdStr.length()) { - String buf = selectToMarker(cmdStr, "\n"); - if (buf != "") { - sCmd.readStr(buf); - SerialPrint("i", F("Order done W"), buf); - } - cmdStr = deleteBeforeDelimiter(cmdStr, "\n"); - } -} +// void spaceCmdExecute(String& cmdStr) { +// cmdStr += "\r\n"; +// cmdStr.replace("\r\n", "\n"); +// cmdStr.replace("\r", "\n"); +// while (cmdStr.length()) { +// String buf = selectToMarker(cmdStr, "\n"); +// if (buf != "") { +// sCmd.readStr(buf); +// SerialPrint("i", F("Order done W"), buf); +// } +// cmdStr = deleteBeforeDelimiter(cmdStr, "\n"); +// } +// } // String getValueJson(String& key) { // String live = jsonReadStr(paramsHeapJson, key);