Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Th3maz1ng:8e655ed8fe4e5e9f75748cf1051fe2653299c230
Branches Tags
Th3maz1ng:master
..
compare: Th3maz1ng:5dd667e1d5967a535522a4930883beaa2f34b353
Branches Tags
Th3maz1ng:master

No commits in common. "8e655ed8fe4e5e9f75748cf1051fe2653299c230" and "5dd667e1d5967a535522a4930883beaa2f34b353" have entirely different histories.
8e655ed8fe ... 5dd667e1d5

3 changed files with 27 additions and 66 deletions
Show Stats Expand all files Collapse all files

21
sdCard_content/WWW/indexV2.htm
View File

@ -5,14 +5,14 @@
<style> <style>
body body
{ {
/*display: flex; display: flex;
min-height: 100vh; min-height: 100vh;
flex-direction: column;*/ flex-direction: column;
} }
section section
{ {
/*flex: 1 0 auto;*/ flex: 1 0 auto;
} }
.switch label input[type=checkbox]:checked+.lever .switch label input[type=checkbox]:checked+.lever
@ -178,17 +178,20 @@
<span id="localIP"></span> <span id="localIP"></span>
</div> </div>
</div> </div>
<select id="networksSelect"> <select>
<option value="" disabled selected>Click on scan</option> <option value="" disabled selected>Select a network</option>
<option value="1">Network 1</option>
<option value="2">Network 2</option>
<option value="3">Network 3</option>
</select> </select>
<input placeholder="Password" id="pwd" type="password" class="validate white-text"> <input placeholder="Password" id="pwd" type="password" class="validate white-text">
</div> </div>
<div class="card-action"> <div class="card-action">
<button class="btn waves-effect waves-light green darken-3" type="submit" name="apply"> <button class="btn waves-effect waves-light green darken-3" type="submit" name="apply">
Connect Apply &#10004;
</button> </button>
<button class="btn waves-effect waves-light lime darken-3" style="" onclick="scanAvailableNetworks();" type="submit" name="Scan"> <button class="btn waves-effect waves-light red darken-3" style="" type="submit" name="cancel">
Scan Cancel &#10008;
</button> </button>
</div> </div>
</div> </div>

70
sdCard_content/WWW/rsrc/scriptV2.js
View File

@ -4,9 +4,6 @@
* Anatole SCHRAMM-HENRY - Th3maz1ng * Anatole SCHRAMM-HENRY - Th3maz1ng
**/ **/
//Dev variables
var deviceIPAddr = 'http://192.168.43.46'
//Global variables //Global variables
var App = new Object(); var App = new Object();
var tabInstance = null; var tabInstance = null;
@ -105,12 +102,12 @@ function init()
elemById('datepicker_id').value = day+'-'+month+'-'+year; elemById('datepicker_id').value = day+'-'+month+'-'+year;
/*Initializing the App object*/ /*Initializing the App object*/
App.init(); App.init();
App.registerAutomatedRequest({timeout:5000, pollInterval: 1000, apiEndPoint:deviceIPAddr + '/sab/rtc/get/datetime', gotResponse:(data) => {rtcRefreshHandler(data, 'OK');}, gotError:(e) => {rtcRefreshHandler(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:deviceIPAddr + '/sab/systeminfo', gotResponse:(data) => {sysInfoRefreshHandler(data, 'OK');}, gotError:(e) => {sysInfoRefreshHandler(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:deviceIPAddr + '/sab/wifi/stainfo', gotResponse:(data) => {staInfoRefreshHandler(data, 'OK');}, gotError:(e) => {staInfoRefreshHandler(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:deviceIPAddr + '/sab/io/get/mode', gotResponse:(data) => {ioModeRefreshHandler(data, 'OK');}, gotError:(e) => {ioModeRefreshHandler(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:deviceIPAddr + '/sab/io/get/level', gotResponse:(data) => {ioLevelRefreshHandler(data, 'OK');}, gotError:(e) => {ioLevelRefreshHandler(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:deviceIPAddr + '/sab/power/info', gotResponse:(data) => {powerInfoRefreshHandler(data, 'OK');}, gotError:(e) => {powerInfoRefreshHandler(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: //All requests needing an UI action:
setFrequencyReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setFreqHandler(data, 'OK');}, gotError:(e) => {setFreqHandler(e, 'FAIL');}}); setFrequencyReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setFreqHandler(data, 'OK');}, gotError:(e) => {setFreqHandler(e, 'FAIL');}});
@ -119,7 +116,6 @@ function init()
sdCardActionReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {CardActionHandler(data, 'OK');}, gotError:(e) => {CardActionHandler(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');}}); 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');}}); setIoLevelReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {setIoLevelHandler(data, 'OK');}, gotError:(e) => {setIoLevelHandler(e, 'FAIL');}});
scanNetworkReq = App.buildXMLHttpRequest({timeout:2000, gotResponse:(data) => {scanAvailableNetworksHandler(data, 'OK');}, gotError:(e) => {scanAvailableNetworksHandler(data, 'FAIL');}});
} }
//Callback functions //Callback functions
@ -345,42 +341,12 @@ function getCardSizeHandler(data,kind)
} }
} }
function scanAvailableNetworksHandler(data, kind)
{
if(kind === 'OK')
{
var networkScanObj = JSON.parse(data);
var networksSelect = elemById('networksSelect');
for(var i = 0; i < networksSelect.options.length; i++)
{
networksSelect.remove(0);
}
for(var network in networkScanObj)
{
console.log(network);
var opt = document.createElement("option");
opt.text = networkScanObj[network].SSID + '(' + networkScanObj[network].RSSI + ') ' + (networkScanObj[network].Protected === 'Yes' ? 'protected' : 'open');
opt.value = networkScanObj[network].SSID;
networksSelect.add(opt);
}
elems = document.querySelectorAll('select');
instances = M.FormSelect.init(elems);
}
else
{
}
}
//All UI action functions are here //All UI action functions are here
function setCpuFrequ(freq) function setCpuFrequ(freq)
{ {
console.log('cpu frequ : '+freq); console.log('cpu frequ : '+freq);
setFrequencyReq.open('GET', deviceIPAddr + '/sab/power/set/freq?FREQ='+freq); setFrequencyReq.open('GET', '/sab/power/set/freq?FREQ='+freq);
setFrequencyReq.send(); setFrequencyReq.send();
} }
@ -391,7 +357,7 @@ function setRtc2BrowserTime()
console.log(data); console.log(data);
setRTCReq.open('GET', deviceIPAddr + '/sab/rtc/set/datetime?datetime='+data); setRTCReq.open('GET', '/sab/rtc/set/datetime?datetime='+data);
setRTCReq.send(); setRTCReq.send();
} }
@ -407,13 +373,13 @@ function setRtcTime()
let data = parseInt(dtArray[0])+'_'+parseInt(dtArray[1])+'_'+parseInt(dtArray[2])+'_'+parseInt(tiArray[0])+'_'+parseInt(tiArray[1])+'_0'; let data = parseInt(dtArray[0])+'_'+parseInt(dtArray[1])+'_'+parseInt(dtArray[2])+'_'+parseInt(tiArray[0])+'_'+parseInt(tiArray[1])+'_0';
console.log(data); console.log(data);
setRTCReq.open('GET', deviceIPAddr + '/sab/rtc/set/datetime?datetime='+data); setRTCReq.open('GET', '/sab/rtc/set/datetime?datetime='+data);
setRTCReq.send(); setRTCReq.send();
} }
function sdCardSize() function sdCardSize()
{ {
sdCardSizeReq.open('GET',deviceIPAddr + '/sab/sdcard/size'); sdCardSizeReq.open('GET','/sab/sdcard/size');
sdCardSizeReq.send(); sdCardSizeReq.send();
} }
@ -421,12 +387,12 @@ function mountUnmountCard(id)
{ {
if(elemById(id).checked) //We should mount the sd card if(elemById(id).checked) //We should mount the sd card
{ {
sdCardActionReq.open('GET',deviceIPAddr + '/sab/sdcard/action?action=mount'); sdCardActionReq.open('GET','/sab/sdcard/action?action=mount');
sdCardActionReq.send(); sdCardActionReq.send();
} }
else //We unmount it else //We unmount it
{ {
sdCardActionReq.open('GET',deviceIPAddr + '/sab/sdcard/action?action=unmount'); sdCardActionReq.open('GET','/sab/sdcard/action?action=unmount');
sdCardActionReq.send(); sdCardActionReq.send();
} }
} }
@ -434,23 +400,17 @@ function mountUnmountCard(id)
function setIoMode(pin,mode) function setIoMode(pin,mode)
{ {
var pinOnly = pin.split('_')[0]; var pinOnly = pin.split('_')[0];
setIoModeReq.open('GET',deviceIPAddr + "/sab/io/set/mode?"+pinOnly+'='+ (mode == 'OUTPUT' ? 'OUT' : 'IN')); setIoModeReq.open('GET',"/sab/io/set/mode?"+pinOnly+'='+ (mode == 'OUTPUT' ? 'OUT' : 'IN'));
setIoModeReq.send(); setIoModeReq.send();
} }
function setIoLevel(pin,mode) function setIoLevel(pin,mode)
{ {
var pinOnly = pin.split('_')[0]; var pinOnly = pin.split('_')[0];
setIoLevelReq.open('GET',deviceIPAddr + "/sab/io/set/level?"+pinOnly+'='+ (mode == 'HIGH' ? '1' : '0')); setIoLevelReq.open('GET',"/sab/io/set/level?"+pinOnly+'='+ (mode == 'HIGH' ? '1' : '0'));
setIoLevelReq.send(); setIoLevelReq.send();
} }
function scanAvailableNetworks()
{
scanNetworkReq.open('GET', deviceIPAddr + "/sab/wifi/scanner");
scanNetworkReq.send();
}
App = { App = {
init:function() init:function()
@ -464,7 +424,7 @@ App = {
if(!connected) if(!connected)
{ {
console.log('Sending heartbeat'); console.log('Sending heartbeat');
heartBeatAjx.open('GET', deviceIPAddr + '/sab/web/apitester'); heartBeatAjx.open('GET', '/sab/web/apitester');
heartBeatAjx.send(); heartBeatAjx.send();
} }
},5000); },5000);

2
src/app/WEBServer.h
View File

@ -72,8 +72,6 @@ class WEBServer : public TCPServer<T>, public HttpConstants
{ {
client->printf("\r\nContent-Length: %d", contentLength); client->printf("\r\nContent-Length: %d", contentLength);
} }
client->print("\r\nAccess-Control-Allow-Origin: *");
client->print("\r\n\r\n"); client->print("\r\n\r\n");
} }