mirror of https://github.com/arendst/Tasmota.git
commit
a31a7781d2
|
@ -829,7 +829,7 @@ const char HTTP_SNS_EC[] PROGMEM = "{s}%s " D_EC "{
|
|||
const char HTTP_SNS_O2[] PROGMEM = "{s}%s " D_O2 "{m}%s " D_UNIT_PERCENT "{e}";
|
||||
const char HTTP_SNS_LITERS[] PROGMEM = "{s}%s " D_VOLUME "{m}%s " D_UNIT_LITERS "{e}";
|
||||
const char HTTP_SNS_LPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_LITERS_PER_MIN "{e}";
|
||||
const char HTTP_SNS_DO[] PROGMEM = "{s}%s " D_DO "{m}%s " D_UNIT_PARTS_PER_MILLION "{e}";
|
||||
const char HTTP_SNS_DO[] PROGMEM = "{s}%s " D_DO "{m}%s " D_UNIT_MILIGRAMS_PER_LITER "{e}";
|
||||
const char HTTP_SNS_COLOR_RED[] PROGMEM = "{s}%s " D_COLOR_RED "{m}%u " "{e}";
|
||||
const char HTTP_SNS_COLOR_GREEN[] PROGMEM = "{s}%s " D_COLOR_GREEN "{m}%u " "{e}";
|
||||
const char HTTP_SNS_COLOR_BLUE[] PROGMEM = "{s}%s " D_COLOR_BLUE "{m}%u " "{e}";
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -826,6 +826,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "s"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "s"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "seg"
|
||||
|
|
|
@ -823,6 +823,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "s"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "s"
|
||||
|
|
|
@ -826,6 +826,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "초"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "s"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "гПа"
|
||||
#define D_UNIT_SECOND "сек"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sek"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sek"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "млрд⁻¹"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "децилітр⁻¹"
|
||||
#define D_UNIT_PARTS_PER_MILLION "млн⁻¹"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "гПа"
|
||||
#define D_UNIT_SECOND "сек"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "ppd"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "hPa"
|
||||
#define D_UNIT_SECOND "sec"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "每分升"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "百帕"
|
||||
#define D_UNIT_SECOND "秒"
|
||||
|
|
|
@ -827,6 +827,7 @@
|
|||
#define D_UNIT_PARTS_PER_BILLION "ppb"
|
||||
#define D_UNIT_PARTS_PER_DECILITER "每分升"
|
||||
#define D_UNIT_PARTS_PER_MILLION "ppm"
|
||||
#define D_UNIT_MILIGRAMS_PER_LITER "mg/L"
|
||||
#define D_UNIT_PERCENT "%%"
|
||||
#define D_UNIT_PRESSURE "百帕"
|
||||
#define D_UNIT_SECOND "秒"
|
||||
|
|
|
@ -41,9 +41,8 @@ struct EZOCO2 : public EZOStruct {
|
|||
{
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d}" ), name, CO2);
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_CO2, name, CO2);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#define EZO_DO_READ_LATENCY 600
|
||||
|
||||
struct EZODO : public EZOStruct {
|
||||
EZODO(uint32_t addr) : EZOStruct(addr), DO(0) {}
|
||||
EZODO(uint32_t addr) : EZOStruct(addr), DO(NAN) {}
|
||||
|
||||
virtual void ProcessMeasurement(void)
|
||||
{
|
||||
|
@ -39,10 +39,11 @@ struct EZODO : public EZOStruct {
|
|||
dtostrfd(DO, 2, str);
|
||||
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_DO "\":%d}" ), name, str);
|
||||
}
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_DO "\":%s" ), name, str);
|
||||
ResponseJsonEnd();
|
||||
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_DO, name, str);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
@ -54,7 +55,7 @@ private:
|
|||
float DO;
|
||||
};
|
||||
|
||||
const char EZODO::id[] PROGMEM = "D.O.";
|
||||
const char EZODO::id[] PROGMEM = "DO";
|
||||
|
||||
#endif // USE_EZODO
|
||||
#endif // USE_I2C
|
||||
|
|
|
@ -40,9 +40,8 @@ struct EZOEC : public EZOStruct {
|
|||
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_EC "\":%s}" ), name, str);
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_EC, name, str);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
|
|
@ -40,9 +40,8 @@ struct EZOO2 : public EZOStruct {
|
|||
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_O2 "\":%d}" ), name, str);
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_O2, name, str);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
|
|
@ -40,9 +40,8 @@ struct EZOORP : public EZOStruct {
|
|||
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ORP "\":%s}" ), name, str);
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_ORP, name, str);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
|
|
@ -40,9 +40,8 @@ struct EZOPH : public EZOStruct {
|
|||
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_PH "\":%s}" ), name, str);
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_PH, name, str);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
|
|
@ -46,9 +46,8 @@ struct EZOPRS : public EZOStruct {
|
|||
ResponseAppend_P(PSTR(",\"" D_JSON_PRESSUREATSEALEVEL "\":%s"), sealevelstr);
|
||||
}
|
||||
ResponseJsonEnd();
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_PD(HTTP_SNS_PRESSURE, name, str, PressureUnit().c_str());
|
||||
if (Settings.altitude != 0) {
|
||||
WSContentSend_PD(HTTP_SNS_SEAPRESSURE, name, sealevelstr, PressureUnit().c_str());
|
||||
|
|
|
@ -39,9 +39,8 @@ struct EZORTD : public EZOStruct {
|
|||
|
||||
if (json) {
|
||||
ResponseAppend_P(JSON_SNS_F_TEMP, name, Settings.flag2.temperature_resolution, &temp);
|
||||
}
|
||||
#ifdef USE_WEBSERVER
|
||||
else {
|
||||
}else {
|
||||
WSContentSend_Temp(name, temp);
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue