Merge branch 'master' of github.com:PX4/Firmware into rssi

This commit is contained in:
Lorenz Meier
2014-01-23 07:49:18 +01:00
48 changed files with 1403 additions and 2122 deletions
+1
View File
@@ -1302,6 +1302,7 @@ PX4IO::io_handle_battery(uint16_t vbatt, uint16_t ibatt)
/* voltage is scaled to mV */
battery_status.voltage_v = vbatt / 1000.0f;
battery_status.voltage_filtered_v = vbatt / 1000.0f;
/*
ibatt contains the raw ADC count, as 12 bit ADC