diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index ac51c3ef6..50199770d 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -1063,6 +1063,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index 61f2a502e..17d163560 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index e17fc15a6..a2b0e737b 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Salzwasserpumpe" #define D_NEOPOOL_TIME "Zeit" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Laufzeit Zelle" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrAus" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index cbddc2e29..f40d5108c 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 55275c9bb..26e0d57d6 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index f8f91108f..e55d8371e 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -1063,6 +1063,7 @@ #define D_NEOPOOL_RELAY_CD "Pompe Brome" #define D_NEOPOOL_TIME "Durée" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "OK" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 2d181d0e4..77f0f7582 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index ef306ac58..43464a51c 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index cfb08ce4e..04a22efa8 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Idő" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 8f0335fac..444e36c34 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 3097e59b7..6c106a8ed 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 599e96d47..b3bb446a6 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 2952e153a..580914249 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index ac695b699..b6dd915e0 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index b5e1435c1..f264d30bf 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index f483d3eb7..c7d4fb659 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index 8bd50eda5..7109033d3 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index c05701137..b2a8a0fb3 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 4ce422a8d..1bc9908c1 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index c7b8b84f1..160e6d236 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 22c0e684c..26cf0606f 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 61054f7bf..1991ba908 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -1064,6 +1064,7 @@ #define D_NEOPOOL_RELAY_CD "Brine pump" #define D_NEOPOOL_TIME "Time" #define D_NEOPOOL_FILT_MODE "Filtration" +#define D_NEOPOOL_CELL_RUNTIME "Cell runtime" #define D_NEOPOOL_POLARIZATION "Pol" // Sensor status #define D_NEOPOOL_PR_OFF "PrOff" #define D_NEOPOOL_SETPOINT_OK "Ok" diff --git a/tasmota/xsns_83_neopool.ino b/tasmota/xsns_83_neopool.ino index 789bbf627..50f0aac3d 100644 --- a/tasmota/xsns_83_neopool.ino +++ b/tasmota/xsns_83_neopool.ino @@ -105,6 +105,8 @@ enum NeoPoolRegister { MBF_HIDRO_VOLTAGE, // 0x0111 Reports on the stress applied to the hydrolysis cell. This register, together with that of MBF_HIDRO_CURRENT allows extrapolating the salinity of the water. // GLOBAL page (0x02xx) + MBF_CELL_RUNTIME_LOW = 0x0206, // 0x0206* undocumented - cell runtime (32 bit) - low word + MBF_CELL_RUNTIME_HIGH = 0x0207, // 0x0207* undocumented - cell runtime (32 bit) - high word MBF_BOOST_CTRL = 0x020C, // 0x020C undocumented - 0x0000 = Boost Off, 0x05A0 = Boost with redox ctrl, 0x85A0 = Boost without redox ctrl MBF_SET_MANUAL_CTRL = 0x0289, // 0x0289 undocumented - write a 1 before manual control MBF_RELAY_STATE, after done write 0 and do MBF_EXEC MBF_ESCAPE = 0x0297, // 0x0297 undocumented - A write operation to this register is the same as using the ESC button on main screen - clears error @@ -581,8 +583,9 @@ struct { NeoPoolRegList list[]; }; } NeoPoolReg[] = { - // 4 entries so using 250ms poll interval we are through in a second for all register + // 6 entries so using 250ms poll interval we are through in 1,5 for all register {NEOPOOL_REG_TYPE_BLOCK, {MBF_ION_CURRENT, MBF_NOTIFICATION - MBF_ION_CURRENT + 1, nullptr}}, + {NEOPOOL_REG_TYPE_BLOCK, {MBF_CELL_RUNTIME_LOW, MBF_CELL_RUNTIME_HIGH - MBF_CELL_RUNTIME_LOW + 1, nullptr}}, {NEOPOOL_REG_TYPE_BLOCK, {MBF_PAR_VERSION, MBF_PAR_MODEL - MBF_PAR_VERSION + 1, nullptr}}, {NEOPOOL_REG_TYPE_BLOCK, {MBF_PAR_TIME_LOW, MBF_PAR_FILT_GPIO - MBF_PAR_TIME_LOW + 1, nullptr}}, {NEOPOOL_REG_TYPE_BLOCK, {MBF_PAR_ION, MBF_PAR_FILTRATION_TYPE - MBF_PAR_ION + 1, nullptr}}, @@ -685,6 +688,7 @@ const char HTTP_SNS_NEOPOOL_CONDUCTIVITY[] PROGMEM = "{s}%s " D_NEOPOOL_COND const char HTTP_SNS_NEOPOOL_IONIZATION[] PROGMEM = "{s}%s " D_NEOPOOL_IONIZATION "{m}" NEOPOOL_FMT_ION " " "%s%s" "{e}"; const char HTTP_SNS_NEOPOOL_FILT_MODE[] PROGMEM = "{s}%s " D_NEOPOOL_FILT_MODE "{m}%s" "{e}"; const char HTTP_SNS_NEOPOOL_RELAY[] PROGMEM = "{s}%s " "%s" "{m}%s" "{e}"; +const char HTTP_SNS_NEOPOOL_CELL_RUNTIME[] PROGMEM = "{s}%s " D_NEOPOOL_CELL_RUNTIME "{m}%s" "{e}"; const char HTTP_SNS_NEOPOOL_STATUS[] PROGMEM = " %s "; const char HTTP_SNS_NEOPOOL_STATUS_NORMAL[] PROGMEM = "filter:invert(0.1)"; @@ -1254,6 +1258,7 @@ uint32_t NeoPoolGetSpeedIndex(uint16_t speedvalue) #define D_NEOPOOL_JSON_FILTRATION_MODE "Mode" #define D_NEOPOOL_JSON_FILTRATION_SPEED "Speed" #define D_NEOPOOL_JSON_HYDROLYSIS "Hydrolysis" +#define D_NEOPOOL_JSON_CELL_RUNTIME "Runtime" #define D_NEOPOOL_JSON_IONIZATION "Ionization" #define D_NEOPOOL_JSON_LIGHT "Light" #define D_NEOPOOL_JSON_LIGHT_MODE "Mode" @@ -1382,6 +1387,11 @@ void NeoPoolShow(bool json) ResponseAppend_P(PSTR(",\"" D_NEOPOOL_JSON_HYDROLYSIS "\":{\"" D_JSON_DATA "\":" NEOPOOL_FMT_HIDRO), dec, &fvalue); ResponseAppend_P(PSTR(",\"" D_NEOPOOL_JSON_UNIT "\":\"%s\""), sunit); +#ifndef NEOPOOL_OPTIMIZE_READINGS + ResponseAppend_P(PSTR(",\"" D_NEOPOOL_JSON_CELL_RUNTIME "\":\"%s\""), + GetDuration((uint32_t)NeoPoolGetData(MBF_CELL_RUNTIME_LOW) + ((uint32_t)NeoPoolGetData(MBF_CELL_RUNTIME_HIGH) << 16)).c_str()); +#endif // NEOPOOL_OPTIMIZE_READINGS + // S1 const char *state = PSTR(""); if (0 == (NeoPoolGetData(MBF_HIDRO_STATUS) & MBMSK_HIDRO_STATUS_MODULE_ACTIVE)) { @@ -1456,13 +1466,15 @@ void NeoPoolShow(bool json) ); #ifndef NEOPOOL_OPTIMIZE_READINGS - // Time - char dt[20]; - TIME_T tmpTime; - BreakTime((uint32_t)NeoPoolGetData(MBF_PAR_TIME_LOW) + ((uint32_t)NeoPoolGetData(MBF_PAR_TIME_HIGH) << 16), tmpTime); - snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02d %02d:%02d"), - tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute); - WSContentSend_PD(HTTP_SNS_NEOPOOL_TIME, neopool_type, dt); + { + // Time + char dt[20]; + TIME_T tmpTime; + BreakTime((uint32_t)NeoPoolGetData(MBF_PAR_TIME_LOW) + ((uint32_t)NeoPoolGetData(MBF_PAR_TIME_HIGH) << 16), tmpTime); + snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02d %02d:%02d"), + tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute); + WSContentSend_PD(HTTP_SNS_NEOPOOL_TIME, neopool_type, dt); + } #endif // NEOPOOL_OPTIMIZE_READINGS // Temperature @@ -1635,6 +1647,18 @@ void NeoPoolShow(bool json) WSContentSend_PD(HTTP_SNS_NEOPOOL_RELAY,neopool_type, sdesc, '\0' == *stemp ? ((NeoPoolGetData(MBF_RELAY_STATE) & (1<