fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 22:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into attitudeekf

Browse Source
This commit is contained in:
Thomas Gubler
2014-07-25 14:33:29 +02:00
parent a30a5d2665 bd808ccf3a
commit 4b0230042f
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/check_submodules.sh
+2 -2
View File
@@ -73,8 +73,8 @@ then
exit 1 exit 1
fi fi
else else
git submodule init git submodule init;
git submodule update git submodule update;
fi fi
exit 0 exit 0
src/drivers/drv_tone_alarm.h
+1
View File
@@ -149,6 +149,7 @@ enum {
TONE_GPS_WARNING_TUNE, TONE_GPS_WARNING_TUNE,
TONE_ARMING_FAILURE_TUNE, TONE_ARMING_FAILURE_TUNE,
TONE_PARACHUTE_RELEASE_TUNE, TONE_PARACHUTE_RELEASE_TUNE,
TONE_EKF_WARNING_TUNE,
TONE_NUMBER_OF_TUNES TONE_NUMBER_OF_TUNES
}; };
src/drivers/stm32/tone_alarm/tone_alarm.cpp
+2
View File
@@ -336,6 +336,7 @@ ToneAlarm::ToneAlarm() :
_default_tunes[TONE_GPS_WARNING_TUNE] = "MFT255L4AAAL1F#"; //gps warning slow _default_tunes[TONE_GPS_WARNING_TUNE] = "MFT255L4AAAL1F#"; //gps warning slow
_default_tunes[TONE_ARMING_FAILURE_TUNE] = "MFT255L4<<<BAP"; _default_tunes[TONE_ARMING_FAILURE_TUNE] = "MFT255L4<<<BAP";
_default_tunes[TONE_PARACHUTE_RELEASE_TUNE] = "MFT255L16agagagag"; // parachute release _default_tunes[TONE_PARACHUTE_RELEASE_TUNE] = "MFT255L16agagagag"; // parachute release
_default_tunes[TONE_EKF_WARNING_TUNE] = "MFT255L8ddd#d#eeff"; // ekf warning
_tune_names[TONE_STARTUP_TUNE] = "startup"; // startup tune _tune_names[TONE_STARTUP_TUNE] = "startup"; // startup tune
_tune_names[TONE_ERROR_TUNE] = "error"; // ERROR tone _tune_names[TONE_ERROR_TUNE] = "error"; // ERROR tone
@@ -348,6 +349,7 @@ ToneAlarm::ToneAlarm() :
_tune_names[TONE_GPS_WARNING_TUNE] = "gps_warning"; // gps warning _tune_names[TONE_GPS_WARNING_TUNE] = "gps_warning"; // gps warning
_tune_names[TONE_ARMING_FAILURE_TUNE] = "arming_failure"; //fail to arm _tune_names[TONE_ARMING_FAILURE_TUNE] = "arming_failure"; //fail to arm
_tune_names[TONE_PARACHUTE_RELEASE_TUNE] = "parachute_release"; // parachute release _tune_names[TONE_PARACHUTE_RELEASE_TUNE] = "parachute_release"; // parachute release
_tune_names[TONE_EKF_WARNING_TUNE] = "ekf_warning"; // ekf warning
} }
ToneAlarm::~ToneAlarm() ToneAlarm::~ToneAlarm()
src/modules/uORB/topics/vehicle_status.h
+1 -1
View File
@@ -186,7 +186,7 @@ struct vehicle_status_s {
bool condition_system_sensors_initialized; bool condition_system_sensors_initialized;
bool condition_system_returned_to_home; bool condition_system_returned_to_home;
bool condition_auto_mission_available; bool condition_auto_mission_available;
bool condition_global_position_valid; /**< set to true by the commander app if the quality of the gps signal is good enough to use it in the position estimator */ bool condition_global_position_valid; /**< set to true by the commander app if the quality of the position estimate is good enough to use it for navigation */
bool condition_launch_position_valid; /**< indicates a valid launch position */ bool condition_launch_position_valid; /**< indicates a valid launch position */
bool condition_home_position_valid; /**< indicates a valid home position (a valid home position is not always a valid launch) */ bool condition_home_position_valid; /**< indicates a valid home position (a valid home position is not always a valid launch) */
bool condition_local_position_valid; bool condition_local_position_valid;
uavcan
+1 -1
Submodule uavcan updated: dca2611c31...d84fc8a846