Merge branch 'll40ls_startup' of https://github.com/mhkabir/Firmware into mhkabir-ll40ls_startup

Conflicts:
	ROMFS/px4fmu_common/init.d/rc.sensors
This commit is contained in:
James Goppert 2015-05-26 20:08:11 -04:00
commit cbc169af2f
2 changed files with 17 additions and 5 deletions

View File

@ -115,12 +115,15 @@ if px4flow start
then
fi
if pwm_input start
then
fi
if ll40ls start pwm
if param compare SENS_ENABLE_LL40LS 1
then
if pwm_input start
then
fi
if ll40ls start pwm
then
fi
fi
#