From 8817c532f4441c24fd4aa2d209c81d8865b5705e Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 3 Nov 2020 22:45:43 +0300 Subject: [PATCH] esp32 compiling version --- include/RemoteOrdersUdp.h | 4 +++- platformio.ini | 2 +- src/items/LoggingClass.cpp | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/RemoteOrdersUdp.h b/include/RemoteOrdersUdp.h index a8c2d8e0..1500c55e 100644 --- a/include/RemoteOrdersUdp.h +++ b/include/RemoteOrdersUdp.h @@ -1,7 +1,9 @@ #pragma once +#ifdef ESP8266 #include "ESPAsyncUDP.h" extern AsyncUDP asyncUdp; extern void asyncUdpInit(); extern String uint8tToString(uint8_t* data, size_t len); extern bool udpPacketValidation(String& data); -extern void udpPacketParse(String& data); \ No newline at end of file +extern void udpPacketParse(String& data); +#endif \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index e80eaee2..7829153a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ [platformio] -default_envs = esp8266 +default_envs = esp32 ;============================================================================================================================================= [common_env_data] lib_deps_external = diff --git a/src/items/LoggingClass.cpp b/src/items/LoggingClass.cpp index ca34a0ce..b5fa298c 100644 --- a/src/items/LoggingClass.cpp +++ b/src/items/LoggingClass.cpp @@ -42,7 +42,8 @@ void LoggingClass::addNewDelOldData(const String filename, size_t maxPoints, Str logData += timeNow->getTimeUnix() + " " + payload + "\r\n"; writeFile(filename, logData); } - } else { + } + else { if (timeNow->hasTimeSynced()) { addFileLn(filename, timeNow->getTimeUnix() + " " + payload); } @@ -95,7 +96,8 @@ void sendLogData(String file, String topic) { jsonWriteFloat(buf, "y1", value.toFloat()); if (log_date.length() < 3) { json_array += buf; - } else { + } + else { json_array += buf + ","; } buf = "{}"; @@ -111,10 +113,12 @@ void sendLogData(String file, String topic) { } void clean_log_date() { +#ifdef ESP8266 auto dir = LittleFS.openDir("logs"); while (dir.next()) { String fname = dir.fileName(); SerialPrint("I", "System", fname); removeFile("logs/" + fname); } +#endif }