mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update NeoPool webUI pH alarms (#20743)

This commit is contained in:
Norbert Richter 2024-02-17 15:23:29 +01:00 committed by GitHub
parent 1abaf146b5
commit 2068879c23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
- Berry class `int64` made immutable (#20727) - Berry class `int64` made immutable (#20727)
- LVGL make lv_touch_3_buttons more responsive (#20728) - LVGL make lv_touch_3_buttons more responsive (#20728)
- HASPmota fix and improve demo with pixel-perfect fonts (#20734) - HASPmota fix and improve demo with pixel-perfect fonts (#20734)
- NeoPool webUI pH alarms (4 & 5) completed
### Fixed ### Fixed
- ESP32 PWM activity on unconfigured PWM GPIOs (#20732) - ESP32 PWM activity on unconfigured PWM GPIOs (#20732)

6
tasmota/tasmota_xsns_sensor/xsns_83_neopool.ino
View File

@ -834,7 +834,9 @@ const char kNeoPoolpHAlarms[] PROGMEM =
D_NEOPOOL_SETPOINT_OK "|" D_NEOPOOL_SETPOINT_OK "|"
D_NEOPOOL_PH_HIGH "|" D_NEOPOOL_PH_HIGH "|"
D_NEOPOOL_PH_LOW "|" 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" #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); (((uint16_t)(fvalue*10) > (uint16_t)(fphmax*10)) ? HTTP_SNS_NEOPOOL_STATUS_ACTIVE : HTTP_SNS_NEOPOOL_STATUS_INACTIVE), stemp);
WSContentSend_PD(PSTR(" ")); WSContentSend_PD(PSTR(" "));
// S2 // 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); 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); WSContentSend_PD(HTTP_SNS_NEOPOOL_STATUS, bg_color, HTTP_SNS_NEOPOOL_STATUS_ACTIVE, stemp);
} }