diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-12 08:22:50 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-12 08:22:50 +0200 |
| commit | 4adc6d30b301cf4f2cc31e81f0efe1e9ba9b9d5d (patch) | |
| tree | fa218075320e276c7f170fe5a5af0f308eeb3325 /ROMFS | |
| parent | 32e1bd15b834da1f9d6a23688f893b98dc414f38 (diff) | |
| parent | f4cf94b08427bfda10919de1cee6b58171ed5e50 (diff) | |
| download | px4-firmware-4adc6d30b301cf4f2cc31e81f0efe1e9ba9b9d5d.tar.gz px4-firmware-4adc6d30b301cf4f2cc31e81f0efe1e9ba9b9d5d.tar.bz2 px4-firmware-4adc6d30b301cf4f2cc31e81f0efe1e9ba9b9d5d.zip | |
Merged failsafe from master
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/3035_viper | 5 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 5 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.sensors | 5 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 9 |
4 files changed, 15 insertions, 9 deletions
diff --git a/ROMFS/px4fmu_common/init.d/3035_viper b/ROMFS/px4fmu_common/init.d/3035_viper index cb2b26c3c..3714b612f 100644 --- a/ROMFS/px4fmu_common/init.d/3035_viper +++ b/ROMFS/px4fmu_common/init.d/3035_viper @@ -9,7 +9,4 @@ sh /etc/init.d/rc.fw_defaults set MIXER Viper -pwm failsafe -c 5 -p 1000 -pwm failsafe -c 6 -p 1000 -pwm failsafe -c 7 -p 1000 -pwm failsafe -c 8 -p 1000 +set FAILSAFE "-c567 -p 1000" diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 1de0abb58..e44cd0953 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -77,4 +77,9 @@ then pwm max -c $PWM_OUTPUTS -p $PWM_MAX fi fi + + if [ $FAILSAFE != none ] + then + pwm failsafe -d $OUTPUT_DEV $FAILSAFE + fi fi diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors index ecb408a54..739df7ac0 100644 --- a/ROMFS/px4fmu_common/init.d/rc.sensors +++ b/ROMFS/px4fmu_common/init.d/rc.sensors @@ -68,6 +68,11 @@ else fi fi +# Check for flow sensor +if px4flow start +then +fi + # # Start the sensor collection task. # IMPORTANT: this also loads param offsets diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index c9e6a27ca..c1948460d 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -66,6 +66,9 @@ then # sercon + # Try to get an USB console + nshterm /dev/ttyACM0 & + # # Start the ORB (first app to start) # @@ -96,11 +99,9 @@ then # if rgbled start then - echo "[init] RGB Led" else if blinkm start then - echo "[init] BlinkM" blinkm systemstate fi fi @@ -129,6 +130,7 @@ then set LOAD_DEFAULT_APPS yes set GPS yes set GPS_FAKE no + set FAILSAFE none # # Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts @@ -279,9 +281,6 @@ then fi fi - # Try to get an USB console - nshterm /dev/ttyACM0 & - # # Start the datamanager (and do not abort boot if it fails) # |