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

Корректируем сообщение об ошибке в модулях датчиков

Browse Source 
для возможности генерации события об ошибке
This commit is contained in:
biver
2022-10-28 16:26:13 +03:00
parent 305a5f5ccb
commit dfd24dc1f6
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/sensors/AhtXX/AhtXX.cpp
View File

@@ -7,30 +7,30 @@
std::map<String, AHTxx*> ahts; std::map<String, AHTxx*> ahts;
void printStatus(AHTxx *aht) { String getStatus(AHTxx *aht) {
switch (aht->getStatus()) { switch (aht->getStatus()) {
case AHTXX_NO_ERROR: case AHTXX_NO_ERROR:
Serial.println(F("no error")); return F("no error");
break; break;
case AHTXX_BUSY_ERROR: case AHTXX_BUSY_ERROR:
Serial.println(F("sensor AHT busy, increase polling time")); return F("sensor AHT busy, increase polling time");
break; break;
case AHTXX_ACK_ERROR: case AHTXX_ACK_ERROR:
Serial.println(F("sensor AHT didn't return ACK, not connected, broken, long wires (reduce speed), bus locked by slave (increase stretch limit)")); return F("sensor AHT didn't return ACK, not connected, broken, long wires (reduce speed), bus locked by slave (increase stretch limit)");
break; break;
case AHTXX_DATA_ERROR: case AHTXX_DATA_ERROR:
Serial.println(F(" AHT: received data smaller than expected, not connected, broken, long wires (reduce speed), bus locked by slave (increase stretch limit)")); return F(" AHT: received data smaller than expected, not connected, broken, long wires (reduce speed), bus locked by slave (increase stretch limit)");
break; break;
case AHTXX_CRC8_ERROR: case AHTXX_CRC8_ERROR:
Serial.println(F("AHT: computed CRC8 not match received CRC8, this feature supported only by AHT2x sensors")); return F("AHT: computed CRC8 not match received CRC8, this feature supported only by AHT2x sensors");
break; break;
default: default:
Serial.println(F("AHT: unknown status")); return F("AHT: unknown status");
break; break;
} }
} }
@@ -49,7 +49,7 @@ class AhtXXt : public IoTItem {
if (value.valD != AHTXX_ERROR) { if (value.valD != AHTXX_ERROR) {
regEvent(value.valD, "AhtXXt"); regEvent(value.valD, "AhtXXt");
} else { } else {
printStatus(_aht); //print temperature command status SerialPrint("E", "Sensor AHTXX", getStatus(_aht), _id);
} }
} }
@@ -70,7 +70,7 @@ class AhtXXh : public IoTItem {
if (value.valD != AHTXX_ERROR) { if (value.valD != AHTXX_ERROR) {
regEvent(value.valD, "AhtXXh"); regEvent(value.valD, "AhtXXh");
} else { } else {
printStatus(_aht); //print temperature command status SerialPrint("E", "Sensor AHTXX", getStatus(_aht), _id);
} }
} }

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

@@ -26,7 +26,7 @@ class Bme280t : public IoTItem {
if (value.valD != NAN && value.valD < 145) if (value.valD != NAN && value.valD < 145)
regEvent(value.valD, "Bme280t"); regEvent(value.valD, "Bme280t");
else else
SerialPrint("E", "Sensor Bme280t", "Error"); SerialPrint("E", "Sensor Bme280t", "Error", _id);
} }
~Bme280t(){}; ~Bme280t(){};
@@ -46,7 +46,7 @@ class Bme280h : public IoTItem {
if (value.valD != NAN && value.valD < 100) if (value.valD != NAN && value.valD < 100)
regEvent(value.valD, "Bme280h"); regEvent(value.valD, "Bme280h");
else else
SerialPrint("E", "Sensor Bme280h", "Error"); SerialPrint("E", "Sensor Bme280h", "Error", _id);
} }
~Bme280h(){}; ~Bme280h(){};
@@ -67,7 +67,7 @@ class Bme280p : public IoTItem {
value.valD = value.valD / 1.333224 / 100; value.valD = value.valD / 1.333224 / 100;
regEvent(value.valD, "Bme280p"); regEvent(value.valD, "Bme280p");
} else } else
SerialPrint("E", "Sensor Bme280p", "Error"); SerialPrint("E", "Sensor Bme280p", "Error", _id);
} }
~Bme280p(){}; ~Bme280p(){};

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

@@ -26,7 +26,7 @@ class Bmp280t : public IoTItem {
if (value.valD != NAN && value.valD < 150) if (value.valD != NAN && value.valD < 150)
regEvent(value.valD, "Bmp280t"); regEvent(value.valD, "Bmp280t");
else else
SerialPrint("E", "Sensor Bmp280t", "Error"); SerialPrint("E", "Sensor Bmp280t", "Error", _id);
} }
~Bmp280t(){}; ~Bmp280t(){};
@@ -47,7 +47,7 @@ class Bmp280p : public IoTItem {
value.valD = value.valD / 1.333224 / 100; value.valD = value.valD / 1.333224 / 100;
regEvent(value.valD, "Bmp280p"); regEvent(value.valD, "Bmp280p");
} else } else
SerialPrint("E", "Sensor Bmp280p", "Error"); SerialPrint("E", "Sensor Bmp280p", "Error", _id);
} }
~Bmp280p(){}; ~Bmp280p(){};

4
src/modules/sensors/Dht1122/Dht1122.cpp
View File

@@ -26,7 +26,7 @@ class Dht1122t : public IoTItem {
if (String(value.valD) != "nan") if (String(value.valD) != "nan")
regEvent(value.valD, "Dht1122t"); regEvent(value.valD, "Dht1122t");
else else
SerialPrint("E", "Sensor DHTt", "Error"); SerialPrint("E", "Sensor DHTt", "Error", _id);
} }
~Dht1122t(){}; ~Dht1122t(){};
@@ -46,7 +46,7 @@ class Dht1122h : public IoTItem {
if (String(value.valD) != "nan") if (String(value.valD) != "nan")
regEvent(value.valD, "Dht1122h"); regEvent(value.valD, "Dht1122h");
else else
SerialPrint("E", "Sensor DHTh", "Error"); SerialPrint("E", "Sensor DHTh", "Error", _id);
} }
~Dht1122h(){}; ~Dht1122h(){};

2
src/modules/sensors/Ds18b20/Ds18b20.cpp
View File

@@ -71,7 +71,7 @@ class Ds18b20 : public IoTItem {
if (value.valD != DEVICE_DISCONNECTED_C) if (value.valD != DEVICE_DISCONNECTED_C)
regEvent(value.valD, ""); //обязательный вызов для отправки результата работы regEvent(value.valD, ""); //обязательный вызов для отправки результата работы
else else
SerialPrint("E", "Sensor Ds18b20", "Error"); SerialPrint("E", "Sensor Ds18b20", "Error", _id);
} }
//======================================================================================================= //=======================================================================================================

4
src/modules/sensors/GY21/GY21.cpp
View File

@@ -23,7 +23,7 @@ class GY21t : public IoTItem {
if (value.valD < 300) if (value.valD < 300)
regEvent(value.valD, "GY21"); // TODO: найти способ понимания ошибки получения данных regEvent(value.valD, "GY21"); // TODO: найти способ понимания ошибки получения данных
else else
SerialPrint("E", "Sensor GY21t", "Error"); SerialPrint("E", "Sensor GY21t", "Error", _id);
} }
~GY21t(){}; ~GY21t(){};
@@ -39,7 +39,7 @@ class GY21h : public IoTItem {
if (value.valD != 0) if (value.valD != 0)
regEvent(value.valD, "GY21h"); // TODO: найти способ понимания ошибки получения данных regEvent(value.valD, "GY21h"); // TODO: найти способ понимания ошибки получения данных
else else
SerialPrint("E", "Sensor GY21h", "Error"); SerialPrint("E", "Sensor GY21h", "Error", _id);
} }
~GY21h(){}; ~GY21h(){};

4
src/modules/sensors/Hdc1080/Hdc1080.cpp
View File

@@ -24,7 +24,7 @@ class Hdc1080t : public IoTItem {
if (value.valD < 124) if (value.valD < 124)
regEvent(value.valD, "Hdc1080t"); regEvent(value.valD, "Hdc1080t");
else else
SerialPrint("E", "Sensor Hdc1080t", "Error"); SerialPrint("E", "Sensor Hdc1080t", "Error", _id);
} }
~Hdc1080t(){}; ~Hdc1080t(){};
@@ -39,7 +39,7 @@ class Hdc1080h : public IoTItem {
if (value.valD < 99) if (value.valD < 99)
regEvent(value.valD, "Hdc1080h"); regEvent(value.valD, "Hdc1080h");
else else
SerialPrint("E", "Sensor Hdc1080h", "Error"); SerialPrint("E", "Sensor Hdc1080h", "Error", _id);
} }
~Hdc1080h(){}; ~Hdc1080h(){};

2
src/modules/sensors/Max6675/Max6675.cpp
View File

@@ -29,7 +29,7 @@ class MAX6675t : public IoTItem {
if (String(value.valD) != "nan") { if (String(value.valD) != "nan") {
regEvent(value.valD, "Max6675t"); regEvent(value.valD, "Max6675t");
} else { } else {
SerialPrint("E", "Sensor Max6675t", "Error"); SerialPrint("E", "Sensor Max6675t", "Error", _id);
} }
} }

4
src/modules/sensors/Sht20/Sht20.cpp
View File

@@ -16,7 +16,7 @@ class Sht20t : public IoTItem {
if (value.valD > -46.85F) if (value.valD > -46.85F)
regEvent(value.valD, "Sht20t"); regEvent(value.valD, "Sht20t");
else else
SerialPrint("E", "Sensor Sht20t", "Error"); SerialPrint("E", "Sensor Sht20t", "Error", _id);
} }
~Sht20t(){}; ~Sht20t(){};
@@ -32,7 +32,7 @@ class Sht20h : public IoTItem {
if (value.valD != -6) if (value.valD != -6)
regEvent(value.valD, "Sht20h"); regEvent(value.valD, "Sht20h");
else else
SerialPrint("E", "Sensor Sht20h", "Error"); SerialPrint("E", "Sensor Sht20h", "Error", _id);
} }
~Sht20h(){}; ~Sht20h(){};

4
src/modules/sensors/Sht30/Sht30.cpp
View File

@@ -26,7 +26,7 @@ class Sht30t : public IoTItem {
SerialPrint("E", "Sensor Sht30t", "OK"); SerialPrint("E", "Sensor Sht30t", "OK");
if (value.valD < -46.85F) regEvent(value.valD, "Sht30t"); // TODO: найти способ понимания ошибки получения данных if (value.valD < -46.85F) regEvent(value.valD, "Sht30t"); // TODO: найти способ понимания ошибки получения данных
else SerialPrint("E", "Sensor Sht30t", "Error"); else SerialPrint("E", "Sensor Sht30t", "Error", _id);
} }
} }
~Sht30t() {}; ~Sht30t() {};
@@ -42,7 +42,7 @@ class Sht30h : public IoTItem {
SerialPrint("E", "Sensor Sht30h", "OK"); SerialPrint("E", "Sensor Sht30h", "OK");
if (value.valD != -6) regEvent(value.valD, "Sht30h"); // TODO: найти способ понимания ошибки получения данных if (value.valD != -6) regEvent(value.valD, "Sht30h"); // TODO: найти способ понимания ошибки получения данных
else SerialPrint("E", "Sensor Sht30h", "Error"); else SerialPrint("E", "Sensor Sht30h", "Error", _id);
} }
} }
~Sht30h() {}; ~Sht30h() {};