diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane b/ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane index 3c40be1514..319c9d16ed 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane @@ -13,8 +13,6 @@ param set-default FW_LND_ANG 8 param set-default FW_L1_PERIOD 12 -param set-default FW_MAN_P_MAX 30 - param set-default FW_PR_P 0.9 param set-default FW_PR_FF 0.2 param set-default FW_PSP_OFF 2 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1037_believer b/ROMFS/px4fmu_common/init.d-posix/airframes/1037_believer index d836ca8873..0e3593d762 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/1037_believer +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1037_believer @@ -13,8 +13,6 @@ param set-default FW_LND_ANG 8 param set-default FW_L1_PERIOD 12 -param set-default FW_MAN_P_MAX 30 - param set-default FW_PR_P 0.9 param set-default FW_PR_FF 0.2 param set-default FW_PSP_OFF 2 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol b/ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol index 1b67a5fa66..9b4d01e091 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol @@ -49,7 +49,6 @@ param set-default PWM_MAIN_FUNC7 202 param set-default PWM_MAIN_FUNC8 203 param set-default FW_L1_PERIOD 12 -param set-default FW_MAN_P_MAX 30 param set-default FW_PR_FF 0.2 param set-default FW_PR_P 0.9 param set-default FW_PSP_OFF 2 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter b/ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter index ac62a455d4..19a0a78cca 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter @@ -44,7 +44,6 @@ param set-default PWM_MAIN_FUNC7 202 param set-default PWM_MAIN_REV 96 # invert both elevons param set-default FW_L1_PERIOD 12 -param set-default FW_MAN_P_MAX 30 param set-default FW_PR_I 0.2 param set-default FW_PR_P 0.2 param set-default FW_PSP_OFF 2 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor b/ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor index 22017105b2..c6bacdd2c9 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor @@ -56,7 +56,6 @@ param set-default PWM_MAIN_FUNC10 202 param set-default PWM_MAIN_FUNC11 203 param set-default FW_L1_PERIOD 12 -param set-default FW_MAN_P_MAX 30 param set-default FW_PR_FF 0.2 param set-default FW_PR_P 0.9 param set-default FW_PSP_OFF 2 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1043_standard_vtol_drop b/ROMFS/px4fmu_common/init.d-posix/airframes/1043_standard_vtol_drop index cd4b5b90e2..739a6c22b5 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/1043_standard_vtol_drop +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1043_standard_vtol_drop @@ -8,7 +8,6 @@ . ${R}etc/init.d/rc.vtol_defaults param set-default FW_L1_PERIOD 12 -param set-default FW_MAN_P_MAX 30 param set-default FW_PR_FF 0.2 param set-default FW_PR_P 0.9 param set-default FW_PSP_OFF 2 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1 b/ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1 index bc83aaad7d..0a4a023144 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1 +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1 @@ -38,7 +38,6 @@ param set-default FW_P_LIM_MAX 25 param set-default FW_P_LIM_MIN -5 param set-default FW_R_LIM 30 -param set-default FW_MAN_P_MAX 30.0 param set-default FW_MAN_R_MAX 30.0 param set-default FW_THR_TRIM 0.8 diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/17002_tf-g2 b/ROMFS/px4fmu_common/init.d-posix/airframes/17002_tf-g2 index e593991ae8..a8c64e3651 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/17002_tf-g2 +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/17002_tf-g2 @@ -44,7 +44,6 @@ param set-default FW_P_LIM_MAX 25 param set-default FW_P_LIM_MIN -5 param set-default FW_R_LIM 30 -param set-default FW_MAN_P_MAX 30.0 param set-default FW_MAN_R_MAX 30.0 param set-default FW_THR_CRUISE 0.8 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad index 31e7e0b0f6..ea53dc3d65 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad +++ b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad @@ -55,7 +55,6 @@ param set-default FW_T_SINK_MIN 1 param set-default FW_T_VERT_ACC 6 param set-default FW_THR_TRIM 0.70 param set-default FW_THR_SLEW_MAX 1 -param set-default FW_MAN_P_MAX 30 param set-default FW_P_LIM_MAX 15 param set-default FW_P_LIM_MIN -25 param set-default FW_P_RMAX_NEG 45 diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark index caaa5d2eaa..8503ac2586 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark +++ b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark @@ -31,7 +31,6 @@ param set-default FW_AIRSPD_MAX 30 param set-default FW_AIRSPD_MIN 19 param set-default FW_AIRSPD_TRIM 23 param set-default FW_L1_R_SLEW_MAX 40 -param set-default FW_MAN_P_MAX 30 param set-default FW_PSP_OFF 3 param set-default FW_P_LIM_MAX 18 param set-default FW_P_LIM_MIN -25 diff --git a/src/modules/fw_att_control/fw_att_control_params.c b/src/modules/fw_att_control/fw_att_control_params.c index f99e5cbe6a..b039f6c69b 100644 --- a/src/modules/fw_att_control/fw_att_control_params.c +++ b/src/modules/fw_att_control/fw_att_control_params.c @@ -455,7 +455,7 @@ PARAM_DEFINE_FLOAT(FW_MAN_R_MAX, 45.0f); * @increment 0.5 * @group FW Attitude Control */ -PARAM_DEFINE_FLOAT(FW_MAN_P_MAX, 45.0f); +PARAM_DEFINE_FLOAT(FW_MAN_P_MAX, 30.0f); /** * Flaps setting during take-off