From 078c4389b584c8e89c1e23d29b0f5933bef5dcfd Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Wed, 16 Dec 2020 13:59:01 +0100 Subject: [PATCH] 1 mb compiling version --- include/Clock.h | 2 + include/Consts.h | 36 ++++------------ include/FSEditor.h | 2 - include/SoftUART.h | 5 ++- include/Telegram.h | 4 +- include/Utils/FileHelper.h | 3 -- include/Utils/FileUtils.h | 4 -- include/Utils/TimeUtils.h | 16 +++++++ include/items/SensorBme280Class.h | 6 ++- include/items/SensorBmp280Class.h | 6 ++- include/items/SensorDhtClass.h | 6 ++- include/items/SensorModbusClass.h | 8 +++- include/items/vPwmOut.h | 4 +- platformio.ini | 9 ++-- src/BufferExecute.cpp | 13 +++++- src/Init.cpp | 2 + src/ItemsList.cpp | 41 +----------------- src/MqttClient.cpp | 4 +- src/SoftUART.cpp | 8 ++-- src/Telegram.cpp | 6 +-- src/Web.cpp | 70 +++++++++++++++---------------- src/items/SensorBme280Class.cpp | 6 +-- src/items/SensorBmp280Class.cpp | 6 +-- src/items/SensorDhtClass.cpp | 6 +-- src/items/SensorModbusClass.cpp | 46 ++++++++++---------- src/items/vButtonOut.cpp | 6 ++- src/items/vPwmOut.cpp | 9 +++- src/main.cpp | 8 ++++ 28 files changed, 168 insertions(+), 174 deletions(-) diff --git a/include/Clock.h b/include/Clock.h index fdb55cbe..83ce72dc 100644 --- a/include/Clock.h +++ b/include/Clock.h @@ -11,6 +11,8 @@ extern void clockInit(); #include "sntp.h" #endif + + class Clock { private: Time_t _time_local; diff --git a/include/Consts.h b/include/Consts.h index 698d0d00..d8a40cfb 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -42,37 +42,19 @@ //#define SSDP_ENABLED //=========Sensors enable/disable================================================================================================================================= -#define LEVEL_ENABLED -#define ANALOG_ENABLED -#define DALLAS_ENABLED -#define DHT_ENABLED -#define BMP_ENABLED -#define BME_ENABLED +#define SensorBme280Enabled +#define SensorBmp280Enabled +#define SensorDhtEnabled +#define PwmOutEnable +//#define SensorModbusEnabled + +//=========others================================================================================================================================= +//#define telegram +//#define uartEnable -//=========Gears enable/disable=================================================================================================================================== -#define STEPPER_ENABLED -#define SERVO_ENABLED -//========Other enable/disable==================================================================================================================================== -#define LOGGING_ENABLED -#define SERIAL_ENABLED -#define PUSH_ENABLED - -struct Time_t { - uint8_t second; - uint8_t minute; - uint8_t hour; - uint8_t day_of_week; - uint8_t day_of_month; - uint8_t month; - uint16_t day_of_year; - uint16_t year; - unsigned long days; - unsigned long valid; -}; - //================================================================================================================================================================ enum TimerTask_t { WIFI_SCAN, WIFI_MQTT_CONNECTION_CHECK, diff --git a/include/FSEditor.h b/include/FSEditor.h index 16efe998..c037d008 100644 --- a/include/FSEditor.h +++ b/include/FSEditor.h @@ -1,8 +1,6 @@ #pragma once - #include //#include - #ifdef ESP8266 #include #endif diff --git a/include/SoftUART.h b/include/SoftUART.h index 7af320cc..a566e06a 100644 --- a/include/SoftUART.h +++ b/include/SoftUART.h @@ -1,9 +1,10 @@ #pragma once - +#ifdef uartEnable #include "SoftwareSerial.h" extern SoftwareSerial* myUART; extern void uartInit(); extern void uartHandle(); -extern void parse(String& incStr); \ No newline at end of file +extern void parse(String& incStr); +#endif \ No newline at end of file diff --git a/include/Telegram.h b/include/Telegram.h index 0571fd40..6b04b878 100644 --- a/include/Telegram.h +++ b/include/Telegram.h @@ -1,4 +1,5 @@ #pragma once +#ifdef telegram #include "Global.h" extern void sendTelegramMsg(); @@ -7,4 +8,5 @@ extern void handleTelegram(); extern bool isTelegramEnabled(); extern bool isTelegramInputOn(); extern void telegramMsgParse(String msg); -extern String returnListOfParams(); \ No newline at end of file +extern String returnListOfParams(); +#endif \ No newline at end of file diff --git a/include/Utils/FileHelper.h b/include/Utils/FileHelper.h index 542ed423..d2691706 100644 --- a/include/Utils/FileHelper.h +++ b/include/Utils/FileHelper.h @@ -1,9 +1,6 @@ #pragma once - #include - //#include "FS.h" - #ifdef ESP32 #include "LITTLEFS.h" #define LittleFS LITTLEFS diff --git a/include/Utils/FileUtils.h b/include/Utils/FileUtils.h index d630fc39..cd51532f 100644 --- a/include/Utils/FileUtils.h +++ b/include/Utils/FileUtils.h @@ -1,11 +1,7 @@ #pragma once - #include - #include "Consts.h" - //#include "FS.h" - #ifdef ESP32 #include "LITTLEFS.h" #define LittleFS LITTLEFS diff --git a/include/Utils/TimeUtils.h b/include/Utils/TimeUtils.h index 60bf405f..8b4c0739 100644 --- a/include/Utils/TimeUtils.h +++ b/include/Utils/TimeUtils.h @@ -48,6 +48,22 @@ int getOffsetInMinutes(int timezone); /* * Разбивает время на составляющие */ + +struct Time_t { + uint8_t second; + uint8_t minute; + uint8_t hour; + uint8_t day_of_week; + uint8_t day_of_month; + uint8_t month; + uint16_t day_of_year; + uint16_t year; + unsigned long days; + unsigned long valid; +}; + void breakEpochToTime(unsigned long epoch, Time_t& tm); + + void timeInit(); \ No newline at end of file diff --git a/include/items/SensorBme280Class.h b/include/items/SensorBme280Class.h index 42b7d532..d3156418 100644 --- a/include/items/SensorBme280Class.h +++ b/include/items/SensorBme280Class.h @@ -1,6 +1,7 @@ #pragma once +#include "Consts.h" +#ifdef SensorBme280Enabled #include - #include "Class/LineParsing.h" #include "Global.h" #include "items/SensorConvertingClass.h" @@ -52,4 +53,5 @@ class SensorBme280Class : public SensorConvertingClass { SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } }; -extern SensorBme280Class mySensorBme280; \ No newline at end of file +extern SensorBme280Class mySensorBme280; +#endif \ No newline at end of file diff --git a/include/items/SensorBmp280Class.h b/include/items/SensorBmp280Class.h index 934245a1..d775cc87 100644 --- a/include/items/SensorBmp280Class.h +++ b/include/items/SensorBmp280Class.h @@ -1,6 +1,7 @@ #pragma once +#include "Consts.h" +#ifdef SensorBmp280Enabled #include - #include "Class/LineParsing.h" #include "Global.h" #include "items/SensorConvertingClass.h" @@ -45,4 +46,5 @@ class SensorBmp280Class : public SensorConvertingClass { SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); } }; -extern SensorBmp280Class mySensorBmp280; \ No newline at end of file +extern SensorBmp280Class mySensorBmp280; +#endif \ No newline at end of file diff --git a/include/items/SensorDhtClass.h b/include/items/SensorDhtClass.h index 6eb4433b..2242ed4e 100644 --- a/include/items/SensorDhtClass.h +++ b/include/items/SensorDhtClass.h @@ -1,6 +1,7 @@ #pragma once +#include "Consts.h" +#ifdef SensorDhtEnabled #include - #include "Class/LineParsing.h" #include "Global.h" #include "items/SensorConvertingClass.h" @@ -75,4 +76,5 @@ class SensorDhtClass : public SensorConvertingClass { } } }; -extern SensorDhtClass mySensorDht; \ No newline at end of file +extern SensorDhtClass mySensorDht; +#endif \ No newline at end of file diff --git a/include/items/SensorModbusClass.h b/include/items/SensorModbusClass.h index 494540ea..9f13e166 100644 --- a/include/items/SensorModbusClass.h +++ b/include/items/SensorModbusClass.h @@ -1,9 +1,9 @@ -#ifdef modbus #pragma once +#include "Consts.h" +#ifdef SensorModbusEnabled #include #include #include - #include "Class/LineParsing.h" #include "Global.h" #include "items/SensorConvertingClass.h" @@ -82,4 +82,8 @@ class SensorModbusClass : public SensorConvertingClass { } }; extern SensorModbusClass mySensorModbus; + +extern void modbus(); +extern void modbusReading(); + #endif \ No newline at end of file diff --git a/include/items/vPwmOut.h b/include/items/vPwmOut.h index 2b9ba669..0c27d196 100644 --- a/include/items/vPwmOut.h +++ b/include/items/vPwmOut.h @@ -1,6 +1,7 @@ #pragma once +#include "Consts.h" +#ifdef PwmOutEnable #include - #include "Global.h" class PwmOut; @@ -27,3 +28,4 @@ extern MyPwmOutVector* myPwmOut; extern void pwmOut(); extern void pwmOutExecute(); +#endif diff --git a/platformio.ini b/platformio.ini index 5cb44ff7..98ed5b66 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ [platformio] -default_envs = esp8266 +default_envs = esp8266_01_1m ;============================================================================================================================================= [common_env_data] lib_deps_external = @@ -38,7 +38,8 @@ framework = arduino ;board = esp01_1m ;board = esp12e board = nodemcuv2 -board_build.ldscript = eagle.flash.1m256.ld +;board_build.ldscript = eagle.flash.1m256.ld +board_build.ldscript = eagle.flash.1m512.ld platform = https://github.com/platformio/platform-espressif8266.git lib_deps = ${common_env_data.lib_deps_external} @@ -47,12 +48,10 @@ lib_deps = ESPAsyncUDP EspSoftwareSerial CTBot - SPIFFS monitor_filters = esp8266_exception_decoder upload_speed = 921600 monitor_speed = 115200 -;board_build.filesystem = littlefs -board_build.filesystem = SPIFFS +board_build.filesystem = littlefs ;============================================================================================================================================= [env:esp8266] framework = arduino diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp index 4af187a8..1bff0d34 100644 --- a/src/BufferExecute.cpp +++ b/src/BufferExecute.cpp @@ -9,6 +9,7 @@ #include "items/vLogging.h" #include "items/vImpulsOut.h" #include "items/vCountDown.h" +#include "items/SensorModbusClass.h" void loopCmdAdd(const String& cmdStr) { orderBuf += cmdStr; @@ -41,9 +42,11 @@ void csvCmdExecute(String& cmdStr) { if (order == F("button-out")) { sCmd.addCommand(order.c_str(), buttonOut); } +#ifdef PwmOutEnable else if (order == F("pwm-out")) { sCmd.addCommand(order.c_str(), pwmOut); } +#endif else if (order == F("button-in")) { sCmd.addCommand(order.c_str(), buttonIn); } @@ -59,12 +62,15 @@ void csvCmdExecute(String& cmdStr) { else if (order == F("dallas-temp")) { sCmd.addCommand(order.c_str(), dallas); } +#ifdef SensorDhtEnabled else if (order == F("dht-temp")) { sCmd.addCommand(order.c_str(), dhtTemp); } else if (order == F("dht-hum")) { sCmd.addCommand(order.c_str(), dhtHum); } +#endif +#ifdef SensorBme280Enabled else if (order == F("bme280-temp")) { sCmd.addCommand(order.c_str(), bme280Temp); } @@ -74,15 +80,20 @@ void csvCmdExecute(String& cmdStr) { else if (order == F("bme280-press")) { sCmd.addCommand(order.c_str(), bme280Press); } +#endif +#ifdef SensorBmp280Enabled else if (order == F("bmp280-temp")) { sCmd.addCommand(order.c_str(), bmp280Temp); } else if (order == F("bmp280-press")) { sCmd.addCommand(order.c_str(), bmp280Press); } +#endif +#ifdef SensorModbusEnabled else if (order == F("modbus")) { - //sCmd.addCommand(order.c_str(), modbus); + sCmd.addCommand(order.c_str(), modbus); } +#endif else if (order == F("uptime")) { sCmd.addCommand(order.c_str(), sysUptime); } diff --git a/src/Init.cpp b/src/Init.cpp index 25885189..fc0fa3ae 100644 --- a/src/Init.cpp +++ b/src/Init.cpp @@ -76,11 +76,13 @@ void deviceInit() { inOutput_KeyList = ""; inOutput_EnterCounter = -1; //======clear pwm params======= + #ifdef PwmOutEnable if (myPwmOut != nullptr) { myPwmOut->clear(); } pwmOut_KeyList = ""; pwmOut_EnterCounter = -1; + #endif //=================================== if (myCountDown != nullptr) { myCountDown->clear(); diff --git a/src/ItemsList.cpp b/src/ItemsList.cpp index 25e45bb6..13937acf 100644 --- a/src/ItemsList.cpp +++ b/src/ItemsList.cpp @@ -19,34 +19,13 @@ void itemsListInit() { }, nullptr); -#ifdef FLASH_SIZE_1MB - myNotAsyncActions->add( - do_addItem, [&](void*) { - addItem(itemName); - itemName = ""; - }, - nullptr); - myNotAsyncActions->add( - do_addPreset, [&](void*) { - addPreset(presetName); - presetName = ""; - }, - nullptr); -#endif SerialPrint("I", F("Items"), F("Items Init")); } void addItem(String name) { -#ifdef FLASH_SIZE_1MB - String url = serverIP + F("/projects/iotmanager/config/items/") + name + ".txt"; - String item = getURL(url); - Serial.println(url); - if (item == "error") return; -#endif -#ifndef FLASH_SIZE_1MB + String item = readFile("items/" + name + ".txt", 1024); -#endif name = selectToMarker(name, "-"); @@ -81,34 +60,16 @@ void addItem(String name) { } void addPreset(String name) { -#ifdef FLASH_SIZE_1MB - String url = serverIP + F("/projects/iotmanager/config/presets/") + name + ".txt"; - String preset = getURL(url); - Serial.println(url); - if (preset == "error") return; -#endif -#ifndef FLASH_SIZE_1MB String preset = readFile("presets/" + name + ".txt", 4048); -#endif - addFile(DEVICE_CONFIG_FILE, "\n" + preset); Serial.println(preset); name.replace(".c", ".s"); -#ifdef FLASH_SIZE_1MB - url = serverIP + F("/projects/iotmanager/config/presets/") + name + ".txt"; - String scenario = getURL(url); - Serial.println(url); - if (scenario == "error") return; -#endif -#ifndef FLASH_SIZE_1MB String scenario = readFile("presets/" + name + ".txt", 4048); -#endif removeFile(DEVICE_SCENARIO_FILE); - addFile(DEVICE_SCENARIO_FILE, scenario); loadScenario(); Serial.println(scenario); diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index d5ce4107..951d16c4 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -124,10 +124,8 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) { SerialPrint("I", "MQTT", "Full update"); publishWidgets(); publishState(); -#ifdef LOGGING_ENABLED - choose_log_date_and_send(); -#endif + choose_log_date_and_send(); } else if (topicStr.indexOf("control") != -1) { diff --git a/src/SoftUART.cpp b/src/SoftUART.cpp index 91ba781d..8a7dc57e 100644 --- a/src/SoftUART.cpp +++ b/src/SoftUART.cpp @@ -1,3 +1,4 @@ +#ifdef uartEnable #include "SoftUART.h" #include "Global.h" @@ -8,7 +9,7 @@ HardwareSerial* myUART = nullptr; #endif void uartInit() { - if (!jsonReadBool(configSetupJson, "uart")) { + if (!jsonReadBool(configSetupJson, "uartEnable")) { return; } if (!myUART) { @@ -25,7 +26,7 @@ void uartInit() { void uartHandle() { if (myUART) { - if (!jsonReadBool(configSetupJson, "uart")) { + if (!jsonReadBool(configSetupJson, "uartEnable")) { return; } static String incStr; @@ -50,4 +51,5 @@ void parse(String& incStr) { orderBuf += incStr; SerialPrint("I", "=>UART", incStr); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Telegram.cpp b/src/Telegram.cpp index 679ba5c7..2ab73d32 100644 --- a/src/Telegram.cpp +++ b/src/Telegram.cpp @@ -1,6 +1,5 @@ +#ifdef telegram #include "Telegram.h" - - CTBot* myBot{ nullptr }; void telegramInit() { @@ -119,4 +118,5 @@ String returnListOfParams() { cmdStr = deleteBeforeDelimiter(cmdStr, "\n"); } return out; -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Web.cpp b/src/Web.cpp index 6be0c2cc..c673a79a 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -20,24 +20,12 @@ void web_init() { server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) { //==============================set.device.json==================================================================================================== if (request->hasArg("addItem")) { -#ifdef FLASH_SIZE_1MB - itemName = request->getParam("addItem")->value(); - myNotAsyncActions->make(do_addItem); -#endif -#ifndef FLASH_SIZE_1MB addItem(request->getParam("addItem")->value()); -#endif request->redirect("/?set.device"); } if (request->hasArg("addPreset")) { -#ifdef FLASH_SIZE_1MB - presetName = request->getParam("addPreset")->value(); - myNotAsyncActions->make(do_addPreset); -#endif -#ifndef FLASH_SIZE_1MB addPreset(request->getParam("addPreset")->value()); -#endif jsonWriteStr(configSetupJson, "warning1", F("

Требуется перезагрузка

")); request->redirect("/?set.device"); } @@ -109,12 +97,11 @@ void web_init() { request->send(200); } -#ifdef LOGGING_ENABLED + if (request->hasArg("cleanlog")) { cleanLogAndData(); request->send(200); } -#endif //==============================wifi settings============================================= if (request->hasArg("devname")) { @@ -279,29 +266,37 @@ void web_init() { myNotAsyncActions->make(do_BUSSCAN); request->redirect("/?set.utilities"); } - if (request->hasArg("uart")) { - bool value = request->getParam("uart")->value().toInt(); - jsonWriteBool(configSetupJson, "uart", value); + if (request->hasArg("uartEnable")) { + bool value = request->getParam("uartEnable")->value().toInt(); + jsonWriteBool(configSetupJson, "uartEnable", value); saveConfig(); +#ifdef uartEnable uartInit(); +#endif request->send(200); } if (request->hasArg("uartS")) { jsonWriteStr(configSetupJson, "uartS", request->getParam("uartS")->value()); saveConfig(); +#ifdef uartEnable uartInit(); +#endif request->send(200); } if (request->hasArg("uartTX")) { jsonWriteStr(configSetupJson, "uartTX", request->getParam("uartTX")->value()); saveConfig(); +#ifdef uartEnable uartInit(); +#endif request->send(200); } if (request->hasArg("uartRX")) { jsonWriteStr(configSetupJson, "uartRX", request->getParam("uartRX")->value()); saveConfig(); +#ifdef uartEnable uartInit(); +#endif request->send(200); } @@ -335,26 +330,31 @@ void web_init() { SerialPrint("I", "Update", "firmware version: " + String(lastVersion)); String msg = ""; - //if (FLASH_SIZE_1MB) { - // msg = F("Обновление невозможно, память устройства 1 мб"); - //} - //else { - if (lastVersion == FIRMWARE_VERSION) { - msg = F("Актуальная версия прошивки уже установлена."); +#ifdef FLASH_SIZE_1MB + if (FLASH_SIZE_1MB) { + msg = F("Обновление невозможно, память устройства 1 мб"); } - else if (lastVersion > FIRMWARE_VERSION) { - msg = F("Новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); + else { +#endif + + if (lastVersion == FIRMWARE_VERSION) { + msg = F("Актуальная версия прошивки уже установлена."); + } + else if (lastVersion > FIRMWARE_VERSION) { + msg = F("Новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); + } + else if (lastVersion == -1) { + msg = F("Cервер не найден. Попробуйте повторить позже..."); + } + else if (lastVersion == -2) { + msg = F("Устройство не подключено к роутеру!"); + } + else if (lastVersion < FIRMWARE_VERSION) { + msg = F("Ошибка версии. Попробуйте повторить позже..."); + } +#ifdef FLASH_SIZE_1MB } - else if (lastVersion == -1) { - msg = F("Cервер не найден. Попробуйте повторить позже..."); - } - else if (lastVersion == -2) { - msg = F("Устройство не подключено к роутеру!"); - } - else if (lastVersion < FIRMWARE_VERSION) { - msg = F("Ошибка версии. Попробуйте повторить позже..."); - } - //} +#endif // else if (lastVersion == "") { //msg = F("Нажмите на кнопку \"обновить прошивку\" повторно..."); diff --git a/src/items/SensorBme280Class.cpp b/src/items/SensorBme280Class.cpp index 21a2f476..086c44f4 100644 --- a/src/items/SensorBme280Class.cpp +++ b/src/items/SensorBme280Class.cpp @@ -1,7 +1,7 @@ +#include "Consts.h" +#ifdef SensorBme280Enabled #include "items/SensorBme280Class.h" - #include "BufferExecute.h" -//#ifdef SensorBme280Enabled //=========================================Модуль ультрозвукового дальномера================================================================== //bme280-temp;id;anydata;Сенсоры;Температура;order;c[1] //bme280-hum;id;anydata;Сенсоры;Температура;order;c[1] @@ -44,4 +44,4 @@ void bme280ReadingPress() { String key = sCmd.order(); mySensorBme280.SensorBme280ReadPress(key); } -//#endif \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/items/SensorBmp280Class.cpp b/src/items/SensorBmp280Class.cpp index e6a2e7ed..f8e5b06f 100644 --- a/src/items/SensorBmp280Class.cpp +++ b/src/items/SensorBmp280Class.cpp @@ -1,7 +1,7 @@ +#include "Consts.h" +#ifdef SensorBmp280Enabled #include "items/SensorBmp280Class.h" - #include "BufferExecute.h" -//#ifdef SensorBmp280Enabled //=========================================Модуль ультрозвукового дальномера================================================================== //bmp280-temp;id;anydata;Сенсоры;Температура;order;c[1] //bmp280-hum;id;anydata;Сенсоры;Температура;order;c[1] @@ -32,4 +32,4 @@ void bmp280ReadingPress() { String key = sCmd.order(); mySensorBmp280.SensorBmp280ReadPress(key); } -//#endif \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/items/SensorDhtClass.cpp b/src/items/SensorDhtClass.cpp index 035a4eb2..d0c2e41c 100644 --- a/src/items/SensorDhtClass.cpp +++ b/src/items/SensorDhtClass.cpp @@ -1,7 +1,7 @@ +#include "Consts.h" +#ifdef SensorDhtEnabled #include "items/SensorDhtClass.h" - #include "BufferExecute.h" -//#ifdef SensorDhtEnabled //=========================================DHT Sensor================================================================== //dht-temp;id;anydata;Сенсоры;Температура;order;pin;type[dht11];c[1] //dht-hum;id;anydata;Сенсоры;Влажность;order;pin;type[dht11];c[1] @@ -32,4 +32,4 @@ void dhtReadingHum() { String key = sCmd.order(); mySensorDht.SensorDhtReadHum(key); } -//#endif \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/items/SensorModbusClass.cpp b/src/items/SensorModbusClass.cpp index 368fe916..a4e84157 100644 --- a/src/items/SensorModbusClass.cpp +++ b/src/items/SensorModbusClass.cpp @@ -1,23 +1,23 @@ -//#include "items/SensorModbusClass.h" -// -//#include "BufferExecute.h" -////#ifdef SensorModbusEnabled -////=========================================Модуль modbus=================================================================================== -////modbus;id;anydata;Сенсоры;Температура;order;addr[1];regaddr[0];c[1] -////========================================================================================================================================= -//SensorModbusClass mySensorModbus; -// -//void modbus() { -// mySensorModbus.update(); -// String key = mySensorModbus.gkey(); -// sCmd.addCommand(key.c_str(), modbusReading); -// mySensorModbus.SensorModbusInit(); -// mySensorModbus.clear(); -//} -//void modbusReading() { -// String key = sCmd.order(); -// String addr = sCmd.next(); -// String regaddr = sCmd.next(); -// mySensorModbus.SensorModbusRead(key, addr.toInt(), regaddr.toInt()); -//} -////#endif \ No newline at end of file +#include "Consts.h" +#ifdef SensorModbusEnabled +#include "items/SensorModbusClass.h" +#include "BufferExecute.h" +//=========================================Модуль modbus=================================================================================== +//modbus;id;anydata;Сенсоры;Температура;order;addr[1];regaddr[0];c[1] +//========================================================================================================================================= +SensorModbusClass mySensorModbus; + +void modbus() { + mySensorModbus.update(); + String key = mySensorModbus.gkey(); + sCmd.addCommand(key.c_str(), modbusReading); + mySensorModbus.SensorModbusInit(); + mySensorModbus.clear(); +} +void modbusReading() { + String key = sCmd.order(); + String addr = sCmd.next(); + String regaddr = sCmd.next(); + mySensorModbus.SensorModbusRead(key, addr.toInt(), regaddr.toInt()); +} +#endif \ No newline at end of file diff --git a/src/items/vButtonOut.cpp b/src/items/vButtonOut.cpp index ff98e2ee..3ef137b0 100644 --- a/src/items/vButtonOut.cpp +++ b/src/items/vButtonOut.cpp @@ -21,12 +21,14 @@ ButtonOut::~ButtonOut() {} void ButtonOut::execute(String state) { if (_type == "UART") { - if (jsonReadBool(configSetupJson, "uart")) { + if (jsonReadBool(configSetupJson, "uartEnable")) { +#ifdef uartEnable if (myUART) { String msg = _key + " " + state; myUART->print(msg); SerialPrint("I", "<=UART", msg); - } + } +#endif } } if (state != "" && _pin != "") { diff --git a/src/items/vPwmOut.cpp b/src/items/vPwmOut.cpp index f2346c27..06c39916 100644 --- a/src/items/vPwmOut.cpp +++ b/src/items/vPwmOut.cpp @@ -1,9 +1,13 @@ + +#include "Consts.h" +#ifdef PwmOutEnable #include "items/vPwmOut.h" #include "Class/LineParsing.h" #include "Global.h" #include "BufferExecute.h" - #include + + //this class save data to flash PwmOut::PwmOut(unsigned int pin, String key) { _pin = pin; @@ -52,4 +56,5 @@ void pwmOutExecute() { myPwmOut->at(number).execute(state); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 41936b07..60edbce8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,14 +41,18 @@ void setup() { setChipId(); fileSystemInit(); loadConfig(); +#ifdef uartEnable uartInit(); +#endif clockInit(); timeInit(); sensorsInit(); //Will be remooved itemsListInit(); espInit(); routerConnect(); +#ifdef telegram telegramInit(); +#endif uptime_init(); upgradeInit(); HttpServer::init(); @@ -91,9 +95,13 @@ void loop() { myNotAsyncActions->loop(); ts.update(); +#ifdef telegram handleTelegram(); +#endif +#ifdef uartEnable uartHandle(); +#endif if (myLogging != nullptr) { for (unsigned int i = 0; i < myLogging->size(); i++) {