TheFloatingLab/HotWaterManager
TheFloatingLab/HotWaterManager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Corrected an error in the Pump Delta menu option.' (#4) from Version_1.1 into main

Browse Source 
Reviewed-on: #4
This commit is contained in:
Frans Veldman 2025-03-30 12:38:20 +00:00
commit 2603bd5fe4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HotWaterManager.h
View File

@ -15,7 +15,7 @@
// ******** Debug definitions **********
// Leave commented for production!
//#define SIMTEMP 683 // Use this to test the program without actual temperature sensors connected. 683 simulates 68.3 Celcius
//#define SIMTEMP 437 // Use this to test the program without actual temperature sensors connected. 683 simulates 68.3 Celcius
//#define SIMVOLT 141 // Use this to test the program for a specific voltage. 141 simulates 14.1
//#define USEDEFAULT 1 // declutter the EPROM, use the defaults

8
HotWaterManager.ino
View File

@ -135,7 +135,7 @@ const char sfx_minutes[] PROGMEM = " minutes";
const char sfx_days[] PROGMEM = " days";
const char sfx_percent[] PROGMEM = " percent";
const char sfx_volts[] PROGMEM = "V";
const char sfx_deg[] PROGMEM = "\xDF""C";
const char sfx_deg[] PROGMEM = "\xDF""K";
const char sfx_ohms[] PROGMEM = "\xF4";
const char* const suffixes[] = {sfx_seconds,sfx_minutes,sfx_days,sfx_percent,sfx_volts,sfx_deg,sfx_ohms};
@ -182,7 +182,7 @@ const menu_t PROGMEM menu[]= {
{"LED Mode", 0, MENU_8, 0, 4, 1, &fptr_ledmode, &rom.ledmode},
{"Vlt Calibration", 0, MENU_16, 920, 1080, 1, &fptr_showvoltage, &rom.calibration},
{"Pump Source", 0, MENU_8, 0, 2, 1, &fptr_pumpsource, &rom.pumpMode},
{"Pump delta", 6, MENU_16+MENU_SIGNED, 5, 100, 5, &fptr_dummy, &rom.pumpdelta},
{"Pump delta", 6, MENU_16+MENU_SIGNED+1, 5, 100, 5, &fptr_dummy, &rom.pumpdelta},
{"Pump afterrun", 1, MENU_16, 0, 300, 30, &fptr_dummy, &rom.pumpafterrun},
{"Hot Water timer", 2, MENU_16, 0, 180, 15, &fptr_dummy, &rom.hwv_timer},
{"Hot Water pwr", 4, MENU_8, 50, 100, 10, &fptr_dummy, &rom.hwv_pwm},
@ -1066,7 +1066,7 @@ void fptr_ledmode() {
static const char lmod0[] PROGMEM = "Touch";
static const char lmod1[] PROGMEM = "Warm water";
static const char lmod2[] PROGMEM = "Heating up";
static const char lmod3[] PROGMEM = "HW Valve";
static const char lmod3[] PROGMEM = "Solenoid";
static const char lmod4[] PROGMEM = "Legionella";
static const char* const ledmods[] = {lmod0,lmod1,lmod2,lmod3,lmod4};
@ -1111,7 +1111,7 @@ void printMenu(uint8_t item, boolean edit, boolean fahrenheit) {
if(code==MENU_SHOW) {
if(edit)
lcd.print(F("Hold btn to exit"));
lcd.print(F("Hold to exit"));
else
pgmLcdPrint(menu[item].txt);
lcd.setCursor(2,1);