fix(a380/fws): refuel panel door event (#9857)

flybywiresim · Feb 13, 2025 · 93e994a · 93e994a
1 parent df1324b
commit 93e994a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 155 deletions.
diff --git a/...0x/src/systems/instruments/src/MsfsAvionicsCommon/providers/InteractivePointsPublisher.ts b/...0x/src/systems/instruments/src/MsfsAvionicsCommon/providers/InteractivePointsPublisher.ts
diff --git a/fbw-a380x/src/systems/systems-host/index.ts b/fbw-a380x/src/systems/systems-host/index.ts
@@ -24,6 +24,7 @@ import {
   ArincEventBus,
   BtvSimvarPublisher,
   FailuresConsumer,
+  MsfsFlightModelPublisher,
   PilotSeatPublisher,
   VhfComIndices,
 } from '@flybywiresim/fbw-sdk';
@@ -46,7 +47,6 @@ import {
   CpiomAvailableSimvars,
 } from 'instruments/src/MsfsAvionicsCommon/providers/CpiomAvailablePublisher';
 import { A380Failure } from '@failures';
-import { InteractivePointsPublisher } from 'instruments/src/MsfsAvionicsCommon/providers/InteractivePointsPublisher';
 
 CpiomAvailableSimvarPublisher;
 class SystemsHost extends BaseInstrument {
@@ -116,7 +116,7 @@ class SystemsHost extends BaseInstrument {
 
   private readonly cpiomAvailablePublisher = new CpiomAvailableSimvarPublisher(this.bus);
 
-  private readonly interactivePointsPublisher = new InteractivePointsPublisher(this.bus);
+  private readonly interactivePointsPublisher = new MsfsFlightModelPublisher(this.bus);
 
   private readonly fws1ResetPbStatus = ConsumerSubject.create(this.sub.on('a380x_reset_panel_fws1'), false);
   private readonly fws2ResetPbStatus = ConsumerSubject.create(this.sub.on('a380x_reset_panel_fws2'), false);

diff --git a/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts b/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts
@@ -29,6 +29,7 @@ import {
   Arinc429Word,
   FailuresConsumer,
   FrequencyMode,
+  MsfsFlightModelEvents,
   NXLogicConfirmNode,
   NXLogicMemoryNode,
   NXLogicPulseNode,
@@ -61,7 +62,6 @@ import { Mle, Mmo, VfeF1, VfeF1F, VfeF2, VfeF3, VfeFF, Vle, Vmo } from '@shared/
 import { FwsAuralVolume, FwsSoundManager } from 'systems-host/systems/FlightWarningSystem/FwsSoundManager';
 import { FwcFlightPhase, FwsFlightPhases } from 'systems-host/systems/FlightWarningSystem/FwsFlightPhases';
 import { A380Failure } from '@failures';
-import { InteractivePointEvents } from 'instruments/src/MsfsAvionicsCommon/providers/InteractivePointsPublisher';
 import { FuelSystemEvents } from 'instruments/src/MsfsAvionicsCommon/providers/FuelSystemPublisher';
 
 export function xor(a: boolean, b: boolean): boolean {
@@ -86,7 +86,7 @@ export enum FwcAuralWarning {
 
 export class FwsCore {
   public readonly sub = this.bus.getSubscriber<
-    PseudoFwcSimvars & StallWarningEvents & MfdSurvEvents & FuelSystemEvents & KeyEvents & InteractivePointEvents
+    PseudoFwcSimvars & StallWarningEvents & MfdSurvEvents & FuelSystemEvents & KeyEvents & MsfsFlightModelEvents
   >();
 
   private subs: Subscription[] = [];
@@ -964,7 +964,7 @@ export class FwsCore {
 
   private readonly fuelOnBoard = ConsumerSubject.create(this.sub.on('fuel_on_board'), 0);
 
-  private readonly refuelPanel = ConsumerSubject.create(this.sub.on('interactive_point_open_18'), 0);
+  private readonly refuelPanel = ConsumerSubject.create(this.sub.on('msfs_interactive_point_open_18'), 0);
 
   private readonly fuelingInitiated = ConsumerSubject.create(this.sub.on('fuel_refuel_started_by_user'), false);
 
@@ -1730,8 +1730,6 @@ export class FwsCore {
       ),
     );
 
-    SimVar.SetSimVarValue('L:A32NX_STATUS_LEFT_LINE_8', 'string', '000000001');
-
     const ecamMemoKeys = Object.keys(EcamMemos);
     Object.keys(this.memos.ewdToLdgMemos).forEach((key) => {
       this.memos.ewdToLdgMemos[key].codesToReturn.forEach((code) => {

diff --git a/fbw-a380x/src/systems/systems-host/systems/FuelSystemPublisher.ts b/fbw-a380x/src/systems/systems-host/systems/FuelSystemPublisher.ts