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

Compare commits

base: TheFloatingLab:b6796e2fbc5be668fbbd37092e02fdd7ce4e4b4b
Branches Tags
TheFloatingLab:main
TheFloatingLab:Version_1.1
TheFloatingLab:Version_1.0
..
compare: TheFloatingLab:2b5dca6c8aeb8ec392f0f1b28c629fbac65aab2d
Branches Tags
TheFloatingLab:main
TheFloatingLab:Version_1.1
TheFloatingLab:Version_1.0

No commits in common. "b6796e2fbc5be668fbbd37092e02fdd7ce4e4b4b" and "2b5dca6c8aeb8ec392f0f1b28c629fbac65aab2d" have entirely different histories.
b6796e2fbc ... 2b5dca6c8a

2 changed files with 9 additions and 18 deletions
Show Stats Expand all files Collapse all files

20
HotWaterManager.h
View File

@ -1,21 +1,15 @@
// ****** Hardware Model definitions ******** // ****** Hardware Model definitions ********
// Do not change these definitions! The numerical order is important! #define ARDUINO_ 0 // Use this one if you want to build this project around an Arduino
#define ARDUINO_ 0 #define HWV_1_0 1 // Hardware version 1.0 of the Thermal Optimizer board (only a few were made)
#define HWV_1_0 1 #define HWV_1_1 2 // Hardware version 1.1 of the Thermal Optimizer board
#define HWV_1_1 2 #define HWV_1_2 3 // Hardware version 1.2 of the Thermal Optimizer board
#define HWV_1_2 3
// ********* Hardware Model ************ // ********* Hardware Model ************
// Uncomment ONE of the following: #define HWMODEL ARDUINO_ // Change this into the hardware model you want to compile for
#define HWMODEL ARDUINO_ // Use this one if you want to build this project around an Arduino
//#define HWMODEL HWV_1_0 // Use this one if you want to build this project for a ThermalOptimizer board v1.0
//#define HWMODEL HWV_1_1 // Use this one if you want to build this project for a ThermalOptimizer board v1.1
//#define HWMODEL HWV_1_2 // Use this one if you want to build this project for a ThermalOptimizer board v1.2
// ******** Debug definitions ********** // Debug definitions, leave commented for production!
// Leave commented for production! //#define SIMTEMP 713 // Use this to test the program without actual temperature sensors connected. 713 simulates 71.3 Celcius
//#define SIMTEMP 683 // 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 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 //#define USEDEFAULT 1 // declutter the EPROM, use the defaults

7
HotWaterManager.ino
View File

@ -342,8 +342,8 @@ void setup() {
#ifndef USEDEFAULT #ifndef USEDEFAULT
eeprom_read_block((void*)&rom, (void*)0, sizeof(rom)); // These are the configuration settings. eeprom_read_block((void*)&rom, (void*)0, sizeof(rom)); // These are the configuration settings.
#endif
brightness(rom.brightness); brightness(rom.brightness);
#endif
// Prime the "history" of the temperature. Make sure we start with a downward trend // Prime the "history" of the temperature. Make sure we start with a downward trend
delay(1500); delay(1500);
@ -684,9 +684,6 @@ void processmodes() {
// Update the temperature trend arrow // Update the temperature trend arrow
lcd.setCursor(13,0); lcd.setCursor(13,0);
#ifdef SIMTEMP
lcd.write(6); // Simulate upward trend
#else
if(readtemp(0)-lastTemperature>=TRENDDELTA) { if(readtemp(0)-lastTemperature>=TRENDDELTA) {
lcd.write(6); // Trend is going up lcd.write(6); // Trend is going up
lastTemperature=readtemp(0); lastTemperature=readtemp(0);
@ -695,7 +692,7 @@ void processmodes() {
lcd.write(5); // Trend is going down lcd.write(5); // Trend is going down
lastTemperature=readtemp(0); lastTemperature=readtemp(0);
} }
#endif
lcd.setCursor(14,0); lcd.setCursor(14,0);
if(hwv && hwv_timer) { // If the hot water valve is selected... if(hwv && hwv_timer) { // If the hot water valve is selected...