From b2b0170c01a3bc5b5edd36a388735b197d18e8be Mon Sep 17 00:00:00 2001 From: anschrammh Date: Wed, 26 Feb 2020 11:10:20 +0100 Subject: [PATCH] Updated the new dashboard version, work is still in progress --- sdCard_content/WWW/rsrc/scriptV2.js | 41 +++++++++++++++++++---------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/sdCard_content/WWW/rsrc/scriptV2.js b/sdCard_content/WWW/rsrc/scriptV2.js index b203682..a8f2160 100644 --- a/sdCard_content/WWW/rsrc/scriptV2.js +++ b/sdCard_content/WWW/rsrc/scriptV2.js @@ -90,7 +90,6 @@ document.addEventListener('DOMContentLoaded', function() //Dashboard logic initialisation function init() { - /*Setting default values and intervals*/ var browserTimeInt = setInterval(() => {browserTime();},1000); let curDate = new Date(); @@ -103,19 +102,20 @@ function init() elemById('datepicker_id').value = day+'-'+month+'-'+year; /*Initializing the App object*/ App.init(); - App.registerAutomatedRequest({timeout:500, pollInterval: 1000, apiEndPoint:'/sab/rtc/get/datetime', gotResponse:(data) => {rtcRefreshHandler(data, 'OK');}, gotError:(e) => {rtcRefreshHandler(e, 'FAIL');}}); - App.registerAutomatedRequest({timeout:500, pollInterval: 10000, apiEndPoint:'/sab/systeminfo', gotResponse:(data) => {sysInfoRefreshHandler(data, 'OK');}, gotError:(e) => {sysInfoRefreshHandler(e, 'FAIL');}}); - App.registerAutomatedRequest({timeout:500, pollInterval: 1000, apiEndPoint:'/sab/wifi/stainfo', gotResponse:(data) => {staInfoRefreshHandler(data, 'OK');}, gotError:(e) => {staInfoRefreshHandler(e, 'FAIL');}}); - App.registerAutomatedRequest({timeout:500, pollInterval: 5000, apiEndPoint:'/sab/io/get/mode', gotResponse:(data) => {ioModeRefreshHandler(data, 'OK');}, gotError:(e) => {ioModeRefreshHandler(e, 'FAIL');}}); - App.registerAutomatedRequest({timeout:500, pollInterval: 1000, apiEndPoint:'/sab/io/get/level', gotResponse:(data) => {ioLevelRefreshHandler(data, 'OK');}, gotError:(e) => {ioLevelRefreshHandler(e, 'FAIL');}}); + App.registerAutomatedRequest({timeout:5000, pollInterval: 1000, apiEndPoint:'/sab/rtc/get/datetime', gotResponse:(data) => {rtcRefreshHandler(data, 'OK');}, gotError:(e) => {rtcRefreshHandler(e, 'FAIL');}}); + App.registerAutomatedRequest({timeout:5000, pollInterval: 10000, apiEndPoint:'/sab/systeminfo', gotResponse:(data) => {sysInfoRefreshHandler(data, 'OK');}, gotError:(e) => {sysInfoRefreshHandler(e, 'FAIL');}}); + App.registerAutomatedRequest({timeout:5000, pollInterval: 1000, apiEndPoint:'/sab/wifi/stainfo', gotResponse:(data) => {staInfoRefreshHandler(data, 'OK');}, gotError:(e) => {staInfoRefreshHandler(e, 'FAIL');}}); + App.registerAutomatedRequest({timeout:5000, pollInterval: 5000, apiEndPoint:'/sab/io/get/mode', gotResponse:(data) => {ioModeRefreshHandler(data, 'OK');}, gotError:(e) => {ioModeRefreshHandler(e, 'FAIL');}}); + App.registerAutomatedRequest({timeout:5000, pollInterval: 1000, apiEndPoint:'/sab/io/get/level', gotResponse:(data) => {ioLevelRefreshHandler(data, 'OK');}, gotError:(e) => {ioLevelRefreshHandler(e, 'FAIL');}}); + App.registerAutomatedRequest({timeout:5000, pollInterval: 10000, apiEndPoint:'/sab/power/info', gotResponse:(data) => {powerInfoRefreshHandler(data, 'OK');}, gotError:(e) => {powerInfoRefreshHandler(e, 'FAIL');}}); //All requests needing an UI action: - setFrequencyReq = App.buildXMLHttpRequest({timeout:500, gotResponse:(data) => {setFreqHandler(data, 'OK');}, gotError:(e) => {setFreqHandler(e, 'FAIL');}}); - setRTCReq = App.buildXMLHttpRequest({timeout:500, gotResponse:(data) => {setRTCHandler(data, 'OK');}, gotError:(e) => {setRTCHandler(e, 'FAIL');}}); - sdCardSizeReq = App.buildXMLHttpRequest({timeout:500, gotResponse:(data) => {getCardSizeHandler(data, 'OK');}, gotError:(e) => {getCardSizeHandler(e, 'FAIL');}}); - sdCardActionReq = App.buildXMLHttpRequest({timeout:500, gotResponse:(data) => {CardActionHandler(data, 'OK');}, gotError:(e) => {CardActionHandler(e, 'FAIL');}}); - setIoModeReq = App.buildXMLHttpRequest({timeout:500, gotResponse:(data) => {setIoModeHandler(data, 'OK');}, gotError:(e) => {setIoModeHandler(e, 'FAIL');}}); - setIoLevelReq = App.buildXMLHttpRequest({timeout:500, gotResponse:(data) => {setIoLevelHandler(data, 'OK');}, gotError:(e) => {setIoLevelHandler(e, 'FAIL');}}); + setFrequencyReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setFreqHandler(data, 'OK');}, gotError:(e) => {setFreqHandler(e, 'FAIL');}}); + setRTCReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setRTCHandler(data, 'OK');}, gotError:(e) => {setRTCHandler(e, 'FAIL');}}); + sdCardSizeReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {getCardSizeHandler(data, 'OK');}, gotError:(e) => {getCardSizeHandler(e, 'FAIL');}}); + sdCardActionReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {CardActionHandler(data, 'OK');}, gotError:(e) => {CardActionHandler(e, 'FAIL');}}); + setIoModeReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setIoModeHandler(data, 'OK');}, gotError:(e) => {setIoModeHandler(e, 'FAIL');}}); + setIoLevelReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setIoLevelHandler(data, 'OK');}, gotError:(e) => {setIoLevelHandler(e, 'FAIL');}}); } //Callback functions @@ -211,6 +211,19 @@ function staInfoRefreshHandler(data,kind) } }*/ +function powerInfoRefreshHandler(data,kind) +{ + if(kind === 'OK') + { + let powerInfo = JSON.parse(data); + elemById('battLevel').innerHTML = powerInfo['power type'] == 'USB' ? 'USB' : 'BAT:
' + powerInfoObj.level + '%'; + } + else + { + elemById('battLevel').innerHTML = 'NaN'; + } +} + function setIoLevelHandler(data,kind) { if(kind === 'OK') @@ -340,7 +353,7 @@ function setCpuFrequ(freq) function setRtc2BrowserTime() { let d = new Date(); - let data = parseInt(d.getDate())+'_'+parseInt(d.getMonth()+1)+'_'+parseInt(d.getYear())+'_'+parseInt(d.getHours())+'_'+parseInt(d.getMinutes())+'_'+parseInt(d.getSeconds()+5); + let data = parseInt(d.getDate())+'_'+parseInt(d.getMonth()+1)+'_'+parseInt(d.getFullYear())+'_'+parseInt(d.getHours())+'_'+parseInt(d.getMinutes())+'_'+parseInt(d.getSeconds()+5); console.log(data); @@ -405,7 +418,7 @@ App = { if(this.heartBeat == null) //we set the heartBeat only once { console.log("Setting heartbeat"); - let heartBeatAjx = this.buildXMLHttpRequest({timeout:500, apiEndPoint:'/sab/web/apitester', gotResponse:(data) => {console.log('Got heartbeat');connected = true;modalInstance.close();}}); + let heartBeatAjx = this.buildXMLHttpRequest({timeout:2000, apiEndPoint:'/sab/web/apitester', gotResponse:(data) => {console.log('Got heartbeat');connected = true;modalInstance.close();}}); this.heartBeat = setInterval(() => { console.log('connected : '+connected); if(!connected)