sem/5g_drone_ROS2
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge API branch into main #12

Merged
SemvdH merged 334 commits from api into main 2023-06-13 19:54:43 +00:00
Conversation 0 Commits 334 Files Changed 51 +4 -3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 74353bb128 - Show all commits

7
api/views/index.ejs
View File

@@ -78,7 +78,7 @@
var ws;
var checked_for_connection = false;
var connected_to_api = false;
setInterval(check_ws_connection, 1000, ws);
// setInterval(check_ws_connection, 1000, ws);
assign_button_callbacks();
openSocket = () => {
@@ -318,14 +318,14 @@
}
}
function check_ws_connection(ws) {
function check_ws_connection() {
if (checked_for_connection == false && connected_to_api)
{
console.log("Checking connection to API")
if (ws.readyState != WebSocket.OPEN) {
alert("Lost connection to API!")
document.getElementById("connectedlabel").innerHTML = "Not connected to drone";
document.getElementById("connectbutton").disabled = false;
document.getElementById("connectbutton").disabled = false;
checked_for_connection = true;
}
}
@@ -340,6 +340,7 @@
document.getElementById("connectedlabel").innerHTML = "Connected to drone";
document.getElementById("connectbutton").disabled = true;
connected_to_api = true;
setInterval(check_ws_connection, 1000);
openSocket();
});