Merge API branch into main #12

Merged
SemvdH merged 334 commits from api into main 2023-06-13 19:54:43 +00:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 953c7d6884 - Show all commits

View File

@@ -26,14 +26,14 @@
<button id="take_picture" onclick="take_picture()">Take picture</button>
<br>
<button id="arm_disarm" onclick="arm_disarm()">Arm/Disarm</button>
<br>
<!-- <br>
<label for="control_mode">Control mode:</label>
<br>
<select name="control_mode" id="control_mode">
<option value="attitude">Attitude</option>
<option value="velocity">Velocity</option>
<option value="position">Position</option>
</select>
</select> -->
</div>
</div>
<div id="controls">

View File

@@ -86,7 +86,7 @@ class ApiListenerTest(unittest.TestCase):
msg = DroneStatus()
msg.battery_percentage = 10.0
msg.armed = True
msg. height = 10.0
msg.height = 10.0
msg.control_mode = "attitude"
msg.cpu_usage = 10.0
msg.route_setpoint = 0