Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: net 1-wire lpc1768 crypto clock web fram log
Diff: web-this/boiler/web-boiler-script.inc
- Revision:
- 91:8b192efd0288
- Parent:
- 53:c1bf7d9db507
- Child:
- 92:2d1ca4dcbca7
--- a/web-this/boiler/web-boiler-script.inc Thu Jun 04 16:37:59 2020 +0000
+++ b/web-this/boiler/web-boiler-script.inc Wed Jun 10 10:08:06 2020 +0000
@@ -1,41 +1,43 @@
"//Boiler script\n"
"'use strict';\n"
"\n"
-"let dateTime = '';\n"
-"let tankTemperature = '';\n"
-"let blrOutTemperature = '';\n"
-"let blrRtnTemperature = '';\n"
-"let boilerCall = false;\n"
-"let boilerPump = false;\n"
-"let tankSetPoint = '';\n"
-"let tankHysteresis = '';\n"
-"let blrRunOnDeg = '';\n"
-"let blrRunOnTime = '';\n"
+"let dateTime = '';\n"
+"let tankTemperature = '';\n"
+"let blrOutTemperature = '';\n"
+"let blrRtnTemperature = '';\n"
+"let boilerCall = false;\n"
+"let boilerPump = false;\n"
+"let tankSetPoint = '';\n"
+"let tankHysteresis = '';\n"
+"let blrRunOnDeg = '';\n"
+"let blrRunOnTime = '';\n"
"\n"
"function parse()\n"
"{\n"
" let lines = Ajax.response.split('\\n');\n"
-" tankTemperature = OneWire.DS18B20ToString (lines[0]);\n"
-" blrOutTemperature = OneWire.DS18B20ToString (lines[1]);\n"
-" blrRtnTemperature = OneWire.DS18B20ToString (lines[2]);\n"
+" tankTemperature = OneWire.parseDS18B20 (lines[0]);\n"
+" blrOutTemperature = OneWire.parseDS18B20 (lines[1]);\n"
+" blrRtnTemperature = OneWire.parseDS18B20 (lines[2]);\n"
" boilerCall = Ajax.hexToBit (lines[3], 0);\n"
" boilerPump = Ajax.hexToBit (lines[3], 1);\n"
" tankSetPoint = Ajax.hexToSignedInt16(lines[4]);\n"
" tankHysteresis = Ajax.hexToSignedInt16(lines[5]);\n"
-" blrRunOnDeg = Ajax.hexToSignedInt16(lines[6]);\n"
+" blrRunOnDeg = OneWire.parseDS18B20 (lines[6]);\n"
" blrRunOnTime = Ajax.hexToSignedInt16(lines[7]);\n"
"}\n"
"function display()\n"
"{\n"
" let elem;\n"
-" elem = Ajax.getElementOrNull('ajax-tank-html' ); if (elem) elem.textContent = tankTemperature;\n"
-" elem = Ajax.getElementOrNull('ajax-blr-out-html' ); if (elem) elem.textContent = blrOutTemperature;\n"
-" elem = Ajax.getElementOrNull('ajax-blr-rtn-html' ); if (elem) elem.textContent = blrRtnTemperature;\n"
+" elem = Ajax.getElementOrNull('ajax-tank-html' ); if (elem) elem.textContent = tankTemperature.toFixed(1);\n"
+" elem = Ajax.getElementOrNull('ajax-blr-out-html' ); if (elem) elem.textContent = blrOutTemperature.toFixed(1);\n"
+" elem = Ajax.getElementOrNull('ajax-blr-rtn-html' ); if (elem) elem.textContent = blrRtnTemperature.toFixed(1);\n"
+" elem = Ajax.getElementOrNull('ajax-blr-rise-html' ); if (elem) elem.textContent = (blrOutTemperature - blrRtnTemperature).toFixed(1);\n"
+" \n"
" elem = Ajax.getElementOrNull('ajax-blr-call-toggle'); if (elem) elem.setAttribute('dir', boilerCall ? 'rtl' : 'ltr');\n"
" elem = Ajax.getElementOrNull('ajax-blr-pump-toggle'); if (elem) elem.setAttribute('dir', boilerPump ? 'rtl' : 'ltr');\n"
" elem = Ajax.getElementOrNull('ajax-tank-set-point' ); if (elem) elem.value = tankSetPoint;\n"
" elem = Ajax.getElementOrNull('ajax-tank-hysteresis'); if (elem) elem.value = tankHysteresis;\n"
-" elem = Ajax.getElementOrNull('ajax-blr-run-on-deg' ); if (elem) elem.value = blrRunOnDeg;\n"
+" elem = Ajax.getElementOrNull('ajax-blr-run-on-deg' ); if (elem) elem.value = blrRunOnDeg.toFixed(1);\n"
" elem = Ajax.getElementOrNull('ajax-blr-run-on-time'); if (elem) elem.value = blrRunOnTime;\n"
"\n"
"}\n"