Typos with Asinc and \ in path

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

@@ -96,7 +96,7 @@ enum TimerTask_t { WIFI_SCAN,
                    UDP_DB,
                    TEST };
 
-enum notAsincActions {
+enum NotAsyncActions {
     do_ZERO,
     do_UPGRADE,
     do_GETLASTVERSION,

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/Utils/PrintMessage.h

@@ -1,8 +1,8 @@
 #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"
 

platformio.ini

@@ -20,7 +20,6 @@ lib_deps_external =
 	adafruit/Adafruit BMP280 Library
 	adafruit/Adafruit BME280 Library
 	milesburton/DallasTemperature
-	me-no-dev/ESPAsyncUDP	
 lib_deps_internal = 
 	ESP Async WebServer
 	GyverFilters

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/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/UpgradeFirm.cpp

@@ -1,6 +1,6 @@
 #include "Upgrade.h"
 
-#include "Class/NotAsinc.h"
+#include "Class/NotAsync.h"
 #ifdef ESP8266
 #include "ESP8266.h"
 #else
@@ -10,13 +10,13 @@
 #include "Global.h"
 
 void upgradeInit() {
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_UPGRADE, [&](void*) {
             upgrade_firmware(3);
         },
         nullptr);
 
-    myNotAsincActions->add(
+    myNotAsyncActions->add(
         do_GETLASTVERSION, [&](void*) {
             getLastVersion();
         },

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) {

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/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();
 }