Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-26 02:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BoardConfig: auto-restore safety state on watchdog reset

Browse Source 
# Conflicts:
#	libraries/AP_BoardConfig/board_drivers.cpp
This commit is contained in:
Andrew Tridgell 2019-05-07 12:12:48 +10:00 committed by Randy Mackay
parent 4edd270bd9
commit 682362945c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_BoardConfig/AP_BoardConfig.h
View File

@ -161,7 +161,7 @@ public:
// return true if watchdog enabled
static bool watchdog_enabled(void) {
return _singleton?(_singleton->_options & BOARD_OPTION_WATCHDOG)!=0:false;
return instance?(instance->_options & BOARD_OPTION_WATCHDOG)!=0:false;
}
private:

8
libraries/AP_BoardConfig/board_drivers.cpp
View File

@ -19,6 +19,7 @@
#include <AP_HAL/AP_HAL.h>
#include "AP_BoardConfig.h"
#include <AP_Baro/AP_Baro_MS5611.h>
#include <GCS_MAVLink/GCS.h>
#include <stdio.h>
extern const AP_HAL::HAL& hal;
@ -29,7 +30,12 @@ extern const AP_HAL::HAL& hal;
*/
void AP_BoardConfig::board_init_safety()
{
if (state.safety_enable.get() == 0) {
bool force_safety_off = (state.safety_enable.get() == 0);
if (!force_safety_off && hal.util->was_watchdog_safety_off()) {
gcs().send_text(MAV_SEVERITY_INFO, "Forcing safety off for watchdog\n");
force_safety_off = true;
}
if (force_safety_off) {
hal.rcout->force_safety_off();
hal.rcout->force_safety_no_wait();
// wait until safety has been turned off