fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-27 17:40:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'px4/master' into navigator_cleanup

Browse Source 
Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_messages.cpp
	src/modules/mavlink/module.mk
	src/modules/sdlog2/sdlog2_messages.h
This commit is contained in:
Julian Oes
2014-04-22 11:10:48 +02:00
parent d41a01483a aefea1a95d
commit fd56c15a20
17 changed files with 244 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+1 -1
View File
@@ -969,7 +969,7 @@ int commander_thread_main(int argc, char *argv[])
orb_copy(ORB_ID(battery_status), battery_sub, &battery);
/* only consider battery voltage if system has been running 2s and battery voltage is valid */
if (status.hil_state == HIL_STATE_OFF && hrt_absolute_time() > start_time + 2000000 && battery.voltage_filtered_v > 0.0f) {
if (hrt_absolute_time() > start_time + 2000000 && battery.voltage_filtered_v > 0.0f) {
status.battery_voltage = battery.voltage_filtered_v;
status.battery_current = battery.current_a;
status.condition_battery_voltage_valid = true;