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-script.inc

Revision:
92:2d1ca4dcbca7
Parent:
91:8b192efd0288
Child:
104:46ce1aaf8be7
--- a/web-this/boiler/web-boiler-script.inc	Wed Jun 10 10:08:06 2020 +0000
+++ b/web-this/boiler/web-boiler-script.inc	Wed Jun 10 11:45:38 2020 +0000
@@ -15,29 +15,29 @@
 "function parse()\n"
 "{\n"
 "    let lines = Ajax.response.split('\\n');\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       = OneWire.parseDS18B20    (lines[6]);\n"
-"    blrRunOnTime      =    Ajax.hexToSignedInt16(lines[7]);\n"
+"      tankTemperature = Ajax.hexToSignedInt16(lines[0]);\n"
+"    blrOutTemperature = Ajax.hexToSignedInt16(lines[1]);\n"
+"    blrRtnTemperature = Ajax.hexToSignedInt16(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"
+"    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.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"
+"    elem = Ajax.getElementOrNull('ajax-tank-html'      ); if (elem) elem.textContent = OneWire.DS18B20ToString(tankTemperature);\n"
+"    elem = Ajax.getElementOrNull('ajax-blr-out-html'   ); if (elem) elem.textContent = OneWire.DS18B20ToString(blrOutTemperature);\n"
+"    elem = Ajax.getElementOrNull('ajax-blr-rtn-html'   ); if (elem) elem.textContent = OneWire.DS18B20ToString(blrRtnTemperature);\n"
+"    elem = Ajax.getElementOrNull('ajax-blr-rise-html'  ); if (elem) elem.textContent = OneWire.DS18B20ToString(blrOutTemperature - blrRtnTemperature);\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.toFixed(1);\n"
+"    elem = Ajax.getElementOrNull('ajax-blr-run-on-deg' ); if (elem) elem.value = OneWire.DS18B20ToString(blrRunOnDeg);\n"
 "    elem = Ajax.getElementOrNull('ajax-blr-run-on-time'); if (elem) elem.value = blrRunOnTime;\n"
 "\n"
 "}\n"