diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-13 15:38:54 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-13 15:38:54 +0100 |
| commit | 7b7c85dc9663064ea64e35a5267d506a86448209 (patch) | |
| tree | 54406b8d0f3720e29ba7d820e20440e0185f35ea /ROMFS/px4fmu_common/init.d/rc.interface | |
| parent | 5cd2ee83421e79c9f283d46b788343a479418d8a (diff) | |
| parent | 02bc680a9f196af6550201ea167b9b0964b122a9 (diff) | |
| download | px4-firmware-7b7c85dc9663064ea64e35a5267d506a86448209.tar.gz px4-firmware-7b7c85dc9663064ea64e35a5267d506a86448209.tar.bz2 px4-firmware-7b7c85dc9663064ea64e35a5267d506a86448209.zip | |
Merge remote-tracking branch 'upstream/master' into fwposcontrolmode
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rc.interface')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 41e0b149b..0f703c3b3 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -8,12 +8,11 @@ then # # Load mixer # - set MIXERSD /fs/microsd/etc/mixers/$MIXER.mix - # Use the mixer file from the SD-card if it exists - if [ -f $MIXERSD ] + #Use the mixer file from the SD-card if it exists + if [ -f /fs/microsd/etc/mixers/$MIXER.mix ] then - set MIXER_FILE $MIXERSD + set MIXER_FILE /fs/microsd/etc/mixers/$MIXER.mix else set MIXER_FILE /etc/mixers/$MIXER.mix fi @@ -32,29 +31,32 @@ then if mixer load $OUTPUT_DEV $MIXER_FILE then - echo "[init] Mixer loaded: $MIXER_FILE" + echo "[i] Mixer: $MIXER_FILE" else - echo "[init] Error loading mixer: $MIXER_FILE" - tone_alarm $TUNE_OUT_ERROR + echo "[i] Error loading mixer: $MIXER_FILE" + tone_alarm $TUNE_ERR fi + + unset MIXER_FILE else if [ $MIXER != skip ] then - echo "[init] Mixer not defined" - tone_alarm $TUNE_OUT_ERROR + echo "[i] Mixer not defined" + tone_alarm $TUNE_ERR fi fi if [ $OUTPUT_MODE == fmu -o $OUTPUT_MODE == io ] then - if [ $PWM_OUTPUTS != none ] + if [ $PWM_OUT != none ] then # # Set PWM output frequency # if [ $PWM_RATE != none ] then - pwm rate -c $PWM_OUTPUTS -r $PWM_RATE + echo "[i] PWM rate: $PWM_RATE" + pwm rate -c $PWM_OUT -r $PWM_RATE fi # @@ -62,15 +64,18 @@ then # if [ $PWM_DISARMED != none ] then - pwm disarmed -c $PWM_OUTPUTS -p $PWM_DISARMED + echo "[i] PWM disarmed: $PWM_DISARMED" + pwm disarmed -c $PWM_OUT -p $PWM_DISARMED fi if [ $PWM_MIN != none ] then - pwm min -c $PWM_OUTPUTS -p $PWM_MIN + echo "[i] PWM min: $PWM_MIN" + pwm min -c $PWM_OUT -p $PWM_MIN fi if [ $PWM_MAX != none ] then - pwm max -c $PWM_OUTPUTS -p $PWM_MAX + echo "[i] PWM max: $PWM_MAX" + pwm max -c $PWM_OUT -p $PWM_MAX fi fi |