diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-27 21:33:42 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-27 21:33:42 +0200 |
| commit | 05027617996c86005fb8ec4d68fae798b9fbef35 (patch) | |
| tree | e95f7178fecfea58fa81c61bee1550d954feb4bb /ROMFS/px4fmu_common/init.d | |
| parent | 9cc1f1ab9db4af9af18e6879ba82cbcfa8e588f3 (diff) | |
| parent | 62b98cc9447262111da1e9ecac700a180f121482 (diff) | |
| download | px4-firmware-05027617996c86005fb8ec4d68fae798b9fbef35.tar.gz px4-firmware-05027617996c86005fb8ec4d68fae798b9fbef35.tar.bz2 px4-firmware-05027617996c86005fb8ec4d68fae798b9fbef35.zip | |
Merge remote-tracking branch 'upstream/master' into obcfailsafe
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/3035_viper | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 5 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/3035_viper b/ROMFS/px4fmu_common/init.d/3035_viper index a4c1e832d..3714b612f 100644 --- a/ROMFS/px4fmu_common/init.d/3035_viper +++ b/ROMFS/px4fmu_common/init.d/3035_viper @@ -8,3 +8,5 @@ sh /etc/init.d/rc.fw_defaults set MIXER Viper + +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/rcS b/ROMFS/px4fmu_common/init.d/rcS index 195771905..ea04ece34 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) # |