Diff: web-derived/radiator/web-radiator-html.c

Revision:

51:c7c6ce0d57ad

Parent:

49:9491c966dc60

Child:

52:76254a967391

--- a/web-derived/radiator/web-radiator-html.c	Mon Apr 29 06:35:27 2019 +0000
+++ b/web-derived/radiator/web-radiator-html.c	Mon Apr 29 14:46:58 2019 +0000
@@ -1,32 +1,28 @@
 #include "http.h"
-#include "page.h"
-#include "page-derived.h"
-#include "ds18b20.h"
-#include "radiator.h"
-#include "program.h"
 #include "web-base.h"
-#include "web-derived.h"
+#include "web-page-derived.h"
+#include "web-add.h"
 
 void WebRadiatorHtml()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    PageAddHeader(PageSite, "Radiator", "settings.css", "radiator.js");
-    PageAddNav(RADIATOR_PAGE);
-    PageAddH1(PageSite, "Radiator");
+    WebAddHeader("Radiator", "settings.css", "radiator.js");
+    WebAddNav(RADIATOR_PAGE);
+    WebAddH1("Radiator");
 
-    PageAddH2("Output");
-    PageAddAjaxLed           ("Radiator pump",     "ajax-radiator-toggle");
+    WebAddH2("Output");
+    WebAddAjaxLed           ("Radiator pump",     "ajax-radiator-toggle");
     
-    PageAddH2("Inputs");
-    PageAddAjaxLabelledSuffix("Hall temperature",  "ajax-hall-html", "°C");
-    PageAddAjaxLed           ("Programmer output", "ajax-program-toggle");
+    WebAddH2("Inputs");
+    WebAddAjaxLabelledSuffix("Hall temperature",  "ajax-hall-html", "°C");
+    WebAddAjaxLed           ("Programmer output", "ajax-program-toggle");
     
-    PageAddH2("Parameters");
-    PageAddAjaxInputToggle   ("Mode Summer|Winter", "ajax-mode-toggle"    , "htg-chg-mode" );
-    PageAddAjaxInput         ("Winter (night)",  2, "ajax-night-set-point", "nighttemp");
-    PageAddAjaxInput         ("Summer (frost)",  2, "ajax-frost-set-point", "frosttemp");
-    PageAddAjaxInputToggle   ("Override",           "ajax-override-toggle", "htg-chg-override");
+    WebAddH2("Parameters");
+    WebAddAjaxInputToggle   ("Mode Summer|Winter", "ajax-mode-toggle"    , "htg-chg-mode" );
+    WebAddAjaxInput         ("Winter (night)",  2, "ajax-night-set-point", "nighttemp");
+    WebAddAjaxInput         ("Summer (frost)",  2, "ajax-frost-set-point", "frosttemp");
+    WebAddAjaxInputToggle   ("Override",           "ajax-override-toggle", "htg-chg-override");
     
-    PageAddEnd();
+    WebAddEnd();
 
 }