some more fixes

flybywiresim · Dec 22, 2024 · 8f22271 · 8f22271
1 parent 157db97
commit 8f22271
Show file tree

Hide file tree

Showing 13 changed files with 397 additions and 138 deletions.
diff --git a/fbw-a380x/src/systems/instruments/src/EWD/elements/WdNormalChecklists.tsx b/fbw-a380x/src/systems/instruments/src/EWD/elements/WdNormalChecklists.tsx
@@ -183,7 +183,6 @@ export class WdNormalChecklists extends WdAbstractChecklistComponent {
         originalItemIndex: SPECIAL_INDEX_DEFERRED_PAGE_CLEAR,
       });
     }
-    console.log(this.activeDeferredProcedureId.get(), this.activeLine.get());
     super.updateChecklists();
   }
 

diff --git a/...rc/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata21-22-23.tsx b/...rc/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata21-22-23.tsx
@@ -254,50 +254,44 @@ export const EcamAbnormalSensedAta212223: { [n: number]: AbnormalProcedure } = {
         name: 'DESCENT TO FL 100/MEA-MORA',
         sensed: false,
         labelNotCompleted: 'INITIATE',
-        level: 1,
       },
       {
         name: 'MAX FL : 100/MEA-MORA',
         sensed: true,
         style: ChecklistLineStyle.Cyan,
-        level: 1,
       },
       {
-        name: 'WHEN DIFF PRESS < 2 PSI & FL < 100/MEA-MORA :',
+        name: 'WHEN DIFF PRESS<2PSI & FL<100/MEA-MORA :',
         sensed: true,
         condition: true,
-        level: 1,
       },
       {
         name: 'RAM AIR:',
         sensed: true,
         labelNotCompleted: 'ON',
-        level: 2,
+        level: 1,
       },
       {
         name: 'CABIN AIR EXTRACT',
         sensed: true,
         labelNotCompleted: 'OVRD',
-        level: 2,
+        level: 1,
       },
       // In flight, if below FL 100
       {
         name: 'MAX FL : 100/MEA-MORA',
         sensed: true,
         style: ChecklistLineStyle.Cyan,
-        level: 1,
       },
       {
         name: 'RAM AIR:',
         sensed: true,
         labelNotCompleted: 'ON',
-        level: 1,
       },
       {
         name: 'CABIN AIR EXTRACT',
         sensed: true,
         labelNotCompleted: 'OVRD',
-        level: 1,
       },
     ],
   },
@@ -2128,7 +2122,7 @@ export const EcamAbnormalSensedAta212223: { [n: number]: AbnormalProcedure } = {
 
 export const EcamDeferredProcAta212223: { [n: number]: DeferredProcedure } = {
   210700001: {
-    fromAbnormalProc: '211800021',
+    fromAbnormalProcs: ['211800021'],
     title: 'WHEN PACK OVHT OUT',
     type: DeferredProcedureType.ALL_PHASES,
     items: [
@@ -2145,7 +2139,7 @@ export const EcamDeferredProcAta212223: { [n: number]: DeferredProcedure } = {
     ],
   },
   210700002: {
-    fromAbnormalProc: '211800021',
+    fromAbnormalProcs: ['211800021'],
     title: 'WHEN DIFF PR<2 PSI & FL<100/MEA-MORA',
     type: DeferredProcedureType.ALL_PHASES,
     items: [
@@ -2162,7 +2156,7 @@ export const EcamDeferredProcAta212223: { [n: number]: DeferredProcedure } = {
     ],
   },
   221700001: {
-    fromAbnormalProc: '221800006',
+    fromAbnormalProcs: ['221800006'],
     title: 'LDG ELEVN',
     type: DeferredProcedureType.AT_TOP_OF_DESCENT,
     items: [

diff --git a/...380x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata24.tsx b/...380x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata24.tsx
@@ -37,7 +37,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800003: {
-    title: '\x1b<4m\x1b4mELEC\x1bm AC BUS 1+2 & DC BUS 1 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mAC BUS 1+2 & DC BUS 1 FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -120,7 +120,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800005: {
-    title: '\x1b<4m\x1b4mELEC\x1bm AC BUS 2+3 & DC BUS 1+2 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mAC BUS 2+3 & DC BUS 1+2 FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -323,7 +323,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800006: {
-    title: '\x1b<4m\x1b4mELEC\x1bm AC BUS 2+4 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mAC BUS 2+4 FAULT\x1bm",
     sensed: true,
     items: [
       // after landing
@@ -540,7 +540,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800008: {
-    title: '\x1b<4m\x1b4mELEC\x1bm AC BUS 3+4 & DC BUS 2 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mAC BUS 3+4 & DC BUS 2 FAULT\x1bm",
     sensed: true,
     items: [
       // in flight
@@ -892,7 +892,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     items: [],
   },
   240800026: {
-    title: '\x1b<4m\x1b4mELEC\x1bm DC BUS 1 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mDC BUS 1 FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -955,7 +955,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800027: {
-    title: '\x1b<4m\x1b4mELEC\x1bm DC BUS 1 +2 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mDC BUS 1+2 FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -1068,7 +1068,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800028: {
-    title: '\x1b<4m\x1b4mELEC\x1bm DC BUS 1+ESS FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mDC BUS 1+ESS FAULT\x1bm",
     recommendation: 'LAND ANSA',
     sensed: true,
     items: [
@@ -1171,7 +1171,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800029: {
-    title: '\x1b<4m\x1b4mELEC\x1bm DC BUS 2 FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mDC BUS 2 FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -1237,7 +1237,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800030: {
-    title: '\x1b<4m\x1b4mELEC\x1bm DC ESS BUS FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mDC ESS BUS FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -1342,7 +1342,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     ],
   },
   240800031: {
-    title: '\x1b<4m\x1b4mELEC\x1bm DC ESS BUS PART FAULT',
+    title: "\x1b<4m\x1b4mELEC\x1bm \x1b'mDC ESS BUS PART FAULT\x1bm",
     sensed: true,
     items: [
       {
@@ -1691,7 +1691,7 @@ export const EcamAbnormalSensedAta24: { [n: number]: AbnormalProcedure } = {
     items: [],
   },
   240800055: {
-    title: '\x1b<2m\x1b4mELEC\x1bm EMER CONFIG',
+    title: "\x1b<2m\x1b4mELEC\x1bm \x1b'mEMER CONFIG\x1bm",
     sensed: true,
     recommendation: 'LAND ASAP',
     items: [

diff --git a/...x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata29-30.tsx b/...x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata29-30.tsx
@@ -470,7 +470,7 @@ export const EcamAbnormalSensedAta2930: { [n: number]: AbnormalProcedure } = {
     items: [],
   },
   290800035: {
-    title: '\x1b<4m\x1b4mHYD\x1bm G SYS PRESS LO',
+    title: "\x1b<4m\x1b4mHYD\x1bm \x1b'mG SYS PRESS LO\x1bm",
     sensed: true,
     items: [
       {
@@ -511,7 +511,7 @@ export const EcamAbnormalSensedAta2930: { [n: number]: AbnormalProcedure } = {
     ],
   },
   290800036: {
-    title: '\x1b<4m\x1b4mHYD\x1bm Y SYS PRESS LO',
+    title: "\x1b<4m\x1b4mHYD\x1bm \x1b'mY SYS PRESS LO\x1bm",
     sensed: true,
     items: [
       {
@@ -607,7 +607,7 @@ export const EcamAbnormalSensedAta2930: { [n: number]: AbnormalProcedure } = {
     ],
   },
   290800039: {
-    title: '\x1b<4m\x1b4mHYD\x1bm G+Y SYS PRESS LO',
+    title: "\x1b<4m\x1b4mHYD\x1bm \x1b'mG+Y SYS PRESS LO\x1bm",
     sensed: true,
     items: [
       {

diff --git a/...rc/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata31-32-33.tsx b/...rc/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata31-32-33.tsx
@@ -1,7 +1,12 @@
 // Copyright (c) 2024 FlyByWire Simulations
 // SPDX-License-Identifier: GPL-3.0
 
-import { AbnormalProcedure, ChecklistLineStyle } from 'instruments/src/MsfsAvionicsCommon/EcamMessages';
+import {
+  AbnormalProcedure,
+  ChecklistLineStyle,
+  DeferredProcedure,
+  DeferredProcedureType,
+} from 'instruments/src/MsfsAvionicsCommon/EcamMessages';
 
 // Convention for IDs:
 // First two digits: ATA chapter
@@ -1138,3 +1143,38 @@ export const EcamAbnormalSensedAta313233: { [n: number]: AbnormalProcedure } = {
     items: [], // TODO
   },
 };
+
+export const EcamDeferredProcAta313233: { [n: number]: DeferredProcedure } = {
+  320700001: {
+    fromAbnormalProcs: ['290800035', '290800036', '290800039'],
+    title: 'L/G GRVTY EXTN',
+    type: DeferredProcedureType.FOR_LANDING,
+    items: [
+      {
+        name: 'FOR L/G GRVTY EXTN: MAX SPEED 220 KT',
+        sensed: false,
+      },
+      {
+        name: 'L/G LEVER',
+        sensed: true,
+        labelNotCompleted: 'UP',
+      },
+      {
+        name: 'L/G GRVTY (EXTN MAX 2 MIN)',
+        sensed: true,
+        labelNotCompleted: 'DOWN',
+      },
+      {
+        name: 'WHEN L/G LOCKED DOWN OR AFTER 120S',
+        condition: true,
+        sensed: true,
+      },
+      {
+        name: 'L/G LEVER',
+        sensed: true,
+        labelNotCompleted: 'DOWN',
+        level: 1,
+      },
+    ],
+  },
+};
diff --git a/...380x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata34.tsx b/...380x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata34.tsx
@@ -812,7 +812,7 @@ export const EcamAbnormalSensedAta34: { [n: number]: AbnormalProcedure } = {
 
 export const EcamDeferredProcAta34: { [n: number]: DeferredProcedure } = {
   340700001: {
-    fromAbnormalProc: '340800008',
+    fromAbnormalProcs: ['340800008'],
     title: '\x1b<4mLDG ELEVN',
     type: DeferredProcedureType.AT_TOP_OF_DESCENT,
     items: [],

diff --git a/...380x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata70.tsx b/...380x/src/systems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/ata70.tsx
@@ -560,22 +560,22 @@ export const EcamAbnormalSensedAta70: { [n: number]: AbnormalProcedure } = {
     items: [],
   },
   701800109: {
-    title: '\x1b<4m\x1b4mENG\x1bm 1 SHUT DOWN',
+    title: "\x1b<4m\x1b4mENG\x1bm \x1b'm1 SHUT DOWN\x1bm",
     sensed: true,
     items: [],
   },
   701800110: {
-    title: '\x1b<4m\x1b4mENG\x1bm 2 SHUT DOWN',
+    title: "\x1b<4m\x1b4mENG\x1bm \x1b'm2 SHUT DOWN\x1bm",
     sensed: true,
     items: [],
   },
   701800111: {
-    title: '\x1b<4m\x1b4mENG\x1bm 3 SHUT DOWN',
+    title: "\x1b<4m\x1b4mENG\x1bm \x1b'm3 SHUT DOWN\x1bm",
     sensed: true,
     items: [],
   },
   701800112: {
-    title: '\x1b<4m\x1b4mENG\x1bm 4 SHUT DOWN',
+    title: "\x1b<4m\x1b4mENG\x1bm \x1b'm4 SHUT DOWN\x1bm",
     sensed: true,
     items: [],
   },
@@ -810,12 +810,12 @@ export const EcamAbnormalSensedAta70: { [n: number]: AbnormalProcedure } = {
     items: [],
   },
   701800159: {
-    title: '\x1b<4m\x1b4mENG\x1bm TWO ENG OUT ON SAME SIDE',
+    title: "\x1b<4m\x1b4mENG\x1bm \x1b'mTWO ENG OUT ON SAME SIDE\x1bm",
     sensed: true,
     items: [],
   },
   701800160: {
-    title: '\x1b<4m\x1b4mENG\x1bm TWO ENG OUT ON OPPOSITE SIDE',
+    title: "\x1b<4m\x1b4mENG\x1bm \x1b'mTWO ENG OUT ON OPPOSITE SIDE\x1bm",
     sensed: true,
     items: [],
   },

diff --git a/...ems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/secondary-failures.tsx b/...ems/instruments/src/MsfsAvionicsCommon/EcamMessages/AbnormalSensed/secondary-failures.tsx
@@ -0,0 +1,57 @@
+// Copyright (c) 2024 FlyByWire Simulations
+// SPDX-License-Identifier: GPL-3.0
+
+import { AbnormalProcedure } from 'instruments/src/MsfsAvionicsCommon/EcamMessages';
+
+// Convention for IDs:
+// First two digits: ATA chapter
+// Third digit: Sub chapter, if needed
+// Fourth digit:
+//    0 for MEMOs,
+//    1 for normal checklists,
+//    2 for infos,
+//    3 for INOP SYS,
+//    4 for limitations,
+//    7 for deferred procedures,
+//    8 for ABN sensed procedures,
+//    9 for ABN non-sensed procedures
+
+export const EcamAbnormalSecondaryFailures: { [n: number]: AbnormalProcedure } = {
+  999800001: {
+    title: '\x1b<4m*F/CTL',
+    sensed: true,
+    items: [],
+  },
+  999800002: {
+    title: '\x1b<4m*FUEL',
+    sensed: true,
+    items: [],
+  },
+  999800003: {
+    title: '\x1b<4m*WHEEL',
+    sensed: true,
+    items: [],
+  },
+  999800004: {
+    // AC
+    title: '\x1b<4m*ELEC',
+    sensed: true,
+    items: [],
+  },
+  999800005: {
+    // DC
+    title: '\x1b<4m*ELEC',
+    sensed: true,
+    items: [],
+  },
+  999800006: {
+    title: '\x1b<4m*BLEED',
+    sensed: true,
+    items: [],
+  },
+  999800007: {
+    title: '\x1b<4m*HYD',
+    sensed: true,
+    items: [],
+  },
+};
-Original file line number
+Diff line change
@@ Expand Up @@
             originalItemIndex: SPECIAL_INDEX_DEFERRED_PAGE_CLEAR,
           });
         }
-        console.log(this.activeDeferredProcedureId.get(), this.activeLine.get());
         super.updateChecklists();
       }
@@ Expand Down @@