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

Revision:
104:46ce1aaf8be7
Parent:
91:8b192efd0288
Child:
105:1899f7ed17ec
--- a/web-this/boiler/web-boiler-html.c	Tue Jan 19 19:05:06 2021 +0000
+++ b/web-this/boiler/web-boiler-html.c	Wed Feb 10 17:24:36 2021 +0000
@@ -9,21 +9,37 @@
     WebAddNav(BOILER_PAGE);
     WebAddH1("Boiler");
     
-    WebAddH2("Outputs");
+    WebAddH2("Tank outputs");
     WebAddAjaxLed("Boiler call", "ajax-blr-call-toggle");
+    
+    WebAddH2("Tank inputs");
+    WebAddAjaxLabelledSuffix("Tank",               "ajax-tank-html",       "°C");
+
+    WebAddH2("Tank parameters");
+    WebAddAjaxInput("Tank 'off' setpoint (deg)", 2, "ajax-tank-set-point",     "tanksetpoint"    );
+    WebAddAjaxInput("Tank 'on' temp drop (deg)", 2, "ajax-tank-hysteresis",    "tankhysteresis"  );
+
+    WebAddH2("Pump outputs");
     WebAddAjaxLed("Boiler pump", "ajax-blr-pump-toggle");
+    WebAddAjaxLabelledSuffix("Boiler pump speed (0-100)",      "ajax-blr-pump-speed-html", "%");
+    WebAddAjaxLabelledSuffix("Boiler pump pwm  (84-10)",  "ajax-blr-pump-pwm-html"  , "%");
     
-    WebAddH2("Inputs");
-    WebAddAjaxLabelledSuffix("Tank",             "ajax-tank-html",     "°C");
-    WebAddAjaxLabelledSuffix("Boiler output",    "ajax-blr-out-html",  "°C");
-    WebAddAjaxLabelledSuffix("Boiler return",    "ajax-blr-rtn-html",  "°C");
-    WebAddAjaxLabelledSuffix("Boiler temp rise", "ajax-blr-rise-html", "°C");
+    WebAddH2("Pump inputs");
+    WebAddAjaxLabelledSuffix("Boiler output",      "ajax-blr-out-html",    "°C");
+    WebAddAjaxLabelledSuffix("Boiler input",       "ajax-blr-rtn-html",    "°C");
+    WebAddAjaxLabelledSuffix("Boiler ΔT",    "ajax-blr-rise-html",   "°C");
 
-    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"   );
+    WebAddH2("Pump calling parameters");
+    WebAddAjaxInput("Pump speed calling (% or -1)",2, "ajax-pump-speed-calling", "pumpspeedcalling"  );
+    WebAddAjaxInput("Boiler output target (deg)",  2, "ajax-blr-output-target",  "boileroutputtarget");
+    WebAddAjaxInput("Boiler ΔT at pump 0",   3, "ajax-pump-rise-at-0"    , "blrriseat0"        );
+    WebAddAjaxInput("Boiler ΔT at pump 50",  3, "ajax-pump-rise-at-50"   , "blrriseat50"       );
+    WebAddAjaxInput("Boiler ΔT at pump 100", 3, "ajax-pump-rise-at-100"  , "blrriseat100"      );
+
+    WebAddH2("Pump run on parameters");
+    WebAddAjaxInput("Run on residual heat (deg)",  2, "ajax-blr-run-on-deg",     "boilerresidual"    );
+    WebAddAjaxInput("Run on max time (sec)",       2, "ajax-blr-run-on-time",    "boilerrunon"       );
+    WebAddAjaxInput("Run on pump speed (%)",       2, "ajax-pump-speed-run-on",  "pumpspeedrunon"    );
 
     WebAddEnd();