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 2 additions and 1 deletions
Showing only changes of commit d656338993 - Show all commits

View File

@@ -17,6 +17,7 @@
<div id="connectedbuttons">
<div id="buttons">
<button id="take_picture">Take picture</button>
<br>
<button id="arm_disarm">Arm/Disarm</button>
</div>
<div id="connectedstatus">

View File

@@ -491,7 +491,7 @@ private:
*
* @param msg the message indicating that the failsafe was enabled
*/
void on_failsafe_received(const drone_services::msg::FailsafeMsg::SharedPtr msg)
void on_failsafe_receive(const drone_services::msg::FailsafeMsg::SharedPtr msg)
{
if (msg->enabled)
{