Merged master into driver_framework

This commit is contained in:
Lorenz Meier
2015-12-01 12:34:02 +01:00
109 changed files with 5346 additions and 359 deletions
@@ -291,7 +291,7 @@ MEASAirspeedSim::cycle()
void
MEASAirspeedSim::voltage_correction(float &diff_press_pa, float &temperature)
{
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2
#if defined(CONFIG_ARCH_BOARD_PX4FMU_V2) || defined(CONFIG_ARCH_BOARD_PX4FMU_V4)
if (_t_system_power == -1) {
_t_system_power = orb_subscribe(ORB_ID(system_power));