Merge pull request #273 from biveraxe/ver4dev

Повышение версии до 435
This commit is contained in:
2023-04-28 19:47:13 +03:00
committed by GitHub
2 changed files with 4 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
#pragma once
//Версия прошивки
#define FIRMWARE_VERSION 434
#define FIRMWARE_VERSION 435
#ifdef esp8266_1mb_ota
#define FIRMWARE_NAME "esp8266_1mb_ota"

View File

@@ -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);