mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
bme 280 support
This commit is contained in:
@@ -35,7 +35,10 @@ void cmd_init() {
|
||||
|
||||
sCmd.addCommand("dht-temp", dhtTemp);
|
||||
sCmd.addCommand("dht-hum", dhtHum);
|
||||
|
||||
|
||||
sCmd.addCommand("bme280-temp", bme280Temp);
|
||||
sCmd.addCommand("bme280-hum", bme280Hum);
|
||||
sCmd.addCommand("bme280-press", bme280Press);
|
||||
|
||||
handle_time_init();
|
||||
}
|
||||
|
||||
@@ -8,12 +8,9 @@ SensorAnalogClass mySensorAnalog;
|
||||
void analogAdc() {
|
||||
mySensorAnalog.update();
|
||||
String key = mySensorAnalog.gkey();
|
||||
String pin = mySensorAnalog.gpin();
|
||||
sCmd.addCommand(key.c_str(), analogReading);
|
||||
sensorReadingMap += key + ",";
|
||||
jsonWriteStr(configOptionJson, key + "_pin", pin);
|
||||
jsonWriteStr(configOptionJson, key + "_map", mySensorAnalog.gmap());
|
||||
jsonWriteStr(configOptionJson, key + "_с", mySensorAnalog.gc());
|
||||
mySensorAnalog.SensorAnalogInit();
|
||||
mySensorAnalog.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,20 +1,47 @@
|
||||
//#include "ItemsCmd.h"
|
||||
//#include "items/SensorBme280Class.h"
|
||||
////#ifdef SensorBme280Enabled
|
||||
////=========================================Модуль ультрозвукового дальномера==================================================================
|
||||
////Bme280-temp;id;anydata;Сенсоры;Температура;order;pin;c[1]
|
||||
////=========================================================================================================================================
|
||||
//SensorBme280Class mySensorBme280;
|
||||
//void bme280Temp() {
|
||||
// mySensorBme280.update();
|
||||
// String key = mySensorBme280.gkey();
|
||||
// sCmd.addCommand(key.c_str(), bme280Reading);
|
||||
// mySensorBme280.SensorBme280Init();
|
||||
// mySensorBme280.clear();
|
||||
//}
|
||||
//
|
||||
//void bme280Reading() {
|
||||
// String key = sCmd.order();
|
||||
// mySensorBme280.SensorBme280Read(key);
|
||||
//}
|
||||
////#endif
|
||||
#include "items/SensorBme280Class.h"
|
||||
|
||||
#include "ItemsCmd.h"
|
||||
//#ifdef SensorBme280Enabled
|
||||
//=========================================Модуль ультрозвукового дальномера==================================================================
|
||||
//bme280-temp;id;anydata;Сенсоры;Температура;order;c[1]
|
||||
//bme280-hum;id;anydata;Сенсоры;Температура;order;c[1]
|
||||
//bme280-press;id;anydata;Сенсоры;Температура;order;c[1]
|
||||
//=========================================================================================================================================
|
||||
SensorBme280Class mySensorBme280;
|
||||
|
||||
void bme280Temp() {
|
||||
mySensorBme280.update();
|
||||
String key = mySensorBme280.gkey();
|
||||
sCmd.addCommand(key.c_str(), bme280ReadingTemp);
|
||||
mySensorBme280.SensorBme280Init();
|
||||
mySensorBme280.clear();
|
||||
}
|
||||
void bme280ReadingTemp() {
|
||||
String key = sCmd.order();
|
||||
mySensorBme280.SensorBme280ReadTmp(key);
|
||||
}
|
||||
|
||||
void bme280Hum() {
|
||||
mySensorBme280.update();
|
||||
String key = mySensorBme280.gkey();
|
||||
sCmd.addCommand(key.c_str(), bme280ReadingHum);
|
||||
mySensorBme280.SensorBme280Init();
|
||||
mySensorBme280.clear();
|
||||
}
|
||||
void bme280ReadingHum() {
|
||||
String key = sCmd.order();
|
||||
mySensorBme280.SensorBme280ReadHum(key);
|
||||
}
|
||||
|
||||
void bme280Press() {
|
||||
mySensorBme280.update();
|
||||
String key = mySensorBme280.gkey();
|
||||
sCmd.addCommand(key.c_str(), bme280ReadingPress);
|
||||
mySensorBme280.SensorBme280Init();
|
||||
mySensorBme280.clear();
|
||||
}
|
||||
void bme280ReadingPress() {
|
||||
String key = sCmd.order();
|
||||
mySensorBme280.SensorBme280ReadPress(key);
|
||||
}
|
||||
//#endif
|
||||
@@ -19,6 +19,8 @@ void dhtReadingTemp() {
|
||||
mySensorDht.SensorDhtReadTemp(key);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void dhtHum() {
|
||||
mySensorDht.update();
|
||||
String key = mySensorDht.gkey();
|
||||
|
||||
Reference in New Issue
Block a user