From a5171f1178b2c7ebcc0b4a245b7a9803da0c2791 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 20 Oct 2020 22:55:45 +0300 Subject: [PATCH] Optimization --- .vscode/settings.json | 3 +- data/items/input-time.txt | 2 +- data/set.device.json | 2 +- include/Consts.h | 3 +- include/Errors.h | 52 --------------------------- include/Global.h | 4 +-- include/Utils/PrintMessage.h | 1 - include/items/InputClass.h | 2 +- include/items/SensorAnalogClass.h | 2 +- include/items/SensorBme280Class.h | 8 ++--- include/items/SensorBmp280Class.h | 6 ++-- include/items/SensorDallasClass.h | 4 +-- include/items/SensorDhtClass.h | 6 ++-- include/items/SensorModbusClass.h | 6 ++-- include/items/SensorUltrasonicClass.h | 4 +-- src/BufferExecute.cpp | 26 +++++++++----- src/Global.cpp | 3 +- src/Init.cpp | 2 +- src/MqttClient.cpp | 9 ++--- src/Sensors.cpp | 22 ++++++------ src/UpgradeFirm.cpp | 2 +- src/Utils/SerialPrint.cpp | 2 +- src/items/InputTimeClass.cpp | 6 ++-- src/items/SensorAnalogClass.cpp | 2 +- src/items/sysUptime.cpp | 6 ++-- 25 files changed, 69 insertions(+), 116 deletions(-) delete mode 100644 include/Errors.h diff --git a/.vscode/settings.json b/.vscode/settings.json index 37c9ae2c..63657b48 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "files.associations": { "*.tcc": "cpp", - "string": "cpp" + "string": "cpp", + "functional": "cpp" } } \ No newline at end of file diff --git a/data/items/input-time.txt b/data/items/input-time.txt index 46e49666..e90f7689 100644 --- a/data/items/input-time.txt +++ b/data/items/input-time.txt @@ -1 +1 @@ -0;input-time;id;inputTime;Ввод;Введите#время;order;st[10-00-00] \ No newline at end of file +0;input-time;id;inputTime;Ввод;Введите#время;order;st[10:00:00] \ No newline at end of file diff --git a/data/set.device.json b/data/set.device.json index 47b03164..a75e7bf2 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -31,7 +31,7 @@ }, { "type": "h4", - "title": "Time: {{time}}" + "title": "Time: {{timenow}}" }, { "type": "h4", diff --git a/include/Consts.h b/include/Consts.h index b931e4a7..52e81fc5 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -85,7 +85,8 @@ struct Time_t { enum TimerTask_t { WIFI_SCAN, WIFI_MQTT_CONNECTION_CHECK, - SENSORS, + SENSORS10SEC, + SENSORS60SEC, STEPPER1, STEPPER2, LOG1, diff --git a/include/Errors.h b/include/Errors.h deleted file mode 100644 index 2b117273..00000000 --- a/include/Errors.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once - -#include - -#include "Utils/StringUtils.h" - -class Error : public Printable { - public: - static Error OK() { - return Error(); - } - - static Error InfoMessage(const char *message) { - return Error(EL_INFO, message); - } - - static Error ErrorMessage(const char *message) { - return Error(EL_ERROR, message); - } - - public: - Error() : _type{ET_NONE}, _level{EL_NONE} {}; - - Error(const ErrorLevel_t level, const char *message) : Error(ET_FUNCTION, level, message){}; - - Error(const ErrorType_t type, const ErrorLevel_t level, const char *message) : _type{type}, _level{level} { - strncpy(_message, message, sizeof(_message)); - }; - - const ErrorLevel_t level() const { return _level; } - - const ErrorType_t type() const { return _type; } - - const char *message() const { return _message; } - - operator bool() const { return _level != EL_NONE; } - - const String toString() const { - char buf[128]; - sprintf(buf, "[%c] %s", getErrorLevelStr(_level), _message); - return String(buf); - } - - virtual size_t printTo(Print &p) const { - return p.println(toString().c_str()); - } - - private: - char _message[128]; - ErrorType_t _type; - ErrorLevel_t _level; -}; diff --git a/include/Global.h b/include/Global.h index e5d0eaed..42967865 100644 --- a/include/Global.h +++ b/include/Global.h @@ -7,7 +7,6 @@ #include "ESP8266.h" #include "Consts.h" -#include "Errors.h" #include "GyverFilters.h" #include "Upgrade.h" #include "Clock.h" @@ -74,7 +73,8 @@ extern String itemsFile; extern String itemsLine; // Sensors -extern String sensorReadingMap; +extern String sensorReadingMap10sec; +extern String sensorReadingMap60sec; extern int8_t dallasEnterCounter; extern String logging_value_names_list; diff --git a/include/Utils/PrintMessage.h b/include/Utils/PrintMessage.h index f33f4252..2db05d6b 100644 --- a/include/Utils/PrintMessage.h +++ b/include/Utils/PrintMessage.h @@ -3,7 +3,6 @@ #include "Arduino.h" #include "Utils/StringUtils.h" #include "Utils/TimeUtils.h" -#include "Errors.h" #include "Global.h" #define pm PrintMessage(MODULE) diff --git a/include/items/InputClass.h b/include/items/InputClass.h index 7d072423..afe5a0f8 100644 --- a/include/items/InputClass.h +++ b/include/items/InputClass.h @@ -24,7 +24,7 @@ class InputClass : public LineParsing { void inputSetStr(String key, String state) { eventGen(key, ""); jsonWriteStr(configLiveJson, key, state); - publishStatus(key, state); + publishStatus(key, state); } }; diff --git a/include/items/SensorAnalogClass.h b/include/items/SensorAnalogClass.h index 2c1eab4d..f1659263 100644 --- a/include/items/SensorAnalogClass.h +++ b/include/items/SensorAnalogClass.h @@ -29,7 +29,7 @@ class SensorAnalogClass : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); return value; } }; diff --git a/include/items/SensorBme280Class.h b/include/items/SensorBme280Class.h index 35641652..11e97169 100644 --- a/include/items/SensorBme280Class.h +++ b/include/items/SensorBme280Class.h @@ -18,7 +18,7 @@ class SensorBme280Class : public SensorConvertingClass { bme.begin(hexStringToUint8(_addr)); jsonWriteStr(configOptionJson, _key + "_map", _map); jsonWriteStr(configOptionJson, _key + "_с", _c); - sensorReadingMap += _key + ","; + sensorReadingMap10sec += _key + ","; } void SensorBme280ReadTmp(String key) { @@ -28,7 +28,7 @@ class SensorBme280Class : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } void SensorBme280ReadHum(String key) { @@ -38,7 +38,7 @@ class SensorBme280Class : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } void SensorBme280ReadPress(String key) { @@ -49,7 +49,7 @@ class SensorBme280Class : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } }; extern SensorBme280Class mySensorBme280; \ No newline at end of file diff --git a/include/items/SensorBmp280Class.h b/include/items/SensorBmp280Class.h index 438258fc..28ef71a0 100644 --- a/include/items/SensorBmp280Class.h +++ b/include/items/SensorBmp280Class.h @@ -17,7 +17,7 @@ class SensorBmp280Class : public SensorConvertingClass { bmp.begin(hexStringToUint8(_addr)); jsonWriteStr(configOptionJson, _key + "_map", _map); jsonWriteStr(configOptionJson, _key + "_с", _c); - sensorReadingMap += _key + ","; + sensorReadingMap10sec += _key + ","; } void SensorBmp280ReadTmp(String key) { @@ -29,7 +29,7 @@ class SensorBmp280Class : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } void SensorBmp280ReadPress(String key) { @@ -42,7 +42,7 @@ class SensorBmp280Class : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } }; extern SensorBmp280Class mySensorBmp280; \ No newline at end of file diff --git a/include/items/SensorDallasClass.h b/include/items/SensorDallasClass.h index ff7e11bf..203bd7f0 100644 --- a/include/items/SensorDallasClass.h +++ b/include/items/SensorDallasClass.h @@ -14,7 +14,7 @@ class SensorDallasClass : public SensorConvertingClass { sensors.begin(); sensors.setResolution(48); - sensorReadingMap += _key + ","; + sensorReadingMap10sec += _key + ","; dallasEnterCounter++; jsonWriteInt(configOptionJson, _key + "_num", dallasEnterCounter); @@ -37,7 +37,7 @@ class SensorDallasClass : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } } } diff --git a/include/items/SensorDhtClass.h b/include/items/SensorDhtClass.h index bea2edb9..c90fc578 100644 --- a/include/items/SensorDhtClass.h +++ b/include/items/SensorDhtClass.h @@ -17,7 +17,7 @@ class SensorDhtClass : public SensorConvertingClass { if (_type == "dht22") { dht.setup(_pin.toInt(), DHTesp::DHT22); } - sensorReadingMap += _key + ","; + sensorReadingMap10sec += _key + ","; //to do если надо будет читать несколько dht //dhtEnterCounter++; @@ -44,7 +44,7 @@ class SensorDhtClass : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } else { Serial.println("[E] sensor '" + key); } @@ -68,7 +68,7 @@ class SensorDhtClass : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } else { Serial.println("[E] sensor '" + key); } diff --git a/include/items/SensorModbusClass.h b/include/items/SensorModbusClass.h index 27f36c66..39c3d8bd 100644 --- a/include/items/SensorModbusClass.h +++ b/include/items/SensorModbusClass.h @@ -18,8 +18,8 @@ // uart.begin(9600); // jsonWriteStr(configOptionJson, _key + "_map", _map); // jsonWriteStr(configOptionJson, _key + "_с", _c); -// sensorReadingMap += _key + " " + _addr + " " + _reg + ","; -// Serial.println(sensorReadingMap); +// sensorReadingMap10sec += _key + " " + _addr + " " + _reg + ","; +// Serial.println(sensorReadingMap10sec); // } // // void SensorModbusRead(String key, uint8_t slaveAddress, uint16_t regAddress) { @@ -38,7 +38,7 @@ // eventGen(key, ""); // jsonWriteStr(configLiveJson, key, String(valueFl)); // publishStatus(key, String(valueFl)); -// Serial.println("I sensor '" + key + "' data: " + String(valueFl) + ", Slave dev addr: " + String(slaveAddress) + ", Register: " + String(regAddress)); +// SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl) + ", Slave dev addr: " + String(slaveAddress) + ", Register: " + String(regAddress)); // } // // bool getResultMsg(ModbusMaster* modbus1, uint16_t result) { diff --git a/include/items/SensorUltrasonicClass.h b/include/items/SensorUltrasonicClass.h index 06d6a972..5dee38dd 100644 --- a/include/items/SensorUltrasonicClass.h +++ b/include/items/SensorUltrasonicClass.h @@ -12,7 +12,7 @@ class SensorUltrasonic : public SensorConvertingClass { public: SensorUltrasonic() : SensorConvertingClass(){}; void init() { - sensorReadingMap += _key + ","; + sensorReadingMap10sec += _key + ","; String trig = selectFromMarkerToMarker(_pin, ",", 0); String echo = selectFromMarkerToMarker(_pin, ",", 1); pinMode(trig.toInt(), OUTPUT); @@ -43,7 +43,7 @@ class SensorUltrasonic : public SensorConvertingClass { eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); publishStatus(key, String(valueFl)); - Serial.println("I sensor '" + key + "' data: " + String(valueFl)); + SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } }; extern SensorUltrasonic mySensorUltrasonic; \ No newline at end of file diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp index ef78ca8d..677a0989 100644 --- a/src/BufferExecute.cpp +++ b/src/BufferExecute.cpp @@ -1,9 +1,7 @@ #include "BufferExecute.h" + #include "Global.h" #include "Module/Terminal.h" -#include "Errors.h" - - void loopCmdAdd(const String &cmdStr) { orderBuf += cmdStr; @@ -18,7 +16,6 @@ void fileCmdExecute(const String &filename) { } void csvCmdExecute(String &cmdStr) { - cmdStr.replace(";", " "); cmdStr += "\r\n"; cmdStr.replace("\r\n", "\n"); @@ -26,7 +23,7 @@ void csvCmdExecute(String &cmdStr) { int count = 0; while (cmdStr.length()) { String buf = selectToMarker(cmdStr, "\n"); - buf = deleteBeforeDelimiter(buf, " "); //отсечка чекбокса + buf = deleteBeforeDelimiter(buf, " "); //отсечка чекбокса count++; if (count > 1) sCmd.readStr(buf); cmdStr = deleteBeforeDelimiter(cmdStr, "\n"); @@ -47,16 +44,27 @@ void spaceCmdExecute(String &cmdStr) { void loopCmdExecute() { if (orderBuf.length()) { String tmp = selectToMarker(orderBuf, ","); //выделяем первую команду rel 5 1, - SerialPrint("I","CMD","do: " + tmp); - sCmd.readStr(tmp); //выполняем + SerialPrint("I", "CMD", "do: " + tmp); + sCmd.readStr(tmp); //выполняем orderBuf = deleteBeforeDelimiter(orderBuf, ","); //осекаем } } void sensorsInit() { ts.add( - SENSORS, 10000, [&](void *) { - String buf = sensorReadingMap; + SENSORS10SEC, 10000, [&](void *) { + String buf = sensorReadingMap10sec; + while (buf.length()) { + String tmp = selectToMarker(buf, ","); + sCmd.readStr(tmp); + buf = deleteBeforeDelimiter(buf, ","); + } + }, + nullptr, true); + + ts.add( + SENSORS60SEC, 60000, [&](void *) { + String buf = sensorReadingMap60sec; while (buf.length()) { String tmp = selectToMarker(buf, ","); sCmd.readStr(tmp); diff --git a/src/Global.cpp b/src/Global.cpp index 2c033a2d..d840dd98 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -39,7 +39,8 @@ String itemsLine = ""; // Sensors int8_t dallasEnterCounter = -1; -String sensorReadingMap; +String sensorReadingMap10sec; +String sensorReadingMap60sec; // Logging String logging_value_names_list; diff --git a/src/Init.cpp b/src/Init.cpp index e704cc1d..057f7cf1 100644 --- a/src/Init.cpp +++ b/src/Init.cpp @@ -24,7 +24,7 @@ void all_init() { void Device_init() { - sensorReadingMap = ""; + sensorReadingMap10sec = ""; dallasEnterCounter = -1; //logging_value_names_list = ""; diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index e2c76b0c..72b2afaa 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -231,9 +231,6 @@ void publishWidgets() { void publishState() { // берет строку json и ключи превращает в топики а значения колючей в них посылает - // {"name":"MODULES","lang":"","ip":"192.168.43.60","DS":"34.00","rel1":"1","rel2":"1"} - // "name":"MODULES","lang":"","ip":"192.168.43.60","DS":"34.00","rel1":"1","rel2":"1" - // "name":"MODULES","lang":"","ip":"192.168.43.60","DS":"34.00","rel1":"1","rel2":"1", String str = configLiveJson; str.replace("{", ""); str.replace("}", ""); @@ -242,13 +239,13 @@ void publishState() { while (str.length()) { String tmp = selectToMarker(str, ","); - String topic = selectToMarker(tmp, ":"); + String topic = selectToMarker(tmp, "\":"); topic.replace("\"", ""); - String state = selectToMarkerLast(tmp, ":"); + String state = selectToMarkerLast(tmp, "\":"); state.replace("\"", ""); - if ((topic != "time") && (topic != "name") && (topic != "lang") && (topic != "ip") && (topic.indexOf("_in") < 0)) { + if (topic != "timenow") { publishStatus(topic, state); } str = deleteBeforeDelimiter(str, ","); diff --git a/src/Sensors.cpp b/src/Sensors.cpp index a4fe9bf1..d3a0817b 100644 --- a/src/Sensors.cpp +++ b/src/Sensors.cpp @@ -57,7 +57,7 @@ // //eventGen(dhtT_value_name, ""); // //jsonWriteStr(configLiveJson, dhtT_value_name, String(value)); // // publishStatus(dhtT_value_name, String(value)); -// //Serial.println("I sensor '" + dhtT_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + dhtT_value_name + "' data: " + String(value)); // } // } //} @@ -95,7 +95,7 @@ // //eventGen(dhtH_value_name, ""); // //jsonWriteStr(configLiveJson, dhtH_value_name, String(value)); // // publishStatus(dhtH_value_name, String(value)); -// //Serial.println("I sensor '" + dhtH_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + dhtH_value_name + "' data: " + String(value)); // } // } //} @@ -120,7 +120,7 @@ // eventGen("dhtPerception", ""); // publishStatus("dhtPerception", final_line); // if (mqtt.connected()) { -// Serial.println("I sensor 'dhtPerception' data: " + final_line); +// SerialPrint("I", "Sensor", "'dhtPerception' data: " + final_line); // } // } //} @@ -144,7 +144,7 @@ // jsonWriteStr(configLiveJson, "dhtComfort", final_line); // eventGen("dhtComfort", ""); // publishStatus("dhtComfort", final_line); -// Serial.println("I sensor 'dhtComfort' send date " + final_line); +// SerialPrint("I", "Sensor", "'dhtComfort' send date " + final_line); // } //} // @@ -236,7 +236,7 @@ // jsonWriteInt(configLiveJson, "dhtDewpoint", value); // eventGen("dhtDewpoint", ""); // publishStatus("dhtDewpoint", String(value)); -// Serial.println("I sensor 'dhtDewpoint' data: " + String(value)); +// SerialPrint("I", "Sensor", "'dhtDewpoint' data: " + String(value)); // } //} //#endif @@ -272,7 +272,7 @@ // //jsonWriteStr(configLiveJson, bmp280T_value_name, String(value)); // //eventGen(bmp280T_value_name, ""); // // publishStatus(bmp280T_value_name, String(value)); -// //Serial.println("I sensor '" + bmp280T_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + bmp280T_value_name + "' data: " + String(value)); //} // ////bmp280P press1 0x76 Давление#bmp280 Датчики any-data 2 @@ -304,7 +304,7 @@ // //jsonWriteStr(configLiveJson, bmp280P_value_name, String(value)); // //eventGen(bmp280P_value_name, ""); // // publishStatus(bmp280P_value_name, String(value)); -// //Serial.println("I sensor '" + bmp280P_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + bmp280P_value_name + "' data: " + String(value)); //} // ////========================================================================================================================================= @@ -329,7 +329,7 @@ // //jsonWriteStr(configLiveJson, bme280T_value_name, String(value)); // //eventGen(bme280T_value_name, ""); // // publishStatus(bme280T_value_name, String(value)); -// //Serial.println("I sensor '" + bme280T_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + bme280T_value_name + "' data: " + String(value)); //} // ////bme280P pres1 0x76 Давление#bmp280 Датчики any-data 1 @@ -353,7 +353,7 @@ // //jsonWriteStr(configLiveJson, bme280P_value_name, String(value)); // //eventGen(bme280P_value_name, ""); // // publishStatus(bme280P_value_name, String(value)); -// //Serial.println("I sensor '" + bme280P_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + bme280P_value_name + "' data: " + String(value)); //} // ////bme280H hum1 0x76 Влажность#bmp280 Датчики any-data 1 @@ -376,7 +376,7 @@ // //jsonWriteStr(configLiveJson, bme280H_value_name, String(value)); // //eventGen(bme280H_value_name, ""); // // publishStatus(bme280H_value_name, String(value)); -// //Serial.println("I sensor '" + bme280H_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + bme280H_value_name + "' data: " + String(value)); //} // ////bme280A altit1 0x76 Высота#bmp280 Датчики any-data 1 @@ -401,5 +401,5 @@ // // // publishStatus(bme280A_value_name, String(value)); // -// //Serial.println("I sensor '" + bme280A_value_name + "' data: " + String(value)); +// //SerialPrint("I", "Sensor", "'" + bme280A_value_name + "' data: " + String(value)); //} diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index a1b7ac3c..f98312dd 100644 --- a/src/UpgradeFirm.cpp +++ b/src/UpgradeFirm.cpp @@ -25,7 +25,7 @@ void upgradeInit() { if (isNetworkActive()) { getLastVersion(); if (lastVersion > 0) { - SerialPrint("I", "Update", "available version: " + lastVersion); + SerialPrint("I", "Update", "available version: " + String(lastVersion)); } }; } diff --git a/src/Utils/SerialPrint.cpp b/src/Utils/SerialPrint.cpp index 8f57b3dd..77f6047c 100644 --- a/src/Utils/SerialPrint.cpp +++ b/src/Utils/SerialPrint.cpp @@ -3,7 +3,7 @@ #include "Global.h" void SerialPrint(String errorLevel, String module, String msg) { - //if (module == "Stat" || module == "Update") { + //if (module == "Stat") { Serial.println(prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg); //} } \ No newline at end of file diff --git a/src/items/InputTimeClass.cpp b/src/items/InputTimeClass.cpp index fa98061e..52834b86 100644 --- a/src/items/InputTimeClass.cpp +++ b/src/items/InputTimeClass.cpp @@ -1,7 +1,6 @@ #include "ItemsCmd.h" #include "items/InputClass.h" //==========================================Модуль ввода времени============================================ -//input-time time1 inputTime Ввод Введите.время 4 st[10-00-00] //========================================================================================================== InputClass myInputTime; void inputTime() { @@ -21,8 +20,9 @@ void inputTimeSet() { void handle_time_init() { ts.add( TIME, 1000, [&](void *) { - jsonWriteStr(configLiveJson, "time", timeNow->getTime()); - jsonWriteStr(configLiveJson, "timenow", timeNow->getTimeJson()); + //jsonWriteStr(configLiveJson, "time", timeNow->getTime()); + //jsonWriteStr(configLiveJson, "timenow", timeNow->getTimeJson()); + jsonWriteStr(configLiveJson, "timenow", timeNow->getTime()); eventGen("timenow", ""); }, nullptr, true); diff --git a/src/items/SensorAnalogClass.cpp b/src/items/SensorAnalogClass.cpp index b335cc01..bba5cc60 100644 --- a/src/items/SensorAnalogClass.cpp +++ b/src/items/SensorAnalogClass.cpp @@ -8,7 +8,7 @@ void analogAdc() { mySensorAnalog.update(); String key = mySensorAnalog.gkey(); sCmd.addCommand(key.c_str(), analogReading); - sensorReadingMap += key + ","; + sensorReadingMap10sec += key + ","; mySensorAnalog.SensorAnalogInit(); mySensorAnalog.clear(); } diff --git a/src/items/sysUptime.cpp b/src/items/sysUptime.cpp index d52868ac..26119c16 100644 --- a/src/items/sysUptime.cpp +++ b/src/items/sysUptime.cpp @@ -7,16 +7,14 @@ void sysUptime() { myLineParsing.update(); String key = myLineParsing.gkey(); sCmd.addCommand(key.c_str(), uptimeReading); - sensorReadingMap += key + ","; + sensorReadingMap60sec += key + ","; myLineParsing.clear(); } void uptimeReading() { String key = sCmd.order(); - eventGen(key, ""); String uptime = timeNow->getUptime(); - uptime.replace(":", "-"); jsonWriteStr(configLiveJson, key, uptime); publishStatus(key, uptime); - Serial.println("I sensor '" + key + "' data: " + uptime); + SerialPrint("I", "Sensor", "'" + key + "' data: " + uptime); } \ No newline at end of file