Skip to content

Commit

Permalink
Refactor: correct file extension
Browse files Browse the repository at this point in the history
  • Loading branch information
@huaminghuangtw
huaminghuangtw committed Dec 30, 2021
1 parent 34495e2 commit c0c32dd
Show file tree
Hide file tree
Showing 14 changed files with 719 additions and 768 deletions.
0 ESP32WiFiSnifferApp/data/server/config.js → ESP32WiFiSnifferApp/data/server/config.json
View file
File renamed without changes.
269 changes: 130 additions & 139 deletions ESP32WiFiSnifferApp/data/server/general.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,196 +2,187 @@ var gateway = `ws://${window.location.hostname}/ws`;
var websocket;

var demo = undefined; // If true, it displays the demo_device_position on the map.
var demo_device_position = [ 2.89, 1.92 ];
var demo_device_position = [2.89, 1.92];

var RSSIc = undefined; //dBm
var pathLossExp = undefined;

var masterCoords = [undefined, undefined]; //m

var numberOfSlaves = undefined;
var espSlaveXcoords = []; //m
var espSlaveYcoords = []; //m

var roomContourXCoords = []; //m
var roomContourYCoords = []; //m

var roomMaxLength = undefined; // m
var roomMaxWidth = undefined; // m
var edgeGapSize = 0.05; // portion of canvas height/width
var roomMaxWidth = undefined; // m
var edgeGapSize = 0.05; // portion of canvas height/width



window.addEventListener('load', onLoad);


function onLoad(event) {
parseConfigJSON();
parseRoomContourJSON();
initWebSocket();
initButtons();
// Display the Logs tab with measurement data as default:
// by making an automated click on the tab button.
document.getElementById( "measTableTab" ).click();
parseConfigJSON();
parseRoomContourJSON();
initWebSocket();
initButtons();
// Display the Logs tab with measurement data as default:
// by making an automated click on the tab button.
document.getElementById("measTableTab").click();

} // onLoad


function onOpen(event) {
console.log('Connection opened');

} // onOpen


function onClose(event) {
console.log('Connection closed');
setTimeout(initWebSocket, 2000);

} // onClose


function onMessage(event) {
var state;
if (event.data == "1") {
state = "ON";
document.getElementById('ledState').innerHTML = state;
}
else if (event.data == "0") {
state = "OFF";
document.getElementById('ledState').innerHTML = state;
state = "ON";
document.getElementById('ledState').innerHTML = state;
} else if (event.data == "0") {
state = "OFF";
document.getElementById('ledState').innerHTML = state;
} else if (event.data == "stream started") {
console.log("Stream started.");
} else {
let data = JSON.parse(event.data);
appendDataToLogsTable(data);

console.log(data.time);
console.log(data.MAC);

appendPosToPosTable(data);
}
else if(event.data == "stream started") {
console.log("Stream started.");
}
else
{
let data = JSON.parse(event.data);
appendDataToLogsTable( data );

console.log( data.time );
console.log( data.MAC );

appendPosToPosTable( data );
}


} // onMessage


function initWebSocket() {
console.log('Trying to open a WebSocket connection...');
websocket = new WebSocket(gateway);
websocket.onopen = onOpen;
websocket.onclose = onClose;
websocket.onmessage = onMessage;
console.log('Trying to open a WebSocket connection...');
websocket = new WebSocket(gateway);
websocket.onopen = onOpen;
websocket.onclose = onClose;
websocket.onmessage = onMessage;

} // initWebSocket


function initButtons() {
document.getElementById('ledButton').addEventListener('click', toggle);
document.getElementById('ledButton').addEventListener('click', toggle);

} // initButtons
function toggle(){
websocket.send('toggle');


function toggle() {
websocket.send('toggle');

} // toggle


function dataStreamStartOrStop() {
var elem = document.getElementById("startButton");
if (elem.value=="Start")
{
elem.value = "Stop";
}
else
{
elem.value = "Start";
}
websocket.send('streamData');

var elem = document.getElementById("startButton");
if (elem.value == "Start") {
elem.value = "Stop";
} else {
elem.value = "Start";
}
websocket.send('streamData');

} // dataStreamStartOrStop


function loadRoomContourJSON( callback ) {
var xobj = new XMLHttpRequest();
xobj.open('GET','room.js',true);
xobj.onreadystatechange = function() {
if( xobj.readyState == 4 && xobj.status == "200") {
callback(xobj.responseText);
}
};
xobj.send(null);
function loadRoomContourJSON(callback) {
var xobj = new XMLHttpRequest();
xobj.open('GET', 'room.json', true);
xobj.onreadystatechange = function() {
if (xobj.readyState == 4 && xobj.status == "200") {
callback(xobj.responseText);
}
};
xobj.send(null);

} // loadRoomContourJSON


function parseRoomContourJSON() {
var roomContourJson;

function callbackfunc(response) {

roomContourJson = JSON.parse(response);

var roomContourCoords = roomContourJson.room_contour;

for ( var i = 0; i < roomContourCoords.length; i++ )
{
roomContourXCoords[i] = roomContourJson.room_contour[i].x;
roomContourYCoords[i] = roomContourJson.room_contour[i].y;
}

console.log(Math.max(...roomContourXCoords));
roomMaxLength = Math.max( ...roomContourXCoords );
roomMaxWidth = Math.max( ...roomContourYCoords );

}

loadRoomContourJSON( callbackfunc );

var roomContourJson;

function callbackfunc(response) {

roomContourJson = JSON.parse(response);

var roomContourCoords = roomContourJson.room_contour;

for (var i = 0; i < roomContourCoords.length; i++) {
roomContourXCoords[i] = roomContourJson.room_contour[i].x;
roomContourYCoords[i] = roomContourJson.room_contour[i].y;
}

console.log(Math.max(...roomContourXCoords));
roomMaxLength = Math.max(...roomContourXCoords);
roomMaxWidth = Math.max(...roomContourYCoords);

}

loadRoomContourJSON(callbackfunc);

} // parseRoomContourJSON


function loadConfigJSON( callback ) {
var xobj = new XMLHttpRequest();
xobj.overrideMimeType("application/json");
xobj.open('GET','config.js',true);
xobj.onreadystatechange = function() {
if( xobj.readyState == 4 && xobj.status == "200") {
callback(xobj.responseText);
}
};
xobj.send(null);
function loadConfigJSON(callback) {
var xobj = new XMLHttpRequest();
xobj.overrideMimeType("application/json");
xobj.open('GET', 'config.json', true);
xobj.onreadystatechange = function() {
if (xobj.readyState == 4 && xobj.status == "200") {
callback(xobj.responseText);
}
};
xobj.send(null);

} // loadConfigJSON


function parseConfigJSON() {
var configJson;

function callbackfunc(response) {

configJson = JSON.parse( response );

demo = configJson.demo;

pathLossExp = configJson.path_loss_exp;
RSSIc = configJson.RSSI_1m;

masterCoords[0] = configJson.master_coords.x;
masterCoords[1] = configJson.master_coords.y;

numberOfSlaves = configJson.number_of_slaves;

for ( var i = 0; i < numberOfSlaves; i++ )
{
espSlaveXcoords[i] = configJson.slave_coords[i].x;
espSlaveYcoords[i] = configJson.slave_coords[i].y;
}

}

loadConfigJSON( callbackfunc );

var configJson;

function callbackfunc(response) {

configJson = JSON.parse(response);

demo = configJson.demo;

pathLossExp = configJson.path_loss_exp;
RSSIc = configJson.RSSI_1m;

masterCoords[0] = configJson.master_coords.x;
masterCoords[1] = configJson.master_coords.y;

numberOfSlaves = configJson.number_of_slaves;

for (var i = 0; i < numberOfSlaves; i++) {
espSlaveXcoords[i] = configJson.slave_coords[i].x;
espSlaveYcoords[i] = configJson.slave_coords[i].y;
}

}

loadConfigJSON(callbackfunc);

} // parseConfigJSON
0 ESP32WiFiSnifferApp/data/server/layout.htm → ESP32WiFiSnifferApp/data/server/layout.html
View file
File renamed without changes.
0 ESP32WiFiSnifferApp/data/server/room.js → ESP32WiFiSnifferApp/data/server/room.json
View file
File renamed without changes.
14 changes: 0 additions & 14 deletions ESP32WiFiSnifferApp/sdcardcontent/server/config.js
View file

This file was deleted.

14 changes: 14 additions & 0 deletions ESP32WiFiSnifferApp/sdcardcontent/server/config.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"ssid":"YourSSID",
"pswd":"YourPassword",
"am_i_master":false,
"demo":true,
"master_MAC":"00:00:00:00:0F:05",
"master_coords":{"x":0.1,"y":0.1},
"number_of_slaves":4,
"slave_MACs":["00:00:00:00:0F:01","00:00:00:00:0F:02","00:00:00:00:0F:03","00:00:00:00:0F:04"],
"slave_coords":[{"x":0.1,"y":0.53},{"x":0.1,"y":2.9},{"x":4.47,"y":2.9},{"x":2.65,"y":0.6}],
"photo_device_MAC":"F0:F0:F0:F0:F0:F0",
"RSSI_1m":-46,
"path_loss_exp":2.4991
}
Loading

0 comments on commit c0c32dd

Please sign in to comment.