From afe64d4c4acb55fa764ea4310d0afcfd7d732cdf Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:37:31 +0100 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BF=D0=BE=D0=B4=20linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/ESPConfiguration.h | 2 +- include/Global.h | 8 ++++---- include/Main.h | 4 ++-- include/MqttClient.h | 2 +- include/PeriodicTasks.h | 2 +- include/WsServer.h | 2 +- include/classes/IoTScenario.h | 2 +- include/utils/SerialPrint.h | 2 +- src/classes/IoTItem.cpp | 8 ++++---- src/classes/IoTScenario.cpp | 6 +++--- src/classes/ScenarioClass3.cpp | 2 +- src/modules/AnalogAdc.cpp | 2 +- src/modules/Bme280.cpp | 2 +- src/modules/Bmp280.cpp | 2 +- src/modules/Dht1122.cpp | 2 +- src/modules/Sht20.cpp | 2 +- src/modules/ds18b20.cpp | 2 +- src/utils/FileUtils.cpp | 2 +- src/utils/JsonUtils.cpp | 4 ++-- src/utils/SerialPrint.cpp | 2 +- src/utils/StringUtils.cpp | 2 +- src/utils/TimeUtils.cpp | 2 +- src/utils/WiFiUtils.cpp | 2 +- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/ESPConfiguration.h b/include/ESPConfiguration.h index 7f22d53c..d8eab7f5 100644 --- a/include/ESPConfiguration.h +++ b/include/ESPConfiguration.h @@ -1,6 +1,6 @@ #pragma once #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" extern std::vector IoTItems; // вектор ссылок базового класса IoTItem - список всех запущенных сенсоров diff --git a/include/Global.h b/include/Global.h index 56fdd1ab..beeb9a5f 100644 --- a/include/Global.h +++ b/include/Global.h @@ -44,10 +44,10 @@ #include //внутренние глобальные директории проекта -#include "Utils/FileUtils.h" -#include "Utils/JsonUtils.h" -#include "Utils/SerialPrint.h" -#include "Utils/StringUtils.h" +#include "utils/FileUtils.h" +#include "utils/JsonUtils.h" +#include "utils/SerialPrint.h" +#include "utils/StringUtils.h" #include "PeriodicTasks.h" #include "classes/IoTGpio.h" diff --git a/include/Main.h b/include/Main.h index 304cd18e..11b849dc 100644 --- a/include/Main.h +++ b/include/Main.h @@ -2,7 +2,7 @@ // #include "EspFileSystem.h" #include "Global.h" -#include "Utils/WiFiUtils.h" +#include "utils/WiFiUtils.h" #include "AsyncWebServer.h" #include "StandWebServer.h" #include "classes/NotAsync.h" @@ -11,4 +11,4 @@ #include "WsServer.h" #include "DeviceList.h" #include "PeriodicTasks.h" -#include "Classes/IoTScenario.h" +#include "classes/IoTScenario.h" diff --git a/include/MqttClient.h b/include/MqttClient.h index 3d5c1473..6e035e18 100644 --- a/include/MqttClient.h +++ b/include/MqttClient.h @@ -2,7 +2,7 @@ #include "Const.h" #include "classes/NotAsync.h" #include "Global.h" -#include "Utils/WiFiUtils.h" +#include "utils/WiFiUtils.h" void mqttInit(); void selectBroker(); diff --git a/include/PeriodicTasks.h b/include/PeriodicTasks.h index d7c187c7..eee9d1d5 100644 --- a/include/PeriodicTasks.h +++ b/include/PeriodicTasks.h @@ -1,7 +1,7 @@ #pragma once #include "Global.h" #include "WsServer.h" -#include "Utils/TimeUtils.h" +#include "utils/TimeUtils.h" #ifdef ESP32 #include diff --git a/include/WsServer.h b/include/WsServer.h index f31c041d..474a88ba 100644 --- a/include/WsServer.h +++ b/include/WsServer.h @@ -1,6 +1,6 @@ #pragma once #include "Global.h" -#include "Utils/WiFiUtils.h" +#include "utils/WiFiUtils.h" #include "DeviceList.h" #include "ESPConfiguration.h" diff --git a/include/classes/IoTScenario.h b/include/classes/IoTScenario.h index f6d5ddf6..76bd8ce9 100644 --- a/include/classes/IoTScenario.h +++ b/include/classes/IoTScenario.h @@ -1,6 +1,6 @@ #pragma once #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" #include class ExprAST { diff --git a/include/utils/SerialPrint.h b/include/utils/SerialPrint.h index afbacc06..62efd173 100644 --- a/include/utils/SerialPrint.h +++ b/include/utils/SerialPrint.h @@ -1,5 +1,5 @@ #pragma once #include "Global.h" -#include "Utils/TimeUtils.h" +#include "utils/TimeUtils.h" void SerialPrint(String errorLevel, String module, String msg); \ No newline at end of file diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp index ab9ab61d..8831584e 100644 --- a/src/classes/IoTItem.cpp +++ b/src/classes/IoTItem.cpp @@ -1,7 +1,7 @@ -#include "Utils/JsonUtils.h" -#include "Utils/SerialPrint.h" -#include "Classes/ScenarioClass3.h" -#include "Classes/IoTItem.h" +#include "utils/JsonUtils.h" +#include "utils/SerialPrint.h" +#include "classes/ScenarioClass3.h" +#include "classes/IoTItem.h" #include "WsServer.h" #include "ESPConfiguration.h" diff --git a/src/classes/IoTScenario.cpp b/src/classes/IoTScenario.cpp index b88b5fbf..50335697 100644 --- a/src/classes/IoTScenario.cpp +++ b/src/classes/IoTScenario.cpp @@ -2,9 +2,9 @@ #pragma once #include "Global.h" -#include "Classes/IoTItem.h" -#include "Classes/IoTScenario.h" -#include "Utils/FileUtils.h" +#include "classes/IoTItem.h" +#include "classes/IoTScenario.h" +#include "utils/FileUtils.h" // Лексический анализатор возвращает токены [0-255], если это неизвестны, // иначе одну из известных единиц кода diff --git a/src/classes/ScenarioClass3.cpp b/src/classes/ScenarioClass3.cpp index 5d638b9b..a630a635 100644 --- a/src/classes/ScenarioClass3.cpp +++ b/src/classes/ScenarioClass3.cpp @@ -1,3 +1,3 @@ -#include "Classes/ScenarioClass3.h" +#include "classes/ScenarioClass3.h" Scenario* myScenario; diff --git a/src/modules/AnalogAdc.cpp b/src/modules/AnalogAdc.cpp index 5167ef81..5d4f1bfb 100644 --- a/src/modules/AnalogAdc.cpp +++ b/src/modules/AnalogAdc.cpp @@ -1,5 +1,5 @@ #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" extern IoTGpio IoTgpio; diff --git a/src/modules/Bme280.cpp b/src/modules/Bme280.cpp index 1849c818..64920ae1 100644 --- a/src/modules/Bme280.cpp +++ b/src/modules/Bme280.cpp @@ -6,7 +6,7 @@ #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" #include #include diff --git a/src/modules/Bmp280.cpp b/src/modules/Bmp280.cpp index c25fe3c3..35686689 100644 --- a/src/modules/Bmp280.cpp +++ b/src/modules/Bmp280.cpp @@ -6,7 +6,7 @@ #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" #include #include diff --git a/src/modules/Dht1122.cpp b/src/modules/Dht1122.cpp index 0ff9e134..54e8495f 100644 --- a/src/modules/Dht1122.cpp +++ b/src/modules/Dht1122.cpp @@ -6,7 +6,7 @@ #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" #include "DHTesp.h" #include diff --git a/src/modules/Sht20.cpp b/src/modules/Sht20.cpp index 70488f43..82d8d2ca 100644 --- a/src/modules/Sht20.cpp +++ b/src/modules/Sht20.cpp @@ -1,5 +1,5 @@ #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" #include "Wire.h" #include "SHT2x.h" diff --git a/src/modules/ds18b20.cpp b/src/modules/ds18b20.cpp index 2e09aa48..4079223e 100644 --- a/src/modules/ds18b20.cpp +++ b/src/modules/ds18b20.cpp @@ -1,5 +1,5 @@ #include "Global.h" -#include "Classes/IoTItem.h" +#include "classes/IoTItem.h" #include "DallasTemperature.h" #include diff --git a/src/utils/FileUtils.cpp b/src/utils/FileUtils.cpp index b3222408..d6bc6a37 100644 --- a/src/utils/FileUtils.cpp +++ b/src/utils/FileUtils.cpp @@ -1,4 +1,4 @@ -#include "Utils/FileUtils.h" +#include "utils/FileUtils.h" //данная функция записывает файл из буфера страницами указанного размера void writeFileUint8tByFrames(const String& filename, uint8_t*& big_buf, size_t length, size_t headerLenth, size_t frameSize) { diff --git a/src/utils/JsonUtils.cpp b/src/utils/JsonUtils.cpp index 36f32d48..d191280f 100644 --- a/src/utils/JsonUtils.cpp +++ b/src/utils/JsonUtils.cpp @@ -1,5 +1,5 @@ -#include "Utils/JsonUtils.h" -#include "Utils/FileUtils.h" +#include "utils/JsonUtils.h" +#include "utils/FileUtils.h" // new================================================================================ String jsonReadStrDoc(DynamicJsonDocument& doc, String name) { diff --git a/src/utils/SerialPrint.cpp b/src/utils/SerialPrint.cpp index dce41c16..d385b87e 100644 --- a/src/utils/SerialPrint.cpp +++ b/src/utils/SerialPrint.cpp @@ -1,5 +1,5 @@ -#include "Utils\SerialPrint.h" +#include "utils/SerialPrint.h" void SerialPrint(String errorLevel, String module, String msg) { Serial.println(prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg); diff --git a/src/utils/StringUtils.cpp b/src/utils/StringUtils.cpp index ddc9dbde..8dc18410 100644 --- a/src/utils/StringUtils.cpp +++ b/src/utils/StringUtils.cpp @@ -1,4 +1,4 @@ -#include "Utils/StringUtils.h" +#include "utils/StringUtils.h" void writeUint8tToString(uint8_t* payload, size_t length, size_t headerLenth, String& payloadStr) { payloadStr = ""; diff --git a/src/utils/TimeUtils.cpp b/src/utils/TimeUtils.cpp index 1aef83e5..8eea8f06 100644 --- a/src/utils/TimeUtils.cpp +++ b/src/utils/TimeUtils.cpp @@ -1,4 +1,4 @@ -#include "Utils/TimeUtils.h" +#include "utils/TimeUtils.h" static const uint8_t days_in_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; diff --git a/src/utils/WiFiUtils.cpp b/src/utils/WiFiUtils.cpp index 62d03221..787618b8 100644 --- a/src/utils/WiFiUtils.cpp +++ b/src/utils/WiFiUtils.cpp @@ -1,4 +1,4 @@ -#include "Utils/WiFiUtils.h" +#include "utils/WiFiUtils.h" void routerConnect() { WiFi.setAutoConnect(false);