From 615c645aafc54592ed325bca623fa01858979763 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Mon, 3 Oct 2022 00:33:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D1=88=D0=B8=D0=BD=D1=8B?=
 =?UTF-8?q?=20i2c?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/settings.json |  5 ++++-
 src/Main.cpp              | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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 <time.h>
 #include "classes/IoTDB.h"
 #include "utils/Statistic.h"
+#include <Wire.h>
 
 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");