diff --git a/data_svelte/settings.json b/data_svelte/settings.json index 2f7547be..f2b7d36c 100644 --- a/data_svelte/settings.json +++ b/data_svelte/settings.json @@ -16,5 +16,8 @@ "mqttPass": "3hostel3", "serverip": "http://iotmanager.org", "log": 0, - "mqttin": 0 + "mqttin": 0, + "pinSCL": 0, + "pinSDA": 0, + "i2cFreq": 100000 } \ No newline at end of file diff --git a/src/Main.cpp b/src/Main.cpp index 8d4dede3..dd750d81 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -2,6 +2,7 @@ #include #include "classes/IoTDB.h" #include "utils/Statistic.h" +#include IoTScenario iotScen; // объект управления сценарием @@ -57,6 +58,22 @@ void setup() { //инициализация mqtt mqttInit(); + // настраиваем i2c шину + int pinSCL, pinSDA, i2cFreq; + jsonRead(settingsFlashJson, "pinSCL", pinSCL, false); + jsonRead(settingsFlashJson, "pinSDA", pinSDA, false); + jsonRead(settingsFlashJson, "i2cFreq", i2cFreq, false); + if (pinSCL && pinSDA && i2cFreq) { +#ifdef esp32_4mb + Wire.end(); + Wire.begin(pinSDA, pinSCL, (uint32_t)i2cFreq); +#else + Wire.begin(pinSDA, pinSCL); + Wire.setClock(i2cFreq); +#endif + } + + //настраиваем микроконтроллер configure("/config.json");