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

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

Browse Source 
Conflicts:
	src/modules/navigator/navigator_main.cpp
This commit is contained in:
Julian Oes
2014-06-03 16:04:39 +02:00
parent 854bb7fe08 da5b60adab
commit d1d03c34b9
30 changed files with 1060 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_messages.cpp
+1 -1
View File
@@ -295,7 +295,7 @@ protected:
status->onboard_control_sensors_health,
status->load * 1000.0f,
status->battery_voltage * 1000.0f,
status->battery_current * 1000.0f,
status->battery_current * 100.0f,
status->battery_remaining * 100.0f,
status->drop_rate_comm,
status->errors_comm,