From 7a57ac640fd384cf180589b26176f19b9d6ba61c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 19 Jan 2024 12:59:10 +1100 Subject: [PATCH] Tools: convert param files LIM_ROLL_CD -> ROLL_LIMIT_DEG --- Tools/Frame_params/Parrot_Disco/Parrot_Disco.param | 2 +- Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param | 2 +- Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm | 2 +- Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param | 2 +- Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param | 2 +- Tools/Frame_params/QuadPlanes/MFE_StriverMini.param | 2 +- Tools/Frame_params/QuadPlanes/Mugin_EV350.param | 2 +- Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param | 2 +- Tools/Frame_params/SkyWalkerX8.param | 2 +- Tools/Frame_params/SkyWalkerX8_ReverseThrust.param | 2 +- Tools/autotest/default_params/firefly.parm | 2 +- Tools/autotest/default_params/plane-jet.parm | 2 +- Tools/autotest/default_params/plane-jsbsim.parm | 2 +- Tools/autotest/default_params/plane-tailsitter.parm | 2 +- Tools/autotest/default_params/quadplane-cl84.parm | 2 +- Tools/autotest/default_params/quadplane-tilttri.parm | 2 +- Tools/autotest/default_params/quadplane-tilttrivec.parm | 2 +- Tools/autotest/default_params/quadplane-tri.parm | 2 +- Tools/autotest/default_params/quadplane.parm | 2 +- Tools/autotest/default_params/vee-gull 005.param | 2 +- Tools/autotest/models/plane-3d.parm | 2 +- Tools/autotest/models/plane.parm | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param index 0a331aa9c3..6816613423 100644 --- a/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param +++ b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param @@ -26,7 +26,7 @@ LAND_FLARE_ALT 3 LAND_FLARE_SEC 2 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -25.00 -LIM_ROLL_CD 5500 +ROLL_LIMIT_DEG 55.00 NAVL1_PERIOD 16 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.240000 diff --git a/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param b/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param index 9a20856c55..4910bb4b0b 100644 --- a/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param +++ b/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param @@ -18,7 +18,7 @@ INS_HNTCH_REF 0.337000 # fixed wing limits PITCH_LIM_MIN_DEG -20.00 -LIM_ROLL_CD 4000 +ROLL_LIMIT_DEG 40.00 LEVEL_ROLL_LIMIT 12 FBWB_CLIMB_RATE 5 diff --git a/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm b/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm index 713be45248..8bbb7069b8 100644 --- a/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm +++ b/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm @@ -14,7 +14,7 @@ AIRSPEED_CRUISE 27.00 # fixed wing limits PITCH_LIM_MAX_DEG 15.00 PITCH_LIM_MIN_DEG -15.00 -LIM_ROLL_CD 2500 +ROLL_LIMIT_DEG 25.00 # setup elevons as 75% elevator and 25% aileron MIXING_GAIN 0.25 diff --git a/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param b/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param index 1eaaa60646..d2bb18a7bc 100644 --- a/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param +++ b/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param @@ -20,7 +20,7 @@ INS_HNTCH_REF 0.337000 # fixed wing limits PITCH_LIM_MIN_DEG -20.00 -LIM_ROLL_CD 4000 +ROLL_LIMIT_DEG 40.00 LEVEL_ROLL_LIMIT 12 FBWB_CLIMB_RATE 5 diff --git a/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param b/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param index c143d73f4d..58d0a02a8d 100644 --- a/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param +++ b/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param @@ -10,7 +10,7 @@ TRIM_THROTTLE 52 # fixed wing limits PITCH_LIM_MAX_DEG 22.00 -LIM_ROLL_CD 3500 +ROLL_LIMIT_DEG 35.00 NAVL1_PERIOD 24 RTL_ALTITUDE 90.00 FBWB_CLIMB_RATE 5 diff --git a/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param b/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param index 85fa1469dc..08cb4e0055 100644 --- a/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param +++ b/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param @@ -28,7 +28,7 @@ AIRSPEED_MIN 15 # limits PITCH_LIM_MAX_DEG 20.00 PITCH_LIM_MIN_DEG -20.00 -LIM_ROLL_CD 5500 +ROLL_LIMIT_DEG 55.00 # pitch tuning PTCH_RATE_D 0.017718 diff --git a/Tools/Frame_params/QuadPlanes/Mugin_EV350.param b/Tools/Frame_params/QuadPlanes/Mugin_EV350.param index c3d8272a9e..3e6f77b468 100644 --- a/Tools/Frame_params/QuadPlanes/Mugin_EV350.param +++ b/Tools/Frame_params/QuadPlanes/Mugin_EV350.param @@ -5,7 +5,7 @@ RTL_ALTITUDE 80.00 PITCH_LIM_MAX_DEG 20.00 PITCH_LIM_MIN_DEG -20.00 -LIM_ROLL_CD 4000 +ROLL_LIMIT_DEG 40.00 NAVL1_PERIOD 17 PTCH2SRV_TCONST 0.75 RTL_RADIUS 180 diff --git a/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param b/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param index b68d619c39..901b3ac166 100644 --- a/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param +++ b/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param @@ -9,7 +9,7 @@ AIRSPEED_CRUISE 24.00 SCALING_SPEED 20 TRIM_THROTTLE 55 -LIM_ROLL_CD 5000 +ROLL_LIMIT_DEG 50.00 # fixed wing tuning RLL2SRV_RMAX 75 diff --git a/Tools/Frame_params/SkyWalkerX8.param b/Tools/Frame_params/SkyWalkerX8.param index bc9b674e26..693fc04848 100644 --- a/Tools/Frame_params/SkyWalkerX8.param +++ b/Tools/Frame_params/SkyWalkerX8.param @@ -29,7 +29,7 @@ LAND_THR_SLEW,70 LEVEL_ROLL_LIMIT,15 PITCH_LIM_MAX_DEG,15.00 PITCH_LIM_MIN_DEG,-25.00 -LIM_ROLL_CD,3500 +ROLL_LIMIT_DEG,35.00 MIN_GNDSPD_CM,600 MIXING_GAIN,0.5 NAVL1_DAMPING,0.75 diff --git a/Tools/Frame_params/SkyWalkerX8_ReverseThrust.param b/Tools/Frame_params/SkyWalkerX8_ReverseThrust.param index 6630a080bf..729ed72638 100644 --- a/Tools/Frame_params/SkyWalkerX8_ReverseThrust.param +++ b/Tools/Frame_params/SkyWalkerX8_ReverseThrust.param @@ -29,7 +29,7 @@ LAND_THR_SLEW,70 LEVEL_ROLL_LIMIT,15 PITCH_LIM_MAX_DEG,15.00 PITCH_LIM_MIN_DEG,-25.00 -LIM_ROLL_CD,3500 +ROLL_LIMIT_DEG,35.00 MIN_GNDSPD_CM,600 MIXING_GAIN,0.5 NAVL1_DAMPING,0.75 diff --git a/Tools/autotest/default_params/firefly.parm b/Tools/autotest/default_params/firefly.parm index d183ff08dc..82e2baa94e 100644 --- a/Tools/autotest/default_params/firefly.parm +++ b/Tools/autotest/default_params/firefly.parm @@ -47,7 +47,7 @@ INS_GYR_CAL 0 KFF_RDDRMIX 0.500000 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -30.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 NAVL1_PERIOD 8 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.212500 diff --git a/Tools/autotest/default_params/plane-jet.parm b/Tools/autotest/default_params/plane-jet.parm index 1931911d7e..4892f7b83d 100644 --- a/Tools/autotest/default_params/plane-jet.parm +++ b/Tools/autotest/default_params/plane-jet.parm @@ -5,7 +5,7 @@ FBWB_CLIMB_RATE 5.0000 LAND_FLARE_SEC 2.0000 PITCH_LIM_MAX_DEG 20.00 PITCH_LIM_MIN_DEG -25.00 -LIM_ROLL_CD 7000.0000 +ROLL_LIMIT_DEG 70.00 NAVL1_PERIOD 17.0000 PTCH_RATE_D 0.000000 PTCH_RATE_FF 0.690000 diff --git a/Tools/autotest/default_params/plane-jsbsim.parm b/Tools/autotest/default_params/plane-jsbsim.parm index 46485ef733..240f3c3934 100644 --- a/Tools/autotest/default_params/plane-jsbsim.parm +++ b/Tools/autotest/default_params/plane-jsbsim.parm @@ -6,7 +6,7 @@ TRIM_PITCH_DEG 0.00 TRIM_THROTTLE 50 PITCH_LIM_MIN_DEG -20.00 PITCH_LIM_MAX_DEG 25.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 LAND_DISARMDELAY 3 LAND_PITCH_CD 100 LAND_FLARE_SEC 3 diff --git a/Tools/autotest/default_params/plane-tailsitter.parm b/Tools/autotest/default_params/plane-tailsitter.parm index 0711fc831a..6ac7c09bc0 100644 --- a/Tools/autotest/default_params/plane-tailsitter.parm +++ b/Tools/autotest/default_params/plane-tailsitter.parm @@ -3,7 +3,7 @@ AIRSPEED_CRUISE 22.00 TRIM_THROTTLE 50 PITCH_LIM_MIN_DEG -20.00 PITCH_LIM_MAX_DEG 25.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 ARSPD_USE 1 AIRSPEED_MAX 30 AIRSPEED_MIN 10 diff --git a/Tools/autotest/default_params/quadplane-cl84.parm b/Tools/autotest/default_params/quadplane-cl84.parm index a777ff3198..4954b55e74 100644 --- a/Tools/autotest/default_params/quadplane-cl84.parm +++ b/Tools/autotest/default_params/quadplane-cl84.parm @@ -36,7 +36,7 @@ INS_GYR_CAL 0 KFF_RDDRMIX 0.500000 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -30.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 NAVL1_PERIOD 14 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.212500 diff --git a/Tools/autotest/default_params/quadplane-tilttri.parm b/Tools/autotest/default_params/quadplane-tilttri.parm index 65824efa54..e334fe0f0b 100644 --- a/Tools/autotest/default_params/quadplane-tilttri.parm +++ b/Tools/autotest/default_params/quadplane-tilttri.parm @@ -39,7 +39,7 @@ INS_GYR_CAL 0 KFF_RDDRMIX 0.500000 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -30.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 NAVL1_PERIOD 14 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.212500 diff --git a/Tools/autotest/default_params/quadplane-tilttrivec.parm b/Tools/autotest/default_params/quadplane-tilttrivec.parm index 4ff967e70d..c3bb6164e3 100644 --- a/Tools/autotest/default_params/quadplane-tilttrivec.parm +++ b/Tools/autotest/default_params/quadplane-tilttrivec.parm @@ -39,7 +39,7 @@ INS_GYR_CAL 0 KFF_RDDRMIX 0.500000 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -30.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 NAVL1_PERIOD 14 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.212500 diff --git a/Tools/autotest/default_params/quadplane-tri.parm b/Tools/autotest/default_params/quadplane-tri.parm index d09618bcbc..8ec35e7827 100644 --- a/Tools/autotest/default_params/quadplane-tri.parm +++ b/Tools/autotest/default_params/quadplane-tri.parm @@ -39,7 +39,7 @@ INS_GYR_CAL 0 KFF_RDDRMIX 0.500000 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -30.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 NAVL1_PERIOD 14 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.212500 diff --git a/Tools/autotest/default_params/quadplane.parm b/Tools/autotest/default_params/quadplane.parm index 9b8f1498db..999b718a29 100644 --- a/Tools/autotest/default_params/quadplane.parm +++ b/Tools/autotest/default_params/quadplane.parm @@ -37,7 +37,7 @@ INS_GYR_CAL 0 KFF_RDDRMIX 0.500000 PITCH_LIM_MAX_DEG 30.00 PITCH_LIM_MIN_DEG -30.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 NAVL1_PERIOD 14 PTCH_RATE_D 0.000000 PTCH_RATE_I 0.212500 diff --git a/Tools/autotest/default_params/vee-gull 005.param b/Tools/autotest/default_params/vee-gull 005.param index 8b9c8ea78a..7ce049cdd9 100644 --- a/Tools/autotest/default_params/vee-gull 005.param +++ b/Tools/autotest/default_params/vee-gull 005.param @@ -338,7 +338,7 @@ LAND_TYPE,0 LEVEL_ROLL_LIMIT,5 PITCH_LIM_MAX_DEG,20.00 PITCH_LIM_MIN_DEG,-25.00 -LIM_ROLL_CD,4500 +ROLL_LIMIT_DEG,45.00 LOG_BACKEND_TYPE,1 LOG_BITMASK,65535 LOG_DISARMED,0 diff --git a/Tools/autotest/models/plane-3d.parm b/Tools/autotest/models/plane-3d.parm index c56365a6ef..afb92f7c2d 100644 --- a/Tools/autotest/models/plane-3d.parm +++ b/Tools/autotest/models/plane-3d.parm @@ -30,7 +30,7 @@ TRIM_THROTTLE 30 NAVL1_PERIOD 7 AIRSPEED_CRUISE 24.00 AIRSPEED_MAX 30 -LIM_ROLL_CD 7000 +ROLL_LIMIT_DEG 70.00 # setup for scripting SCR_ENABLE 1 SCR_HEAP_SIZE 350000 diff --git a/Tools/autotest/models/plane.parm b/Tools/autotest/models/plane.parm index 0600c55d8f..1a82c70bba 100644 --- a/Tools/autotest/models/plane.parm +++ b/Tools/autotest/models/plane.parm @@ -6,7 +6,7 @@ TRIM_PITCH_DEG 0.00 TRIM_THROTTLE 50 PITCH_LIM_MIN_DEG -20.00 PITCH_LIM_MAX_DEG 25.00 -LIM_ROLL_CD 6500 +ROLL_LIMIT_DEG 65.00 LAND_PITCH_CD 100 LAND_FLARE_SEC 3 ARSPD_USE 1