aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notify: add arming failure tone

Browse Source
This commit is contained in:
Jonathan Challinger 2014-03-31 17:55:14 +09:00 committed by Randy Mackay
parent 7bb981f2df
commit f0fc0397d3
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_Notify/AP_Notify.h
View File

@ -42,6 +42,7 @@ public:
uint16_t failsafe_radio : 1; // 1 if radio failsafe uint16_t failsafe_radio : 1; // 1 if radio failsafe
uint16_t failsafe_battery : 1; // 1 if battery failsafe uint16_t failsafe_battery : 1; // 1 if battery failsafe
uint16_t failsafe_gps : 1; // 1 if gps failsafe uint16_t failsafe_gps : 1; // 1 if gps failsafe
uint16_t arming_failed : 1; // 1 if copter failed to arm after user input
// additional flags // additional flags
uint16_t external_leds : 1; // 1 if external LEDs are enabled (normally only used for copter) uint16_t external_leds : 1; // 1 if external LEDs are enabled (normally only used for copter)

7
libraries/AP_Notify/ToneAlarm_PX4.cpp
View File

@ -65,6 +65,13 @@ void ToneAlarm_PX4::update()
return; return;
} }
if(flags.arming_failed != AP_Notify::flags.arming_failed) {
flags.arming_failed = AP_Notify::flags.arming_failed;
if(flags.arming_failed) {
play_tune(TONE_ARMING_FAILURE_TUNE);
}
}
// check if arming status has changed // check if arming status has changed
if (flags.armed != AP_Notify::flags.armed) { if (flags.armed != AP_Notify::flags.armed) {
flags.armed = AP_Notify::flags.armed; flags.armed = AP_Notify::flags.armed;

1
libraries/AP_Notify/ToneAlarm_PX4.h
View File

@ -41,6 +41,7 @@ private:
uint8_t failsafe_battery : 1; // 1 if battery failsafe uint8_t failsafe_battery : 1; // 1 if battery failsafe
uint8_t gps_glitching : 1; // 1 if gps position is not good uint8_t gps_glitching : 1; // 1 if gps position is not good
uint8_t failsafe_gps : 1; // 1 if gps failsafe uint8_t failsafe_gps : 1; // 1 if gps failsafe
uint8_t arming_failed : 1; // 0 = failing checks, 1 = passed
} flags; } flags;
}; };