From dfd24dc1f66622dad2d38c9a90c4115c29511cdc Mon Sep 17 00:00:00 2001 From: biver Date: Fri, 28 Oct 2022 16:26:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D1=83=D0=B5=D0=BC=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B1=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B5=20=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?= =?UTF-8?q?=D1=8F=D1=85=20=D0=B4=D0=B0=D1=82=D1=87=D0=B8=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BE=D0=B1=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/sensors/AhtXX/AhtXX.cpp | 18 +++++++++--------- src/modules/sensors/Bme280/Bme280.cpp | 6 +++--- src/modules/sensors/Bmp280/Bmp280.cpp | 4 ++-- src/modules/sensors/Dht1122/Dht1122.cpp | 4 ++-- src/modules/sensors/Ds18b20/Ds18b20.cpp | 2 +- src/modules/sensors/GY21/GY21.cpp | 4 ++-- src/modules/sensors/Hdc1080/Hdc1080.cpp | 4 ++-- src/modules/sensors/Max6675/Max6675.cpp | 2 +- src/modules/sensors/Sht20/Sht20.cpp | 4 ++-- src/modules/sensors/Sht30/Sht30.cpp | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/modules/sensors/AhtXX/AhtXX.cpp b/src/modules/sensors/AhtXX/AhtXX.cpp index f32487bf..a49e8fe1 100644 --- a/src/modules/sensors/AhtXX/AhtXX.cpp +++ b/src/modules/sensors/AhtXX/AhtXX.cpp @@ -7,30 +7,30 @@ std::map ahts; -void printStatus(AHTxx *aht) { +String getStatus(AHTxx *aht) { switch (aht->getStatus()) { case AHTXX_NO_ERROR: - Serial.println(F("no error")); + return F("no error"); break; case AHTXX_BUSY_ERROR: - Serial.println(F("sensor AHT busy, increase polling time")); + return F("sensor AHT busy, increase polling time"); break; 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; 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; 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; default: - Serial.println(F("AHT: unknown status")); + return F("AHT: unknown status"); break; } } @@ -49,7 +49,7 @@ class AhtXXt : public IoTItem { if (value.valD != AHTXX_ERROR) { regEvent(value.valD, "AhtXXt"); } 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) { regEvent(value.valD, "AhtXXh"); } else { - printStatus(_aht); //print temperature command status + SerialPrint("E", "Sensor AHTXX", getStatus(_aht), _id); } } diff --git a/src/modules/sensors/Bme280/Bme280.cpp b/src/modules/sensors/Bme280/Bme280.cpp index aa9050c8..071525c4 100644 --- a/src/modules/sensors/Bme280/Bme280.cpp +++ b/src/modules/sensors/Bme280/Bme280.cpp @@ -26,7 +26,7 @@ class Bme280t : public IoTItem { if (value.valD != NAN && value.valD < 145) regEvent(value.valD, "Bme280t"); else - SerialPrint("E", "Sensor Bme280t", "Error"); + SerialPrint("E", "Sensor Bme280t", "Error", _id); } ~Bme280t(){}; @@ -46,7 +46,7 @@ class Bme280h : public IoTItem { if (value.valD != NAN && value.valD < 100) regEvent(value.valD, "Bme280h"); else - SerialPrint("E", "Sensor Bme280h", "Error"); + SerialPrint("E", "Sensor Bme280h", "Error", _id); } ~Bme280h(){}; @@ -67,7 +67,7 @@ class Bme280p : public IoTItem { value.valD = value.valD / 1.333224 / 100; regEvent(value.valD, "Bme280p"); } else - SerialPrint("E", "Sensor Bme280p", "Error"); + SerialPrint("E", "Sensor Bme280p", "Error", _id); } ~Bme280p(){}; diff --git a/src/modules/sensors/Bmp280/Bmp280.cpp b/src/modules/sensors/Bmp280/Bmp280.cpp index fae4ccfa..d0db6beb 100644 --- a/src/modules/sensors/Bmp280/Bmp280.cpp +++ b/src/modules/sensors/Bmp280/Bmp280.cpp @@ -26,7 +26,7 @@ class Bmp280t : public IoTItem { if (value.valD != NAN && value.valD < 150) regEvent(value.valD, "Bmp280t"); else - SerialPrint("E", "Sensor Bmp280t", "Error"); + SerialPrint("E", "Sensor Bmp280t", "Error", _id); } ~Bmp280t(){}; @@ -47,7 +47,7 @@ class Bmp280p : public IoTItem { value.valD = value.valD / 1.333224 / 100; regEvent(value.valD, "Bmp280p"); } else - SerialPrint("E", "Sensor Bmp280p", "Error"); + SerialPrint("E", "Sensor Bmp280p", "Error", _id); } ~Bmp280p(){}; diff --git a/src/modules/sensors/Dht1122/Dht1122.cpp b/src/modules/sensors/Dht1122/Dht1122.cpp index a9c00ef4..00641724 100644 --- a/src/modules/sensors/Dht1122/Dht1122.cpp +++ b/src/modules/sensors/Dht1122/Dht1122.cpp @@ -26,7 +26,7 @@ class Dht1122t : public IoTItem { if (String(value.valD) != "nan") regEvent(value.valD, "Dht1122t"); else - SerialPrint("E", "Sensor DHTt", "Error"); + SerialPrint("E", "Sensor DHTt", "Error", _id); } ~Dht1122t(){}; @@ -46,7 +46,7 @@ class Dht1122h : public IoTItem { if (String(value.valD) != "nan") regEvent(value.valD, "Dht1122h"); else - SerialPrint("E", "Sensor DHTh", "Error"); + SerialPrint("E", "Sensor DHTh", "Error", _id); } ~Dht1122h(){}; diff --git a/src/modules/sensors/Ds18b20/Ds18b20.cpp b/src/modules/sensors/Ds18b20/Ds18b20.cpp index e6518e03..495c3406 100644 --- a/src/modules/sensors/Ds18b20/Ds18b20.cpp +++ b/src/modules/sensors/Ds18b20/Ds18b20.cpp @@ -71,7 +71,7 @@ class Ds18b20 : public IoTItem { if (value.valD != DEVICE_DISCONNECTED_C) regEvent(value.valD, ""); //обязательный вызов для отправки результата работы else - SerialPrint("E", "Sensor Ds18b20", "Error"); + SerialPrint("E", "Sensor Ds18b20", "Error", _id); } //======================================================================================================= diff --git a/src/modules/sensors/GY21/GY21.cpp b/src/modules/sensors/GY21/GY21.cpp index 4c89722e..5af1923b 100644 --- a/src/modules/sensors/GY21/GY21.cpp +++ b/src/modules/sensors/GY21/GY21.cpp @@ -23,7 +23,7 @@ class GY21t : public IoTItem { if (value.valD < 300) regEvent(value.valD, "GY21"); // TODO: найти способ понимания ошибки получения данных else - SerialPrint("E", "Sensor GY21t", "Error"); + SerialPrint("E", "Sensor GY21t", "Error", _id); } ~GY21t(){}; @@ -39,7 +39,7 @@ class GY21h : public IoTItem { if (value.valD != 0) regEvent(value.valD, "GY21h"); // TODO: найти способ понимания ошибки получения данных else - SerialPrint("E", "Sensor GY21h", "Error"); + SerialPrint("E", "Sensor GY21h", "Error", _id); } ~GY21h(){}; diff --git a/src/modules/sensors/Hdc1080/Hdc1080.cpp b/src/modules/sensors/Hdc1080/Hdc1080.cpp index 6af1eff3..fe595787 100644 --- a/src/modules/sensors/Hdc1080/Hdc1080.cpp +++ b/src/modules/sensors/Hdc1080/Hdc1080.cpp @@ -24,7 +24,7 @@ class Hdc1080t : public IoTItem { if (value.valD < 124) regEvent(value.valD, "Hdc1080t"); else - SerialPrint("E", "Sensor Hdc1080t", "Error"); + SerialPrint("E", "Sensor Hdc1080t", "Error", _id); } ~Hdc1080t(){}; @@ -39,7 +39,7 @@ class Hdc1080h : public IoTItem { if (value.valD < 99) regEvent(value.valD, "Hdc1080h"); else - SerialPrint("E", "Sensor Hdc1080h", "Error"); + SerialPrint("E", "Sensor Hdc1080h", "Error", _id); } ~Hdc1080h(){}; diff --git a/src/modules/sensors/Max6675/Max6675.cpp b/src/modules/sensors/Max6675/Max6675.cpp index 67ece7fd..e351602c 100644 --- a/src/modules/sensors/Max6675/Max6675.cpp +++ b/src/modules/sensors/Max6675/Max6675.cpp @@ -29,7 +29,7 @@ class MAX6675t : public IoTItem { if (String(value.valD) != "nan") { regEvent(value.valD, "Max6675t"); } else { - SerialPrint("E", "Sensor Max6675t", "Error"); + SerialPrint("E", "Sensor Max6675t", "Error", _id); } } diff --git a/src/modules/sensors/Sht20/Sht20.cpp b/src/modules/sensors/Sht20/Sht20.cpp index a9100974..85b0e508 100644 --- a/src/modules/sensors/Sht20/Sht20.cpp +++ b/src/modules/sensors/Sht20/Sht20.cpp @@ -16,7 +16,7 @@ class Sht20t : public IoTItem { if (value.valD > -46.85F) regEvent(value.valD, "Sht20t"); else - SerialPrint("E", "Sensor Sht20t", "Error"); + SerialPrint("E", "Sensor Sht20t", "Error", _id); } ~Sht20t(){}; @@ -32,7 +32,7 @@ class Sht20h : public IoTItem { if (value.valD != -6) regEvent(value.valD, "Sht20h"); else - SerialPrint("E", "Sensor Sht20h", "Error"); + SerialPrint("E", "Sensor Sht20h", "Error", _id); } ~Sht20h(){}; diff --git a/src/modules/sensors/Sht30/Sht30.cpp b/src/modules/sensors/Sht30/Sht30.cpp index d0a927b6..d78947df 100644 --- a/src/modules/sensors/Sht30/Sht30.cpp +++ b/src/modules/sensors/Sht30/Sht30.cpp @@ -26,7 +26,7 @@ class Sht30t : public IoTItem { SerialPrint("E", "Sensor Sht30t", "OK"); if (value.valD < -46.85F) regEvent(value.valD, "Sht30t"); // TODO: найти способ понимания ошибки получения данных - else SerialPrint("E", "Sensor Sht30t", "Error"); + else SerialPrint("E", "Sensor Sht30t", "Error", _id); } } ~Sht30t() {}; @@ -42,7 +42,7 @@ class Sht30h : public IoTItem { SerialPrint("E", "Sensor Sht30h", "OK"); if (value.valD != -6) regEvent(value.valD, "Sht30h"); // TODO: найти способ понимания ошибки получения данных - else SerialPrint("E", "Sensor Sht30h", "Error"); + else SerialPrint("E", "Sensor Sht30h", "Error", _id); } } ~Sht30h() {};