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

Fixed some errors in the factory reset logic, enhanced comments in the HotWaterManager.h and README.md file.

Browse Source
This commit is contained in:
Frans Veldman 2025-03-29 10:26:15 +00:00
parent da88825320
commit 8b3d6a43db
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
HotWaterManager.h
View File

@ -9,8 +9,8 @@
#define HWMODEL ARDUINO_ // Change this into the hardware model you want to compile for
// Debug definitions, leave commented for production!
//#define SIMTEMP 80 // Use this to test the program without actual temperature sensors connected. 50 simulates 8.0 Celcius
//#define SIMVOLT 132 // Use this to test the program for a specific voltage. 132 simulates 13.2
//#define SIMTEMP 713 // Use this to test the program without actual temperature sensors connected. 713 simulates 71.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
#if HWMODEL == ARDUINO_
@ -91,8 +91,8 @@
#define LED 13 // Conventionally, this port is used to control a LED
#if HWMODEL == ARDUINO_
#define HEATER 3 // Heater relay control output (Port 18 is ADC 4, conflict if I2C bus is used)
#define BACKLIGHT_B0 18 // Display backlight, bit 0
#define HEATER 3 // Heater relay control output
#define BACKLIGHT_B0 18 // Display backlight, bit 0 (Port 18 is ADC 4, conflict if I2C bus is used)
#define BACKLIGHT_B1 12 // Display backlight, bit 1
#define BACKLIGHT_B2 11 // Display backlight, bit 2
#endif
@ -104,7 +104,7 @@
#endif
#if HWMODEL > HWV_1_0
#define HEATER 3
#define BACKLIGHT_B0 18 // Display backlight, bit 0
#define BACKLIGHT_B0 18 // Display backlight, bit 0 (Port 18 is ADC 4, conflict if I2C bus is used)
#define BACKLIGHT_B1 14 // Display backlight, bit 1
#define BACKLIGHT_B2 11 // Display backlight, bit 2
#endif

44
HotWaterManager.ino
View File

@ -257,7 +257,6 @@ void setup() {
}
lcd.clear();
#ifndef SIMTEMP
// Read the sensor addresses
eeprom_read_block((void*)&sensors, (void*)128, sizeof(sensors));
@ -294,12 +293,13 @@ void setup() {
}
lcd.setCursor(0,1);
lcd.print(F("sensors found"));
#ifndef SIMTEMP
if(!x) // If no temperature sensors have been found...
while(true); // continuation is pointless
#endif
eeprom_write_block((void*)&sensors, (void*)128, sizeof(sensors));
}
#endif
if(sensors.useDS) { // Do we use Digital Sensors?
#if HWMODEL > HWV_1_0
@ -318,29 +318,26 @@ void setup() {
delay(15 + i * 10); // Use a non constant delay to avoid any pulsing loads to sync with the sampling frequency
}
eeprom_read_block((void*)&rom, (void*)0, sizeof(2)); // Read the ROM header
eeprom_read_block((void*)&rom, (void*)0, 2); // Read the ROM header
if(resetpressed || rom.epromchk!=EPROMCHK) { // Reset key pressed or ROM not yet initialized?
if(rom.epromchk==EPROMCHK) {
lcd.print(F("Hold button to")); // Offer user to reset the ROM
lcd.setCursor(0,1);
lcd.print(F("Factory Reset"));
delay(5000);
}
if(resetpressed && rom.epromchk==EPROMCHK) { // Reset pressed, and we have an already configured EPROM?
lcd.print(F("Hold button to")); // Offer user to reset the ROM
lcd.setCursor(0,1);
lcd.print(F("Factory Reset"));
delay(5000);
lcd.clear();
if(!digitalRead(BUTTON)) { // button is pressed
rom.epromchk=EPROMCHK;
if(getvoltage()>180) { // If the voltage is above 18 volts
rom.vreq*=2; // Multiply all default voltages by 2
rom.vfloat*=2;
rom.voff*=2;
rom.vmul=true; // Set the system up for 24 Volts
}
eeprom_write_block((void*)&rom, (void*)0, sizeof(rom));
lcd.print(F("Reset OK"));
delay(1500);
lcd.clear();
}
if(resetpressed && !digitalRead(BUTTON) || rom.epromchk!=EPROMCHK) {// button is pressed or ROM not yet initialized
rom.epromchk=EPROMCHK;
if(getvoltage()>180) { // If the voltage is above 18 volts
rom.vreq*=2; // Multiply all default voltages by 2
rom.vfloat*=2;
rom.voff*=2;
rom.vmul=true; // Set the system up for 24 Volts
}
eeprom_write_block((void*)&rom, (void*)0, sizeof(rom));
lcd.clear();
lcd.print(F("Reset OK"));
}
#ifndef USEDEFAULT
@ -351,6 +348,7 @@ void setup() {
// Prime the "history" of the temperature. Make sure we start with a downward trend
delay(1500);
lastTemperature=readtemp(0)+TRENDDELTA;
lcd.clear();
wdt_enable(WDTO_4S); // Enable watchdog, Use a 4 second interval
}
@ -668,7 +666,7 @@ void processmodes() {
lcd.print(F("Source"));
src=1;
} else {
lcd.print(F("Water "));
lcd.print(F("Tank "));
}
printTemperature(readtemp(src),1,rom.fahrenheit); // Display the temperature

1
README.md
View File

@ -29,6 +29,7 @@ See for details and background [https://www.thefloatinglab.world/en/boilers.html
- Q1 controls the output relay which is used to switch the heater. The relay is not drawn on the schematic. One pin of the coil is connected to 12V (or 24V) and the other one to the transistor output.
- Q2 controls the optional Hot Water Solenoid. The associated circuitry can be omitted if no Hot Water Solenoid is used.
- Q3 controls the optional solar pump. The associated circuitry can be omitted if no solar pump is used.
- The LCD doesn't use a potentiometer for the contrast, a fixed resistor of 1k5 worked with all LCD's (different vendors, different colors) I have tested so far.
### Components