From 6902d57be2ef314e14fab684f7e7bbb91d187e95 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Tue, 5 Jan 2021 12:17:48 +0100
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20Uptime=20=D0=B8=20ccs811?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/items/items.txt        |   2 +-
 data/set.device.json.gz     | Bin 2708 -> 2708 bytes
 data_ungzip/set.device.json |   2 +-
 include/Consts.h            |   2 +-
 src/items/vSensorCcs811.cpp |   2 +-
 src/main.cpp                |  11 ++++++++---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/data/items/items.txt b/data/items/items.txt
index 48ac1334..3cd3c335 100644
--- a/data/items/items.txt
+++ b/data/items/items.txt
@@ -19,7 +19,7 @@
 0;bmp280;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
 0;bmp280;prsid;anydataPress;Сенсоры;Давление;3;c[1];addr[0x76];int[10]*
 0;ccs811;ppmid;anydataPpm;Сенсоры;Содержание#CO2;1;c[1]
-0;ccs811;ppbid;anydataPpb;Сенсоры;Содержание#орг#соед;2;c[1];int[10]*
+0;ccs811;ppbid;anydataPpb;Сенсоры;Содержание#орг#соед;2;c[1];addr[0x76];int[10]*
 0;impuls-out;impid;na;na;na;order;gpio*
 0;count-down;cntid;anydata;Таймер;Обратный#отчет;order*
 0;inoutput;txtid;anydata;Вывод;Вывод#uart;order*
diff --git a/data/set.device.json.gz b/data/set.device.json.gz
index bac0b0a9a184024b38d6fb2dea5ff842b87f50ec..3a067824a77bd6078139f5418b889613f23eb6c5 100644
GIT binary patch
delta 2318
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

delta 2318
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

diff --git a/data_ungzip/set.device.json b/data_ungzip/set.device.json
index 8cf55c7b..6b1b055b 100644
--- a/data_ungzip/set.device.json
+++ b/data_ungzip/set.device.json
@@ -43,7 +43,7 @@
         },
         {
             "type": "h4",
-            "title": "Версия файловой системы: 275"
+            "title": "Версия файловой системы: 276"
         },
         {
             "type": "h4",
diff --git a/include/Consts.h b/include/Consts.h
index 9a0b5bbb..a4bb9c2a 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define FIRMWARE_VERSION 275
+#define FIRMWARE_VERSION 276
 
 #ifdef esp8266_4mb
 #define FIRMWARE_NAME "esp8266_4mb"
diff --git a/src/items/vSensorCcs811.cpp b/src/items/vSensorCcs811.cpp
index 97d9eed5..f0d31f86 100644
--- a/src/items/vSensorCcs811.cpp
+++ b/src/items/vSensorCcs811.cpp
@@ -12,7 +12,7 @@ SensorCcs811::SensorCcs811(const paramsCcs811& paramsPpm, const paramsCcs811& pa
 
     ccs811 = new Adafruit_CCS811();
 
-    if (!ccs811->begin()) SerialPrint("E", "Sensor CCS", "Wire not connected");
+    if (!ccs811->begin(hexStringToUint8(_paramsPpb.addr))) SerialPrint("E", "Sensor CCS", "Wire not connected");
 }
 
 SensorCcs811::~SensorCcs811() {}
diff --git a/src/main.cpp b/src/main.cpp
index a9bf0f88..c120e6ed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,17 +19,17 @@
 #include "Utils/Timings.h"
 #include "Utils/WebUtils.h"
 #include "items/ButtonInClass.h"
-#include "items/vSensorUptime.h"
 #include "items/vCountDown.h"
 #include "items/vImpulsOut.h"
 #include "items/vLogging.h"
 #include "items/vSensorAnalog.h"
 #include "items/vSensorBme280.h"
 #include "items/vSensorBmp280.h"
+#include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
 #include "items/vSensorDht.h"
 #include "items/vSensorUltrasonic.h"
-#include "items/vSensorCcs811.h"
+#include "items/vSensorUptime.h"
 
 void not_async_actions();
 
@@ -160,9 +160,14 @@ void loop() {
             mySensorBmp280->at(i).loop();
         }
     }
-     if (mySensorCcs811 != nullptr) {
+    if (mySensorCcs811 != nullptr) {
         for (unsigned int i = 0; i < mySensorCcs811->size(); i++) {
             mySensorCcs811->at(i).loop();
         }
     }
+    if (mySensorUptime != nullptr) {
+        for (unsigned int i = 0; i < mySensorUptime->size(); i++) {
+            mySensorUptime->at(i).loop();
+        }
+    }
 }
\ No newline at end of file