remove Vs1g t/o speed check; fix approachVls function in FMS

flybywiresim · Dec 3, 2024 · fb68e96 · fb68e96
1 parent 5d509b6
commit fb68e96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcAircraftInterface.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcAircraftInterface.ts
@@ -6,7 +6,7 @@ import { Arinc429SignStatusMatrix, Arinc429Word, FmsOansData } from '@flybywires
 import { FlapConf } from '@fmgc/guidance/vnav/common';
 import { FlightPlanService } from '@fmgc/index';
 import { MmrRadioTuningStatus } from '@fmgc/navigation/NavaidTuner';
-import { Vmcl, Vmo, maxCertifiedAlt, maxGw, maxZfw } from '@shared/PerformanceConstants';
+import { Vmcl, Vmo, maxCertifiedAlt, maxZfw } from '@shared/PerformanceConstants';
 import { FmgcFlightPhase } from '@shared/flightphase';
 import { FmgcDataService } from 'instruments/src/MFD/FMC/fmgc';
 import { ADIRS } from 'instruments/src/MFD/shared/Adirs';
@@ -321,17 +321,10 @@ export class FmcAircraftInterface {
       return false;
     }
 
-    const taxiFuel = this.fmgc.data.taxiFuel.get() ?? 0;
-    const tow = (this.fmc.fmgc.getGrossWeightKg() ?? maxGw) - (this.fmgc.isAnEngineOn() ? 0 : taxiFuel);
-    const flapConf = this.fmgc.data.takeoffFlapsSetting.get();
-
     return (
       (this.flightPlanService.active.performanceData.v1 ?? Infinity) < Math.trunc(A380SpeedsUtils.getVmcg(zp)) ||
       (this.flightPlanService.active.performanceData.vr ?? Infinity) < Math.trunc(1.05 * A380SpeedsUtils.getVmca(zp)) ||
-      (this.flightPlanService.active.performanceData.v2 ?? Infinity) < Math.trunc(1.1 * A380SpeedsUtils.getVmca(zp)) ||
-      (Number.isFinite(tow) &&
-        (this.flightPlanService.active.performanceData.v2 ?? Infinity) <
-          Math.trunc(1.13 * A380SpeedsUtils.getVs1g(tow, flapConf > 1 ? flapConf + 1 : flapConf, true)))
+      (this.flightPlanService.active.performanceData.v2 ?? Infinity) < Math.trunc(1.1 * A380SpeedsUtils.getVmca(zp))
     );
   }
 

diff --git a/fbw-a380x/src/systems/shared/src/OperatingSpeeds.tsx b/fbw-a380x/src/systems/shared/src/OperatingSpeeds.tsx
@@ -116,7 +116,7 @@ export class SpeedsLookupTables {
   };
 
   static getApproachVls(conf: number, cg: number, weight: number): number {
-    if (conf === 1) {
+    if (conf === 0) {
       return SpeedsLookupTables.VLS_CONF_0.get(0, weight);
     } else {
       return SpeedsLookupTables.VLS_APPR_CONF[conf].get(cg, weight);