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 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cbf01d7875 - Show all commits

6
api/views/index.ejs
View File

@@ -17,7 +17,7 @@
<canvas id="result-video" style="border: 1px solid blue;" width="800" height="600"></canvas>
<div id="connectedbuttons">
<div id="connectedstatus">
<p id="connectedlabel">Connected: <%- api_connected %></p>
<p id="connectedlabel">Not connected to drone</p>
<button id="connectbutton" onclick="connect()">Connect</button>
</div>
<div id="buttons">
@@ -292,14 +292,14 @@
if (this.responseText.length > 0) {
var status = JSON.parse(this.responseText);
// console.log(status)
document.getElementById("connectedlabel").innerHTML = "Connected: true";
document.getElementById("connectedlabel").innerHTML = "Connected to drone";
document.getElementById("connectbutton").disabled = true;
// connect_to_video_stream();
}
} else {
console.log("error");
document.getElementById("connectedlabel").innerHTML = "Connected: false";
document.getElementById("connectedlabel").innerHTML = "Not connected to drone";
if (!received) {
alert("Could not connect to API!");
received = true;