Skip to content

Commit 530d051

Browse files
committed
fix(mfd): rpc error & lint
1 parent bcb23b6 commit 530d051

File tree

3 files changed

+30
-11
lines changed

3 files changed

+30
-11
lines changed

fbw-a32nx/src/systems/fmgc/src/flightplanning/FlightPlanInterface.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -300,17 +300,17 @@ export interface FlightPlanInterface<P extends FlightPlanPerformanceData = Fligh
300300
planIndex: number,
301301
): Promise<void>;
302302

303-
setPilotEntryClimbSpeedLimitSpeed(value: number, planIndex: FlightPlanIndex, alternate: boolean): void;
303+
setPilotEntryClimbSpeedLimitSpeed(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void>;
304304

305-
setPilotEntryClimbSpeedLimitAltitude(value: number, planIndex: FlightPlanIndex, alternate: boolean): void;
305+
setPilotEntryClimbSpeedLimitAltitude(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void>;
306306

307-
deleteClimbSpeedLimit(planIndex: FlightPlanIndex, alternate: boolean): void;
307+
deleteClimbSpeedLimit(planIndex: FlightPlanIndex, alternate: boolean): Promise<void>;
308308

309-
setPilotEntryDescentSpeedLimitSpeed(value: number, planIndex: FlightPlanIndex, alternate: boolean): void;
309+
setPilotEntryDescentSpeedLimitSpeed(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void>;
310310

311-
setPilotEntryDescentSpeedLimitAltitude(value: number, planIndex: FlightPlanIndex, alternate: boolean): void;
311+
setPilotEntryDescentSpeedLimitAltitude(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void>;
312312

313-
deleteDescentSpeedLimit(planIndex: FlightPlanIndex, alternate: boolean): void;
313+
deleteDescentSpeedLimit(planIndex: FlightPlanIndex, alternate: boolean): Promise<void>;
314314

315315
// TODO do not pass in waypoint object (rpc)
316316
isWaypointInUse(waypoint: Waypoint): Promise<boolean>;

fbw-a32nx/src/systems/fmgc/src/flightplanning/rpc/FlightPlanRpcClient.ts

+19
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,25 @@ export class FlightPlanRpcClient<P extends FlightPlanPerformanceData> implements
356356
return this.callFunctionViaRpc('editFixInfoEntry', index, callback, planIndex);
357357
}
358358

359+
setPilotEntryClimbSpeedLimitSpeed(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void> {
360+
return this.callFunctionViaRpc('setPilotEntryClimbSpeedLimitSpeed', value, planIndex, alternate);
361+
}
362+
setPilotEntryClimbSpeedLimitAltitude(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void> {
363+
return this.callFunctionViaRpc('setPilotEntryClimbSpeedLimitAltitude', value, planIndex, alternate);
364+
}
365+
deleteClimbSpeedLimit(planIndex: FlightPlanIndex, alternate: boolean): Promise<void> {
366+
return this.callFunctionViaRpc('deleteClimbSpeedLimit', planIndex, alternate);
367+
}
368+
setPilotEntryDescentSpeedLimitSpeed(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void> {
369+
return this.callFunctionViaRpc('setPilotEntryDescentSpeedLimitSpeed', value, planIndex, alternate);
370+
}
371+
setPilotEntryDescentSpeedLimitAltitude(value: number, planIndex: FlightPlanIndex, alternate: boolean): Promise<void> {
372+
return this.callFunctionViaRpc('setPilotEntryDescentSpeedLimitAltitude', value, planIndex, alternate);
373+
}
374+
deleteDescentSpeedLimit(planIndex: FlightPlanIndex, alternate: boolean): Promise<void> {
375+
return this.callFunctionViaRpc('deleteDescentSpeedLimit', planIndex, alternate);
376+
}
377+
359378
isWaypointInUse(waypoint: Waypoint): Promise<boolean> {
360379
return this.callFunctionViaRpc('isWaypointInUse', waypoint);
361380
}

fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/MfdFmsPerf.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
863863
this.clbTablePredLine2.set(null);
864864
} else {
865865
this.clbTableModeLine1.set('SELECTED');
866-
this.clbTableSpdLine1.set(obs && obs.fcuSpeed >= 1 ? (obs?.fcuSpeed.toFixed(0) ?? null) : null);
866+
this.clbTableSpdLine1.set(obs && obs.fcuSpeed >= 1 ? obs?.fcuSpeed.toFixed(0) ?? null : null);
867867
this.clbTableMachLine1.set(obs && obs.fcuSpeed < 1 ? `.${obs.fcuSpeed.toFixed(2).split('.')[1]}` : null);
868868
this.clbTablePredLine1.set(null);
869869

@@ -984,7 +984,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
984984
this.crzTableSpdLine1.set(
985985
obs && obs.fcuSpeed < 1
986986
? '---'
987-
: (this.props.fmcService.master?.fmgc.getManagedClimbSpeed().toFixed(0) ?? null),
987+
: this.props.fmcService.master?.fmgc.getManagedClimbSpeed().toFixed(0) ?? null,
988988
);
989989
this.crzTableMachLine1.set(
990990
obs && obs.fcuSpeed < 1
@@ -999,15 +999,15 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
999999
this.crzTablePredLine2.set(null);
10001000
} else {
10011001
this.crzTableModeLine1.set('SELECTED');
1002-
this.crzTableSpdLine1.set(obs && obs.fcuSpeed < 1 ? '---' : (obs?.fcuSpeed.toFixed(0) ?? null));
1002+
this.crzTableSpdLine1.set(obs && obs.fcuSpeed < 1 ? '---' : obs?.fcuSpeed.toFixed(0) ?? null);
10031003
this.crzTableMachLine1.set(obs && obs.fcuSpeed < 1 ? `.${obs.fcuSpeed.toFixed(2).split('.')[1]}` : null);
10041004

10051005
this.crzTableModeLine2.set('MANAGED');
10061006
// TODO add speed restriction (ECON, SPD LIM, ...) in smaller font
10071007
this.crzTableSpdLine2.set(
10081008
obs && obs.fcuSpeed < 1
10091009
? '---'
1010-
: (this.props.fmcService.master?.fmgc.getManagedCruiseSpeed().toFixed(0) ?? null),
1010+
: this.props.fmcService.master?.fmgc.getManagedCruiseSpeed().toFixed(0) ?? null,
10111011
);
10121012
this.crzTableMachLine2.set(
10131013
obs && obs.fcuSpeed < 1
@@ -1052,7 +1052,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
10521052
this.desTablePredLine2.set(null);
10531053
} else {
10541054
this.desTableModeLine1.set('SELECTED');
1055-
this.desTableSpdLine1.set(obs && obs.fcuSpeed >= 1 ? (obs?.fcuSpeed.toFixed(0) ?? null) : null);
1055+
this.desTableSpdLine1.set(obs && obs.fcuSpeed >= 1 ? obs?.fcuSpeed.toFixed(0) ?? null : null);
10561056
this.desTableMachLine1.set(obs && obs.fcuSpeed < 1 ? `.${obs.fcuSpeed.toFixed(2).split('.')[1]}` : null);
10571057
this.desTablePredLine1.set('--:-- ----');
10581058
this.desTableModeLine2.set('MANAGED');

0 commit comments

Comments
 (0)