diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-11 17:39:10 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-11 17:39:10 +0200 |
| commit | 66d294b5bf3972c1f49ea452964f32e18b25b2d3 (patch) | |
| tree | 2e800468a222fad0977bb415334de2999ba29b06 | |
| parent | 42b496178136a398447742f0efc81348845087e4 (diff) | |
| download | px4-firmware-66d294b5bf3972c1f49ea452964f32e18b25b2d3.tar.gz px4-firmware-66d294b5bf3972c1f49ea452964f32e18b25b2d3.tar.bz2 px4-firmware-66d294b5bf3972c1f49ea452964f32e18b25b2d3.zip | |
Fixed to FMUv2 autostart and config
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/10_io_f330 | 30 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.sensors | 2 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 2 |
3 files changed, 19 insertions, 15 deletions
diff --git a/ROMFS/px4fmu_common/init.d/10_io_f330 b/ROMFS/px4fmu_common/init.d/10_io_f330 index 4083bb905..13272426e 100644 --- a/ROMFS/px4fmu_common/init.d/10_io_f330 +++ b/ROMFS/px4fmu_common/init.d/10_io_f330 @@ -57,11 +57,6 @@ pwm -u 400 -m 0xff px4io recovery # -# Disable px4io topic limiting -# -px4io limit 200 - -# # This sets a PWM right after startup (regardless of safety button) # px4io idle 900 900 900 900 @@ -99,16 +94,23 @@ gps start attitude_estimator_ekf start multirotor_att_control start - -# -# Start logging -# -sdlog2 start -r 50 -a -b 16 - + # -# Start system state +# Disable px4io topic limiting and start logging # -if blinkm start +if [ $BOARD == fmuv1 ] then - blinkm systemstate + px4io limit 200 + sdlog2 start -r 50 -a -b 16 + if blinkm start + then + blinkm systemstate + fi +else + px4io limit 400 + sdlog2 start -r 100 -a -b 16 + if rgbled start + then + #rgbled systemstate + fi fi diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors index 26b561571..17591be5b 100644 --- a/ROMFS/px4fmu_common/init.d/rc.sensors +++ b/ROMFS/px4fmu_common/init.d/rc.sensors @@ -22,10 +22,12 @@ if mpu6000 start then echo "using MPU6000 and HMC5883L" hmc5883 start + set BOARD fmuv1 else echo "using L3GD20 and LSM303D" l3gd20 start lsm303d start + set BOARD fmuv2 fi # diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index ae61802c9..cc182e6af 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -80,7 +80,7 @@ MODULES += modules/multirotor_pos_control # # Logging # -MODULES += modules/sdlog +MODULES += modules/sdlog2 # # Library modules |