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

7
api/views/index.ejs
View File

@@ -9,12 +9,12 @@
<title>5G drone API</title>
</head>
<body style="height: 100%;" onload="opensocket()">
<body style="height: 100%;">
<h1 class="header">5G Drone API</h1>
<!-- <div class="video"> -->
<div class="mainvideo">
<p>Camera view:</p>
<canvas id="result-video" style="border: 1px solid blue; width: 800px;"></img>
<canvas id="result-video" style="border: 1px solid blue; width: 800px;">
<div id="connectedbuttons">
<div id="connectedstatus">
<p id="connectedlabel">Connected: <%- api_connected %></p>
@@ -114,6 +114,8 @@
console.error(error);
}
}
openSocket();
};
function assign_button_callbacks() {
@@ -262,6 +264,7 @@
document.getElementById("connectedlabel").innerHTML = "Connected: true";
document.getElementById("connectbutton").disabled = true;
// connect_to_video_stream();
}
} else {
console.log("error");