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

Добавляем поиск адреса на шине I2C

Browse Source
This commit is contained in:
biver
2022-10-05 20:38:53 +03:00
parent d3fb354a1e
commit 1a605e1135
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/modules/sensors/Bme280/Bme280.cpp
View File

@@ -23,7 +23,7 @@ class Bme280t : public IoTItem {
void doByInterval() {
value.valD = _bme->readTemperature();
if (value.valD < 145)
if (value.valD != NAN && value.valD < 145)
regEvent(value.valD, "Bme280t");
else
SerialPrint("E", "Sensor Bme280t", "Error");
@@ -43,7 +43,7 @@ class Bme280h : public IoTItem {
void doByInterval() {
value.valD = _bme->readHumidity();
if (value.valD < 100)
if (value.valD != NAN && value.valD < 100)
regEvent(value.valD, "Bme280h");
else
SerialPrint("E", "Sensor Bme280h", "Error");
@@ -63,7 +63,7 @@ class Bme280p : public IoTItem {
void doByInterval() {
value.valD = _bme->readPressure();
if (value.valD > 0) {
if (value.valD != NAN && value.valD > 0) {
value.valD = value.valD / 1.333224 / 100;
regEvent(value.valD, "Bme280p");
} else
@@ -77,19 +77,23 @@ void* getAPI_Bme280(String subtype, String param) {
if (subtype == F("Bme280t") || subtype == F("Bme280h") || subtype == F("Bme280p")) {
String addr;
jsonRead(param, "addr", addr);
if (addr == "") {
scanI2C();
return nullptr;
}
if (bmes.find(addr) == bmes.end()) {
bmes[addr] = new Adafruit_BME280();
bmes[addr]->begin(hexStringToUint8(addr));
}
if (subtype == F("Bme280t")) {
return new Bme280t(bmes[addr], param);
} else if (subtype == F("Bme280h")) {
return new Bme280h(bmes[addr], param);
} else if (subtype == F("Bme280p")) {
return new Bme280p(bmes[addr], param);
}
if (bmes.find(addr) == bmes.end()) {
bmes[addr] = new Adafruit_BME280();
bmes[addr]->begin(hexStringToUint8(addr));
}
if (subtype == F("Bme280t")) {
return new Bme280t(bmes[addr], param);
} else if (subtype == F("Bme280h")) {
return new Bme280h(bmes[addr], param);
} else if (subtype == F("Bme280p")) {
return new Bme280p(bmes[addr], param);
}
}
return nullptr;

8
src/modules/sensors/Bmp280/Bmp280.cpp
View File

@@ -23,7 +23,7 @@ class Bmp280t : public IoTItem {
void doByInterval() {
value.valD = _bmp->readTemperature();
if (String(value.valD) != "nan")
if (value.valD != NAN && value.valD < 150)
regEvent(value.valD, "Bmp280t");
else
SerialPrint("E", "Sensor Bmp280t", "Error");
@@ -43,7 +43,7 @@ class Bmp280p : public IoTItem {
void doByInterval() {
value.valD = _bmp->readPressure();
if (String(value.valD) != "nan") {
if (value.valD != NAN && value.valD > 0) {
value.valD = value.valD / 1.333224 / 100;
regEvent(value.valD, "Bmp280p");
} else
@@ -57,6 +57,10 @@ void* getAPI_Bmp280(String subtype, String param) {
if (subtype == F("Bmp280t") || subtype == F("Bmp280p")) {
String addr;
jsonRead(param, "addr", addr);
if (addr == "") {
scanI2C();
return nullptr;
}
if (bmps.find(addr) == bmps.end()) {
bmps[addr] = new Adafruit_BMP280();