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: web-derived/boiler/web-boiler-html.c

Revision:
51:c7c6ce0d57ad
Parent:
49:9491c966dc60
Child:
52:76254a967391
--- a/web-derived/boiler/web-boiler-html.c	Mon Apr 29 06:35:27 2019 +0000
+++ b/web-derived/boiler/web-boiler-html.c	Mon Apr 29 14:46:58 2019 +0000
@@ -1,32 +1,29 @@
 #include "http.h"
-#include "page.h"
-#include "page-derived.h"
-#include "boiler.h"
-#include "ds18b20.h"
-#include "web-base.h"
+#include "web-page-derived.h"
+#include "web-add.h"
 
 void WebBoilerHtml()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    PageAddHeader(PageSite, "Boiler", "settings.css", "boiler.js");
-    PageAddNav(BOILER_PAGE);
-    PageAddH1(PageSite, "Boiler");
+    WebAddHeader("Boiler", "settings.css", "boiler.js");
+    WebAddNav(BOILER_PAGE);
+    WebAddH1("Boiler");
     
-    PageAddH2("Outputs");
-    PageAddAjaxLed("Boiler call", "ajax-blr-call-toggle");
-    PageAddAjaxLed("Boiler pump", "ajax-blr-pump-toggle");
+    WebAddH2("Outputs");
+    WebAddAjaxLed("Boiler call", "ajax-blr-call-toggle");
+    WebAddAjaxLed("Boiler pump", "ajax-blr-pump-toggle");
     
-    PageAddH2("Inputs");
-    PageAddAjaxLabelledSuffix("Tank",          "ajax-tank-html",    "°C");
-    PageAddAjaxLabelledSuffix("Boiler output", "ajax-blr-out-html", "°C");
-    PageAddAjaxLabelledSuffix("Boiler return", "ajax-blr-rtn-html", "°C");
+    WebAddH2("Inputs");
+    WebAddAjaxLabelledSuffix("Tank",          "ajax-tank-html",    "°C");
+    WebAddAjaxLabelledSuffix("Boiler output", "ajax-blr-out-html", "°C");
+    WebAddAjaxLabelledSuffix("Boiler return", "ajax-blr-rtn-html", "°C");
 
-    PageAddH2("Parameters");
-    PageAddAjaxInput("Tank 'off' setpoint (deg)", 2, "ajax-tank-set-point",  "tanksetpoint"  );
-    PageAddAjaxInput("Tank 'on' temp drop (deg)", 2, "ajax-tank-hysteresis", "tankhysteresis");
-    PageAddAjaxInput("Boiler run on (deg)",       2, "ajax-blr-run-on-deg",  "boilerresidual");
-    PageAddAjaxInput("Boiler run on (sec)",       2, "ajax-blr-run-on-time", "boilerrunon"   );
+    WebAddH2("Parameters");
+    WebAddAjaxInput("Tank 'off' setpoint (deg)", 2, "ajax-tank-set-point",  "tanksetpoint"  );
+    WebAddAjaxInput("Tank 'on' temp drop (deg)", 2, "ajax-tank-hysteresis", "tankhysteresis");
+    WebAddAjaxInput("Boiler run on (deg)",       2, "ajax-blr-run-on-deg",  "boilerresidual");
+    WebAddAjaxInput("Boiler run on (sec)",       2, "ajax-blr-run-on-time", "boilerrunon"   );
 
-    PageAddEnd();
+    WebAddEnd();
     
 }
\ No newline at end of file