PWM: transition PWM_{MIN,MAX,DISARMED,RATE} -> PWM_MAIN

This commit is contained in:
Daniel Agar
2021-02-01 08:53:33 +01:00
committed by Lorenz Meier
parent 8b8adbf48e
commit d1a3590aac
71 changed files with 170 additions and 162 deletions
@@ -46,7 +46,7 @@ then
param set MPC_XY_VEL_MAX 2
param set PWM_MIN 1080
param set PWM_MAIN_MIN 1080
fi
set MIXER quad_w
@@ -27,7 +27,7 @@
if [ $AUTOCNF = yes ]
then
param set PWM_AUX_DIS5 950
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_TYPE 2
param set VT_MOT_ID 1234
@@ -42,7 +42,7 @@ then
param set MC_YAWRATE_D 0
param set MC_YAWRATE_FF 0
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_FW_MOT_OFFID 34
param set VT_IDLE_PWM_MC 1080
@@ -16,8 +16,8 @@
if [ $AUTOCNF = yes ]
then
param set PWM_MAX 2000
param set PWM_RATE 400
param set PWM_MAIN_MAX 2000
param set PWM_MAIN_RATE 400
param set VT_MOT_ID 1234
param set VT_IDLE_PWM_MC 1080
@@ -25,8 +25,8 @@
if [ $AUTOCNF = yes ]
then
param set PWM_MAX 2000
param set PWM_RATE 400
param set PWM_MAIN_MAX 2000
param set PWM_MAIN_RATE 400
param set VT_IDLE_PWM_MC 1080
param set VT_TYPE 0
@@ -28,7 +28,7 @@ if [ $AUTOCNF = yes ]
then
param set PWM_AUX_DIS5 950
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set MC_ROLL_P 6
param set MC_ROLLRATE_P 0.17
@@ -47,7 +47,7 @@ then
param set MPC_YAWRAUTO_MAX 20
param set PWM_AUX_DIS3 950
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_MOT_ID 1234
param set VT_FW_MOT_OFFID 1234
@@ -36,7 +36,7 @@ then
param set MPC_YAWRAUTO_MAX 40
param set PWM_AUX_DIS5 950
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_F_TRANS_THR 0.75
param set VT_MOT_ID 1234
@@ -50,7 +50,7 @@ then
param set PWM_AUX_DIS5 950
param set PWM_AUX_REV1 1
param set PWM_AUX_REV2 1
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_ARSP_TRANS 15
param set VT_ARSP_BLEND 8
@@ -70,7 +70,7 @@ then
param set PWM_AUX_DIS5 950
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_ARSP_TRANS 15
param set VT_B_TRANS_DUR 4
@@ -21,8 +21,8 @@ then
param set PWM_AUX_MIN 1000
param set PWM_AUX_RATE 50
param set PWM_MAX 2000
param set PWM_RATE 400
param set PWM_MAIN_MAX 2000
param set PWM_MAIN_RATE 400
param set VT_MOT_ID 1234
param set VT_FW_MOT_OFFID 13
@@ -61,7 +61,7 @@ then
param set MPC_TKO_SPEED 2.5
param set MPC_Z_VEL_MAX_UP 3
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set SENS_BOARD_ROT 8
@@ -122,7 +122,7 @@ then
param set PWM_MAIN_DIS7 900
param set PWM_MAIN_DIS8 900
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set SENS_BOARD_ROT 18
@@ -90,7 +90,7 @@ then
param set PWM_MAIN_DIS3 1000
param set PWM_MAIN_MIN3 1120
param set PWM_MIN 950
param set PWM_MAIN_MIN 950
param set SENS_BOARD_ROT 4
@@ -29,7 +29,7 @@
if [ $AUTOCNF = yes ]
then
param set PWM_AUX_DIS5 950
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set VT_TYPE 2
param set VT_MOT_ID 12345678
@@ -41,10 +41,10 @@ then
param set NAV_ACC_RAD 2
param set PWM_AUX_RATE 50
param set PWM_DISARMED 900
param set PWM_MIN 1075
param set PWM_MAX 1950
param set PWM_RATE 400
param set PWM_MAIN_DISARM 900
param set PWM_MAIN_MIN 1075
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_RATE 400
param set RTL_RETURN_ALT 30
param set RTL_DESCEND_ALT 10
@@ -56,5 +56,5 @@ then
param set MPC_THR_MIN 0.06
param set MPC_MANTHR_MIN 0.06
param set PWM_MIN 1075
param set PWM_MAIN_MIN 1075
fi
@@ -32,7 +32,7 @@ then
param set BAT_N_CELLS 3
param set PWM_AUX_RATE 50
param set PWM_RATE 50
param set PWM_MAIN_RATE 50
param set SENS_BOARD_ROT 8
@@ -27,7 +27,7 @@ then
param set BAT_N_CELLS 3
param set PWM_AUX_RATE 50
param set PWM_RATE 50
param set PWM_MAIN_RATE 50
param set SENS_BOARD_ROT 4
@@ -27,7 +27,7 @@
if [ $AUTOCNF = yes ]
then
param set PWM_AUX_RATE 50
param set PWM_RATE 50
param set PWM_MAIN_RATE 50
fi
set MIXER AETRFG
@@ -43,7 +43,7 @@ then
param set FW_W_RMAX 0
# set disarmed value for the ESC
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
fi
set MIXER AAERTWF
@@ -43,7 +43,7 @@ then
param set FW_W_RMAX 0
# set disarmed value for the ESC
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
fi
set MIXER AAVVTWFF
@@ -44,7 +44,7 @@ then
param set FW_W_RMAX 0
# set disarmed value for the ESC
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
fi
# The Mini Talon does not have a wheel and
@@ -37,9 +37,9 @@ then
param set PWM_AUX_MIN 1075
param set PWM_AUX_MAX 1950
param set PWM_MIN 1075
param set PWM_MAX 1950
param set PWM_RATE 400
param set PWM_MAIN_MIN 1075
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_RATE 400
param set RTL_DESCEND_ALT 10
param set RTL_RETURN_ALT 30
@@ -44,7 +44,7 @@ then
param set FW_RR_IMAX 0.2
param set FW_RR_P 0.04
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
fi
set MIXER fw_generic_wing
@@ -45,7 +45,7 @@ then
param set FW_R_LIM 50
param set FW_R_RMAX 50
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
# Bottom of bay and nominal zero-pitch attitude differ
# the payload bay is pitched up about 7 degrees
@@ -44,7 +44,7 @@ then
param set FW_RR_FF 0.6
param set FW_RR_P 0.04
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
fi
# Configure this as plane.
@@ -45,7 +45,7 @@ then
param set FW_R_RMAX 50
param set FW_R_TC 0.3
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
# Bottom of bay and nominal zero-pitch attitude differ
# the payload bay is pitched up about 7 degrees
@@ -85,7 +85,7 @@ then
# Roll Integrator Anti-Windup
param set FW_RR_IMAX 0.2
param set PWM_DISARMED 1000
param set PWM_MAIN_DISARM 1000
fi
set MIXER fw_generic_wing.main.mix
@@ -61,8 +61,8 @@ then
param set PWM_MAIN_REV1 1
param set PWM_MAIN_REV2 1
param set PWM_MIN 900
param set PWM_MAX 2100
param set PWM_MAIN_MIN 900
param set PWM_MAIN_MAX 2100
fi
set MIXER caipi
@@ -34,5 +34,5 @@ then
param set MPC_THR_MIN 0.06
param set MPC_MANTHR_MIN 0.06
param set PWM_MIN 1075
param set PWM_MAIN_MIN 1075
fi
@@ -37,5 +37,5 @@ then
param set MC_YAWRATE_D 0
param set MPC_THR_MIN 0.06
param set PWM_MIN 1075
param set PWM_MAIN_MIN 1075
fi
@@ -29,5 +29,5 @@ then
param set MC_YAWRATE_D 0
# DJI ESCs do not support calibration and need a higher min
param set PWM_MIN 1230
param set PWM_MAIN_MIN 1230
fi
@@ -29,5 +29,5 @@ then
param set MC_YAWRATE_D 0
# DJI ESCs do not support calibration and need a higher min
param set PWM_MIN 1230
param set PWM_MAIN_MIN 1230
fi
@@ -104,11 +104,11 @@ then
param set NAV_ACC_RAD 2
# PWM and RC Parameters
param set PWM_MAX 1950
param set PWM_MIN 1075
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1075
# use oneshot motor output protocol
param set PWM_RATE 0
param set PWM_MAIN_RATE 0
# RTL Parameters
param set RTL_DESCEND_ALT 5
@@ -37,5 +37,5 @@ then
param set MC_YAWRATE_I 0.1
param set MC_YAWRATE_D 0
param set PWM_MIN 1200
param set PWM_MAIN_MIN 1200
fi
@@ -37,9 +37,9 @@ then
param set PWM_AUX_DISARMED 950
param set PWM_AUX_RATE 50
param set PWM_MIN 1100
param set PWM_MAX 1900
param set PWM_RATE 50
param set PWM_MAIN_MIN 1100
param set PWM_MAIN_MAX 1900
param set PWM_MAIN_RATE 50
param set RTL_RETURN_ALT 30
param set RTL_DESCEND_ALT 10
@@ -41,9 +41,9 @@ then
# use thrust curve factor (instead of TPA)
param set THR_MDL_FAC 0.3
param set PWM_MIN 1075
param set PWM_MAIN_MIN 1075
# enable one-shot
param set PWM_RATE 0
param set PWM_MAIN_RATE 0
# enable high-rate logging profile (helps with tuning)
param set SDLOG_PROFILE 19
@@ -55,5 +55,5 @@ then
param set MPC_THR_MIN 0.06
param set MPC_MANTHR_MIN 0.06
param set PWM_MIN 1075
param set PWM_MAIN_MIN 1075
fi
@@ -50,10 +50,10 @@ then
param set MPC_THR_MIN 0.05
param set MPC_Z_VEL_I_ACC 1.7
param set PWM_MAX 1950
param set PWM_MIN 1050
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1050
param set PWM_RATE 0
param set PWM_MAIN_RATE 0
param set THR_MDL_FAC 0.3
fi
@@ -33,5 +33,5 @@ then
param set MC_YAWRATE_I 0
param set MC_YAWRATE_D 0
param set PWM_MIN 1200
param set PWM_MAIN_MIN 1200
fi
@@ -65,9 +65,9 @@ then
#param set THR_MDL_FAC 0.25
# System
param set PWM_MAX 1950
param set PWM_MIN 1100
param set PWM_RATE 0
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1100
param set PWM_MAIN_RATE 0
#param set SYS_FMU_TASK 1
param set SENS_BOARD_ROT 10
@@ -67,11 +67,11 @@ then
param set THR_MDL_FAC 0.3
# System
param set PWM_MAX 1950
param set PWM_MIN 1180
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1180
# enable one-shot
param set PWM_RATE 0
param set PWM_MAIN_RATE 0
param set SENS_BOARD_ROT 2
@@ -61,9 +61,9 @@ then
#param set THR_MDL_FAC 0.25
# Obsolete
#param set PWM_MAX 1950
#param set PWM_MIN 1100
#param set PWM_RATE 0
#param set PWM_MAIN_MAX 1950
#param set PWM_MAIN_MIN 1100
#param set PWM_MAIN_RATE 0
# Sensors
param set SENS_BOARD_ROT 10
@@ -42,7 +42,7 @@ then
# param set NAV_RCL_ACT 6 # Lockdown
param set PWM_MIN 1075
param set PWM_RATE 400
param set PWM_DISARMED 900
param set PWM_MAIN_MIN 1075
param set PWM_MAIN_RATE 400
param set PWM_MAIN_DISARM 900
fi
@@ -38,7 +38,7 @@ then
param set MC_YAWRATE_I 0.1
param set MC_YAWRATE_D 0
param set PWM_DISARMED 0
param set PWM_MIN 500
param set PWM_MAX 2200
param set PWM_MAIN_DISARM 0
param set PWM_MAIN_MIN 500
param set PWM_MAIN_MAX 2200
fi
@@ -171,11 +171,11 @@ then
param set NAV_RCL_ACT 1
# pwm control
param set PWM_DISARMED 900
param set PWM_MAX 1850
param set PWM_MIN 1075
param set PWM_MAIN_DISARM 900
param set PWM_MAIN_MAX 1850
param set PWM_MAIN_MIN 1075
# Oneshot125
param set PWM_RATE 0
param set PWM_MAIN_RATE 0
# rtl
param set RTL_DESCEND_ALT 5
@@ -60,12 +60,12 @@ then
param set NAV_RCL_ACT 3
param set PWM_DISARMED 0
param set PWM_MIN 0
param set PWM_MAX 255
param set PWM_MAIN_DISARM 0
param set PWM_MAIN_MIN 0
param set PWM_MAIN_MAX 255
# Run the motors at 328.125 kHz (recommended)
param set PWM_RATE 3921
param set PWM_MAIN_RATE 3921
param set SDLOG_PROFILE 1
@@ -73,9 +73,9 @@ then
fi
set PWM_DISARMED none
set PWM_MAX none
set PWM_MIN none
set PWM_MAIN_DISARM none
set PWM_MAIN_MAX none
set PWM_MAIN_MIN none
syslink start
mavlink start -d /dev/bridge0 -b 57600 -m osd -r 40000
@@ -59,12 +59,12 @@ then
param set NAV_RCL_ACT 3
param set PWM_DISARMED 0
param set PWM_MIN 0
param set PWM_MAX 255
param set PWM_MAIN_DISARM 0
param set PWM_MAIN_MIN 0
param set PWM_MAIN_MAX 255
# Run the motors at 328.125 kHz (recommended)
param set PWM_RATE 3921
param set PWM_MAIN_RATE 3921
param set SDLOG_PROFILE 1
@@ -73,9 +73,9 @@ then
fi
set PWM_DISARMED none
set PWM_MAX none
set PWM_MIN none
set PWM_MAIN_DISARM none
set PWM_MAIN_MAX none
set PWM_MAIN_MIN none
syslink start
mavlink start -d /dev/bridge0 -b 57600 -m osd -r 40000
@@ -50,9 +50,9 @@ then
param set NAV_ACC_RAD 0.5
# Provide ESC a constant 1500 us pulse
param set PWM_DISARMED 1500
param set PWM_MAX 2000
param set PWM_MIN 1000
param set PWM_MAIN_DISARM 1500
param set PWM_MAIN_MAX 2000
param set PWM_MAIN_MIN 1000
fi
# Configure this as rover
@@ -62,11 +62,11 @@ then
# Provide ESC a constant 1500 us pulse, which corresponds to
# idle on the Roboclaw motor controller on the Aion R1
param set PWM_DISARMED 1500
param set PWM_MAIN_DISARM 1500
param set PWM_MAIN_DIS0 1500
param set PWM_MAIN_DIS1 1500
param set PWM_MAX 2000
param set PWM_MIN 1000
param set PWM_MAIN_MAX 2000
param set PWM_MAIN_MIN 1000
# Enable Airspeed check circuit breaker because Rovers will have no airspeed sensor
param set CBRK_AIRSPD_CHK 162128
@@ -56,13 +56,13 @@ then
param set NAV_ACC_RAD 0.5
# Provide ESC a constant 1500 us pulse to idle
param set PWM_DISARMED 1500
param set PWM_MAIN_DISARM 1500
param set PWM_MAIN_DIS3 1485
param set PWM_MAIN_DIS4 1485
param set PWM_MAIN_FAIL3 1485
param set PWM_MAIN_FAIL4 1485
param set PWM_MAX 2000
param set PWM_MIN 1000
param set PWM_MAIN_MAX 2000
param set PWM_MAIN_MIN 1000
param set PWM_MAIN_MIN3 970
param set PWM_MAIN_MIN4 970
@@ -83,8 +83,8 @@ then
param set THR_MDL_FAC 0.25
# System
param set PWM_MAX 1950
param set PWM_MIN 1100
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1100
param set PWM_MAIN_DIS5 980
param set PWM_MAIN_DIS6 980
@@ -115,7 +115,7 @@ then
param set COM_DISARM_LAND 3
# PWM ONESHOT
param set PWM_RATE 0
param set PWM_MAIN_RATE 0
# Battery
param set BAT_SOURCE 0
+1 -1
View File
@@ -33,7 +33,7 @@ set PWM_OUT 1234
# PWM Hz - 50 Hz is the normal rate in RC cars, higher rates
# may damage analog servos.
#
set PWM_RATE 50
set PWM_MAIN_RATE 50
#
# This is the gimbal pass mixer.
+1 -1
View File
@@ -45,7 +45,7 @@ then
param set MIS_LTRMIN_ALT 25
param set MIS_TAKEOFF_ALT 25
param set PWM_RATE 50
param set PWM_MAIN_RATE 50
#
# FW takeoff acceleration can easily exceed ublox GPS 2G default.
+2 -2
View File
@@ -254,9 +254,9 @@ then
if [ $PWM_OUT != none ]
then
# Set PWM output frequency.
if [ $PWM_RATE != none ]
if [ $PWM_MAIN_RATE != none ]
then
pwm rate -c ${PWM_OUT} -r ${PWM_RATE}
pwm rate -c ${PWM_OUT} -r ${PWM_MAIN_RATE}
fi
fi
fi
+3 -3
View File
@@ -14,9 +14,9 @@ then
param set RTL_RETURN_ALT 30
param set RTL_DESCEND_ALT 10
param set PWM_MAX 1950
param set PWM_MIN 1075
param set PWM_RATE 400
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1075
param set PWM_MAIN_RATE 400
param set GPS_UBX_DYNMODEL 6
fi
+1 -1
View File
@@ -33,7 +33,7 @@ set PWM_OUT 1234
# PWM Hz - 50 Hz is the normal rate in RC cars, higher rates
# may damage analog servos.
#
set PWM_RATE 50
set PWM_MAIN_RATE 50
#
# This is the gimbal pass mixer.
+4 -6
View File
@@ -9,9 +9,9 @@ set VEHICLE_TYPE uuv
if [ $AUTOCNF = yes ]
then
param set PWM_MAX 1950
param set PWM_MIN 1050
param set PWM_DISARMED 1500
param set PWM_MAIN_MAX 1950
param set PWM_MAIN_MIN 1050
param set PWM_MAIN_DISARM 1500
fi
@@ -19,13 +19,11 @@ fi
# PWM Hz - 50 Hz is the normal rate in RC cars, boats etc,
# higher rates may damage analog servos.
#
set PWM_RATE 50
set PWM_MAIN_RATE 50
#
# Enable servo output on pins 1-4
set PWM_OUT 1234
set PWM_DISARMED 1500
#
# This is the gimbal pass mixer.
+1 -1
View File
@@ -31,7 +31,7 @@ then
param set NAV_ACC_RAD 3
param set PWM_AUX_RATE 50
param set PWM_RATE 400
param set PWM_MAIN_RATE 400
param set RTL_TYPE 1
+4 -17
View File
@@ -41,19 +41,10 @@ set MK_MODE none
set MKBLCTRL_ARG ""
set OUTPUT_MODE none
set PARAM_FILE /fs/microsd/params
set PWM_DISARMED p:PWM_DISARMED
set PWM_MAX p:PWM_MAX
set PWM_MIN p:PWM_MIN
set PWM_OUT none
set PWM_RATE p:PWM_RATE
set PWM_AUX_DISARMED p:PWM_AUX_DISARMED
set PWM_AUX_MAX p:PWM_AUX_MAX
set PWM_AUX_MIN p:PWM_AUX_MIN
set PWM_MAIN_RATE p:PWM_MAIN_RATE
set PWM_AUX_OUT none
set PWM_AUX_RATE p:PWM_AUX_RATE
set PWM_EXTRA_DISARMED p:PWM_EXTRA_DISARMED
set PWM_EXTRA_MAX p:PWM_EXTRA_MAX
set PWM_EXTRA_MIN p:PWM_EXTRA_MIN
set PWM_EXTRA_OUT none
set PWM_EXTRA_RATE p:PWM_EXTRA_RATE
set EXTRA_MIXER_MODE none
@@ -598,16 +589,12 @@ unset MKBLCTRL_ARG
unset OUTPUT_MODE
unset PARAM_DEFAULTS_VER
unset PARAM_FILE
unset PWM_AUX_DISARMED
unset PWM_AUX_MAX
unset PWM_AUX_MIN
unset PWM_AUX_OUT
unset PWM_AUX_RATE
unset PWM_DISARMED
unset PWM_MAX
unset PWM_MIN
unset PWM_MAIN_RATE
unset PWM_OUT
unset PWM_RATE
unset PWM_EXTRA_OUT
unset PWM_EXTRA_RATE
unset RC_INPUT_ARGS
unset SDCARD_MIXERS_PATH
unset STARTUP_TUNE