From 2068879c238eaf1aeed2386ee53bea570ccd7a15 Mon Sep 17 00:00:00 2001 From: Norbert Richter Date: Sat, 17 Feb 2024 15:23:29 +0100 Subject: [PATCH] Update NeoPool webUI pH alarms (#20743) --- CHANGELOG.md | 1 + tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed3ff48d5..68354b44a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. - Berry class `int64` made immutable (#20727) - LVGL make lv_touch_3_buttons more responsive (#20728) - HASPmota fix and improve demo with pixel-perfect fonts (#20734) +- NeoPool webUI pH alarms (4 & 5) completed ### Fixed - ESP32 PWM activity on unconfigured PWM GPIOs (#20732) diff --git a/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino b/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino index 81abf890f..c448c9507 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino @@ -834,7 +834,9 @@ const char kNeoPoolpHAlarms[] PROGMEM = D_NEOPOOL_SETPOINT_OK "|" D_NEOPOOL_PH_HIGH "|" D_NEOPOOL_PH_LOW "|" - D_NEOPOOL_PUMP_TIME_EXCEEDED + D_NEOPOOL_PUMP_TIME_EXCEEDED "|" + D_NEOPOOL_PH_HIGH "|" + D_NEOPOOL_PH_LOW ; #define NEOPOOL_FMT_PH "%*_f" @@ -2043,7 +2045,7 @@ void NeoPoolShow(bool json) (((uint16_t)(fvalue*10) > (uint16_t)(fphmax*10)) ? HTTP_SNS_NEOPOOL_STATUS_ACTIVE : HTTP_SNS_NEOPOOL_STATUS_INACTIVE), stemp); WSContentSend_PD(PSTR(" ")); // S2 - if ((NeoPoolGetData(MBF_PH_STATUS) & MBMSK_PH_STATUS_ALARM) >=1 && (NeoPoolGetData(MBF_PH_STATUS) & MBMSK_PH_STATUS_ALARM) <= 3) { + if ((NeoPoolGetData(MBF_PH_STATUS) & MBMSK_PH_STATUS_ALARM) > 0) { GetTextIndexed(stemp, sizeof(stemp), NeoPoolGetData(MBF_PH_STATUS) & MBMSK_PH_STATUS_ALARM, kNeoPoolpHAlarms); WSContentSend_PD(HTTP_SNS_NEOPOOL_STATUS, bg_color, HTTP_SNS_NEOPOOL_STATUS_ACTIVE, stemp); }