Merge branch 'master' into navigator_new_vector

This commit is contained in:
Anton Babushkin
2014-01-14 15:45:49 +01:00
28 changed files with 984 additions and 273 deletions
+2 -2
View File
@@ -680,8 +680,8 @@ int mavlink_thread_main(int argc, char *argv[])
v_status.onboard_control_sensors_health,
v_status.load * 1000.0f,
v_status.battery_voltage * 1000.0f,
v_status.battery_current * 1000.0f,
v_status.battery_remaining,
v_status.battery_current * 100.0f,
v_status.battery_remaining * 100.0f,
v_status.drop_rate_comm,
v_status.errors_comm,
v_status.errors_count1,