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

Revision:
35:bb8a6d1c034c
Parent:
34:18a3fc737899
Child:
36:07c7e4d197f2
--- a/http-derived/boiler/http-boiler-html.c	Thu Feb 28 16:21:15 2019 +0000
+++ b/http-derived/boiler/http-boiler-html.c	Thu Mar 07 15:17:26 2019 +0000
@@ -8,25 +8,24 @@
 void HttpBoilerHtml()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    PageAddHeader(PageSite, "Boiler", "settings.css", NULL);
+    PageAddHeader(PageSite, "Boiler", "settings.css", "heating.js");
     PageAddNav(BOILER_PAGE);
     PageAddH1(PageSite, "Boiler");
     
-    int16_t temp;
-    char text[DS18B20_VALUE_STRING_LENGTH];
-    temp = DS18B20ValueFromRom(BoilerGetTankRom());    DS18B20ValueToString(temp, text); PageAddLabelledValue("Tank",          12, text);
-    temp = DS18B20ValueFromRom(BoilerGetOutputRom());  DS18B20ValueToString(temp, text); PageAddLabelledValue("Boiler output", 12, text);
-    temp = DS18B20ValueFromRom(BoilerGetReturnRom());  DS18B20ValueToString(temp, text); PageAddLabelledValue("Boiler return", 12, text);
-    
+    PageAddH2("Inputs");
+    PageAddAjaxLabelled(11, "Tank",          "ajax-tank-html",    "°C");
+    PageAddAjaxLabelled(11, "Boiler output", "ajax-blr-out-html", "°C");
+    PageAddAjaxLabelled(11, "Boiler return", "ajax-blr-rtn-html", "°C");
+
     PageAddH2("Parameters");
-    PageAddIntInput("/boiler", 0, "Tank set point",         10, "tanksetpoint",   2, BoilerGetTankSetPoint());
-    PageAddIntInput("/boiler", 0, "Tank hysteresis",        10, "tankhysteresis", 2, BoilerGetTankHysteresis());
-    PageAddIntInput("/boiler", 0, "Boiler run on residual", 10, "boilerresidual", 2, BoilerGetRunOnResidual());
-    PageAddIntInput("/boiler", 0, "Boiler run on time",     10, "boilerrunon",    2, BoilerGetRunOnTime());
+    PageAddIntInput("/boiler", 0, "Tank 'off' setpoint (deg)", 12, "tanksetpoint",   2, BoilerGetTankSetPoint());
+    PageAddIntInput("/boiler", 0, "Tank 'on' temp drop (deg)", 12, "tankhysteresis", 2, BoilerGetTankHysteresis());
+    PageAddIntInput("/boiler", 0, "Boiler run on (deg)",       12, "boilerresidual", 2, BoilerGetRunOnResidual());
+    PageAddIntInput("/boiler", 0, "Boiler run on (sec)",       12, "boilerrunon",    2, BoilerGetRunOnTime());
     
     PageAddH2("Outputs");
-    PageAddLabelledOnOff("Boiler call", 12, BoilerCall);
-    PageAddLabelledOnOff("Boiler pump", 12, BoilerPump);
+    PageAddAjaxToggle(12, "Boiler call", "ajax-blr-call-toggle", "htg-chg-blr-call");
+    PageAddAjaxToggle(12, "Boiler pump", "ajax-blr-pump-toggle", "htg-chg-blr-pump");
 
     PageAddEnd();