diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-13 15:59:40 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-13 15:59:40 +0100 |
| commit | a78264507e510d75b8694e3a0ec7c2acd35ea1e3 (patch) | |
| tree | 188ac29b7ddfd97a5b12b6e7f759f694d73b089b | |
| parent | 7b7c85dc9663064ea64e35a5267d506a86448209 (diff) | |
| parent | 24fd099e58029dd275d2f30fc65bb9209bb26983 (diff) | |
| download | px4-firmware-a78264507e510d75b8694e3a0ec7c2acd35ea1e3.tar.gz px4-firmware-a78264507e510d75b8694e3a0ec7c2acd35ea1e3.tar.bz2 px4-firmware-a78264507e510d75b8694e3a0ec7c2acd35ea1e3.zip | |
Merge remote-tracking branch 'upstream/master' into fwposcontrolmode
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 0f703c3b3..bab71be93 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -55,7 +55,6 @@ then # if [ $PWM_RATE != none ] then - echo "[i] PWM rate: $PWM_RATE" pwm rate -c $PWM_OUT -r $PWM_RATE fi @@ -64,17 +63,14 @@ then # if [ $PWM_DISARMED != none ] then - echo "[i] PWM disarmed: $PWM_DISARMED" pwm disarmed -c $PWM_OUT -p $PWM_DISARMED fi if [ $PWM_MIN != none ] then - echo "[i] PWM min: $PWM_MIN" pwm min -c $PWM_OUT -p $PWM_MIN fi if [ $PWM_MAX != none ] then - echo "[i] PWM max: $PWM_MAX" pwm max -c $PWM_OUT -p $PWM_MAX fi fi diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 7532d3811..94c462439 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -1,6 +1,9 @@ #!nsh # # PX4FMU startup script. +# +# NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS. +# # # Default to auto-start mode. @@ -480,7 +483,7 @@ then set MAV_TYPE 1 fi - #param set MAV_TYPE $MAV_TYPE + param set MAV_TYPE $MAV_TYPE # Load mixer and configure outputs sh /etc/init.d/rc.interface @@ -580,6 +583,11 @@ then echo "Exit from nsh" exit fi + unset EXIT_ON_END # End of autostart fi + +# There is no further processing, so we can free some RAM +# XXX potentially unset all script variables. +unset TUNE_ERR |