diff --git a/src/modules/fw_rate_control/FixedwingRateControl.cpp b/src/modules/fw_rate_control/FixedwingRateControl.cpp index 3ae3272cfa..cce9dbd75f 100644 --- a/src/modules/fw_rate_control/FixedwingRateControl.cpp +++ b/src/modules/fw_rate_control/FixedwingRateControl.cpp @@ -394,20 +394,6 @@ void FixedwingRateControl::Run() /* throttle passed through if it is finite */ _vehicle_thrust_setpoint.xyz[0] = PX4_ISFINITE(_rates_sp.thrust_body[0]) ? _rates_sp.thrust_body[0] : 0.0f; - - /* scale effort by battery status */ - if (_param_fw_bat_scale_en.get() && _vehicle_thrust_setpoint.xyz[0] > 0.1f) { - - if (_battery_status_sub.updated()) { - battery_status_s battery_status{}; - - if (_battery_status_sub.copy(&battery_status) && battery_status.connected && battery_status.scale > 0.f) { - _battery_scale = battery_status.scale; - } - } - - _vehicle_thrust_setpoint.xyz[0] *= _battery_scale; - } } // publish rate controller status diff --git a/src/modules/fw_rate_control/FixedwingRateControl.hpp b/src/modules/fw_rate_control/FixedwingRateControl.hpp index 54cf23be00..99c5f8c9d8 100644 --- a/src/modules/fw_rate_control/FixedwingRateControl.hpp +++ b/src/modules/fw_rate_control/FixedwingRateControl.hpp @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -103,7 +102,6 @@ private: uORB::SubscriptionInterval _parameter_update_sub{ORB_ID(parameter_update), 1_s}; - uORB::Subscription _battery_status_sub{ORB_ID(battery_status)}; uORB::Subscription _manual_control_setpoint_sub{ORB_ID(manual_control_setpoint)}; uORB::Subscription _rates_sp_sub{ORB_ID(vehicle_rates_setpoint)}; uORB::Subscription _vehicle_control_mode_sub{ORB_ID(vehicle_control_mode)}; @@ -141,8 +139,6 @@ private: bool _landed{true}; - float _battery_scale{1.0f}; - float _energy_integration_time{0.0f}; float _control_energy[4] {}; float _control_prev[3] {}; @@ -173,8 +169,6 @@ private: (ParamInt) _param_fw_arsp_scale_en, - (ParamBool) _param_fw_bat_scale_en, - (ParamFloat) _param_fw_dtrim_p_vmax, (ParamFloat) _param_fw_dtrim_p_vmin, (ParamFloat) _param_fw_dtrim_r_vmax, diff --git a/src/modules/fw_rate_control/fw_rate_control_params.c b/src/modules/fw_rate_control/fw_rate_control_params.c index 8493f11c72..c0df0d500d 100644 --- a/src/modules/fw_rate_control/fw_rate_control_params.c +++ b/src/modules/fw_rate_control/fw_rate_control_params.c @@ -269,17 +269,6 @@ PARAM_DEFINE_FLOAT(FW_ACRO_Y_MAX, 90); */ PARAM_DEFINE_FLOAT(FW_ACRO_Z_MAX, 45); -/** - * Enable throttle scale by battery level - * - * This compensates for voltage drop of the battery over time by attempting to - * normalize performance across the operating range of the battery. - * - * @boolean - * @group FW Rate Control - */ -PARAM_DEFINE_INT32(FW_BAT_SCALE_EN, 0); - /** * Enable airspeed scaling *