From cc27d8a170bb0ac09a36c5e6b8ebb165bb83da8b Mon Sep 17 00:00:00 2001 From: biver Date: Fri, 28 Apr 2023 08:30:16 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=BE=D1=81=D0=B8=D0=BC?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20i2c=20=D1=80=D0=B0=D0=BD=D0=B5=D0=B5?= =?UTF-8?q?=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Main.cpp b/src/Main.cpp index daabef89..0e621c25 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -120,13 +120,8 @@ void setup() { stopErrorMarker(SETUPBASE_ERRORMARKER); - - initErrorMarker(SETUPCONF_ERRORMARKER); - // настраиваем микроконтроллер - configure("/config.json"); - // настраиваем i2c шину int i2c, pinSCL, pinSDA, i2cFreq; jsonRead(settingsFlashJson, "pinSCL", pinSCL, false); @@ -143,6 +138,9 @@ void setup() { #endif SerialPrint("i", "i2c", F("i2c pins overriding done")); } + + // настраиваем микроконтроллер + configure("/config.json"); stopErrorMarker(SETUPCONF_ERRORMARKER); From 62ae53739e69e5a56699ea071e9dbac487d717ec Mon Sep 17 00:00:00 2001 From: biver Date: Fri, 28 Apr 2023 19:46:15 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D0=BE=D0=B2=D1=8B=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BE=20435?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Const.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Const.h b/include/Const.h index 75efb4bb..20cf9a1f 100644 --- a/include/Const.h +++ b/include/Const.h @@ -1,7 +1,7 @@ #pragma once //Версия прошивки -#define FIRMWARE_VERSION 434 +#define FIRMWARE_VERSION 435 #ifdef esp8266_1mb_ota #define FIRMWARE_NAME "esp8266_1mb_ota"