Andrew Boyson / oldheating

Central Heating controller using the real time clock, PHY module for internet, 1-wire interface for temperature sensors, a system log and a configuration file

Dependencies:   net 1-wire lpc1768 crypto clock web fram log

/media/uploads/andrewboyson/heating.sch

/media/uploads/andrewboyson/heating.brd

/media/uploads/andrewboyson/eagle.epf

Diff: heating/radiator.c

Revision:
97:84d58bf7a835
Parent:
96:18a3813bb4b5
Child:
98:c75c959bcde3
--- a/heating/radiator.c	Sat Oct 03 14:29:33 2020 +0000
+++ b/heating/radiator.c	Sun Oct 04 07:54:54 2020 +0000
@@ -33,13 +33,13 @@
 int      RadiatorGetNightTemperature    () { return  (int)nightTemperature;       } 
 int      RadiatorGetFrostTemperature    () { return  (int)frostTemperature;       } 
 
-static void  setWinter              ( bool  value) { htgWinter            =     (char)value; FramWrite(iWinter,               1, &htgWinter           ); }
-static void  setOverride            ( bool  value) { htgOverride          =     (char)value; FramWrite(iOverride,             1, &htgOverride         ); }
-static void  setHallRom             ( char* value) { memcpy(hallRom,  value, 8);             FramWrite(iHallRom,              8,  hallRom             ); }
-void RadiatorSetOverrideCancelHour  ( int   value) { overrideCancelHour   =  (uint8_t)value, FramWrite(iOverrideCancelHour,   1, &overrideCancelHour  ); }
-void RadiatorSetOverrideCancelMinute( int   value) { overrideCancelMinute =  (uint8_t)value, FramWrite(iOverrideCancelMinute, 1, &overrideCancelMinute); }
-void RadiatorSetNightTemperature    ( int   value) { nightTemperature     =  (int16_t)value; FramWrite(iNightTemperature,     2, &nightTemperature    ); }
-void RadiatorSetFrostTemperature    ( int   value) { frostTemperature     =  (int16_t)value; FramWrite(iFrostTemperature,     2, &frostTemperature    ); }
+static void  setWinter              ( bool  v) {                             htgWinter            =     (char)v; FramWrite(iWinter,               1, &htgWinter           ); }
+static void  setOverride            ( bool  v) {                             htgOverride          =     (char)v; FramWrite(iOverride,             1, &htgOverride         ); }
+static void  setHallRom             ( char* v) {                             memcpy(hallRom,  v, 8);             FramWrite(iHallRom,              8,  hallRom             ); }
+void RadiatorSetOverrideCancelHour  ( int   v) { if (v > 23 || v < 0) v = 0; overrideCancelHour   =  (uint8_t)v, FramWrite(iOverrideCancelHour,   1, &overrideCancelHour  ); }
+void RadiatorSetOverrideCancelMinute( int   v) { if (v > 59 || v < 0) v = 0; overrideCancelMinute =  (uint8_t)v, FramWrite(iOverrideCancelMinute, 1, &overrideCancelMinute); }
+void RadiatorSetNightTemperature    ( int   v) { if (v > 99 || v < 0) v = 0; nightTemperature     =  (int16_t)v; FramWrite(iNightTemperature,     2, &nightTemperature    ); }
+void RadiatorSetFrostTemperature    ( int   v) { if (v > 99 || v < 0) v = 0; frostTemperature     =  (int16_t)v; FramWrite(iFrostTemperature,     2, &frostTemperature    ); }
 
 static bool outputBeforeOverride = false;
 static void makeOutputBeforeOverride()