Skip to content

Commit

Permalink
AP_Motors: support for making use of heading correction on ground sel…
Browse files Browse the repository at this point in the history
…ectable

change heli rotors turning on ground yaw behavior
Make use of heading correction on ground selectable for tradheli
  • Loading branch information
bnsgeyer committed Dec 4, 2024
1 parent 2a3dc4b commit 0add4ef
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions libraries/AP_Motors/AP_MotorsHeli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ const AP_Param::GroupInfo AP_MotorsHeli::var_info[] = {
// @Param: OPTIONS
// @DisplayName: Heli_Options
// @Description: Bitmask of heli options. Bit 0 changes how the pitch, roll, and yaw axis integrator term is managed for low speed and takeoff/landing. In AC 4.0 and earlier, scheme uses a leaky integrator for ground speeds less than 5 m/s and won't let the steady state integrator build above ILMI. The integrator is allowed to build to the ILMI value when it is landed. The other integrator management scheme bases integrator limiting on takeoff and landing. Whenever the aircraft is landed the integrator is set to zero. When the aicraft is airborne, the integrator is only limited by IMAX.
// @Bitmask: 0:Use Leaky I
// @Bitmask: 0:Use Leaky I, 1:Heading Error Correction On-Ground
// @User: Standard
AP_GROUPINFO("OPTIONS", 28, AP_MotorsHeli, _heli_options, (uint8_t)HeliOption::USE_LEAKY_I),
AP_GROUPINFO("OPTIONS", 28, AP_MotorsHeli, _heli_options, (uint8_t)HeliOption::USE_LEAKY_I + (uint8_t)HeliOption::USE_HDG_CORRECTION),

// @Param: COL_ANG_MIN
// @DisplayName: Collective Blade Pitch Angle Minimum
Expand Down
8 changes: 6 additions & 2 deletions libraries/AP_Motors/AP_MotorsHeli.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,15 @@ class AP_MotorsHeli : public AP_Motors {

// enum for heli optional features
enum class HeliOption {
USE_LEAKY_I = (1<<0), // 1
USE_LEAKY_I = (1<<0),
USE_HDG_CORRECTION = (1<<1),
};

// use leaking integrator management scheme
bool using_leaky_integrator() const { return heli_option(HeliOption::USE_LEAKY_I); }
bool using_leaky_integrator() const override { return heli_option(HeliOption::USE_LEAKY_I); }

// use heading error correction
bool using_hdg_error_correction() const override { return heli_option(HeliOption::USE_HDG_CORRECTION); }

// Run arming checks
bool arming_checks(size_t buflen, char *buffer) const override;
Expand Down
4 changes: 4 additions & 0 deletions libraries/AP_Motors/AP_Motors_Class.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ class AP_Motors {
// This function required for tradheli. Tradheli initializes targets when going from unarmed to armed state.
// This function is overriden in motors_heli class. Always true for multicopters.
virtual bool init_targets_on_arming() const { return true; }
// use leaking integrator management scheme is always false for multirotors
virtual bool using_leaky_integrator() const { return false; }
// use heading error correction which is always true for multirotors
virtual bool using_hdg_error_correction() const { return true; }

// returns true if the configured PWM type is digital and should have fixed endpoints
bool is_digital_pwm_type() const;
Expand Down

0 comments on commit 0add4ef

Please sign in to comment.