Merge branch 'master' into beta

ROMFS/px4fmu_common/init.d/rc.logging

@@ -1,6 +1,6 @@
 #!nsh
 #
-# Initialise logging services.
+# Initialize logging services.
 #
 
 if [ -d /fs/microsd ]

src/drivers/px4io/px4io.cpp

@@ -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

src/modules/sensors/sensors.cpp

@@ -1546,8 +1546,8 @@ Sensors::task_main()
 	raw.adc_voltage_v[3] = 0.0f;
 
 	memset(&_battery_status, 0, sizeof(_battery_status));
-	_battery_status.voltage_v = 0.0f;
-	_battery_status.voltage_filtered_v = 0.0f;
+	_battery_status.voltage_v = -1.0f;
+	_battery_status.voltage_filtered_v = -1.0f;
 	_battery_status.current_a = -1.0f;
 	_battery_status.discharged_mah = -1.0f;