Diff: clock/http-clock-script.inc

Revision:

77:4689596a2f3f

Parent:

46:1822fdbe6c0c

Child:

94:d7226b2c14b6

--- a/clock/http-clock-script.inc	Thu Mar 21 11:21:19 2019 +0000
+++ b/clock/http-clock-script.inc	Sat Mar 23 12:26:49 2019 +0000
@@ -2,20 +2,24 @@
 "\n"
 "var response        = '';\n"
 "var headers         = '';\n"
-"var msRtc           = 0;     //nibbles 0 to 3: 16 bits\n"
+"var msRtc           = 0;     //nibbles  0 to  3: 16 bits\n"
 "var msCountAtRtcSet = 0;\n"
 "var msDiff          = 0;\n"
-"var rtcIsSet        = false; //nibble  4: bit 0\n"
-"var clockIsSet      = false; //nibble  4: bit 1\n"
-"var sourceIsOk      = false; //nibble  4: bit 2\n"
-"var rateIsLocked    = false; //nibble  4: bit 3\n"
-"var timeIsLocked    = false; //nibble  5: bit 0\n"
-"var leapEnable      = false; //nibble  5: bit 1\n"
-"var leapForward     = false; //nibble  5: bit 2\n"
-"var leapmonths1970  = 0;     //nibbles 6 to 8: 12 bits\n"
+"var rtcIsSet        = false; //nibble   4      : bit 0\n"
+"var clockIsSet      = false; //nibble   4      : bit 1\n"
+"var sourceIsOk      = false; //nibble   4      : bit 2\n"
+"var rateIsLocked    = false; //nibble   4      : bit 3\n"
+"var timeIsLocked    = false; //nibble   5      : bit 0\n"
+"var leapEnable      = false; //nibble   5      : bit 1\n"
+"var leapForward     = false; //nibble   5      : bit 2\n"
+"var leapmonths1970  = 0;     //nibbles  6 to  8: 12 bits\n"
 "var leapmonth       = 0;\n"
 "var leapyear        = 0;\n"
-"var leaps           = 0;     //nibbles 9 to 12: 16 bits\n"
+"var leaps           = 0;     //nibbles  9 to 12: 16 bits\n"
+"var ppb             = 0;     //nibbles 13 to 20: 32 bits\n"
+"var scanavg         = 0;     //nibbles 21 to 28: 32 bits\n"
+"var scanmax         = 0;     //nibbles 29 to 36: 32 bits\n"
+"var scanmin         = 0;     //nibbles 37 to 44: 32 bits\n"
 "var msCount         = 0;\n"
 "\n"
 "const         TICK_MS =   100;\n"
@@ -49,7 +53,11 @@
 "   leapyear        = (leapmonths1970 - leapmonth) / 12;\n"
 "   leapmonth      += 1;\n"
 "   leapyear       += 1970;\n"
-"   leaps           = parseInt(response.substr(9, 4), 16);\n"
+"   leaps           = parseInt(response.substr( 9, 4), 16);\n"
+"   ppb             = parseInt(response.substr(13, 8), 16);\n"
+"   scanavg         = parseInt(response.substr(21, 8), 16);\n"
+"   scanmax         = parseInt(response.substr(29, 8), 16);\n"
+"   scanmin         = parseInt(response.substr(37, 8), 16);\n"
 "}\n"
 "function displayGeneral()\n"
 "{\n"
@@ -68,10 +76,16 @@
 "\n"
 "   elem = document.getElementById('ajax-leap-count'   ); if (elem) elem.value = leaps;\n"
 "\n"
-"   elem = document.getElementById('ajax-response'     ); if (elem) elem.innerHTML  = response;\n"
-"   elem = document.getElementById('ajax-headers'      ); if (elem) elem.innerHTML  = headers;\n"
+"   elem = document.getElementById('ajax-ppb'          ); if (elem) elem.value = ppb;\n"
+"\n"
+"   elem = document.getElementById('ajax-scan-avg'     ); if (elem) elem.textContent = scanavg;\n"
+"   elem = document.getElementById('ajax-scan-max'     ); if (elem) elem.textContent = scanmax;\n"
+"   elem = document.getElementById('ajax-scan-min'     ); if (elem) elem.textContent = scanmin;\n"
+"\n"
+"   elem = document.getElementById('ajax-response'     ); if (elem) elem.textContent = response;\n"
+"   elem = document.getElementById('ajax-headers'      ); if (elem) elem.textContent = headers;\n"
 "   \n"
-"   elem = document.getElementById('date-diff'         ); if (elem) elem.innerHTML = msDiff;\n"
+"   elem = document.getElementById('ajax-date-diff'    ); if (elem) elem.textContent = msDiff;\n"
 "}\n"
 "\n"
 "function formatNumbers00(i)\n"
@@ -135,11 +149,10 @@
 "    //Display time\n"
 "    var elem;\n"
 "        \n"
-"    elem = document.getElementById('date-utc');\n"
-"    if (elem) elem.innerHTML = y + '-' + n + '-' + d + ' ' + w + ' ' + h + ':' + m + ':' + s + ' TAI-UTC=' + leaps;\n"
+"    elem = document.getElementById('ajax-date-utc');\n"
+"    if (elem) elem.textContent = y + '-' + n + '-' + d + ' ' + w + ' ' + h + ':' + m + ':' + s + ' TAI-UTC=' + leaps;\n"
 "\n"
-"    elem = document.getElementById('date-pc');\n"
-"    //if (elem) elem.innerHTML = now.toString();\n"
+"    elem = document.getElementById('ajax-date-pc');\n"
 "    var options = \n"
 "    {\n"
 "        year:         'numeric',\n"
@@ -151,7 +164,7 @@
 "        second:       '2-digit',\n"
 "        timeZoneName: 'short'\n"
 "    };\n"
-"    if (elem) elem.innerHTML = now.toLocaleString(undefined, options);\n"
+"    if (elem) elem.textContent = now.toLocaleString(undefined, options);\n"
 "}\n"
 "\n"
 "var ajax;\n"