Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SITL: fixed tilt quadplanes and re-enable then in CI FlyEachFrame #26248

Merged
merged 3 commits into from
Feb 18, 2024
Merged

SITL: fixed tilt quadplanes and re-enable then in CI FlyEachFrame #26248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9364425
SITL: fixed SITL for tilted motors
tridge Feb 17, 2024
630ef35
SITL: added 4 motor tilt vectored quadplane
tridge Feb 17, 2024
915423f
autotest: fixed parameters for tilt quadplanes
tridge Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Tools/autotest/arduplane.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3948,11 +3948,7 @@ def FlyEachFrame(self):
vinfo = vehicleinfo.VehicleInfo()
vinfo_options = vinfo.options[self.vehicleinfo_key()]
known_broken_frames = {
"firefly": "falls out of sky after transition",
"plane-tailsitter": "does not take off; immediately emits 'AP: Transition VTOL done' while on ground",
"quadplane-cl84": "falls out of sky instead of transitioning",
"quadplane-tilttri": "falls out of sky instead of transitioning",
"quadplane-tilttrivec": "loses attitude control and crashes",
"plane-ice" : "needs ICE control channel for ignition",
"quadplane-ice" : "needs ICE control channel for ignition",
"quadplane-can" : "needs CAN periph",
Expand Down
97 changes: 14 additions & 83 deletions Tools/autotest/default_params/firefly.parm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,28 @@
SERVO1_FUNCTION = 78
SERVO2_FUNCTION = 77
SERVO1_REVERSED = 1
SERVO2_REVERSED = 1
SERVO1_MAX = 2000
SERVO1_MIN = 1000
SERVO2_MAX = 2000
SERVO2_MIN = 1000
AHRS_EKF_TYPE 2
ARMING_RUDDER 2
AIRSPEED_MAX 35
AIRSPEED_MIN 6
ARSPD_USE 1
AUTOTUNE_LEVEL 8
COMPASS_OFS2_X -0.420265
COMPASS_OFS2_Y -0.726942
COMPASS_OFS2_Z 6.665476
COMPASS_OFS3_X -0.420265
COMPASS_OFS3_Y -0.726942
COMPASS_OFS3_Z 6.665476
COMPASS_OFS_X -0.453570
COMPASS_OFS_Y -0.585846
COMPASS_OFS_Z 6.815743
EK2_ENABLE 1
EK2_IMU_MASK 3
FBWB_CLIMB_RATE 10
FLTMODE1 10
FLTMODE2 11
FLTMODE3 12
FLTMODE4 5
FLTMODE5 19
FLTMODE6 5
FLTMODE_CH 5
INS_ACC2OFFS_X 0.001000
INS_ACC2OFFS_Y 0.001000
INS_ACC2OFFS_Z 0.001000
INS_ACC2SCAL_X 1.001000
INS_ACC2SCAL_Y 1.001000
INS_ACC2SCAL_Z 1.001000
INS_ACCOFFS_X 0.001000
INS_ACCOFFS_Y 0.001000
INS_ACCOFFS_Z 0.001000
INS_ACCSCAL_X 1.001000
INS_ACCSCAL_Y 1.001000
INS_ACCSCAL_Z 1.001000
INS_GYR_CAL 0
KFF_RDDRMIX 0.500000
PTCH_LIM_MAX_DEG 30.00
PTCH_LIM_MIN_DEG -30.00
ROLL_LIMIT_DEG 65.00
NAVL1_PERIOD 8
PTCH_RATE_D 0.000000
PTCH_RATE_I 0.212500
PTCH_RATE_IMAX 0.888889
PTCH_RATE_P 0.309954
PTCH2SRV_RLL 1
RALLY_INCL_HOME 0
RALLY_LIMIT_KM 5
RALLY_TOTAL 0
RC1_DZ 30
RC1_MAX 1886
RC1_MIN 1087
RC1_TRIM 1500
RC3_MAX 2000
RC3_MIN 1000
SERVO3_MIN 1000
SERVO3_MAX 2000
RLL_RATE_D 0.000000
RLL_RATE_I 0.212500
RLL_RATE_IMAX 0.888889
RLL_RATE_P 0.141009
SCHED_LOOP_RATE 300
THR_MAX 100
AIRSPEED_CRUISE 25.00
LOG_BITMASK 65534
# map channel 13 out for tilt
Q_ENABLE 1
Q_FRAME_CLASS 5
Q_FRAME_TYPE 11
Q_ASSIST_SPEED 10

Q_TILT_ENABLE 1
Q_TILT_MASK 54
Q_TILT_MAX 60
Q_TILT_RATE_DN 15
Q_RTL_MODE 1

Q_VFWD_GAIN 0.1
Q_WVANE_GAIN 0.3
SERVO9_FUNCTION 41
SERVO9_MIN 1000
SERVO9_MAX 2000


SERVO1_FUNCTION = 78
SERVO2_FUNCTION = 77
SERVO1_REVERSED = 1
SERVO2_REVERSED = 1

SERVO3_FUNCTION 33
SERVO4_FUNCTION 34
SERVO5_FUNCTION 35
SERVO6_FUNCTION 36
SERVO7_FUNCTION 37
SERVO8_FUNCTION 38
PTCH_RATE_FF 1.407055
RLL_RATE_FF 0.752741

SERVO9_FUNCTION 41
SERVO9_MIN 1000
SERVO9_MAX 2000
76 changes: 10 additions & 66 deletions Tools/autotest/default_params/quadplane-cl84.parm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,14 @@
ARMING_RUDDER 2
ARSPD_TYPE 0
AIRSPEED_MAX 35
AIRSPEED_MIN 6
AUTOTUNE_LEVEL 8
COMPASS_OFS2_X -0.420265
COMPASS_OFS2_Y -0.726942
COMPASS_OFS2_Z 6.665476
COMPASS_OFS3_X -0.420265
COMPASS_OFS3_Y -0.726942
COMPASS_OFS3_Z 6.665476
COMPASS_OFS_X -0.453570
COMPASS_OFS_Y -0.585846
COMPASS_OFS_Z 6.815743
FBWB_CLIMB_RATE 10
FLTMODE1 10
FLTMODE2 11
FLTMODE3 12
FLTMODE4 5
FLTMODE5 19
FLTMODE6 5
FLTMODE_CH 5
INS_ACC2OFFS_X 0.001000
INS_ACC2OFFS_Y 0.001000
INS_ACC2OFFS_Z 0.001000
INS_ACC2SCAL_X 1.001000
INS_ACC2SCAL_Y 1.001000
INS_ACC2SCAL_Z 1.001000
INS_ACCOFFS_X 0.001000
INS_ACCOFFS_Y 0.001000
INS_ACCOFFS_Z 0.001000
INS_ACCSCAL_X 1.001000
INS_ACCSCAL_Y 1.001000
INS_ACCSCAL_Z 1.001000
INS_GYR_CAL 0
KFF_RDDRMIX 0.500000
PTCH_LIM_MAX_DEG 30.00
PTCH_LIM_MIN_DEG -30.00
ROLL_LIMIT_DEG 65.00
NAVL1_PERIOD 14
PTCH_RATE_D 0.000000
PTCH_RATE_I 0.212500
PTCH_RATE_IMAX 0.888889
PTCH_RATE_P 0.309954
PTCH2SRV_RLL 1
RALLY_INCL_HOME 0
RALLY_LIMIT_KM 5
RALLY_TOTAL 0
RLL_RATE_D 0.000000
RLL_RATE_I 0.212500
RLL_RATE_IMAX 0.888889
RLL_RATE_P 0.141009
THR_MAX 100
AIRSPEED_CRUISE 25.00
SERVO12_FUNCTION 41
SERVO12_MIN 1000
SERVO12_MAX 2000
SERVO11_TRIM 1500
RTL_RADIUS 80
RTL_ALTITUDE 20.00
Q_ENABLE 1
Q_FRAME_CLASS 7
Q_ANGLE_MAX 4500
Q_ASSIST_SPEED 6
Q_TILT_ENABLE 1
Q_TILT_MASK 3
Q_TILT_RATE 13
Q_TILT_TYPE 1
Q_RTL_MODE 1
PTCH_RATE_FF 1.407055
RLL_RATE_FF 0.552741

# 7 seconds to move servo
Q_TILT_RATE_DN 12.85
Q_TILT_RATE_UP 12.85


SERVO12_FUNCTION 41
SERVO12_MIN 1000
SERVO12_MAX 2000
18 changes: 18 additions & 0 deletions Tools/autotest/default_params/quadplane-tilt.parm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

Q_ENABLE 1
Q_FRAME_CLASS 1
Q_FRAME_TYPE 1

Q_TILT_ENABLE 1
Q_TILT_TYPE 2
Q_TILT_YAW_ANGLE 10
Q_TILT_MASK 5

SERVO3_FUNCTION 0

SERVO12_FUNCTION 76
SERVO13_FUNCTION 75
SERVO12_MIN 1000
SERVO12_MAX 2000
SERVO13_MIN 1000
SERVO13_MAX 2000
82 changes: 6 additions & 76 deletions Tools/autotest/default_params/quadplane-tilttri.parm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,11 @@
AHRS_EKF_TYPE 2
ARMING_RUDDER 2
AIRSPEED_MAX 35
AIRSPEED_MIN 6
ARSPD_USE 1
AUTOTUNE_LEVEL 8
COMPASS_OFS2_X -0.420265
COMPASS_OFS2_Y -0.726942
COMPASS_OFS2_Z 6.665476
COMPASS_OFS3_X -0.420265
COMPASS_OFS3_Y -0.726942
COMPASS_OFS3_Z 6.665476
COMPASS_OFS_X -0.453570
COMPASS_OFS_Y -0.585846
COMPASS_OFS_Z 6.815743
EK2_ENABLE 1
EK2_IMU_MASK 3
FBWB_CLIMB_RATE 10
FLTMODE1 10
FLTMODE2 11
FLTMODE3 12
FLTMODE4 5
FLTMODE5 19
FLTMODE6 5
FLTMODE_CH 5
INS_ACC2OFFS_X 0.001000
INS_ACC2OFFS_Y 0.001000
INS_ACC2OFFS_Z 0.001000
INS_ACC2SCAL_X 1.001000
INS_ACC2SCAL_Y 1.001000
INS_ACC2SCAL_Z 1.001000
INS_ACCOFFS_X 0.001000
INS_ACCOFFS_Y 0.001000
INS_ACCOFFS_Z 0.001000
INS_ACCSCAL_X 1.001000
INS_ACCSCAL_Y 1.001000
INS_ACCSCAL_Z 1.001000
INS_GYR_CAL 0
KFF_RDDRMIX 0.500000
PTCH_LIM_MAX_DEG 30.00
PTCH_LIM_MIN_DEG -30.00
ROLL_LIMIT_DEG 65.00
NAVL1_PERIOD 14
PTCH_RATE_D 0.000000
PTCH_RATE_I 0.212500
PTCH_RATE_IMAX 0.888889
PTCH_RATE_P 0.309954
PTCH2SRV_RLL 1
Q_ANGLE_MAX 4500
Q_ASSIST_SPEED 6
Q_ENABLE 1
Q_FRAME_CLASS 7
RALLY_INCL_HOME 0
RALLY_LIMIT_KM 5
RALLY_TOTAL 0
RC1_DZ 30
RC1_MAX 1886
RC1_MIN 1087
RC1_TRIM 1500
RC3_MAX 2000
RC3_MIN 1000
SERVO3_MIN 1000
SERVO3_MAX 2000
RLL_RATE_D 0.000000
RLL_RATE_I 0.212500
RLL_RATE_IMAX 0.888889
RLL_RATE_P 0.141009
SCHED_LOOP_RATE 300
THR_MAX 100
AIRSPEED_CRUISE 25.00
LOG_BITMASK 65534

SERVO3_FUNCTION 0

Q_TILT_ENABLE 1
Q_TILT_MASK 3
Q_VFWD_GAIN 0.1
Q_TILT_TYPE 0

SERVO12_FUNCTION 41
SERVO12_MIN 1000
SERVO12_MAX 2000
RTL_RADIUS 80
Q_RTL_MODE 1
RTL_ALTITUDE 20.00
PTCH_RATE_FF 1.407055
RLL_RATE_FF 0.552741
Loading
Loading