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

timeout in status receive

Browse Source
This commit is contained in:
Sem van der Hoeven
2023-06-08 13:16:57 +02:00
parent dd38be123f
commit 6b21465a35
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/views/index.ejs
View File

@@ -304,6 +304,7 @@
function handle_ws_message(data) { function handle_ws_message(data) {
// console.log("Handling message " + data); // console.log("Handling message " + data);
clearTimeout(api_timout);
if (data.type == "STATUS") { if (data.type == "STATUS") {
document.getElementById("batterypercentage").innerHTML = "Battery percentage: " + data.data.battery_percentage.toString().substring(0, 4) + "%"; document.getElementById("batterypercentage").innerHTML = "Battery percentage: " + data.data.battery_percentage.toString().substring(0, 4) + "%";
document.getElementById("cpuload").innerHTML = "CPU load: " + data.data.cpu_usage.toString().substring(0, 6).substring(2, 4) + "%"; document.getElementById("cpuload").innerHTML = "CPU load: " + data.data.cpu_usage.toString().substring(0, 6).substring(2, 4) + "%";
@@ -311,6 +312,12 @@
document.getElementById("control_mode").innerHTML = "Control mode: " + data.data.control_mode; document.getElementById("control_mode").innerHTML = "Control mode: " + data.data.control_mode;
document.getElementById("speed").innerHTML = "Current speed (m/s): x: " + data.data.velocity[0] + " y: " + data.data.velocity[1] + " z: " + data.data.velocity[2]; document.getElementById("speed").innerHTML = "Current speed (m/s): x: " + data.data.velocity[0] + " y: " + data.data.velocity[1] + " z: " + data.data.velocity[2];
document.getElementById("position").innerHTML = "Current position (m): x: " + data.data.position[0] + " y: " + data.data.position[1] + " z: " + data.data.position[2]; document.getElementById("position").innerHTML = "Current position (m): x: " + data.data.position[0] + " y: " + data.data.position[1] + " z: " + data.data.position[2];
api_timeout = setTimeout(function () {
console.log("API timed out")
alert("Connection to API timed out!");
document.getElementById("connectedlabel").innerHTML = "Not connected to drone";
document.getElementById("connectbutton").disabled = false;
}, 3000);
} else if (data.type == "FAILSAFE") { } else if (data.type == "FAILSAFE") {
document.getElementById("failsafe").innerHTML = "Failsafe: ACTIVATED"; document.getElementById("failsafe").innerHTML = "Failsafe: ACTIVATED";
document.getElementById("failsafe").style.backgroundColor = "red"; document.getElementById("failsafe").style.backgroundColor = "red";
@@ -325,19 +332,6 @@
} }
} }
function check_ws_connection() {
if (checked_for_connection == false && connected_to_api) {
console.log("Checking connection to API")
ws.send(JSON.stringify({ "command": 7 }));
api_timout = setTimeout(function () {
alert("API did not respond on time!")
document.getElementById("connectedlabel").innerHTML = "Not connected to drone";
document.getElementById("connectbutton").disabled = false;
}, 1000);
}
}
function local_connect() { function local_connect() {
console.log("Connecting to API"); console.log("Connecting to API");
ws = new WebSocket("ws://10.100.0.40:9001/"); ws = new WebSocket("ws://10.100.0.40:9001/");
@@ -347,7 +341,6 @@
document.getElementById("connectedlabel").innerHTML = "Connected to drone"; document.getElementById("connectedlabel").innerHTML = "Connected to drone";
document.getElementById("connectbutton").disabled = true; document.getElementById("connectbutton").disabled = true;
connected_to_api = true; connected_to_api = true;
setInterval(check_ws_connection, 2000);
openSocket(); openSocket();
}); });