Merge pull request #54 from ytrikoz/beta

ESP32 target build

include/Class/NotAsinc.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <Arduino.h>
-#include <stdint.h>
-
-#include <functional>
-
-typedef std::function<void(void*)> NotAsincCb;
-
-struct NotAsincItem {
-    bool test;
-    NotAsincCb cb;
-    void * cb_arg;
-    volatile bool is_used = false;
-};
-
-class NotAsinc {
-   private:
-    uint8_t size;
-    uint8_t task = 0;
-    NotAsincItem* items = NULL;
-    void handle(NotAsincCb f, void* arg);
-
-   public:
-    NotAsinc(uint8_t size);
-    ~NotAsinc();
-
-    void add(uint8_t i, NotAsincCb, void* arg);
-    void make(uint8_t task);
-    void loop();
-};
-extern NotAsinc* myNotAsincActions;

include/Class/NotAsync.h

@@ -0,0 +1,32 @@
+#pragma once
+#include <Arduino.h>
+#include <stdint.h>
+
+#include <functional>
+
+typedef std::function<void(void*)> NotAsyncCb;
+
+struct NotAsyncItem {
+    bool test;
+    NotAsyncCb cb;
+    void* cb_arg;
+    volatile bool is_used = false;
+};
+
+class NotAsync {
+   private:
+    uint8_t size;
+    uint8_t task = 0;
+    NotAsyncItem* items = NULL;
+    void handle(NotAsyncCb f, void* arg);
+
+   public:
+    NotAsync(uint8_t size);
+    ~NotAsync();
+
+    void add(uint8_t i, NotAsyncCb, void* arg);
+    void make(uint8_t task);
+    void loop();
+};
+
+extern NotAsync* myNotAsyncActions;

include/Consts.h

@@ -1,33 +1,47 @@
 #pragma once
 
-//=================Firmeare=================
+//
+// Firmware
+//
 #define FIRMWARE_NAME "esp8266-iotm"
 #define FIRMWARE_VERSION 257
 #define FLASH_4MB true
 
-//=================System===================
+//
+// System
+//
 #define NUM_BUTTONS 6
 #define LED_PIN 2
 
-//=================MQTT=====================
+//
+// MQTT
+//
 #define MQTT_RECONNECT_INTERVAL 20000
 
-//===============Telemetry==================
+//
+// Telemetry
+//
 #define TELEMETRY_UPDATE_INTERVAL_MIN 60
 
-//=============Configuration================
+//
+// Configuration
+//
 #define DEVICE_CONFIG_FILE "s.conf.csv"
 #define DEVICE_SCENARIO_FILE "s.scen.txt"
 
-//=============System parts=================
+//
+// System parts
+//
 //#define OTA_UPDATES_ENABLED
 //#define MDNS_ENABLED
 //#define WEBSOCKET_ENABLED
 //#define LAYOUT_IN_RAM
 //#define UDP_ENABLED
-//#define SSDP_EN
+#define SSDP_ENABLED
 
-//=========Sensors enable/disable===========
+//
+// Sensors enable/disable
+//
 #define TANK_LEVEL_SAMPLES 10
 #define LEVEL_ENABLED
 #define ANALOG_ENABLED
@@ -36,16 +50,19 @@
 #define BMP_ENABLED
 #define BME_ENABLED
 
-//=========Gears enable/disable===========
+//
+// Gears enable/disable
+//
 #define STEPPER_ENABLED
 #define SERVO_ENABLED
 
-//=========Other enable/disable===========
+//
+// Other enable/disable
+//
 #define LOGGING_ENABLED
 #define SERIAL_ENABLED
 #define PUSH_ENABLED
 
-
 struct Time_t {
     uint8_t second;
     uint8_t minute;
@@ -79,7 +96,7 @@ enum TimerTask_t { WIFI_SCAN,
                    UDP_DB,
                    TEST };
 
-enum notAsincActions {
+enum NotAsyncActions {
     do_ZERO,
     do_UPGRADE,
     do_GETLASTVERSION,

include/Errors.h

@@ -2,7 +2,7 @@
 
 #include <Arduino.h>
 
-String getErrorLevelStr(ErrorLevel_t level);
+#include "Utils/StringUtils.h"
 
 class Error : public Printable {
    public:
@@ -37,7 +37,7 @@ class Error : public Printable {
 
     const String toString() const {
         char buf[128];
-        sprintf(buf, "[%s] %s", getErrorLevelStr(_level).c_str(), _message);
+        sprintf(buf, "[%c] %s", getErrorLevelStr(_level), _message);
         return String(buf);
     }
 

include/FSEditor.h

@@ -15,6 +15,9 @@ class FSEditor : public AsyncWebHandler {
     bool _authenticated;
     uint32_t _startTime;
 
+   private:
+    void getDirList(const String& path, String& output);
+
    public:
 #ifdef ESP32
     FSEditor(const fs::FS& fs, const String& username = String(), const String& password = String());
@@ -24,5 +27,7 @@ class FSEditor : public AsyncWebHandler {
     virtual bool canHandle(AsyncWebServerRequest* request) override final;
     virtual void handleRequest(AsyncWebServerRequest* request) override final;
     virtual void handleUpload(AsyncWebServerRequest* request, const String& filename, size_t index, uint8_t* data, size_t len, bool final) override final;
-    virtual bool isRequestHandlerTrivial() override final { return false; }
+    virtual bool isRequestHandlerTrivial() override final {
+        return false;
+    }
 };

include/Global.h

@@ -13,13 +13,13 @@
 #include "Clock.h"
 
 #include "MqttClient.h"
-#include "Utils\FileUtils.h"
+#include "Utils/FileUtils.h"
-#include "Utils\JsonUtils.h"
+#include "Utils/JsonUtils.h"
-#include "Utils\StringUtils.h"
+#include "Utils/StringUtils.h"
-#include "Utils\SysUtils.h"
+#include "Utils/SysUtils.h"
-#include "Utils\PrintMessage.h"
+#include "Utils/PrintMessage.h"
-#include "Utils\WiFiUtils.h"
+#include "Utils/WiFiUtils.h"
-#include "Utils\SerialPrint.h"
+#include "Utils/SerialPrint.h"
 
 #include <Adafruit_BME280.h>
 #include <Adafruit_BMP280.h>

include/SSDP.h

@@ -1,8 +1,9 @@
 #pragma once
-#include "Global.h"
+
 #include <Arduino.h>
-#ifdef SSDP_EN
+
-extern void SsdpInit();
+#include "Consts.h"
-extern String xmlNode(String tags, String data);
+
-extern String decToHex(uint32_t decValue, byte desiredStringLength);
+#ifdef SSDP_ENABLED
+void SsdpInit();
 #endif

include/Servo/Servos.h

@@ -1,7 +1,11 @@
 #pragma once
 
 #include <Arduino.h>
+#ifdef ESP8266
 #include <Servo.h>
+#else
+#include <ESP32Servo.h>
+#endif
 
 struct Servo_t {
     uint8_t num;

include/Utils/PrintMessage.h

@@ -1,12 +1,11 @@
 #pragma once
 
 #include "Arduino.h"
-#include "Utils\StringUtils.h"
+#include "Utils/StringUtils.h"
-#include "Utils\TimeUtils.h"
+#include "Utils/TimeUtils.h"
 #include "Errors.h"
 #include "Global.h"
 
-
 #define pm PrintMessage(MODULE)
 
 class PrintMessage {
@@ -24,8 +23,23 @@ class PrintMessage {
     }
 
    private:
+    void printErrorLevel(ErrorLevel_t level) {
+        Serial.printf("[%c] ", getErrorLevelStr(level));
+    }
+
+    void printUptime() {
+        Serial.printf("%lu ", ((unsigned long)millis() / 1000));
+    }
+
+    void printModule() {
+        Serial.printf("[%s] ", _module);
+    }
+
     void print(const ErrorLevel_t level, const String& str) {
-        Serial.printf("%s [%s] [%s] %s\n", prettyMillis(millis()).c_str(), getErrorLevelStr(level).c_str(), _module, str.c_str());
+        printUptime();
+        printErrorLevel(level);
+        printModule();
+        Serial.println(str.c_str());
     }
 
    private:

include/Utils/StringUtils.h

@@ -26,4 +26,6 @@ size_t itemsCount(String str, const String& separator);
 
 boolean isDigitStr(const String&);
 
-String prettyBytes(size_t size);
+String prettyBytes(size_t size);
+
+const char getErrorLevelStr(uint8_t level);

include/Utils/SysUtils.h

@@ -2,6 +2,8 @@
 #include <Arduino.h>
 #include "Global.h"
 
+uint32_t ESP_getChipId();
+
 const String getChipId();
 
 void setLedStatus(LedStatus_t status);
@@ -14,4 +16,4 @@ const String getHeapStats();
 
 const String getMacAddress();
 
-void setChipId();
+void setChipId();

include/items/SensorAnalogClass.h

@@ -16,21 +16,19 @@ class SensorAnalogClass : public SensorConvertingClass {
     }
 
     int SensorAnalogRead(String key, String pin) {
-        int pinInt = pin.toInt();
         int value;
-
 #ifdef ESP32
+        int pinInt = pin.toInt();
         value = analogRead(pinInt);
 #endif
 #ifdef ESP8266
         value = analogRead(A0);
 #endif
-
         value = this->mapping(key, value);
         float valueFl = this->correction(key, value);
         eventGen(key, "");
         jsonWriteStr(configLiveJson, key, String(valueFl));
-         publishStatus(key, String(valueFl));
+        publishStatus(key, String(valueFl));
         Serial.println("I sensor '" + key + "' data: " + String(valueFl));
         return value;
     }

platformio.ini

@@ -13,14 +13,13 @@ default_envs = esp8266
 
 [common_env_data]
 lib_deps_external = 
-	ArduinoJson@5.*
+	bblanchon/ArduinoJson @5.*
-	Bounce2
+	thomasfredericks/Bounce2
-	PubSubClient
+	knolleary/PubSubClient
-	DHT sensor library for ESPx
+	beegee-tokyo/DHT sensor library for ESPx
-	Adafruit BMP280 Library
+	adafruit/Adafruit BMP280 Library
-	Adafruit BME280 Library
+	adafruit/Adafruit BME280 Library
-	DallasTemperature
+	milesburton/DallasTemperature
-	ESP Async UDP
 lib_deps_internal = 
 	ESP Async WebServer
 	GyverFilters
@@ -33,11 +32,12 @@ platform = https://github.com/platformio/platform-espressif32.git
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${common_env_data.lib_deps_internal}
-	AsyncTCP
+	me-no-dev/ESPAsyncTCP
-	ESP32Servo
+	madhephaestus/ESP32Servo
 	LITTLEFS
+	luc-github/ESP32SSDP
 monitor_filters = esp32_exception_decoder
-upload_speed = 921600
+;upload_speed = 921600
 monitor_speed = 115200
 board_build.filesystem = littlefs
 
@@ -56,7 +56,7 @@ monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
 board_build.filesystem = littlefs
-board_build.f_cpu = 160000000L
+;board_build.f_cpu = 160000000L
 
 [env:esp8266]
 framework = arduino
@@ -69,7 +69,7 @@ lib_deps =
 	ESPAsyncUDP
 	EspSoftwareSerial
 monitor_filters = esp8266_exception_decoder
-upload_speed = 921600
+;upload_speed = 921600
 monitor_speed = 115200
 board_build.filesystem = littlefs
 board_build.f_cpu = 160000000L

src/Bus.cpp

@@ -1,9 +1,9 @@
 #include "Bus.h"
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
 #include "Global.h"
 
 void busInit() {
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_BUSSCAN, [&](void*) {
             String tmp = i2c_scan();
             if (tmp == "error") {

src/Class/NotAsinc.cpp

@@ -1,30 +0,0 @@
-#include "Class/NotAsinc.h"
-
-NotAsinc::NotAsinc(uint8_t size) {
-    this->items = new NotAsincItem[size];
-    this->size = size;
-}
-
-NotAsinc::~NotAsinc() {}
-
-void NotAsinc::add(uint8_t i, NotAsincCb f, void* arg) {
-    this->items[i].cb = f;
-    this->items[i].cb_arg = arg;
-    this->items[i].is_used = true;
-}
-
-void NotAsinc::loop() {
-        if (this->items[task].is_used) {
-            handle(this->items[task].cb, this->items[task].cb_arg);
-            task = 0;
-        }
-}
-
-void NotAsinc::make(uint8_t task) {
-   this->task = task;
-}
-
-void NotAsinc::handle(NotAsincCb f, void* arg) {
-    f(arg);
-}
-NotAsinc* myNotAsincActions;

src/Class/NotAsync.cpp

@@ -0,0 +1,30 @@
+#include "Class/NotAsync.h"
+
+NotAsync::NotAsync(uint8_t size) {
+    this->items = new NotAsyncItem[size];
+    this->size = size;
+}
+
+NotAsync::~NotAsync() {}
+
+void NotAsync::add(uint8_t i, NotAsyncCb f, void* arg) {
+    this->items[i].cb = f;
+    this->items[i].cb_arg = arg;
+    this->items[i].is_used = true;
+}
+
+void NotAsync::loop() {
+    if (this->items[task].is_used) {
+        handle(this->items[task].cb, this->items[task].cb_arg);
+        task = 0;
+    }
+}
+
+void NotAsync::make(uint8_t task) {
+    this->task = task;
+}
+
+void NotAsync::handle(NotAsyncCb f, void* arg) {
+    f(arg);
+}
+NotAsync* myNotAsyncActions;

src/FSEditor.cpp

@@ -167,58 +167,73 @@ bool FSEditor::canHandle(AsyncWebServerRequest *request) {
     return false;
 }
 
+#ifdef ESP8266
+void FSEditor::getDirList(const String &path, String &output) {
+    auto dir = _fs.openDir(path.c_str());
+    while (dir.next()) {
+        String fname = dir.fileName();
+        if (!path.endsWith("/") && !fname.startsWith("/")) {
+            fname = "/" + fname;
+        }
+        fname = path + fname;
+        if (isExcluded(_fs, fname.c_str())) {
+            continue;
+        }
+        if (dir.isDirectory()) {
+            getDirList(fname, output);
+            continue;
+        }
+        if (output != "[") output += ',';
+        char buf[128];
+        sprintf(buf, "{\"type\":\"file\",\"name\":\"%s\",\"size\":%d}", fname.c_str(), dir.fileSize());
+        output += buf;
+    }
+}
+#else
+void FSEditor::getDirList(const String &path, String &output) {
+    auto dir = _fs.open(path, FILE_READ);
+    dir.rewindDirectory();
+    while (dir.openNextFile()) {
+        String fname = dir.name();
+        if (!path.endsWith("/") && !fname.startsWith("/")) {
+            fname = "/" + fname;
+        }
+        fname = path + fname;
+        if (isExcluded(_fs, fname.c_str())) {
+            continue;
+        }
+        if (dir.isDirectory()) {
+            getDirList(fname, output);
+            continue;
+        }
+        if (output != "[") output += ',';
+        char buf[128];
+        sprintf(buf, "{\"type\":\"file\",\"name\":\"%s\",\"size\":%d}", fname.c_str(), dir.size());
+        output += buf;
+    }
+}
+#endif
+
 void FSEditor::handleRequest(AsyncWebServerRequest *request) {
     if (_username.length() && _password.length() && !request->authenticate(_username.c_str(), _password.c_str()))
         return request->requestAuthentication();
 
     if (request->method() == HTTP_GET) {
         if (request->hasParam("list")) {
-            String path = request->getParam("list")->value();
+            if (request->hasParam("list")) {
-#ifdef ESP32
+                String path = request->getParam("list")->value();
-            File dir = _fs.open(path);
+                String output = "[";
-#else
+                getDirList(path, output);
-            fs::Dir dir = _fs.openDir(path);
+                output += "]";
-#endif
+                request->send(200, "application/json", output);
-            path = String();
+                output = String();
-            String output = "[";
-#ifdef ESP32
-            File entry = dir.openNextFile();
-            while (entry) {
-#else
-            while (dir.next()) {
-                fs::File entry = dir.openFile("r");
-#endif
-                String fname = entry.fullName();
-                if (fname.charAt(0) != '/') fname = "/" + fname;
-
-                if (isExcluded(_fs, fname.c_str())) {
-#ifdef ESP32
-                    entry = dir.openNextFile();
-#endif
-                    continue;
-                }
-                if (output != "[") output += ',';
-                output += "{\"type\":\"";
-                output += "file";
-                output += "\",\"name\":\"";
-                output += String(fname);
-                output += "\",\"size\":";
-                output += String(entry.size());
-                output += "}";
-#ifdef ESP32
-                entry = dir.openNextFile();
-#else
-                entry.close();
-#endif
             }
-#ifdef ESP32
-            dir.close();
-#endif
-            output += "]";
-            request->send(200, "application/json", output);
-            output = String();
         } else if (request->hasParam("edit") || request->hasParam("download")) {
+#ifdef ESP8266
             request->send(request->_tempFile, request->_tempFile.fullName(), String(), request->hasParam("download"));
+#else
+            request->send(request->_tempFile, request->_tempFile.name(), String(), request->hasParam("download"));
+#endif
         } else {
             const char *buildTime = __DATE__ " " __TIME__ " GMT";
             if (request->header("If-Modified-Since").equals(buildTime)) {

src/ItemsCmd.cpp

@@ -1,7 +1,7 @@
 #include "ItemsCmd.h"
 
 #include "BufferExecute.h"
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
 #include "Cmd.h"
 #include "Global.h"
 #include "Module/Terminal.h"
@@ -313,7 +313,7 @@ void cmd_init() {
 //}
 //
 //void firmwareUpdate() {
-//    myNotAsincActions->make(do_UPGRADE);
+//    myNotAsyncActions->make(do_UPGRADE);
 //}
 //
 //void firmwareVersion() {

src/ItemsList.cpp

@@ -1,19 +1,19 @@
 #include "ItemsList.h"
 
-#include "Class\NotAsinc.h"
+#include "Class/NotAsync.h"
 #include "Init.h"
-#include "Utils\StringUtils.h"
+#include "Utils/StringUtils.h"
 
 static const char* firstLine PROGMEM = "Удалить;Тип элемента;Id;Виджет;Имя вкладки;Имя виджета;Позиция виджета";
 
 void itemsListInit() {
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_deviceInit, [&](void*) {
             Device_init();
         },
         nullptr);
 
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_delChoosingItems, [&](void*) {
             delChoosingItems();
         },

src/MqttClient.cpp

@@ -2,7 +2,7 @@
 
 #include <LittleFS.h>
 
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
 #include "Global.h"
 #include "Init.h"
 
@@ -10,7 +10,7 @@ String mqttPrefix;
 String mqttRootDevice;
 
 void mqttInit() {
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_MQTTPARAMSCHANGED, [&](void*) {
             mqttReconnect();
         },
@@ -133,7 +133,7 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
 
     } else if (topicStr.indexOf("update")) {
         if (payloadStr == "1") {
-            myNotAsincActions->make(do_UPGRADE);
+            myNotAsyncActions->make(do_UPGRADE);
         }
 
     } else if (topicStr.indexOf("devc")) {

src/SSDP.cpp

@@ -1,13 +1,19 @@
+#include "SSDP.h"
 
-#include <SSDP.h>
 #include "Global.h"
-#ifdef SSDP_EN
+
+#ifdef SSDP_ENABLED
 #ifdef ESP8266
-        #include <ESP8266SSDP.h>
+#include <ESP8266SSDP.h>
 #endif
 #ifdef ESP32
-        #include <ESP32SSDP.h>
+#include <ESP32SSDP.h>
 #endif
+
+String xmlNode(String tags, String data);
+
+String decToHex(uint32_t decValue, byte desiredStringLength);
+
 //39164
 //457684
 void SsdpInit() {
@@ -31,7 +37,7 @@ void SsdpInit() {
         ssdpDescription += xmlNode(F("modelURL"), F("https://github.com/IoTManagerProject/IoTManager/wiki"));
         ssdpDescription += xmlNode(F("manufacturer"), F("Borisenko Dmitry"));
         ssdpDescription += xmlNode(F("manufacturerURL"), F("https://github.com/IoTManagerProject/IoTManager"));
-        ssdpDescription += xmlNode(F("UDN"), "uuid:38323636-4558-4dda-9188-cda0e6" + decToHex(ESP.getChipId(), 6));
+        ssdpDescription += xmlNode(F("UDN"), "uuid:38323636-4558-4dda-9188-cda0e6" + decToHex(ESP_getChipId(), 6));
         ssdpDescription = xmlNode("device", ssdpDescription);
         ssdpHeder += ssdpDescription;
         ssdpSend += ssdpHeder;

src/UpgradeFirm.cpp

@@ -1,17 +1,22 @@
-#include "UpgradeFirm.h"
+#include "Upgrade.h"
 
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
+#ifdef ESP8266
 #include "ESP8266.h"
+#else
+#include <HTTPUpdate.h>
+#endif
+
 #include "Global.h"
 
 void upgradeInit() {
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_UPGRADE, [&](void*) {
             upgrade_firmware(3);
         },
         nullptr);
 
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_GETLASTVERSION, [&](void*) {
             getLastVersion();
         },
@@ -78,8 +83,13 @@ bool upgradeFS() {
     WiFiClient wifiClient;
     bool ret = false;
     Serial.println("Start upgrade LittleFS, please wait...");
+#ifdef ESP8266
     ESPhttpUpdate.rebootOnUpdate(false);
     t_httpUpdate_return retFS = ESPhttpUpdate.updateSpiffs(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/littlefs/littlefs.bin"));
+#else
+    httpUpdate.rebootOnUpdate(false);
+    HTTPUpdateResult retFS = httpUpdate.updateSpiffs(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/littlefs/littlefs.bin"));
+#endif
     if (retFS == HTTP_UPDATE_OK) {  //если FS обновилась успешно
         SerialPrint("I", "Update", "LittleFS upgrade done!");
         ret = true;
@@ -91,8 +101,15 @@ bool upgradeBuild() {
     WiFiClient wifiClient;
     bool ret = false;
     Serial.println("Start upgrade BUILD, please wait...");
+
+#ifdef ESP8266
     ESPhttpUpdate.rebootOnUpdate(false);
     t_httpUpdate_return retBuild = ESPhttpUpdate.update(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/firmware/firmware.bin"));
+#else
+    httpUpdate.rebootOnUpdate(false);
+    HTTPUpdateResult retBuild = httpUpdate.update(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/firmware/firmware.bin"));
+#endif
+
     if (retBuild == HTTP_UPDATE_OK) {  //если BUILD обновился успешно
         SerialPrint("I", "Update", "BUILD upgrade done!");
         ret = true;

src/Utils/JsonUtils.cpp

@@ -1,4 +1,4 @@
-#include "Utils\JsonUtils.h"
+#include "Utils/JsonUtils.h"
 #include "Utils/FileUtils.h"
 #include "Global.h"
 

src/Utils/StringUtils.cpp

@@ -1,4 +1,4 @@
-#include "Utils\StringUtils.h"
+#include "Utils/StringUtils.h"
 #include "Consts.h"
 
 String selectToMarkerLast(String str, String found) {
@@ -111,26 +111,16 @@ String prettyBytes(size_t size) {
         return String(size / 1024.0 / 1024.0 / 1024.0) + "GB";
 }
 
-static const char *str_info = "I";
+const char getErrorLevelStr(uint8_t level) {
-static const char *str_warn = "W";
-static const char *str_error = "E";
-static const char *str_unknown = "?";
-
-String getErrorLevelStr(ErrorLevel_t level) {
-    const char *ptr;
     switch (level) {
         case EL_INFO:
-            ptr = str_info;
+            return 'I';
-            break;
         case EL_WARNING:
-            ptr = str_warn;
+            return 'W';
-            break;
         case EL_ERROR:
-            ptr = str_error;
+            return 'E';
-            break;
         default:
-            ptr = str_unknown;
             break;
     }
-    return String(ptr);
+    return '?';
 }

src/Utils/SysUtils.cpp

@@ -3,28 +3,39 @@
 #include "Global.h"
 #include "Utils/PrintMessage.h"
 
-
 const String getUniqueId(const char* name) {
     return String(name) + getMacAddress();
 }
 
-const String getChipId() {
+uint32_t ESP_getChipId(void) {
-    String res;
 #ifdef ESP32
-    char buf[32] = {0};
+    uint32_t id = 0;
-    uint32_t mac = ESP.getEfuseMac();
+    for (uint32_t i = 0; i < 17; i = i + 8) {
-    sprintf(buf, "%0X", mac);
+        id |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
-    res = String(buf);
+    }
+    return id;
+#else
+    return ESP.getChipId();
 #endif
-#ifdef ESP8266
+}
-    res = String(ESP.getChipId()) + "-" + String(ESP.getFlashChipId());
+
+uint32_t ESP_getFlashChipId(void) {
+#ifdef ESP32
+    // Нет аналогичной (без доп.кода) функций в 32
+    // надо использовать другой id - варианты есть
+    return ESP_getChipId();
+#else
+    return ESP.getFlashChipId();
 #endif
-    return res;
+}
+
+const String getChipId() {
+    return String(ESP_getChipId()) + "-" + String(ESP_getFlashChipId());
 }
 
 void setChipId() {
     chipId = getChipId();
-    SerialPrint("I","System","id: " + chipId);
+    SerialPrint("I", "System", "id: " + chipId);
 }
 
 #ifdef ESP8266

src/Utils/TimeUtils.cpp

@@ -1,6 +1,6 @@
-#include "Utils\TimeUtils.h"
+#include "Utils/TimeUtils.h"
 
-#include "Utils\StringUtils.h"
+#include "Utils/StringUtils.h"
 
 static const uint8_t days_in_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 static const char* week_days[7] = {"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat"};

src/Utils/WebUtils.cpp

@@ -1,4 +1,4 @@
-#include "Utils\WebUtils.h"
+#include "Utils/WebUtils.h"
 #include "ESPAsyncWebServer.h"
 
 String getURL(const String& urls) {
@@ -17,8 +17,6 @@ String getURL(const String& urls) {
 
 
 
-
-
 const String getMethodName(AsyncWebServerRequest* request) {
     String res = F("UNKNOWN");
     if (request->method() == HTTP_GET)

src/Utils/statUtils.cpp

@@ -6,6 +6,11 @@
 #include "Global.h"
 #include "ItemsList.h"
 
+#ifdef ESP32
+#include <rom/rtc.h>
+#endif
+
+String ESP_getResetReason(void);
 
 void initSt() {
     addNewDevice();
@@ -25,7 +30,7 @@ void initSt() {
 void decide() {
     if ((WiFi.status() == WL_CONNECTED)) {
         uint8_t cnt = getNextNumber("stat.txt");
-        SerialPrint("I","Stat","Total resets number: " + String(cnt));
+        SerialPrint("I", "Stat", "Total resets number: " + String(cnt));
         if (cnt <= 3) {
             //Serial.println("(get)");
             getPsn();
@@ -81,7 +86,7 @@ String addNewDevice() {
         }
         http.end();
     }
-    SerialPrint("I","Stat","New device registaration: " + ret);
+    SerialPrint("I", "Stat", "New device registaration: " + ret);
     return ret;
 }
 
@@ -95,7 +100,7 @@ String updateDevicePsn(String lat, String lon, String accur) {
         http.addHeader("Content-Type", "application/json");
         String mac = WiFi.macAddress().c_str();
         int httpCode = http.POST("?id=" + mac +
-                                 "&resetReason=" + ESP.getResetReason() +
+                                 "&resetReason=" + ESP_getResetReason() +
                                  "&lat=" + lat +
                                  "&lon=" + lon +
                                  "&accuracy=" + accur + "");
@@ -110,7 +115,7 @@ String updateDevicePsn(String lat, String lon, String accur) {
         }
         http.end();
     }
-    SerialPrint("I","Stat","Update device psn: " + ret);
+    SerialPrint("I", "Stat", "Update device psn: " + ret);
     return ret;
 }
 
@@ -124,10 +129,10 @@ String updateDeviceStatus() {
         http.addHeader("Content-Type", "application/json");
         String mac = WiFi.macAddress().c_str();
         int httpCode = http.POST("?id=" + mac +
-                                 "&resetReason=" + ESP.getResetReason() +
+                                 "&resetReason=" + ESP_getResetReason() +
                                  "&uptime=" + timeNow->getUptime() +
                                  "&uptimeTotal=" + getUptimeTotal() +
-                                 "&version=" + FIRMWARE_VERSION + 
+                                 "&version=" + FIRMWARE_VERSION +
                                  "&resetsTotal=" + String(getCurrentNumber("stat.txt")) + "");
         if (httpCode > 0) {
             ret = httpCode;
@@ -140,14 +145,14 @@ String updateDeviceStatus() {
         }
         http.end();
     }
-    SerialPrint("I","Stat","Update device data: " + ret);
+    SerialPrint("I", "Stat", "Update device data: " + ret);
     return ret;
 }
 
 String getUptimeTotal() {
     uint8_t hrs = getCurrentNumber("totalhrs.txt");
     String hrsStr = prettySeconds(hrs * 60 * 60);
-    SerialPrint("I","Stat","Total running time: " + hrsStr);
+    SerialPrint("I", "Stat", "Total running time: " + hrsStr);
     return hrsStr;
 }
 
@@ -164,7 +169,53 @@ uint8_t getCurrentNumber(String file) {
     return number;
 }
 
+#ifdef ESP8266
+String ESP_getResetReason(void) {
+    return ESP.getResetReason();
+}
+#else
+String ESP32GetResetReason(uint32_t cpu_no) {
+    // tools\sdk\include\esp32\rom\rtc.h
+    switch (rtc_get_reset_reason((RESET_REASON)cpu_no)) {
+        case POWERON_RESET:
+            return F("Vbat power on reset");  // 1
+        case SW_RESET:
+            return F("Software reset digital core");  // 3
+        case OWDT_RESET:
+            return F("Legacy watch dog reset digital core");  // 4
+        case DEEPSLEEP_RESET:
+            return F("Deep Sleep reset digital core");  // 5
+        case SDIO_RESET:
+            return F("Reset by SLC module, reset digital core");  // 6
+        case TG0WDT_SYS_RESET:
+            return F("Timer Group0 Watch dog reset digital core");  // 7
+        case TG1WDT_SYS_RESET:
+            return F("Timer Group1 Watch dog reset digital core");  // 8
+        case RTCWDT_SYS_RESET:
+            return F("RTC Watch dog Reset digital core");  // 9
+        case INTRUSION_RESET:
+            return F("Instrusion tested to reset CPU");  // 10
+        case TGWDT_CPU_RESET:
+            return F("Time Group reset CPU");  // 11
+        case SW_CPU_RESET:
+            return F("Software reset CPU");  // 12
+        case RTCWDT_CPU_RESET:
+            return F("RTC Watch dog Reset CPU");  // 13
+        case EXT_CPU_RESET:
+            return F("or APP CPU, reseted by PRO CPU");  // 14
+        case RTCWDT_BROWN_OUT_RESET:
+            return F("Reset when the vdd voltage is not stable");  // 15
+        case RTCWDT_RTC_RESET:
+            return F("RTC Watch dog reset digital core and rtc module");  // 16
+        default:
+            return F("NO_MEAN");  // 0
+    }
+}
 
+String ESP_getResetReason(void) {
+    return ESP32GetResetReason(0);  // CPU 0
+}
+#endif
 //String getUptimeTotal() {
 //    static int hrs;
 //    EEPROM.begin(512);

src/Web.cpp

@@ -1,6 +1,6 @@
 #include "Web.h"
 
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
 #include "Global.h"
 #include "Init.h"
 #include "ItemsList.h"
@@ -23,7 +23,7 @@ void web_init() {
         }
 
         if (request->hasArg("delChoosingItems")) {
-            myNotAsincActions->make(do_delChoosingItems);
+            myNotAsyncActions->make(do_delChoosingItems);
             request->send(200);
         }
 
@@ -33,7 +33,7 @@ void web_init() {
         }
 
         if (request->hasArg("saveItems")) {
-            myNotAsincActions->make(do_deviceInit);
+            myNotAsyncActions->make(do_deviceInit);
             request->send(200);
         }
 
@@ -142,37 +142,37 @@ void web_init() {
         if (request->hasArg("mqttServer")) {
             jsonWriteStr(configSetupJson, "mqttServer", request->getParam("mqttServer")->value());
             saveConfig();
-            myNotAsincActions->make(do_MQTTPARAMSCHANGED);
+            myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
             request->send(200);
         }
         if (request->hasArg("mqttPort")) {
             int port = (request->getParam("mqttPort")->value()).toInt();
             jsonWriteInt(configSetupJson, "mqttPort", port);
             saveConfig();
-            myNotAsincActions->make(do_MQTTPARAMSCHANGED);
+            myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
             request->send(200);
         }
         if (request->hasArg("mqttPrefix")) {
             jsonWriteStr(configSetupJson, "mqttPrefix", request->getParam("mqttPrefix")->value());
             saveConfig();
-            myNotAsincActions->make(do_MQTTPARAMSCHANGED);
+            myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
             request->send(200);
         }
         if (request->hasArg("mqttUser")) {
             jsonWriteStr(configSetupJson, "mqttUser", request->getParam("mqttUser")->value());
             saveConfig();
-            myNotAsincActions->make(do_MQTTPARAMSCHANGED);
+            myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
             request->send(200);
         }
         if (request->hasArg("mqttPass")) {
             jsonWriteStr(configSetupJson, "mqttPass", request->getParam("mqttPass")->value());
             saveConfig();
-            myNotAsincActions->make(do_MQTTPARAMSCHANGED);
+            myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
             request->send(200);
         }
 
         if (request->hasArg("mqttsend")) {
-            myNotAsincActions->make(do_MQTTUDP);
+            myNotAsyncActions->make(do_MQTTUDP);
             request->send(200);
         }
 
@@ -197,7 +197,7 @@ void web_init() {
 
         //==============================utilities settings=============================================
         if (request->hasArg("i2c")) {
-            myNotAsincActions->make(do_BUSSCAN);
+            myNotAsyncActions->make(do_BUSSCAN);
             request->redirect("/?set.utilities");
         }
     });
@@ -219,7 +219,7 @@ void web_init() {
     * Check
     */
     server.on("/check", HTTP_GET, [](AsyncWebServerRequest* request) {
-        myNotAsincActions->make(do_GETLASTVERSION);
+        myNotAsyncActions->make(do_GETLASTVERSION);
         SerialPrint("I", "Update", "firmware version: " + String(lastVersion));
 
         String msg = "";
@@ -251,7 +251,7 @@ void web_init() {
     * Upgrade
     */
     server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) {
-        myNotAsincActions->make(do_UPGRADE);
+        myNotAsyncActions->make(do_UPGRADE);
         request->send(200, "text/html");
     });
 }

src/main.cpp

@@ -3,7 +3,7 @@
 
 #include "BufferExecute.h"
 #include "Class/CallBackTest.h"
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
 #include "Class/ScenarioClass.h"
 #include "Cmd.h"
 #include "Global.h"
@@ -11,7 +11,7 @@
 #include "ItemsList.h"
 #include "Utils/StatUtils.h"
 #include "Utils/Timings.h"
-#include "Utils\WebUtils.h"
+#include "Utils/WebUtils.h"
 #include "items/ButtonInClass.h"
 //#include "RemoteOrdersUdp.h"
 #include "Bus.h"
@@ -32,7 +32,7 @@ void setup() {
 
     setChipId();
 
-    myNotAsincActions = new NotAsinc(do_LAST);
+    myNotAsyncActions = new NotAsync(do_LAST);
     myScenario = new Scenario();
 
     SerialPrint("I", "FS", "FS Init");
@@ -112,7 +112,7 @@ void loop() {
     loopCmdExecute();
     //loopSerial();
 
-    myNotAsincActions->loop();
+    myNotAsyncActions->loop();
     ts.update();
 }