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:
105:1899f7ed17ec
Parent:
104:46ce1aaf8be7
Child:
106:41ed3ea0bbba
--- a/web-this/boiler/web-boiler-html.c	Wed Feb 10 17:24:36 2021 +0000
+++ b/web-this/boiler/web-boiler-html.c	Tue Feb 23 20:35:07 2021 +0000
@@ -21,25 +21,30 @@
 
     WebAddH2("Pump outputs");
     WebAddAjaxLed("Boiler pump", "ajax-blr-pump-toggle");
-    WebAddAjaxLabelledSuffix("Boiler pump speed (0-100)",      "ajax-blr-pump-speed-html", "%");
+    WebAddAjaxLabelledSuffix("Boiler pump speed (10-100)",     "ajax-blr-pump-speed-html", "%");
     WebAddAjaxLabelledSuffix("Boiler pump pwm  (84-10)",  "ajax-blr-pump-pwm-html"  , "%");
     
     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");
+    WebAddAjaxLabelledSuffix("Boiler output",        "ajax-blr-out-html",  "°C");
+    WebAddAjaxLabelledSuffix("Boiler input",         "ajax-blr-rtn-html",  "°C");
+    WebAddAjaxLabelledSuffix("Boiler input aligned", "ajax-blr-aln-html",  "°C");
+    WebAddAjaxLabelledSuffix("Boiler ΔT",      "ajax-blr-rise-html", "°C");
 
-    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 parameters");
+    WebAddAjaxInput("Full speed circuit time (sec)" , 2, "ajax-full-speed-secs"   , "fullspeedsecs"     );
+    
+    WebAddH2("Pump parameters during boiler call");
+    WebAddAjaxInputToggle("Boiler call enable", "ajax-blr-enable-toggle",      "boilercallenable");
+    WebAddAjaxInput("Calling pump speed (%, A or T)", 2, "ajax-pump-speed-calling", "pumpspeedcalling"  );
+    WebAddAjaxInput("Boiler output target (deg)"    , 2, "ajax-blr-output-target" , "boileroutputtarget");
+    WebAddAjaxInput("Minimum flow (%)"              , 3, "ajax-pump-rise-at-0"    , "blrriseat0"        );
+    WebAddAjaxInput("Mid flow speed"                , 3, "ajax-pump-rise-at-50"   , "blrriseat50"       );
+    WebAddAjaxInput("Full speed ΔT"           , 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"    );
+    WebAddH2("Pump parameters during run on");
+    WebAddAjaxInput("Run on min ΔT"           , 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();