Browse Source

Enable new PWM disarmed setting which allows to pick the single throttle channel. Servos stay unpowered until safety is disabled, ESC gets a standby pulse

sbg
Lorenz Meier 9 years ago
parent
commit
17e77535bf
  1. 7
      ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad
  2. 25
      ROMFS/px4fmu_common/init.d/rc.interface
  3. 1
      ROMFS/px4fmu_common/init.d/rcS

7
ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad

@ -38,11 +38,8 @@ set PWM_OUT 1234
set PWM_RATE 400 set PWM_RATE 400
set MIXER_AUX vtol_AAERT set MIXER_AUX vtol_AAERT
set PWM_AUX_RATE 50 set PWM_ACHDIS 5
set PWM_AUX_OUT 1234 set PWM_AUX_DISARMED 950
set PWM_AUX_DISARMED 1000
set PWM_AUX_MIN 1000
set PWM_AUX_MAX 2000
set MAV_TYPE 22 set MAV_TYPE 22

25
ROMFS/px4fmu_common/init.d/rc.interface

@ -147,6 +147,7 @@ then
set FAILSAFE_AUX none set FAILSAFE_AUX none
fi fi
# Set min / max for aux out and rates
if [ $PWM_AUX_OUT != none ] if [ $PWM_AUX_OUT != none ]
then then
# #
@ -157,13 +158,6 @@ then
pwm rate -c $PWM_AUX_OUT -r $PWM_AUX_RATE -d $OUTPUT_AUX_DEV pwm rate -c $PWM_AUX_OUT -r $PWM_AUX_RATE -d $OUTPUT_AUX_DEV
fi fi
#
# Set disarmed, min and max PWM_AUX values
#
if [ $PWM_AUX_DISARMED != none ]
then
pwm disarmed -c $PWM_AUX_OUT -p $PWM_AUX_DISARMED -d $OUTPUT_AUX_DEV
fi
if [ $PWM_AUX_MIN != none ] if [ $PWM_AUX_MIN != none ]
then then
pwm min -c $PWM_AUX_OUT -p $PWM_AUX_MIN -d $OUTPUT_AUX_DEV pwm min -c $PWM_AUX_OUT -p $PWM_AUX_MIN -d $OUTPUT_AUX_DEV
@ -174,6 +168,23 @@ then
fi fi
fi fi
# Set disarmed values for aux out
# Transitional support until all configs
# are updated
if [ $PWM_ACHDIS == none ]
then
set PWM_ACHDIS ${PWM_AUX_OUT}
fi
#
# Set disarmed, min and max PWM_AUX values
#
if [ $PWM_AUX_DISARMED != none -a $PWM_ACHDIS != none ]
then
pwm disarmed -c $PWM_ACHDIS -p $PWM_AUX_DISARMED -d $OUTPUT_AUX_DEV
fi
if [ $FAILSAFE_AUX != none ] if [ $FAILSAFE_AUX != none ]
then then
pwm failsafe -d $OUTPUT_AUX_DEV $FAILSAFE pwm failsafe -d $OUTPUT_AUX_DEV $FAILSAFE

1
ROMFS/px4fmu_common/init.d/rcS

@ -182,6 +182,7 @@ then
set PWM_MAX none set PWM_MAX none
set PWM_AUX_OUT none set PWM_AUX_OUT none
set PWM_AUX_RATE none set PWM_AUX_RATE none
set PWM_ACHDIS none
set PWM_AUX_DISARMED none set PWM_AUX_DISARMED none
set PWM_AUX_MIN none set PWM_AUX_MIN none
set PWM_AUX_MAX none set PWM_AUX_MAX none

Loading…
Cancel
Save