Minor test changes

This commit is contained in:
anschrammh 2019-12-28 14:16:24 +01:00
parent 57a5f05e29
commit 78231e9228

View File

@ -13,13 +13,20 @@ var powerInfoInter = null;
var execTimeStart = null; var execTimeStart = null;
//XMLHttpRequest objects
let ajaxReqPowerInfo = new XMLHttpRequest();
let ajaxReqGetIoMode = new XMLHttpRequest();
let ajaxReqRtc = new XMLHttpRequest();
//This function set the app up //This function set the app up
function init() function init()
{ {
console.log("Body loaded - starting setup"); console.log("Body loaded - starting setup");
refreshRtc(); initAjaxRtc();
rtcClockInter = setInterval(refreshRtc,1000); refreshRtc(ajaxReqRtc);
rtcClockInter = setInterval(() => {refreshRtc(ajaxReqRtc)},1000);
refreshSysInfo(); refreshSysInfo();
sysinfoInter = setInterval(refreshSysInfo,10000); sysinfoInter = setInterval(refreshSysInfo,10000);
@ -28,13 +35,13 @@ function init()
sigStrenthInter = setInterval(refreshSigStrength,1000); sigStrenthInter = setInterval(refreshSigStrength,1000);
sdCardSize(); sdCardSize();
getIoMode(); getIoMode(ajaxReqGetIoMode);
getIoLevel(); getIoLevel();
ioModeLevelInter = setInterval(() => {getIoMode();getIoLevel();},1000); ioModeLevelInter = setInterval(() => {getIoMode(ajaxReqGetIoMode);getIoLevel();},1000);
powerInfo(); powerInfo(ajaxReqPowerInfo);
powerInfoInter = setInterval(powerInfo,10000); powerInfoInter = setInterval(() => {powerInfo(ajaxReqPowerInfo);},10000);
//We init the time boxes //We init the time boxes
var curDate = new Date(); var curDate = new Date();
@ -47,6 +54,49 @@ function init()
console.log("Ending setup"); console.log("Ending setup");
} }
function initAjaxRtc()
{
ajaxReqRtc.timeout = 5000;
ajaxReqRtc.onreadystatechange = function()
{
switch(this.readyState)
{
case 0:
break;
case 1:
console.log("Connection established");
break;
case 2:
console.log("Request received");
break;
case 3:
console.log("Processing request");
break;
case 4:
console.log("Response is ready");
if(this.status != 0){onConnected(); document.getElementById('execTime').innerHTML = new Date().getTime() - execTimeStart;}
if(this.status == 200)
{
console.log("Response : " + this.responseText);
var rtcObj = JSON.parse(this.responseText);
console.log(rtcObj);
document.getElementById('rtcValue').innerHTML = rtcObj.time + ' ' + rtcObj.date;
}
else
{
console.log("Error, status is : " + this.status);
document.getElementById('rtcValue').innerHTML = 'ERROR';
document.getElementById('execTime').innerHTML = 'NaN';
}
break;
default:
console.log("Unknown state");
}
}
ajaxReqRtc.ontimeout = onTimeOut;
}
function onTimeOut(e) function onTimeOut(e)
{ {
console.error("Request timed out"); console.error("Request timed out");
@ -61,21 +111,20 @@ function onConnected()
console.log("Connected to Swiss Army Board"); console.log("Connected to Swiss Army Board");
document.getElementById('imgDisco').style.display = 'none'; document.getElementById('imgDisco').style.display = 'none';
document.getElementById('imgConn').style.display = 'block'; document.getElementById('imgConn').style.display = 'block';
refreshRtc(); refreshRtc(ajaxReqRtc);
refreshSysInfo(); refreshSysInfo();
refreshSigStrength(); refreshSigStrength();
sdCardSize(); sdCardSize();
getIoMode(); getIoMode(ajaxReqGetIoMode);
getIoLevel(); getIoLevel();
powerInfo(); powerInfo(ajaxReqPowerInfo);
} }
} }
function powerInfo() function powerInfo(ajaxReq)
{ {
console.log("Getting board power info"); console.log("Getting board power info");
var ajaxReq = new XMLHttpRequest();
ajaxReq.timeout = 5000; ajaxReq.timeout = 5000;
ajaxReq.onreadystatechange = function() ajaxReq.onreadystatechange = function()
{ {
@ -117,50 +166,11 @@ function powerInfo()
ajaxReq.send(); ajaxReq.send();
} }
function refreshRtc() function refreshRtc(ajaxReq)
{ {
console.log("Refreshing RTC"); console.log("Refreshing RTC");
var ajaxReq = new XMLHttpRequest();
ajaxReq.timeout = 5000;
ajaxReq.onreadystatechange = function()
{
switch(this.readyState)
{
case 0:
break;
case 1:
console.log("Connection established");
break;
case 2:
console.log("Request received");
break;
case 3:
console.log("Processing request");
break;
case 4:
console.log("Response is ready");
if(this.status != 0){onConnected(); document.getElementById('execTime').innerHTML = new Date().getTime() - execTimeStart;}
if(this.status == 200)
{
console.log("Response : " + this.responseText);
var rtcObj = JSON.parse(this.responseText);
console.log(rtcObj);
document.getElementById('rtcValue').innerHTML = rtcObj.time + ' ' + rtcObj.date;
}
else
{
console.log("Error, status is : " + this.status);
document.getElementById('rtcValue').innerHTML = 'ERROR';
document.getElementById('execTime').innerHTML = 'NaN';
}
break;
default:
console.log("Unknown state");
} ajaxReqRtc.open('GET',"/sab/rtc/get/datetime");
}
ajaxReq.ontimeout = onTimeOut;
ajaxReq.open('GET',"/sab/rtc/get/datetime");
execTimeStart = new Date().getTime(); execTimeStart = new Date().getTime();
ajaxReq.send(); ajaxReq.send();
} }
@ -405,11 +415,9 @@ function sdCardSize()
ajaxReq.send(); ajaxReq.send();
} }
function getIoMode() function getIoMode(ajaxReq)
{ {
console.log("Getting IO mode for all IO's"); console.log("Getting IO mode for all IO's");
var ajaxReq = new XMLHttpRequest();
ajaxReq.timeout = 5000; ajaxReq.timeout = 5000;
ajaxReq.onreadystatechange = function() ajaxReq.onreadystatechange = function()
{ {