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

Merge branch 'master' into offboard2_merge

Browse Source 
Conflicts:
	src/modules/uORB/topics/rc_channels.h
This commit is contained in:
Julian Oes
2014-07-02 15:15:26 +02:00
parent fdceb8b062 f428ebb04f
commit 73d6121a9d
89 changed files with 1952 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/vehicle_status.h
+4
View File
@@ -193,6 +193,8 @@ struct vehicle_status_s {
bool condition_local_altitude_valid;
bool condition_airspeed_valid; /**< set to true by the commander app if there is a valid airspeed measurement available */
bool condition_landed; /**< true if vehicle is landed, always true if disarmed */
bool condition_power_input_valid; /**< set if input power is valid */
float avionics_power_rail_voltage; /**< voltage of the avionics power rail */
bool rc_signal_found_once;
bool rc_signal_lost; /**< true if RC reception lost */
@@ -222,6 +224,8 @@ struct vehicle_status_s {
uint16_t errors_count2;
uint16_t errors_count3;
uint16_t errors_count4;
bool circuit_breaker_engaged_power_check;
};
/**