From e822414187453a6ceca871453e2d41a0a4bd22c5 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Mon, 4 Jan 2021 01:17:11 +0100 Subject: [PATCH] Uptime --- include/BufferExecute.h | 18 +----------------- include/items/sysUptime.h | 5 +++++ src/BufferExecute.cpp | 1 + src/Utils/WiFiUtils.cpp | 3 ++- src/items/sysUptime.cpp | 2 +- 5 files changed, 10 insertions(+), 19 deletions(-) create mode 100644 include/items/sysUptime.h diff --git a/include/BufferExecute.h b/include/BufferExecute.h index 28644b59..b63e40be 100644 --- a/include/BufferExecute.h +++ b/include/BufferExecute.h @@ -14,22 +14,6 @@ extern void buttonInSet(); -extern void bme280Temp(); -extern void bme280ReadingTemp(); -extern void bme280Hum(); -extern void bme280ReadingHum(); -extern void bme280Press(); -extern void bme280ReadingPress(); - -extern void bmp280Temp(); -extern void bmp280ReadingTemp(); -extern void bmp280Press(); -extern void bmp280ReadingPress(); - -//extern void modbus(); -//extern void modbusReading(); - -extern void sysUptime(); -extern void uptimeReading(); + diff --git a/include/items/sysUptime.h b/include/items/sysUptime.h new file mode 100644 index 00000000..9e9b3f7c --- /dev/null +++ b/include/items/sysUptime.h @@ -0,0 +1,5 @@ + +#pragma once + +extern void sysUptime(); +extern void uptimeReading(); \ No newline at end of file diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp index 2a28b95f..0f5c487d 100644 --- a/src/BufferExecute.cpp +++ b/src/BufferExecute.cpp @@ -2,6 +2,7 @@ #include "Global.h" #include "SoftUART.h" // +#include "items/sysUptime.h" #include "items/vSensorDallas.h" #include "items/vSensorUltrasonic.h" #include "items/vButtonOut.h" diff --git a/src/Utils/WiFiUtils.cpp b/src/Utils/WiFiUtils.cpp index 2f09705d..d69c1a59 100644 --- a/src/Utils/WiFiUtils.cpp +++ b/src/Utils/WiFiUtils.cpp @@ -1,5 +1,5 @@ #include "Utils/WiFiUtils.h" - +#include "items/sysUptime.h" #include "FileSystem.h" void routerConnect() { @@ -141,6 +141,7 @@ uint8_t RSSIquality() { void wifiSignalInit() { ts.add( SYGNAL, 1000 * 60, [&](void*) { + //uptimeReading(); SerialPrint("I", "System", printMemoryStatus()); #ifdef ESP8266 getFSInfo(); diff --git a/src/items/sysUptime.cpp b/src/items/sysUptime.cpp index 58a9e12c..b20029d9 100644 --- a/src/items/sysUptime.cpp +++ b/src/items/sysUptime.cpp @@ -1,3 +1,4 @@ +#include "items/sysUptime.h" #include "Class/LineParsing.h" #include "BufferExecute.h" #include "Global.h" @@ -7,7 +8,6 @@ void sysUptime() { myLineParsing.update(); String key = myLineParsing.gkey(); sCmd.addCommand(key.c_str(), uptimeReading); - //ensorReadingMap30sec += key + ","; myLineParsing.clear(); }