Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'master' into beta

Browse Source
This commit is contained in:
Anton Babushkin
2014-01-20 16:48:50 +01:00
parent 0809981800 c58b68d377
commit a3dbd817dc
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/rc.logging
+1 -1
View File
@@ -1,6 +1,6 @@
#!nsh #!nsh
# #
# Initialise logging services. # Initialize logging services.
# #
if [ -d /fs/microsd ] if [ -d /fs/microsd ]
src/drivers/px4io/px4io.cpp
+1
View File
@@ -1302,6 +1302,7 @@ PX4IO::io_handle_battery(uint16_t vbatt, uint16_t ibatt)
/* voltage is scaled to mV */ /* voltage is scaled to mV */
battery_status.voltage_v = vbatt / 1000.0f; 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 ibatt contains the raw ADC count, as 12 bit ADC
src/modules/sensors/sensors.cpp
+2 -2
View File
@@ -1546,8 +1546,8 @@ Sensors::task_main()
raw.adc_voltage_v[3] = 0.0f; raw.adc_voltage_v[3] = 0.0f;
memset(&_battery_status, 0, sizeof(_battery_status)); memset(&_battery_status, 0, sizeof(_battery_status));
_battery_status.voltage_v = 0.0f; _battery_status.voltage_v = -1.0f;
_battery_status.voltage_filtered_v = 0.0f; _battery_status.voltage_filtered_v = -1.0f;
_battery_status.current_a = -1.0f; _battery_status.current_a = -1.0f;
_battery_status.discharged_mah = -1.0f; _battery_status.discharged_mah = -1.0f;