Skip to content

Commit 885d46c

Browse files
committed
LP-549 Make ASWA throttle threshold configurable. Add FlightModeSettings.AlwaysStabilizeWhenArmedThrottleThreshold with default value of 0.2
1 parent 28ad665 commit 885d46c

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

flight/modules/ManualControl/manualcontrol.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
#define ASSISTEDCONTROL_BRAKETHRUST_DEADBAND_FACTOR_HI 1.04f
6767

6868
#define ALWAYSTABILIZEACCESSORY_THRESHOLD 0.05f
69-
#define ALWAYSTABILIZETHROTTLE_THRESHOLD 0.2f
7069

7170
// defined handlers
7271

@@ -500,7 +499,8 @@ static void manualControlTask(void)
500499
if (alwaysStabilizedSwitch) {
501500
if (acc.AccessoryVal <= -ALWAYSTABILIZEACCESSORY_THRESHOLD) {
502501
newAlwaysStabilized = FLIGHTSTATUS_ALWAYSSTABILIZEWHENARMED_FALSE;
503-
} else if ((acc.AccessoryVal >= ALWAYSTABILIZEACCESSORY_THRESHOLD) && (cmd.Thrust >= ALWAYSTABILIZETHROTTLE_THRESHOLD)) { // && Thrust (or Throttle?) above threshold
502+
} else if ((acc.AccessoryVal >= ALWAYSTABILIZEACCESSORY_THRESHOLD) &&
503+
(cmd.Throttle >= modeSettings.AlwaysStabilizeWhenArmedThrottleThreshold)) {
504504
newAlwaysStabilized = FLIGHTSTATUS_ALWAYSSTABILIZEWHENARMED_TRUE;
505505
}
506506
} else {

shared/uavobjectdefinition/flightmodesettings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
options="Disabled,Accessory 0,Accessory 1,Accessory 2,Accessory 3"
8383
defaultvalue="Disabled"
8484
description="For Multirotors. Always stabilize no matter the throttle setting when vehicle is armed. Does not work when vehicle is set to Always Armed."/>
85-
85+
<field name="AlwaysStabilizeWhenArmedThrottleThreshold" units="%" type="float" elements="1" defaultvalue="0.2"/>
86+
8687
<field name="ArmedTimeout" units="ms" type="uint16" elements="1" defaultvalue="30000"/>
8788
<field name="ArmingSequenceTime" units="ms" type="uint16" elements="1" defaultvalue="1000"/>
8889
<field name="DisarmingSequenceTime" units="ms" type="uint16" elements="1" defaultvalue="1000"/>

0 commit comments

Comments
 (0)