update conflict files: overview, flight widget

fix fix fix port-back fix fix
flybywiresim · Feb 19, 2024 · 8f8b1e5 · 8f8b1e5
1 parent 1e3f0f0
commit 8f8b1e5
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 26 deletions.
diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx
@@ -6,15 +6,13 @@
 import React, { useState } from 'react';
 import { IconPlane } from '@tabler/icons';
 import { CloudArrowDown } from 'react-bootstrap-icons';
-import { AircraftType, usePersistentProperty, useSimVar } from '@flybywiresim/fbw-sdk';
+import { usePersistentProperty, useSimVar } from '@flybywiresim/fbw-sdk';
 import { toast } from 'react-toastify';
 import { fetchSimbriefDataAction, isSimbriefDataLoaded } from '../../Store/features/simBrief';
 import { useAppSelector, useAppDispatch } from '../../Store/store';
 
 import { ScrollableContainer } from '../../UtilComponents/ScrollableContainer';
 import { t } from '../../translation';
-import { getAirframeType } from '../../Efb';
-import { AC_TYPE } from '../../Enum/Airframe';
 
 interface InformationEntryProps {
     title: string;
@@ -138,7 +136,7 @@ export const FlightWidget = () => {
                         {' '}
                         |
                         {' '}
-                        {(airframe !== null ? AC_TYPE[airframe] : 'A320-251N')}
+                        {'A320-251N'}
                     </h1>
                 )}
             </div>

diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Dispatch/Pages/OverviewPage.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Dispatch/Pages/OverviewPage.tsx
@@ -2,17 +2,19 @@
 //
 // SPDX-License-Identifier: GPL-3.0
 import React from 'react';
+import { AircraftType, useSimVar } from '@flybywiresim/fbw-sdk';
 import { A320Overview } from 'instruments/src/EFB/Dispatch/Pages/Overview/A320_251N/A320Overview';
 import { A380Overview } from 'instruments/src/EFB/Dispatch/Pages/Overview/A380_842/A380Overview';
-import { getAirframeType } from '../../Efb';
 
 export const OverviewPage = () => {
-    switch (getAirframeType()) {
-    case 'A320_251N':
+    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum');
+
+    switch (airframe) {
+    case AircraftType.A320_251N:
         return (
             <A320Overview />
         );
-    case 'A380_842':
+    case AircraftType.A380_842:
         return (
             <A380Overview />
         );

diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/Fuel/Fuel.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/Fuel/Fuel.tsx
@@ -4,14 +4,14 @@
 
 /* eslint-disable max-len */
 import React, { useState } from 'react';
-import { Units, useSimVar } from '@flybywiresim/fbw-sdk';
-import { getAirframeType } from '../../../Efb';
+import { AircraftType, Units, useSimVar } from '@flybywiresim/fbw-sdk';
 import { isSimbriefDataLoaded } from '../../../Store/features/simBrief';
 import { A320Fuel } from './A320_251N/A320Fuel';
 import { A380Fuel } from './A380_842/A380Fuel';
 import { useAppSelector } from '../../../Store/store';
 
 export const Fuel = () => {
+    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum');
     const [isOnGround] = useSimVar('SIM ON GROUND', 'Bool', 8_059);
     const simbriefUnits = useAppSelector((state) => state.simbrief.data.units);
     const simbriefPlanRamp = useAppSelector((state) => state.simbrief.data.fuels.planRamp);
@@ -21,8 +21,8 @@ export const Fuel = () => {
     const [massUnitForDisplay] = useState(Units.usingMetric ? 'KGS' : 'LBS');
     const [convertUnit] = useState(Units.usingMetric ? 1 : (1 / 0.4535934));
 
-    switch (getAirframeType()) {
-    case 'A380_842':
+    switch (airframe) {
+    case AircraftType.A380_842:
         return (
             <A380Fuel
                 simbriefDataLoaded={simbriefDataLoaded}
@@ -32,7 +32,7 @@ export const Fuel = () => {
                 isOnGround={isOnGround}
             />
         );
-    case 'A320_251N':
+    case AircraftType.A320_251N:
     default:
         return (
             <A320Fuel

diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx
@@ -11,6 +11,7 @@ import { useAppSelector } from '../../../Store/store';
 import { isSimbriefDataLoaded } from '../../../Store/features/simBrief';
 
 export const Payload = () => {
+    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum');
     const simbriefUnits = useAppSelector((state) => state.simbrief.data.units);
     const simbriefBagWeight = parseInt(useAppSelector((state) => state.simbrief.data.weights.bagWeight));
     const simbriefPaxWeight = parseInt(useAppSelector((state) => state.simbrief.data.weights.passengerWeight));
@@ -25,7 +26,6 @@ export const Payload = () => {
     const simbriefDataLoaded = isSimbriefDataLoaded();
 
     const [massUnitForDisplay] = useState(Units.usingMetric ? 'KGS' : 'LBS');
-    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum');
 
     switch (airframe) {
     case AircraftType.A380_842:

diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx
@@ -3,7 +3,7 @@
 
 /* eslint-disable max-len */
 import React, { useEffect, useState } from 'react';
-import { useSimVar, MathUtils } from '@flybywiresim/fbw-sdk';
+import { useSimVar, MathUtils, AircraftType } from '@flybywiresim/fbw-sdk';
 import { ZoomIn, ZoomOut } from 'react-bootstrap-icons';
 import { IconPlane } from '@tabler/icons';
 import { Coordinates } from 'msfs-geo';
@@ -21,7 +21,6 @@ import {
     setMapRange,
     TScreenCoordinates,
 } from '../../Store/features/pushback';
-import { getAirframeType } from '../../Efb';
 
 interface TurningRadiusIndicatorProps {
     turningRadius: number;
@@ -68,7 +67,7 @@ const TurningRadiusIndicator = ({ turningRadius }: TurningRadiusIndicatorProps)
 
 export const PushbackMap = () => {
     const dispatch = useAppDispatch();
-
+    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum');
     const [planeHeadingTrue] = useSimVar('PLANE HEADING DEGREES TRUE', 'degrees', 50);
     const [planeLatitude] = useSimVar('A:PLANE LATITUDE', 'degrees latitude', 50);
     const [planeLongitude] = useSimVar('A:PLANE LONGITUDE', 'degrees longitude', 50);
@@ -83,7 +82,7 @@ export const PushbackMap = () => {
         'number',
         250,
     );
-    const turnIndicatorTuningDefault = getAirframeType() === 'A320_251N' ? 1.35 : 1.35; // determined by testing
+    const turnIndicatorTuningDefault = airframe === AircraftType.A320_251N ? 1.35 : 1.35; // determined by testing
 
     // Reducer state for pushback
     const {
@@ -100,8 +99,8 @@ export const PushbackMap = () => {
     // Aircraft wheelbase in meters
     // Source: https://www.airbus.com/sites/g/files/jlcbta136/files/2021-11/Airbus-Commercial-Aircraft-AC-A320.pdf
     // Source: https://www.airbus.com/sites/g/files/jlcbta136/files/2022-02/Airbus-A380-Facts-and-Figures-February-2022.pdf
-    const aircraftWheelBase = getAirframeType() === 'A380_842' ? 31.9 : 12.64;
-    const aircraftLengthMeter = getAirframeType() === 'A380_842' ? 72.72 : 37.57;
+    const aircraftWheelBase = airframe === AircraftType.A380_842 ? 31.9 : 12.64;
+    const aircraftLengthMeter = airframe === AircraftType.A380_842 ? 72.72 : 37.57;
 
     // Map
     const [mouseDown, setMouseDown] = useState(false);

diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0
 
 /* eslint-disable no-console */
-import React, { useState } from 'react';
+import React from 'react';
 import { AircraftType, useSimVar } from '@flybywiresim/fbw-sdk';
 import { A380Services } from './Services/A380_842/A380Services';
 import { A320Services } from './Services/A320_251N/A320Services';
 
 export const ServicesPage = () => {
-    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum')
+    const [airframe] = useSimVar('L:A32NX_AIRCRAFT_TYPE', 'Enum');
 
     switch (airframe) {
     case AircraftType.A380_842:

diff --git a/fbw-a32nx/src/systems/instruments/src/EFB/Settings/ThrottleConfig/ThrottleConfig.tsx b/fbw-a32nx/src/systems/instruments/src/EFB/Settings/ThrottleConfig/ThrottleConfig.tsx
@@ -142,7 +142,7 @@ export const ThrottleConfig = ({ isShown, onClose }: ThrottleConfigProps) => {
             ...getOverlapErrors(2, throttleTwoSimvars),
         ];
         // to avoid false errors on the A320 when only 2 axis are used
-        if (airframe === AircraftType.A380_842) {
+        if (airframe === 'A380_842') {
             errors.push(...getOverlapErrors(3, throttleThreeSimvars));
             errors.push(...getOverlapErrors(4, throttleFourSimvars));
         }
@@ -232,7 +232,7 @@ export const ThrottleConfig = ({ isShown, onClose }: ThrottleConfigProps) => {
             >
                 2
             </SelectItem>
-            {airframe === AircraftType.A380_842 && (
+            {airframe === 'A380_842' && (
                 <SelectItem
                     selected={axisNum === 4}
                     onSelect={() => setAxisNum(4)}
@@ -350,13 +350,13 @@ export const ThrottleConfig = ({ isShown, onClose }: ThrottleConfigProps) => {
     const getAxis = () => {
         switch (axisNum) {
         case 4:
-            if (airframe === AircraftType.A380_842) {
+            if (airframe === 'A380_842') {
                 return fourAxis;
             }
             console.warn('A320 does not have 4 axis - defaulting to 2 axis');
             return twoAxisA320;
         case 2:
-            if (airframe === AircraftType.A380_842) {
+            if (airframe === 'A380_842') {
                 return twoAxisA380;
             }
             return twoAxisA320;