Andrew Boyson
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/values.c
- Revision:
- 94:ded7c74d49fb
- Parent:
- 90:1c504a7b465e
- Child:
- 105:1899f7ed17ec
--- a/heating/values.c Wed Jun 10 17:04:22 2020 +0000
+++ b/heating/values.c Thu Jun 11 08:52:01 2020 +0000
@@ -12,7 +12,7 @@
#include "ds18b20.h"
#include "radiator.h"
#include "boiler.h"
-#include "program.h"
+#include "hot-water.h"
#include "log.h"
#include "net.h"
@@ -94,14 +94,15 @@
value = BoilerGetReturnDS18B20Value();
value &= 0x0FFF;
record |= value; //0000 AAAB BBCC CDDD
- record <<= 16; //AAAB BBCC CDDD 0000
+ record <<= 12; //0AAA BBBC CCDD D000
+ value = HotWaterGetDS18B20Value();
+ value &= 0x0FFF;
+ record |= value; //0AAA BBBC CCDD DEEE
+ record <<= 4; //AAAB BBCC CDDD EEE0
- record |= ProgramTimerOutput << 0;
- record |= RadiatorGetWinter() << 1;
- record |= RadiatorGetOverride() << 2;
- record |= RadiatorPump << 3;
- record |= BoilerCall << 4;
- record |= BoilerPump << 5; //AAAB BBCC CDDD 003F
+ record |= RadiatorPump << 0;
+ record |= BoilerCall << 1;
+ record |= BoilerPump << 2; //AAAB BBCC CDDD EEEF
if (count == 0) setStartTime(ClkNowTai());