From 281f338f97fd015131303703bf460cfb9219524e Mon Sep 17 00:00:00 2001 From: Yuri Trikoz Date: Sun, 18 Oct 2020 09:52:17 +0300 Subject: [PATCH] Typos with Asinc and \ in path --- include/Class/NotAsinc.h | 31 ------------------------------- include/Class/NotAsync.h | 32 ++++++++++++++++++++++++++++++++ include/Consts.h | 2 +- include/Global.h | 14 +++++++------- include/Utils/PrintMessage.h | 4 ++-- platformio.ini | 1 - src/Bus.cpp | 4 ++-- src/Class/NotAsinc.cpp | 30 ------------------------------ src/Class/NotAsync.cpp | 30 ++++++++++++++++++++++++++++++ src/ItemsCmd.cpp | 4 ++-- src/ItemsList.cpp | 8 ++++---- src/MqttClient.cpp | 6 +++--- src/UpgradeFirm.cpp | 6 +++--- src/Utils/JsonUtils.cpp | 2 +- src/Utils/StringUtils.cpp | 2 +- src/Utils/TimeUtils.cpp | 4 ++-- src/Utils/WebUtils.cpp | 4 +--- src/Web.cpp | 24 ++++++++++++------------ src/main.cpp | 8 ++++---- 19 files changed, 107 insertions(+), 109 deletions(-) delete mode 100644 include/Class/NotAsinc.h create mode 100644 include/Class/NotAsync.h delete mode 100644 src/Class/NotAsinc.cpp create mode 100644 src/Class/NotAsync.cpp diff --git a/include/Class/NotAsinc.h b/include/Class/NotAsinc.h deleted file mode 100644 index 73d45196..00000000 --- a/include/Class/NotAsinc.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once -#include -#include - -#include - -typedef std::function 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; \ No newline at end of file diff --git a/include/Class/NotAsync.h b/include/Class/NotAsync.h new file mode 100644 index 00000000..1d5278cc --- /dev/null +++ b/include/Class/NotAsync.h @@ -0,0 +1,32 @@ +#pragma once +#include +#include + +#include + +typedef std::function 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; \ No newline at end of file diff --git a/include/Consts.h b/include/Consts.h index 3038dcfd..36bfcf3c 100644 --- a/include/Consts.h +++ b/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, diff --git a/include/Global.h b/include/Global.h index d08aeab3..e5d0eaed 100644 --- a/include/Global.h +++ b/include/Global.h @@ -13,13 +13,13 @@ #include "Clock.h" #include "MqttClient.h" -#include "Utils\FileUtils.h" -#include "Utils\JsonUtils.h" -#include "Utils\StringUtils.h" -#include "Utils\SysUtils.h" -#include "Utils\PrintMessage.h" -#include "Utils\WiFiUtils.h" -#include "Utils\SerialPrint.h" +#include "Utils/FileUtils.h" +#include "Utils/JsonUtils.h" +#include "Utils/StringUtils.h" +#include "Utils/SysUtils.h" +#include "Utils/PrintMessage.h" +#include "Utils/WiFiUtils.h" +#include "Utils/SerialPrint.h" #include #include diff --git a/include/Utils/PrintMessage.h b/include/Utils/PrintMessage.h index 833342b6..637b793f 100644 --- a/include/Utils/PrintMessage.h +++ b/include/Utils/PrintMessage.h @@ -1,8 +1,8 @@ #pragma once #include "Arduino.h" -#include "Utils\StringUtils.h" -#include "Utils\TimeUtils.h" +#include "Utils/StringUtils.h" +#include "Utils/TimeUtils.h" #include "Errors.h" #include "Global.h" diff --git a/platformio.ini b/platformio.ini index a0075b81..31ac6233 100644 --- a/platformio.ini +++ b/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 diff --git a/src/Bus.cpp b/src/Bus.cpp index 49cbaa54..12cbcf6a 100644 --- a/src/Bus.cpp +++ b/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") { diff --git a/src/Class/NotAsinc.cpp b/src/Class/NotAsinc.cpp deleted file mode 100644 index f1c8f5f9..00000000 --- a/src/Class/NotAsinc.cpp +++ /dev/null @@ -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; \ No newline at end of file diff --git a/src/Class/NotAsync.cpp b/src/Class/NotAsync.cpp new file mode 100644 index 00000000..75c2ce24 --- /dev/null +++ b/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; \ No newline at end of file diff --git a/src/ItemsCmd.cpp b/src/ItemsCmd.cpp index 5521806c..af43621e 100644 --- a/src/ItemsCmd.cpp +++ b/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() { diff --git a/src/ItemsList.cpp b/src/ItemsList.cpp index 4ad89cd6..d6803b23 100644 --- a/src/ItemsList.cpp +++ b/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(); }, diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index 5d726c00..e2c76b0c 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -2,7 +2,7 @@ #include -#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")) { diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index 780dfdc7..669870f9 100644 --- a/src/UpgradeFirm.cpp +++ b/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(); }, diff --git a/src/Utils/JsonUtils.cpp b/src/Utils/JsonUtils.cpp index 04b4b926..bcc2c761 100644 --- a/src/Utils/JsonUtils.cpp +++ b/src/Utils/JsonUtils.cpp @@ -1,4 +1,4 @@ -#include "Utils\JsonUtils.h" +#include "Utils/JsonUtils.h" #include "Utils/FileUtils.h" #include "Global.h" diff --git a/src/Utils/StringUtils.cpp b/src/Utils/StringUtils.cpp index 7c043f0e..969cd59e 100644 --- a/src/Utils/StringUtils.cpp +++ b/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) { diff --git a/src/Utils/TimeUtils.cpp b/src/Utils/TimeUtils.cpp index 1464a245..2b313e69 100644 --- a/src/Utils/TimeUtils.cpp +++ b/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"}; diff --git a/src/Utils/WebUtils.cpp b/src/Utils/WebUtils.cpp index fa0da202..8c766b0e 100644 --- a/src/Utils/WebUtils.cpp +++ b/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) diff --git a/src/Web.cpp b/src/Web.cpp index 07c8d914..409f9836 100644 --- a/src/Web.cpp +++ b/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"); }); } diff --git a/src/main.cpp b/src/main.cpp index c86c10b9..c8ebba41 100644 --- a/src/main.cpp +++ b/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(); }