Merge API branch into main #12

Merged
SemvdH merged 334 commits from api into main 2023-06-13 19:54:43 +00:00
Showing only changes of commit f50e2d0d57 - Show all commits

View File

@@ -77,6 +77,8 @@
<script>
var ws;
var checked_for_connection = false;
var connected_to_api = false;
setInterval(check_ws_connection, 1000, ws);
assign_button_callbacks();
openSocket = () => {
@@ -317,7 +319,7 @@
}
function check_ws_connection(ws) {
if (checked_for_connection == false)
if (checked_for_connection == false && connected_to_api)
{
console.log("Checking connection to API")
if (ws.readyState != WebSocket.OPEN) {
@@ -337,7 +339,7 @@
console.log("connected with websockets to API!");
document.getElementById("connectedlabel").innerHTML = "Connected to drone";
document.getElementById("connectbutton").disabled = true;
setInterval(check_ws_connection, 1000, ws);
connected_to_api = true;
openSocket();
});