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/boiler.c

Revision:
11:fa01ea25b62d
Parent:
5:82197a6997fd
Child:
13:2ca12dd42e91
--- a/heating/boiler.c	Mon Nov 26 14:06:44 2018 +0000
+++ b/heating/boiler.c	Sun Dec 02 19:17:40 2018 +0000
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 
 #include    "gpio.h"
-#include    "tick.h"
+#include "clktime.h"
 #include "ds18b20.h"
 #include    "fram.h"
 
@@ -90,11 +90,11 @@
     if (BoilerCall)
     {
         BoilerPump = true;
-        offTicks = Ticks();
+        offTicks = TimeNow();
     }
     else
     {
-        int secondsSinceBoilerOff = (Ticks() - offTicks) >> TICK_ONE_SECOND_SHIFT;
+        int secondsSinceBoilerOff = (TimeNow() - offTicks) >> TIME_ONE_SECOND_SHIFT;
         if (secondsSinceBoilerOff > runOnTime) BoilerPump = false;
         if (boilerTempsAreValid)
         {