keep AUTOPILOT_OFF event

flybywiresim · Jan 3, 2025 · ed8aaa4 · ed8aaa4
1 parent 6bf113d
commit ed8aaa4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 27 deletions.
diff --git a/fbw-a32nx/src/behavior/src/A32NX_Interior_Misc.xml b/fbw-a32nx/src/behavior/src/A32NX_Interior_Misc.xml
@@ -368,6 +368,7 @@
             <UseTemplate Name="ASOBO_GT_Push_Button_Held">
                 <TOOLTIPID>%((L:A32NX_AUTOPILOT_ACTIVE, Bool))%{if}Disc. Autopilot%{else}Take priority%{end}</TOOLTIPID>
                 <LEFT_SINGLE_CODE>
+                    (&gt;K:AUTOPILOT_OFF)
                     1 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
                 </LEFT_SINGLE_CODE>
                 <LEFT_LEAVE_CODE>

diff --git a/fbw-a32nx/src/systems/systems-host/systems/FWC/PseudoFWC.ts b/fbw-a32nx/src/systems/systems-host/systems/FWC/PseudoFWC.ts
@@ -125,7 +125,6 @@ export class PseudoFWC {
   public readonly recallButtonInputBuffer = new NXLogicMemoryNode(false);
   public readonly aThrDiscInputBuffer = new NXLogicMemoryNode(false);
   public readonly apDiscInputBuffer = new NXLogicMemoryNode(false);
-  public readonly takeoverPbInputBuffer = new NXLogicMemoryNode(false);
 
   /* PSEUDO FWC VARIABLES */
   private readonly startupTimer = new DebounceTimer();
@@ -1264,13 +1263,6 @@ export class PseudoFWC {
       this.recallButtonInputBuffer.write(true, false);
     }
 
-    if (
-      SimVar.GetSimVarValue('L:A32NX_PRIORITY_TAKEOVER:1', SimVarValueType.Bool) ||
-      SimVar.GetSimVarValue('L:A32NX_PRIORITY_TAKEOVER:2', SimVarValueType.Bool)
-    ) {
-      this.takeoverPbInputBuffer.write(true, false);
-    }
-
     // Enforce cycle time for the logic computation (otherwise pulse nodes would be broken)
     if (deltaTime === -1 || _deltaTime === 0) {
       return;
@@ -1285,10 +1277,7 @@ export class PseudoFWC {
     this.clr2PulseNode.write(this.clearButtonInputBuffer.read(), deltaTime);
     this.rclUpPulseNode.write(this.recallButtonInputBuffer.read(), deltaTime);
     this.autoThrustInstinctiveDiscPressed.write(this.aThrDiscInputBuffer.read(), deltaTime);
-    this.autoPilotInstinctiveDiscPressedPulse.write(
-      this.apDiscInputBuffer.read() || this.takeoverPbInputBuffer.read(),
-      deltaTime,
-    );
+    this.autoPilotInstinctiveDiscPressedPulse.write(this.apDiscInputBuffer.read(), deltaTime);
 
     // Inputs update
     this.flightPhaseEndedPulseNode.write(false, deltaTime);
@@ -2915,7 +2904,6 @@ export class PseudoFWC {
     this.recallButtonInputBuffer.write(false, true);
     this.aThrDiscInputBuffer.write(false, true);
     this.apDiscInputBuffer.write(false, true);
-    this.takeoverPbInputBuffer.write(false, true);
     this.autoPilotInstinctiveDiscCountSinceLastFwsCycle = 0;
   }
 

diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp b/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp
@@ -1736,7 +1736,7 @@ bool FlyByWireInterface::updateFmgc(double sampleTime, int fmgcIndex) {
   fmgcs[fmgcIndex].modelInputs.in.sim_data.tailstrike_protection_on = tailstrikeProtectionEnabled;
 
   bool athr_instinctive_disc = simConnectInterface.getSimInputThrottles().ATHR_disconnect || idAutothrustDisconnect->get() == 1;
-  bool ap_instinctive_disc = simInputAutopilot.AP_disconnect || idCaptPriorityButtonPressed->get() || idFoPriorityButtonPressed->get();
+  bool ap_instinctive_disc = simInputAutopilot.AP_disconnect;
 
   fmgcs[fmgcIndex].modelInputs.in.discrete_inputs.is_unit_1 = fmgcIndex == 0;
   fmgcs[fmgcIndex].modelInputs.in.discrete_inputs.athr_opp_engaged = fmgcsDiscreteOutputs[oppFmgcIndex].athr_own_engaged;

diff --git a/...cts/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_Misc.xml b/...cts/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_Misc.xml
@@ -382,6 +382,7 @@
             <UseTemplate Name="ASOBO_GT_Push_Button_Held">
                 <TOOLTIPID>%((L:A32NX_AUTOPILOT_ACTIVE, Bool))%{if}Disc. Autopilot%{else}Take priority%{end}</TOOLTIPID>
                 <LEFT_SINGLE_CODE>
+                    (&gt;K:AUTOPILOT_OFF)
                     1 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
                 </LEFT_SINGLE_CODE>
                 <LEFT_LEAVE_CODE>

diff --git a/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts b/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts
@@ -206,7 +206,6 @@ export class FwsCore {
   public readonly clDownInputBuffer = new NXLogicMemoryNode(false);
   public readonly aThrDiscInputBuffer = new NXLogicMemoryNode(false);
   public readonly apDiscInputBuffer = new NXLogicMemoryNode(false);
-  public readonly takeoverPbInputBuffer = new NXLogicMemoryNode(false);
 
   /* PSEUDO FWC VARIABLES */
 
@@ -1817,13 +1816,6 @@ export class FwsCore {
       this.clDownInputBuffer.write(true, false);
     }
 
-    if (
-      SimVar.GetSimVarValue('L:A32NX_PRIORITY_TAKEOVER:1', SimVarValueType.Bool) ||
-      SimVar.GetSimVarValue('L:A32NX_PRIORITY_TAKEOVER:2', SimVarValueType.Bool)
-    ) {
-      this.takeoverPbInputBuffer.write(true, false);
-    }
-
     // Enforce cycle time for the logic computation (otherwise pulse nodes would be broken)
     if (deltaTime === -1 || _deltaTime === 0) {
       return;
@@ -1847,10 +1839,7 @@ export class FwsCore {
     this.clUpPulseNode.write(this.clUpInputBuffer.read(), deltaTime);
     this.clDownPulseNode.write(this.clDownInputBuffer.read(), deltaTime);
     this.autoThrustInstinctiveDiscPressed.write(this.aThrDiscInputBuffer.read(), deltaTime);
-    this.autoPilotInstinctiveDiscPressedPulse.write(
-      this.apDiscInputBuffer.read() || this.takeoverPbInputBuffer.read(),
-      deltaTime,
-    );
+    this.autoPilotInstinctiveDiscPressedPulse.write(this.apDiscInputBuffer.read(), deltaTime);
 
     // Inputs update
     this.flightPhaseEndedPulseNode.write(false, deltaTime);
@@ -4154,7 +4143,6 @@ export class FwsCore {
     this.clDownInputBuffer.write(false, true);
     this.aThrDiscInputBuffer.write(false, true);
     this.apDiscInputBuffer.write(false, true);
-    this.takeoverPbInputBuffer.write(false, true);
     this.autoPilotInstinctiveDiscCountSinceLastFwsCycle = 0;
   }