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

Исправил Uptime и ccs811

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-01-05 12:17:48 +01:00
parent c72af8650b
commit 6902d57be2
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/items/items.txt
View File

@@ -19,7 +19,7 @@
0;bmp280;tmpid;anydataTemp;Сенсоры;Температура;1;c[1] 0;bmp280;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
0;bmp280;prsid;anydataPress;Сенсоры;Давление;3;c[1];addr[0x76];int[10]* 0;bmp280;prsid;anydataPress;Сенсоры;Давление;3;c[1];addr[0x76];int[10]*
0;ccs811;ppmid;anydataPpm;Сенсоры;Содержание#CO2;1;c[1] 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;impuls-out;impid;na;na;na;order;gpio*
0;count-down;cntid;anydata;Таймер;Обратный#отчет;order* 0;count-down;cntid;anydata;Таймер;Обратный#отчет;order*
0;inoutput;txtid;anydata;Вывод;Вывод#uart;order* 0;inoutput;txtid;anydata;Вывод;Вывод#uart;order*

BIN
data/set.device.json.gz
View File

Binary file not shown.

2
data_ungzip/set.device.json
View File

@@ -43,7 +43,7 @@
}, },
{ {
"type": "h4", "type": "h4",
"title": "Версия файловой системы: 275" "title": "Версия файловой системы: 276"
}, },
{ {
"type": "h4", "type": "h4",

2
include/Consts.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#define FIRMWARE_VERSION 275 #define FIRMWARE_VERSION 276
#ifdef esp8266_4mb #ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb" #define FIRMWARE_NAME "esp8266_4mb"

2
src/items/vSensorCcs811.cpp
View File

@@ -12,7 +12,7 @@ SensorCcs811::SensorCcs811(const paramsCcs811& paramsPpm, const paramsCcs811& pa
ccs811 = new Adafruit_CCS811(); 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() {} SensorCcs811::~SensorCcs811() {}

9
src/main.cpp
View File

@@ -19,17 +19,17 @@
#include "Utils/Timings.h" #include "Utils/Timings.h"
#include "Utils/WebUtils.h" #include "Utils/WebUtils.h"
#include "items/ButtonInClass.h" #include "items/ButtonInClass.h"
#include "items/vSensorUptime.h"
#include "items/vCountDown.h" #include "items/vCountDown.h"
#include "items/vImpulsOut.h" #include "items/vImpulsOut.h"
#include "items/vLogging.h" #include "items/vLogging.h"
#include "items/vSensorAnalog.h" #include "items/vSensorAnalog.h"
#include "items/vSensorBme280.h" #include "items/vSensorBme280.h"
#include "items/vSensorBmp280.h" #include "items/vSensorBmp280.h"
#include "items/vSensorCcs811.h"
#include "items/vSensorDallas.h" #include "items/vSensorDallas.h"
#include "items/vSensorDht.h" #include "items/vSensorDht.h"
#include "items/vSensorUltrasonic.h" #include "items/vSensorUltrasonic.h"
#include "items/vSensorCcs811.h" #include "items/vSensorUptime.h"
void not_async_actions(); void not_async_actions();
@@ -165,4 +165,9 @@ void loop() {
mySensorCcs811->at(i).loop(); mySensorCcs811->at(i).loop();
} }
} }
if (mySensorUptime != nullptr) {
for (unsigned int i = 0; i < mySensorUptime->size(); i++) {
mySensorUptime->at(i).loop();
}
}
} }