fix Discovery, DugTrace

include/DebugTrace.h

@@ -19,6 +19,9 @@ typedef struct {
 } re_restart_debug_t;
 
 #endif // RESTART_DEBUG_INFO
+
+__NOINIT_ATTR static int8_t bootloop_panic_count;
+
 extern "C" void __real_esp_panic_handler(void*);
 void printDebugTrace();
 void sendDebugTraceAndFreeMemory(bool);

include/EspFileSystem.h

@@ -51,6 +51,7 @@ extern void globalVarsSync();
 // extern String getParamsJson();
 
 extern void syncSettingsFlashJson();
+void resetSettingsFlashByPanic();
 extern void syncValuesFlashJson();
 
 extern const String getChipId();

include/Global.h

@@ -60,7 +60,7 @@
 #include "utils/StringUtils.h"
 #include "PeriodicTasks.h"
 #include "classes/IoTGpio.h"
-
+#include "classes/IoTDiscovery.h"   
 /*********************************************************************************************************************
 *****************************************глобальные объекты классов***************************************************
 **********************************************************************************************************************/

include/classes/IoTItem.h

@@ -3,6 +3,7 @@
 //#include "classes/IoTBench.h"
 
 class IoTBench;
+class IoTDiscovery;
 
 struct IoTValue {
     float valD = 0;
@@ -57,10 +58,10 @@ class IoTItem {
     //virtual IoTItem* getCAMDriver();
     virtual IoTItem* getTlgrmDriver();
     //virtual IoTBench* getBenchmark();
-    virtual IoTBench*getBenchmarkTask();
+    virtual IoTBench* getBenchmarkTask();
-    virtual IoTBench*getBenchmarkLoad();
+    virtual IoTBench* getBenchmarkLoad();
-    virtual IoTBench*getHADiscovery();
+    virtual IoTDiscovery* getHADiscovery();
-    virtual IoTBench*getHOMEdDiscovery();
+    virtual IoTDiscovery* getHOMEdDiscovery();
     virtual unsigned long getRtcUnixTime();
 
         // делаем доступным модулям отправку сообщений в телеграм

lib/TickerScheduler/TickerScheduler.cpp

@@ -105,9 +105,9 @@ void TickerScheduler::update()
     {
 		if (this->items[i].is_used)
 		{
-			//#ifdef ARDUINO_ARCH_AVR
+			#if defined ARDUINO_ARCH_AVR || defined LIBRETINY
 			this->items[i].t.Tick();
-			//#endif
+			#endif
 
 			handleTicker(this->items[i].cb, this->items[i].cb_arg, &this->items[i].flag);
 		}

myProfile.json

@@ -137,13 +137,21 @@
                 "path": "src/modules/virtual/Cron",
                 "active": false
             },
+            {
+                "path": "src/modules/virtual/DiscoveryHA",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/DiscoveryHomeD",
+                "active": true
+            },
             {
                 "path": "src/modules/virtual/GoogleSheet",
                 "active": false
             },
             {
                 "path": "src/modules/virtual/Loging",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/virtual/LogingDaily",
@@ -167,7 +175,7 @@
             },
             {
                 "path": "src/modules/virtual/Variable",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/virtual/VButton",
@@ -447,7 +455,7 @@
             },
             {
                 "path": "src/modules/exec/SIM800",
-                "active": true
+                "active": false
             },
             {
                 "path": "src/modules/exec/SmartBoiler",

platformio.ini

@@ -9,18 +9,20 @@ lib_deps_external =
 
 [env]
 extra_scripts = pre:tools/prebuildscript.py
+
+[common]
 build_flags = 
-	; библиотека OpenTherm EctoControl Adapter
-	-I./src/modules/exec/EctoControlAdapter/lib
 	-L./src/modules/exec/EctoControlAdapter/lib
-	-lEctoControlAdapterLib
+	-lrsEctoControl
+	-I./src/modules/exec/EctoControlAdapter/lib
 
 [env:esp8266_1mb_ota]
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp8266_1mb_ota_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_1mb_ota="esp8266_1mb_ota"
+build_flags = ${common.build_flags} 
+	-Desp8266_1mb_ota="esp8266_1mb_ota"
 framework = arduino
 board = nodemcuv2
 board_build.ldscript = eagle.flash.1m64.ld
@@ -41,7 +43,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8266_1mb_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_1mb="esp8266_1mb"
+build_flags = ${common.build_flags} 
+	-Desp8266_1mb="esp8266_1mb"
 framework = arduino
 board = nodemcuv2
 board_build.ldscript = eagle.flash.1m256.ld
@@ -62,7 +65,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8285_1mb_ota_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_1mb_ota="esp8266_1mb_ota"
+build_flags = ${common.build_flags} 
+	-Desp8266_1mb_ota="esp8266_1mb_ota"
 framework = arduino
 board = esp8285
 board_build.ldscript = eagle.flash.1m64.ld
@@ -83,7 +87,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8266_2mb_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_2mb="esp8266_2mb"
+build_flags = ${common.build_flags} 
+	-Desp8266_2mb="esp8266_2mb"
 framework = arduino
 board = d1_wroom_02
 board_build.ldscript = eagle.flash.2m1m.ld
@@ -104,7 +109,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8266_2mb_ota_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_2mb_ota="esp8266_2mb_ota"
+build_flags = ${common.build_flags} 
+	-Desp8266_2mb_ota="esp8266_2mb_ota"
 framework = arduino
 board = d1_wroom_02
 board_build.ldscript = eagle.flash.2m256.ld
@@ -125,7 +131,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8285_1mb_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_1mb="esp8266_1mb"
+build_flags = ${common.build_flags} 
+	-Desp8266_1mb="esp8266_1mb"
 framework = arduino
 board = esp8285
 board_build.ldscript = eagle.flash.1m256.ld
@@ -146,7 +153,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8266_4mb_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_4mb="esp8266_4mb"
+build_flags = ${common.build_flags} 
+	-Desp8266_4mb="esp8266_4mb"
 framework = arduino
 board = nodemcuv2
 board_build.ldscript = eagle.flash.4m1m.ld
@@ -168,7 +176,8 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 	${env:esp8266_16mb_fromitems.lib_deps}
 	ESPAsyncUDP
-build_flags = -Desp8266_16mb="esp8266_16mb"
+build_flags = ${common.build_flags} 
+	-Desp8266_16mb="esp8266_16mb"
 framework = arduino
 board = nodemcuv2
 platform = espressif8266 @4.0.1
@@ -189,7 +198,8 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32_4mb_fromitems.lib_deps}
-build_flags = -Desp32_4mb="esp32_4mb"
+build_flags = ${common.build_flags} 
+	-Desp32_4mb="esp32_4mb"
 	-Wl,--wrap=esp_panic_handler
 framework = arduino
 board = esp32dev
@@ -211,7 +221,8 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32_4mb3f_fromitems.lib_deps}
-build_flags = -Desp32_4mb="esp32_4mb"
+build_flags = ${common.build_flags} 
+	-Desp32_4mb="esp32_4mb"
 	-Wl,--wrap=esp_panic_handler
 framework = arduino
 board = esp32dev
@@ -234,7 +245,7 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32cam_4mb_fromitems.lib_deps}
-build_flags = 
+build_flags = ${common.build_flags} 
 	-Desp32cam_4mb="esp32cam_4mb"
 	-DBOARD_HAS_PSRAM
 	-mfix-esp32-psram-cache-issue
@@ -259,7 +270,8 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32s2_4mb_fromitems.lib_deps}
-build_flags = -Desp32s2_4mb="esp32s2_4mb"
+build_flags = ${common.build_flags} 
+	-Desp32s2_4mb="esp32s2_4mb"
 	-DARDUINO_USB_CDC_ON_BOOT=1
 	-DARDUINO_USB_MODE=0
 	-Wl,--wrap=esp_panic_handler
@@ -283,7 +295,8 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32c3m_4mb_fromitems.lib_deps}
-build_flags = -Desp32c3m_4mb="esp32c3m_4mb"
+build_flags = ${common.build_flags} 
+	-Desp32c3m_4mb="esp32c3m_4mb"
 	-Wl,--wrap=esp_panic_handler
 framework = arduino
 board = lolin_c3_mini
@@ -306,7 +319,7 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32s3_16mb_fromitems.lib_deps}
-build_flags = 
+build_flags = ${common.build_flags} 
 	-Desp32s3_16mb="esp32s3_16mb"
 	-Wl,--wrap=esp_panic_handler
 framework = arduino
@@ -332,7 +345,8 @@ extra_scripts = pre:tools/patch32_ws.py
 lib_deps = 
 	${common_env_data.lib_deps_external}
 	${env:esp32_16mb_fromitems.lib_deps}
-build_flags = -Desp32_16mb="esp32_16mb"
+build_flags = ${common.build_flags} 
+	-Desp32_16mb="esp32_16mb"
 	-Wl,--wrap=esp_panic_handler
 framework = arduino
 board = esp32dev
@@ -371,7 +385,6 @@ monitor_speed = 115200
 build_flags = 
 	-DLT_LOGLEVEL=LT_LEVEL_DEBUG
 	-DLT_DEBUG_ALL=1
-	#-DLFS_THREADSAFE=1
 	-DPROJECT_DATA_DIR="data_svelte"
 	-DLT_USE_TIME=1
 	-DDEBUG_ESP_PORT=Serial1
@@ -385,10 +398,6 @@ build_src_filter =
 	+<modules/*.cpp>
 	${env:tiny_fromitems.build_src_filter}
 
-[task_flash_fs]
-description = Flash File System
-cmd = echo "Flash FS Tiny board" && patch\ltchiptool.exe flash --start 0x1DB000 --skip 0x00000 --length 0x25000 -f lt_littlefs.bin -p %UPLOAD_PORT% && echo "Complete!"
-
 [env:esp8266_1mb_ota_fromitems]
 lib_deps = 
 	adafruit/Adafruit BME280 Library
@@ -713,62 +722,16 @@ build_src_filter =
 
 [env:esp32_4mb3f_fromitems]
 lib_deps = 
-	https://github.com/enjoyneering/AHTxx.git
+	gyverlibs/FastBot
-	adafruit/Adafruit BME280 Library
-	adafruit/Adafruit BMP280 Library
-	beegee-tokyo/DHT sensor library for ESPx
-	https://github.com/milesburton/Arduino-Temperature-Control-Library
-	https://github.com/tremaru/iarduino_RTC
-	robtillaart/SHT2x@^0.1.1
-	WEMOS SHT3x@1.0.0
-	plerup/EspSoftwareSerial
-	gyverlibs/EncButton @ ^2.0
-	https://github.com/RoboticsBrno/ServoESP32#v1.0.3
-	adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
-	adafruit/Adafruit BusIO @ ^1.13.2
-	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
-	adafruit/Adafruit BusIO @ ^1.13.2
-	https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
-	marcoschwartz/LiquidCrystal_I2C@^1.1.4
-	https://github.com/maxint-rd/TM16xx
-	adafruit/Adafruit GFX Library @ ^1.11.5
 build_src_filter = 
-	+<modules/virtual/Cron>
+	+<modules/virtual/DiscoveryHA>
+	+<modules/virtual/DiscoveryHomeD>
 	+<modules/virtual/Loging>
-	+<modules/virtual/LogingDaily>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
-	+<modules/virtual/VariableColor>
 	+<modules/virtual/VButton>
-	+<modules/sensors/Acs712>
+	+<modules/exec/EctoControlAdapter>
-	+<modules/sensors/AhtXX>
+	+<modules/exec/Telegram_v2>
-	+<modules/sensors/AnalogAdc>
-	+<modules/sensors/Bme280>
-	+<modules/sensors/Bmp280>
-	+<modules/sensors/Dht1122>
-	+<modules/sensors/Ds18b20>
-	+<modules/sensors/Impulse>
-	+<modules/sensors/Pzem004t>
-	+<modules/sensors/RTC>
-	+<modules/sensors/S8>
-	+<modules/sensors/Sht20>
-	+<modules/sensors/Sht30>
-	+<modules/sensors/Sonar>
-	+<modules/sensors/UART>
-	+<modules/exec/ButtonIn>
-	+<modules/exec/ButtonOut>
-	+<modules/exec/Buzzer>
-	+<modules/exec/Enconder>
-	+<modules/exec/IoTServo>
-	+<modules/exec/Mcp23017>
-	+<modules/exec/Mp3>
-	+<modules/exec/Multitouch>
-	+<modules/exec/Pcf8574>
-	+<modules/exec/Pwm32>
-	+<modules/exec/TelegramLT>
-	+<modules/display/Lcd2004>
-	+<modules/display/Smi2_m>
-	+<modules/display/TM16XX>
 
 [env:esp32cam_4mb_fromitems]
 lib_deps = 

src/DebugTrace.cpp

@@ -9,6 +9,7 @@ __NOINIT_ATTR static re_restart_debug_t _debug_info;
 #include "esp_err.h"
 #include "soc/soc_memory_layout.h"
 #include "soc/cpu.h"
+#include "esp_ota_ops.h"
 
 // RU: Размер буфера для конвертации даты и времeни в строку
 #define CONFIG_FORMAT_STRFTIME_BUFFER_SIZE 32

src/EspFileSystem.cpp

@@ -49,13 +49,13 @@ void resetSettingsFlashByPanic()
     writeFile(F("/scenario_bak.txt"), update.scenarioTxt);
     writeFile(F("/layout_bak.json"), update.layoutJson);
     */
-    update.configJson = "[]";
+    //update.configJson = "[]";
-    update.scenarioTxt = "";
+    //update.scenarioTxt = "";
-    update.layoutJson = "[]";
+    //update.layoutJson = "[]";
-    writeFile(F("/config.json"), update.configJson);
+    writeFile(F("/config.json"), "[]");
-    writeFile(F("/scenario.txt"), update.scenarioTxt);
+    writeFile(F("/scenario.txt"), "");
-    writeFile(F("/layout.json"), update.layoutJson);
+    writeFile(F("/layout.json"), "[]");
-    ESP.reset();
+    ESP.restart();
 }
 
 void syncValuesFlashJson()

src/Main.cpp

@@ -158,7 +158,10 @@ void setup() {
         bootloop_panic_count = -1;
     } 
     if (bootloop_panic_count == -1)
+    {
         SerialPrint("E", "CORE", F("CONFIG and SCENARIO reset !!!"));
+        bootloop_panic_count = 0;
+    }
 
     // настраиваем микроконтроллер
     configure("/config.json");

src/classes/IoTDiscovery.cpp

@@ -1,6 +1,5 @@
 #include "Global.h"
 #include "classes/IoTDiscovery.h"
-#include "IoTDiscovery.h"
 
 IoTDiscovery::IoTDiscovery(const String &parameters) : IoTItem(parameters)
 {

src/classes/IoTItem.cpp

@@ -258,11 +258,11 @@ IoTBench *IoTItem::getBenchmarkLoad()
 {
     return nullptr;
 }
-IoTBench *IoTItem::getHOMEdDiscovery()
+IoTDiscovery *IoTItem::getHOMEdDiscovery()
 {
     return nullptr;
 }
-IoTBench *IoTItem::getHADiscovery()
+IoTDiscovery *IoTItem::getHADiscovery()
 {
     return nullptr;
 }

src/modules/exec/EctoControlAdapter/modinfo.json

@@ -1,5 +1,5 @@
 {
-    "menuSection": "sensors",
+    "menuSection": "executive_devices",
     "configItem": [
         {
             "global": 0,
@@ -37,7 +37,7 @@
         "title": "EctoControlAdapter",
         "moduleDesc": "Управление отопительным котлом через адаптер EctoControl по протоколам OpenTherm, eBUS, Navien. Посредством Modbus RTU. Разъем 4P4C: 1-Желтый(красный)+12V; 2-Белый-GND; 3-Зелёный-A; 4-Коричневый(Синий)-B",
         "propInfo": {
-            "addr": "Адрес slav",
+            "addr": "Адрес slave",
             "int": "Количество секунд между опросами датчика.",
             "RX": "Пин RX",
             "TX": "Пин TX",

src/modules/virtual/DiscoveryHA/DiscoveryHA.cpp

@@ -219,7 +219,7 @@ public:
         }
     }
 
-    IoTDiscovery *getBenchmarkTask()
+    IoTDiscovery *getHADiscovery()
     {
         if (HA)
             return this;

src/modules/virtual/DiscoveryHA/modinfo.json

@@ -1,5 +1,5 @@
 {
-  "menuSection": "virtual",
+  "menuSection": "virtual_elments",
   "configItem": [
     {
       "global": 0,

src/modules/virtual/DiscoveryHomeD/DiscoveryHomeD.cpp

@@ -31,7 +31,7 @@ public:
         if (!HOMEd)
             return;
 
-        if (msg.indexOf("HELLO") == -1)
+        if (payloadStr.indexOf("HELLO") == -1)
         {
 /*             String dev = selectToMarkerLast(topic, "/");
             dev.toUpperCase();
@@ -254,7 +254,7 @@ public:
             }
         }
     }
-    IoTBench *getBenchmarkTask()
+    IoTDiscovery *getHOMEdDiscovery()
     {
         if (HOMEd)
             return this;

src/modules/virtual/DiscoveryHomeD/modinfo.json

@@ -1,5 +1,5 @@
 {
-  "menuSection": "virtual",
+  "menuSection": "virtual_elments",
   "configItem": [
     {
       "global": 0,