iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #273 from biveraxe/ver4dev

Browse Source 
Повышение версии до 435
This commit is contained in:
Ilya Belyakov
2023-04-28 19:47:13 +03:00
committed by GitHub
parent 1534647cce 62ae53739e
commit d2c9810cb2
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Const.h
View File

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

8
src/Main.cpp
View File

@@ -120,13 +120,8 @@ void setup() {
stopErrorMarker(SETUPBASE_ERRORMARKER); stopErrorMarker(SETUPBASE_ERRORMARKER);
initErrorMarker(SETUPCONF_ERRORMARKER); initErrorMarker(SETUPCONF_ERRORMARKER);
// настраиваем микроконтроллер
configure("/config.json");
// настраиваем i2c шину // настраиваем i2c шину
int i2c, pinSCL, pinSDA, i2cFreq; int i2c, pinSCL, pinSDA, i2cFreq;
jsonRead(settingsFlashJson, "pinSCL", pinSCL, false); jsonRead(settingsFlashJson, "pinSCL", pinSCL, false);
@@ -144,6 +139,9 @@ void setup() {
SerialPrint("i", "i2c", F("i2c pins overriding done")); SerialPrint("i", "i2c", F("i2c pins overriding done"));
} }
// настраиваем микроконтроллер
configure("/config.json");
stopErrorMarker(SETUPCONF_ERRORMARKER); stopErrorMarker(SETUPCONF_ERRORMARKER);