From 8a8240fdd473a677712a4886c6b2b6eef6e8997b Mon Sep 17 00:00:00 2001 From: Matt Nischan Date: Thu, 7 Dec 2023 16:45:18 -0600 Subject: [PATCH] SU14 SDK update. --- src/garminsdk/autopilot/GarminAPConfig.ts | 38 +- .../autopilot/GarminAPConfigInterface.ts | 12 + .../autopilot/GarminAPStateManager.ts | 9 + src/garminsdk/autopilot/GarminAutopilot.ts | 16 +- .../autopilot/GarminNavToNavManager.ts | 3 +- src/garminsdk/autopilot/GarminVNavManager.ts | 3 +- src/garminsdk/autopilot/GarminVNavManager2.ts | 3 +- src/garminsdk/autopilot/index.ts | 1 + src/garminsdk/components/cas/CAS.tsx | 30 +- .../components/common/BearingDisplay.tsx | 143 +- .../components/common/LatLonDisplay.tsx | 32 +- .../components/common/NumberUnitDisplay.tsx | 133 +- .../components/common/TimeDisplay.tsx | 67 +- src/garminsdk/components/list/ScrollList.tsx | 91 +- .../components/map/GarminMapBuilder.tsx | 189 +- src/garminsdk/components/map/GarminMapKeys.ts | 14 + .../components/map/MapRangeDisplay.tsx | 3 +- .../components/map/MapResourcePriority.ts | 6 + .../components/map/MapWaypointIcon.ts | 16 +- .../map/NextGenGarminMapBuilder.tsx | 97 + .../assembled/NextGenConnextMapBuilder.tsx | 22 +- .../map/assembled/NextGenHsiMapBuilder.tsx | 3 +- .../map/assembled/NextGenNavMapBuilder.tsx | 26 +- .../assembled/NextGenNearestMapBuilder.tsx | 22 +- .../assembled/NextGenWaypointMapBuilder.tsx | 6 +- .../MapDataIntegrityRTRController.ts | 70 +- .../MapDesiredOrientationController.ts | 97 + .../MapFlightPlanFocusRTRController.ts | 20 +- .../controllers/MapOrientationController.ts | 10 +- .../MapOrientationModeController.ts | 69 + .../MapOrientationRTRController.ts | 11 +- .../MapOrientationSettingsController.ts | 93 + .../controllers/MapPanningRTRController.ts | 206 ++ .../controllers/MapPointerRTRController.ts | 199 +- .../map/controllers/MapTerrainController.ts | 54 +- .../controllers/MapWaypointsVisController.ts | 73 +- .../WeatherMapOrientationController.ts | 14 +- ...WeatherMapOrientationSettingsController.ts | 138 ++ .../components/map/controllers/index.ts | 7 +- src/garminsdk/components/map/index.ts | 3 +- .../MapRelativeTerrainStatusIndicator.tsx | 6 +- .../map/layers/MapRangeCompassLayer.tsx | 62 +- .../map/layers/MapWaypointsLayer.tsx | 2 +- .../map/layers/TrafficMapRangeLayer.tsx | 207 +- .../map/modules/MapOrientationModule.ts | 20 +- .../map/modules/MapPanningModule.ts | 12 + .../map/modules/MapPointerModule.ts | 4 +- .../map/modules/MapTrackVectorModule.ts | 2 +- .../map/modules/MapWaypointsModule.ts | 5 +- src/garminsdk/components/map/modules/index.ts | 1 + .../DefaultNavDataBarFieldModelFactory.ts | 17 +- ...EventBusNavDataBarFieldTypeModelFactory.ts | 23 + .../GenericNavDataBarFieldModelFactory.ts | 578 +----- .../components/navdatabar/NavDataBar.tsx | 2 +- .../navdatabar/NavDataBarFieldModel.ts | 12 + .../NavDataBarFieldTypeModelFactories.ts | 851 ++++++++ .../NextGenNavDataBarFieldRenderer.ts | 4 +- src/garminsdk/components/navdatabar/index.ts | 2 + .../components/navdatafield/NavDataField.tsx | 60 +- .../navdatafield/NavDataFieldModel.ts | 5 + .../navdatafield/NavDataFieldType.ts | 143 +- .../NavDataFieldTypeRenderers.tsx | 240 +++ ...x => NextGenNavDataFieldTypeRenderers.tsx} | 352 ++-- .../components/navdatafield/index.ts | 3 +- .../airspeed/AirspeedDefinitionFactory.ts | 3 + .../nextgenpfd/airspeed/AirspeedIndicator.tsx | 104 +- .../airspeed/AirspeedIndicatorDataProvider.ts | 40 +- .../nextgenpfd/horizon/ArtificialHorizon.tsx | 229 ++- .../nextgenpfd/horizon/HorizonDisplay.tsx | 8 +- .../nextgenpfd/horizon/PitchLadder.tsx | 5 +- .../components/nextgenpfd/horizon/index.ts | 1 + .../navstatusbox/NavStatusBoxFieldModel.ts | 2 +- .../NavStatusBoxFieldRenderer.tsx | 3 +- .../components/touchbutton/TouchButton.tsx | 3 + .../components/touchpad/TouchPad.tsx | 2 + .../components/waypoint/WaypointIcon.tsx | 51 +- src/garminsdk/flightplan/Fms.ts | 64 +- src/garminsdk/flightplan/FmsUtils.ts | 3 +- src/garminsdk/graphics/text/UnitFormatter.ts | 23 +- .../navigation/NavIndicatorController.ts | 5 +- src/garminsdk/navigation/NavdataComputer.ts | 3 +- src/garminsdk/navigation/VNavDataProvider.ts | 3 +- src/garminsdk/navigation/WaypointInfoStore.ts | 47 +- .../settings/DateTimeUserSettings.ts | 73 +- src/garminsdk/settings/MapUserSettings.ts | 11 +- src/garminsdk/settings/UnitsUserSettings.ts | 380 ++-- src/garminsdk/settings/VSpeedUserSettings.ts | 21 +- .../settings/WeatherMapUserSettings.ts | 1 + src/garminsdk/system/AdcSystem.ts | 21 +- src/garminsdk/system/GpsReceiverSystem.ts | 36 +- .../traffic/AdsbSensitivityParameters.ts | 2 +- src/garminsdk/traffic/GarminTcasII.ts | 72 +- .../traffic/TrafficAdvisorySystem.ts | 77 +- src/garminsdk/traffic/TrafficInfoService.ts | 296 ++- src/msfstypes/coherent/apcontroller.d.ts | 33 + src/msfstypes/coherent/facilities.d.ts | 3 + src/msfstypes/index.d.ts | 1 + src/msfstypes/js/animation/animation.d.ts | 173 ++ src/msfstypes/js/avionics.d.ts | 150 ++ src/msfstypes/js/buttons.d.ts | 106 + src/msfstypes/js/common.d.ts | 1133 +++++++++++ src/msfstypes/js/datastorage.d.ts | 7 + src/msfstypes/js/datavalidator.d.ts | 15 + src/msfstypes/js/flight.d.ts | 298 +++ src/msfstypes/js/inputs.d.ts | 21 + src/msfstypes/js/leaderboards.d.ts | 65 + src/msfstypes/js/netbingmap.d.ts | 102 + src/msfstypes/js/padscroll.d.ts | 110 ++ src/msfstypes/js/radionav.d.ts | 6 + src/msfstypes/js/services/aircraft.d.ts | 61 + .../js/services/checklistmanager.d.ts | 123 ++ src/msfstypes/js/services/community.d.ts | 251 +++ src/msfstypes/js/services/contentmanager.d.ts | 60 + src/msfstypes/js/services/controls.d.ts | 182 ++ src/msfstypes/js/services/fuelpayload.d.ts | 56 + src/msfstypes/js/services/gamenavlog.d.ts | 54 + .../js/services/genericpanelmanager.d.ts | 8 + .../ingamepanelcontrolsviewlistener.d.ts | 5 + .../js/services/installationmanager.d.ts | 22 + src/msfstypes/js/services/market.d.ts | 282 +++ src/msfstypes/js/services/notifications.d.ts | 59 + src/msfstypes/js/services/objective.d.ts | 19 + src/msfstypes/js/services/profile.d.ts | 111 ++ .../js/services/raceleaderboard.d.ts | 9 + src/msfstypes/js/services/replay.d.ts | 114 ++ .../js/services/rewardscreenmanager.d.ts | 107 + src/msfstypes/js/services/toolbarpanels.d.ts | 76 + .../js/services/tooltipsmanager.d.ts | 23 + src/msfstypes/js/services/weather.d.ts | 133 ++ src/msfstypes/js/simplane.d.ts | 588 ++++++ src/msfstypes/js/simvar.d.ts | 46 + src/msfstypes/js/slider.d.ts | 51 + src/msfstypes/js/sortedlist.d.ts | 11 + src/msfstypes/js/testsimvar.d.ts | 10 + src/msfstypes/js/types.d.ts | 108 ++ src/msfstypes/js/uiresourceelement.d.ts | 136 ++ src/msfstypes/js/wasmsimcanvas.d.ts | 24 + src/msfstypes/js/widgetscontainer.d.ts | 52 + src/msfstypes/package.json | 21 + .../pages/vcockpit/core/vcockpit.d.ts | 42 + .../pages/vcockpit/core/vcockpitlogic.d.ts | 39 + .../instruments/shared/baseinstrument.d.ts | 149 ++ .../shared/flightelements/approach.d.ts | 19 + .../shared/flightelements/flightplan.d.ts | 36 + .../flightelements/flightplanmanager.d.ts | 187 ++ .../shared/flightelements/geocalc.d.ts | 18 + .../flightelements/nearestwaypoint.d.ts | 192 ++ .../shared/flightelements/runway.d.ts | 21 + .../shared/flightelements/waypoint.d.ts | 205 ++ .../shared/flightelements/waypointloader.d.ts | 242 +++ .../shared/utils/datareadmanager.d.ts | 24 + .../instruments/shared/utils/radionav.d.ts | 103 + .../instruments/shared/utils/xmllogic.d.ts | 209 ++ .../pages/vcockpit/systems/systems.d.ts | 16 + .../vcockpit/systems/systems_as1000.d.ts | 22 + src/sdk/autopilot/APConfig.ts | 22 +- src/sdk/autopilot/Autopilot.ts | 55 +- src/sdk/autopilot/directors/APFLCDirector.ts | 35 +- .../autopilot/directors/APPitchLvlDirector.ts | 66 + src/sdk/autopilot/directors/APVSDirector.ts | 4 +- src/sdk/autopilot/directors/index.ts | 1 + src/sdk/autopilot/index.ts | 1 + src/sdk/autopilot/managers/APStateManager.ts | 19 +- .../managers/AltitudeSelectManager.ts | 94 +- src/sdk/autothrottle/AbstractAutothrottle.ts | 29 +- src/sdk/cas/CasSystem.ts | 19 +- src/sdk/components/FSComponent.ts | 5 +- .../XMLGauges/GaugeDefinitions/BaseGauge.ts | 2 +- .../components/XMLGauges/XMLGaugeAdapter.ts | 62 +- src/sdk/components/bing/BingComponent.tsx | 6 +- src/sdk/components/common/DigitScroller.tsx | 4 +- .../components/controls/HardwareUiControl.tsx | 4 +- .../controls/HardwareUiControlList.tsx | 5 + .../map/DefaultMapLabeledRingLabel.tsx | 138 ++ src/sdk/components/map/MapLabeledRingLabel.ts | 57 + .../map/MapMultiLineAirspaceRenderer.ts | 2 +- src/sdk/components/map/index.ts | 61 +- .../layers/GenericMapSharedCanvasSubLayer.ts | 77 + .../layers/MapLabeledRingCanvasSubLayer.tsx | 238 +++ .../map/layers/MapLabeledRingLayer.tsx | 159 +- .../map/layers/MapSharedCanvasLayer.tsx | 357 ++++ .../components/mapsystem/MapSystemBuilder.tsx | 48 +- .../components/mapsystem/MapSystemUtils.ts | 53 +- .../controllers/MapRotationController.ts | 2 +- .../mapsystem/modules/MapRotationModule.ts | 5 +- src/sdk/data/Consumer.ts | 2 +- src/sdk/data/ConsumerSubject.ts | 26 +- src/sdk/data/ConsumerValue.ts | 24 +- src/sdk/data/SimVars.ts | 14 + src/sdk/fmc/AbstractFmcPage.ts | 10 +- src/sdk/fmc/FmcFormat.ts | 22 +- src/sdk/fmc/FmcScreen.ts | 15 +- src/sdk/fmc/SimpleFmcRenderer.ts | 2 +- src/sdk/fmc/components/DisplayField.ts | 22 +- src/sdk/fmc/components/TextInputField.ts | 31 +- src/sdk/graphics/color/ColorUtils.ts | 149 +- src/sdk/graphics/text/NumberFormatter.ts | 91 +- src/sdk/instruments/ADC.ts | 515 ++++- src/sdk/instruments/Accelerometer.ts | 35 + .../instruments/AircraftInertialPublisher.ts | 55 + src/sdk/instruments/BasePublishers.ts | 24 +- src/sdk/instruments/Clock.ts | 14 +- src/sdk/instruments/ControlSurfaces.ts | 4 + src/sdk/instruments/EngineData.ts | 21 +- src/sdk/instruments/GNSS.ts | 4 + src/sdk/instruments/GPSSat.ts | 1714 ++++++++++++++--- src/sdk/instruments/RadioCommon.ts | 3 +- src/sdk/instruments/index.ts | 2 + src/sdk/math/NumberUnit.ts | 14 +- src/sdk/navigation/Facilities.ts | 2 +- src/sdk/simbrief/index.ts | 3 +- src/sdk/sub/AbstractSubscribable.ts | 2 +- src/sdk/sub/CombinedSubject.ts | 3 + src/sdk/sub/ComputedSubject.ts | 2 +- src/sdk/sub/MappedSubject.ts | 3 +- src/sdk/sub/Subscribable.ts | 5 +- src/sdk/sub/SubscribableArray.ts | 2 +- src/sdk/sub/SubscribableMapFunctions.ts | 19 + src/sdk/traffic/TCAS.ts | 49 +- src/sdk/utils/datastructures/ArrayUtils.ts | 33 +- .../Assets/Fonts/DejaVuSans-SemiBold.ttf | Bin 0 -> 732148 bytes .../EngineInstruments/DialGauge.tsx | 28 +- .../EngineInstruments/HorizontalBarGauge.tsx | 62 +- .../EngineInstruments/VerticalBarGauge.tsx | 28 +- .../Components/UI/FPL/ConstraintSelector.tsx | 70 +- .../Components/UI/FPL/MFDFPLVNavProfile.tsx | 22 +- .../MFD/Components/UI/MFDPageMenuDialog.css | 43 +- .../MFD/Components/UI/MFDPageMenuDialog.tsx | 4 +- .../MFD/Components/UI/MFDPageSelect.tsx | 9 +- .../WTG1000/MFD/Components/UI/MFDUiPage.tsx | 11 + .../MFD/Components/UI/MFDViewService.ts | 26 +- .../UI/NavDataBar/MFDNavDataBar.css | 52 +- .../UI/Nearest/Airports/FrequenciesGroup.tsx | 6 +- .../UI/Nearest/MFDNearestAirportsPage.tsx | 115 +- .../MFD/Components/UI/Procedure/MFDProc.tsx | 1 + .../UI/Procedure/ProcSequenceItem.tsx | 2 +- .../MFDSystemSetupDataBarGroup.tsx | 24 +- .../MFDSystemSetupDateTimeGroup.tsx | 10 +- .../UI/SystemSetup/MFDSystemSetupRow.tsx | 2 +- .../NavSystems/WTG1000/MFD/WTG1000_MFD.tsx | 96 +- .../FlightInstruments/AirspeedIndicator.css | 260 --- .../FlightInstruments/AirspeedIndicator.tsx | 883 --------- .../G1000AirspeedIndicator.css | 679 +++++++ .../G1000AirspeedIndicator.tsx | 77 + .../G1000AirspeedIndicatorDataProvider.ts | 19 + .../AirspeedIndicator/index.ts | 2 + .../FlightInstruments/Altimeter.tsx | 33 +- .../PFD/Components/FlightInstruments/CAS.css | 13 +- .../PFD/Components/FlightInstruments/CAS.tsx | 406 ++-- .../PFD/Components/FlightInstruments/index.ts | 1 + .../Components/Overlays/BottomInfoPanel.css | 17 +- .../PFD/Components/Overlays/Fma/Fma.tsx | 14 + .../PFD/Components/Overlays/Transponder.css | 12 +- .../PFD/Components/Overlays/Transponder.tsx | 103 +- .../PFD/Components/UI/Alerts/AlertsSubject.ts | 48 +- .../Components/UI/Alerts/CasAlertsBridge.ts | 74 + .../WTG1000/PFD/Components/UI/Alerts/index.ts | 1 + .../PFD/Components/UI/FPL/FPLSection.tsx | 63 +- .../Components/UI/FPL/FPLSectionDeparture.tsx | 74 +- .../UI/FPL/FPLSectionDestination.tsx | 39 +- .../PFD/Components/UI/PFDViewService.ts | 21 +- .../PFD/Components/UI/TimerRef/TimerRef.css | 96 +- .../PFD/Components/UI/TimerRef/TimerRef.tsx | 423 ++-- .../NavSystems/WTG1000/PFD/WTG1000_PFD.tsx | 161 +- .../Shared/Autopilot/G1000Autopilot.ts | 71 +- .../WTG1000/Shared/Config/Config.ts | 34 + .../Shared/Config/DefaultConfigFactory.ts | 28 + .../Shared/Config/LookupTableConfig.ts | 73 + .../WTG1000/Shared/Config/NumericConfig.ts | 321 +++ .../WTG1000/Shared/Config/SpeedConfig.ts | 209 ++ .../NavSystems/WTG1000/Shared/Config/index.ts | 5 + .../NavSystems/WTG1000/Shared/FuelComputer.ts | 45 +- .../NavSystems/WTG1000/Shared/G1000Events.ts | 14 +- .../WTG1000/Shared/G1000PfdPlugin.ts | 16 + .../NavSystems/WTG1000/Shared/G1000Plugin.ts | 51 +- .../Input/AltimeterBaroKeyEventHandler.ts | 11 +- .../Shared/Input/ControlpadHEventHandler.ts | 121 ++ .../MapRelativeTerrainStatusIndicator.css | 2 + .../WTG1000/Shared/Map/MapUserSettings.ts | 4 + .../Shared/NavCom/NavComFrequencyElement.tsx | 321 ++- .../WTG1000/Shared/NavCom/NavComRadio.css | 52 +- .../WTG1000/Shared/NavCom/NavComRadio.tsx | 96 +- .../AirspeedIndicatorConfig.ts | 389 ++++ .../AirspeedIndicator/ColorRangeConfig.ts | 103 + .../AirspeedIndicator/VSpeedBugConfig.ts | 73 + .../Profiles/AirspeedIndicator/index.ts | 3 + .../Profiles/Autopilot/AutopilotConfig.ts | 266 +++ .../Shared/Profiles/Autopilot/index.ts | 1 + .../Profiles/G1000AirframeOptionsManager.ts | 153 ++ .../Profiles/G1000SettingSaveManager.ts | 2 +- .../WTG1000/Shared/Profiles/index.ts | 3 + .../NavSystems/WTG1000/Shared/StartupLogo.tsx | 6 +- .../WTG1000/Shared/UI/Common/g1k_common.css | 23 +- .../Controllers/ControlpadInputController.ts | 434 +++++ .../UI/Controllers/XpdrInputController.ts | 81 + .../WTG1000/Shared/UI/DirectTo/DirectTo.tsx | 6 +- .../NavSystems/WTG1000/Shared/UI/FmsHEvent.ts | 49 +- .../WTG1000/Shared/UI/G1000UiControl.tsx | 1007 +++++++++- .../WTG1000/Shared/UI/Menus/MFD/LeanMenu.ts | 1 - .../WTG1000/Shared/UI/Menus/RootMenu.ts | 49 +- .../WTG1000/Shared/UI/Menus/SoftKey.css | 82 +- .../WTG1000/Shared/UI/Menus/SoftKey.tsx | 28 +- .../WTG1000/Shared/UI/Menus/SoftKeyMenu.ts | 11 +- .../WTG1000/Shared/UI/Menus/XPDRCodeMenu.ts | 12 +- .../WTG1000/Shared/UI/Menus/XPDRMenu.ts | 5 +- .../Shared/UI/UIControls/ArrowToggle.tsx | 7 +- .../Shared/UI/UIControls/InputComponent.tsx | 97 +- .../Shared/UI/UIControls/NumberInput.tsx | 4 +- .../Shared/UI/UIControls/SelectControl.tsx | 2 +- .../Shared/UI/UIControls/WaypointInput.tsx | 2 +- .../Shared/UI/UiControls2/ArrowControl.css | 27 + .../Shared/UI/UiControls2/ArrowControl.tsx | 201 ++ .../UI/UiControls2/CourseNumberInput.tsx | 58 + .../UI/UiControls2/G1000UiControlWrapper.tsx | 4 +- .../UI/UiControls2/GenericNumberInput.tsx | 98 +- .../Shared/UI/UiControls2/TimeNumberInput.tsx | 59 + .../WTG1000/Shared/UI/UiControls2/index.ts | 3 + .../UserSettings/UserSettingSelectControl.tsx | 2 +- .../WTG1000/Shared/UI/ViewService.ts | 18 +- .../WTG1000/Shared/UI/WptInfo/WptInfo.tsx | 1 + .../WTG1000/Shared/Units/UnitsUserSettings.ts | 2 +- .../WTG1000/Shared/VSpeed/VSpeed.ts | 44 + .../WTG1000/Shared/VSpeed/VSpeedConfig.ts | 61 + .../Shared/VSpeed/VSpeedGroupConfig.ts | 47 + .../Shared/VSpeed/VSpeedUserSettings.ts | 87 + .../NavSystems/WTG1000/Shared/VSpeed/index.ts | 3 + .../NavSystems/WTG1000/Shared/index.ts | 4 + .../NavSystems/WTG1000/package.json | 18 + .../package.json | 4 +- .../rollup-defs.config.js | 12 - .../Assets/Fonts/DejaVuSans-SemiBold.ttf | Bin 731016 -> 732148 bytes .../GTC/Components/CharInput/CharInput.tsx | 319 +++ .../Components/CharInput/CharInputSlot.tsx | 267 +++ .../WTG3000/GTC/Components/CharInput/index.ts | 2 + .../Components/CursorInput/CursorInput.css | 1 + .../Components/CursorInput/CursorInput.tsx | 28 +- .../CursorInput/CursorInputSlot.css | 1 + .../CursorInput/CursorInputSlot.tsx | 18 +- .../GTC/Components/Keyboard/Keyboard.css | 191 ++ .../GTC/Components/Keyboard/Keyboard.tsx | 239 +++ .../WTG3000/GTC/Components/Keyboard/index.ts | 1 + .../Components/LatLonInput/LatLonInput.tsx | 19 +- .../TouchButton/GtcListSelectTouchButton.tsx | 6 +- .../TouchButton/GtcWaypointSelectButton.tsx | 19 +- .../Components/TouchSlider/TouchSlider.css | 14 +- .../Waypoint/GtcWaypointDisplay.tsx | 45 +- .../WTG3000/GTC/Components/index.ts | 2 + .../GTC/Dialog/AbstractGtcNumberDialog.css | 4 +- .../WTG3000/GTC/Dialog/GtcDistanceDialog.tsx | 2 +- .../WTG3000/GTC/Dialog/GtcFrequencyDialog.css | 4 +- .../WTG3000/GTC/Dialog/GtcKeyboardDialog.tsx | 39 +- .../WTG3000/GTC/Dialog/GtcLatLonDialog.css | 4 +- .../WTG3000/GTC/Dialog/GtcLatLonDialog.tsx | 8 +- .../WTG3000/GTC/Dialog/GtcMessageDialog.tsx | 2 +- .../GTC/Dialog/GtcUserWaypointDialog.tsx | 15 +- .../WTG3000/GTC/Dialog/GtcWaypointDialog.css | 126 ++ .../WTG3000/GTC/Dialog/GtcWaypointDialog.tsx | 549 ++++++ .../NavSystems/WTG3000/GTC/Dialog/index.ts | 1 + .../WTG3000/GTC/GtcService/GtcViewKeys.ts | 4 +- .../GtcAvionicsSettingsPageMfdFieldsList.tsx | 6 +- .../FlightPlanPage/GtcFlightPlanDialogs.tsx | 41 +- .../Pages/NavComHome/GtcAudioRadiosPopup.css | 1 + .../Procedures/GtcProcedureSelectionPage.tsx | 3 +- .../WTG3000/GTC/WTG3000GtcInstrument.tsx | 52 +- .../WTG3000/GTC/package-defs-only.json | 2 +- .../NavSystems/WTG3000/GTC/package.json | 11 +- .../WTG3000/GTC/rollup-defs.config.js | 12 - .../NavSystems/WTG3000/GTC/tsconfig.json | 2 +- .../WTG3000/MFD/WTG3000MfdInstrument.tsx | 19 +- .../WTG3000/MFD/package-defs-only.json | 2 +- .../NavSystems/WTG3000/MFD/package.json | 11 +- .../WTG3000/MFD/rollup-defs.config.js | 12 - .../NavSystems/WTG3000/MFD/tsconfig.json | 2 +- .../Components/Airspeed/AirspeedIndicator.tsx | 1 - .../Components/Airspeed/ColorRangeConfig.ts | 2 +- .../WTG3000/PFD/Components/Fma/Fma.tsx | 2 + .../PFD/Components/Horizon/HorizonDisplay.tsx | 7 +- .../WTG3000/PFD/WTG3000PfdInstrument.tsx | 10 +- .../WTG3000/PFD/package-defs-only.json | 2 +- .../NavSystems/WTG3000/PFD/package.json | 11 +- .../WTG3000/PFD/rollup-defs.config.js | 12 - .../NavSystems/WTG3000/PFD/tsconfig.json | 2 +- .../package.json | 2 +- .../Shared/Autopilot/G3000Autopilot.ts | 6 +- .../MapRelativeTerrainStatusIndicator.css | 2 + .../FlightPlanTextInset/FlightPlanTextRow.tsx | 6 +- .../WTG3000/Shared/Config/NumericConfig.ts | 2 + .../WTG3000/Shared/Config/SpeedConfig.ts | 34 +- .../NavSystems/WTG3000/Shared/G3000Version.ts | 4 +- .../Shared/NavReference/G3000NavReference.ts | 3 +- .../Settings/G3000UserSettingSaveManager.ts | 4 +- .../Shared/Settings/MapUserSettings.ts | 2 + .../WTG3000/Shared/WTG3000FsInstrument.ts | 8 +- .../NavSystems/WTG3000/Shared/package.json | 13 +- .../WTG3000/Shared/package.json.src | 2 +- .../WTG3000/Shared/rollup-defs.config.js | 12 - .../wtg3000common/package.json | 2 +- .../GPS/Shared/Autopilot/GNSVNavManager.ts | 3 +- .../NavSystems/GPS/Shared/MainScreen.tsx | 10 +- .../NavSystems/GPS/Shared/StartupScreen.tsx | 4 +- .../UI/DataFields/GNSDataFieldRenderer.tsx | 4 +- .../UI/Pages/Waypoint/ProcDeparturePage.tsx | 19 +- src/workingtitle-instruments-gns/package.json | 4 +- .../WT21/FMC/Pages/ApproachRefPage.ts | 10 +- .../WT21/FMC/Pages/TakeoffRefPage.ts | 10 +- .../Instruments/WT21/MFD/MFDUserSettings.tsx | 13 + .../WT21/MFD/Menus/MfdLwrMenuViewService.ts | 185 +- .../WT21/MFD/Menus/MfdUprMenuViewService.ts | 10 +- .../WT21/MFD/WT21_MFD_Instrument.tsx | 42 +- .../FlightInstruments/AirspeedIndicator.tsx | 10 +- .../Instruments/WT21/PFD/Menus/PfdMenu.tsx | 6 +- .../WT21/PFD/Menus/PfdMenuViewService.ts | 208 +- .../WT21/PFD/Menus/PfdRefsMenu.tsx | 46 +- .../PFD/Menus/PfdSideButtonsNavBrgSrcMenu.css | 32 + .../PFD/Menus/PfdSideButtonsNavBrgSrcMenu.tsx | 205 ++ .../PFD/Menus/PfdSideButtonsRefs1Menu.tsx | 265 +++ .../PFD/Menus/PfdSideButtonsRefs2Menu.css | 11 + .../PFD/Menus/PfdSideButtonsRefs2Menu.tsx | 137 ++ .../WT21/PFD/Menus/PfdSideButtonsRefsMenu.css | 35 + .../WT21/PFD/WT21_PFD_Instrument.tsx | 68 +- .../WT21/Shared/Config/DisplayUnitConfig.ts | 56 + .../WT21/Shared/FlightPlan/WT21Fms.ts | 442 +++-- .../WT21/Shared/FlightPlan/WT21FmsUtils.ts | 12 + .../WT21/Shared/FlightPlanAsoboSync.ts | 17 +- .../WT21/Shared/LowerSection/HSI/MfdHsi.tsx | 30 +- .../LeftInfoPanel/ElapsedTimeDisplay.css | 28 + .../LeftInfoPanel/ElapsedTimeDisplay.tsx | 30 +- .../LeftInfoPanel/LeftInfoPanel.tsx | 35 +- .../LeftInfoPanel/NavSourcePreset.css | 24 + .../LeftInfoPanel/NavSourcePreset.tsx | 28 +- .../LowerSection/LowerSectionContainer.tsx | 16 +- .../RightInfoPanel/FormatInfo.css | 55 + .../RightInfoPanel/FormatSwitch.tsx | 57 + .../RightInfoPanel/MinimumsDisplay.css | 9 +- .../RightInfoPanel/RightInfoPanel.css | 7 +- .../RightInfoPanel/RightInfoPanel.tsx | 56 +- .../RightInfoPanel/TerrWxInfo.css | 48 +- .../RightInfoPanel/TerrWxInfo.tsx | 84 +- .../LowerSection/RightInfoPanel/TfcInfo.css | 40 +- .../LowerSection/RightInfoPanel/TfcInfo.tsx | 37 +- .../WT21/Shared/Menus/Components/Checkbox.css | 58 +- .../Menus/Components/CheckboxNumeric.tsx | 92 +- .../Menus/Components/CyclicRadioItem.css | 21 + .../Menus/Components/CyclicRadioList.css | 125 ++ .../Menus/Components/FloatingRadioItem.tsx | 55 + .../Menus/Components/FloatingRadioList.tsx | 145 ++ .../Shared/Menus/Components/PopupSubMenu.tsx | 22 +- .../Shared/Menus/Components/RadioList.css | 49 +- .../Shared/Menus/Components/RadioList.tsx | 75 +- .../WT21/Shared/Menus/Components/Radiobox.tsx | 29 +- .../WT21/Shared/Menus/MenuContainer.css | 8 + .../Shared/Navigation/WT21NavIndicators.ts | 29 +- .../Shared/Profiles/VSpeedUserSettings.ts | 22 +- .../Shared/Profiles/WT21SettingSaveManager.ts | 14 +- .../Instruments/WT21/Shared/UI/GuiHEvent.ts | 8 + .../WT21/Shared/UI/MenuViewService.ts | 13 +- .../WT21/Shared/UI/WT21UiControl.tsx | 50 +- .../Shared/WT21DisplayUnitFsInstrument.ts | 113 ++ .../Instruments/WT21/Shared/WT21_Common.css | 1 + 459 files changed, 26814 insertions(+), 5442 deletions(-) create mode 100644 src/garminsdk/autopilot/GarminAPConfigInterface.ts create mode 100644 src/garminsdk/components/map/NextGenGarminMapBuilder.tsx create mode 100644 src/garminsdk/components/map/controllers/MapDesiredOrientationController.ts create mode 100644 src/garminsdk/components/map/controllers/MapOrientationModeController.ts create mode 100644 src/garminsdk/components/map/controllers/MapOrientationSettingsController.ts create mode 100644 src/garminsdk/components/map/controllers/MapPanningRTRController.ts create mode 100644 src/garminsdk/components/map/controllers/WeatherMapOrientationSettingsController.ts create mode 100644 src/garminsdk/components/map/modules/MapPanningModule.ts create mode 100644 src/garminsdk/components/navdatabar/EventBusNavDataBarFieldTypeModelFactory.ts create mode 100644 src/garminsdk/components/navdatabar/NavDataBarFieldTypeModelFactories.ts create mode 100644 src/garminsdk/components/navdatafield/NavDataFieldTypeRenderers.tsx rename src/garminsdk/components/navdatafield/{NextGenNavDataFieldRenderers.tsx => NextGenNavDataFieldTypeRenderers.tsx} (57%) create mode 100644 src/msfstypes/coherent/apcontroller.d.ts create mode 100644 src/msfstypes/coherent/facilities.d.ts create mode 100644 src/msfstypes/index.d.ts create mode 100644 src/msfstypes/js/animation/animation.d.ts create mode 100644 src/msfstypes/js/avionics.d.ts create mode 100644 src/msfstypes/js/buttons.d.ts create mode 100644 src/msfstypes/js/common.d.ts create mode 100644 src/msfstypes/js/datastorage.d.ts create mode 100644 src/msfstypes/js/datavalidator.d.ts create mode 100644 src/msfstypes/js/flight.d.ts create mode 100644 src/msfstypes/js/inputs.d.ts create mode 100644 src/msfstypes/js/leaderboards.d.ts create mode 100644 src/msfstypes/js/netbingmap.d.ts create mode 100644 src/msfstypes/js/padscroll.d.ts create mode 100644 src/msfstypes/js/radionav.d.ts create mode 100644 src/msfstypes/js/services/aircraft.d.ts create mode 100644 src/msfstypes/js/services/checklistmanager.d.ts create mode 100644 src/msfstypes/js/services/community.d.ts create mode 100644 src/msfstypes/js/services/contentmanager.d.ts create mode 100644 src/msfstypes/js/services/controls.d.ts create mode 100644 src/msfstypes/js/services/fuelpayload.d.ts create mode 100644 src/msfstypes/js/services/gamenavlog.d.ts create mode 100644 src/msfstypes/js/services/genericpanelmanager.d.ts create mode 100644 src/msfstypes/js/services/ingamepanelcontrolsviewlistener.d.ts create mode 100644 src/msfstypes/js/services/installationmanager.d.ts create mode 100644 src/msfstypes/js/services/market.d.ts create mode 100644 src/msfstypes/js/services/notifications.d.ts create mode 100644 src/msfstypes/js/services/objective.d.ts create mode 100644 src/msfstypes/js/services/profile.d.ts create mode 100644 src/msfstypes/js/services/raceleaderboard.d.ts create mode 100644 src/msfstypes/js/services/replay.d.ts create mode 100644 src/msfstypes/js/services/rewardscreenmanager.d.ts create mode 100644 src/msfstypes/js/services/toolbarpanels.d.ts create mode 100644 src/msfstypes/js/services/tooltipsmanager.d.ts create mode 100644 src/msfstypes/js/services/weather.d.ts create mode 100644 src/msfstypes/js/simplane.d.ts create mode 100644 src/msfstypes/js/simvar.d.ts create mode 100644 src/msfstypes/js/slider.d.ts create mode 100644 src/msfstypes/js/sortedlist.d.ts create mode 100644 src/msfstypes/js/testsimvar.d.ts create mode 100644 src/msfstypes/js/types.d.ts create mode 100644 src/msfstypes/js/uiresourceelement.d.ts create mode 100644 src/msfstypes/js/wasmsimcanvas.d.ts create mode 100644 src/msfstypes/js/widgetscontainer.d.ts create mode 100644 src/msfstypes/package.json create mode 100644 src/msfstypes/pages/vcockpit/core/vcockpit.d.ts create mode 100644 src/msfstypes/pages/vcockpit/core/vcockpitlogic.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/baseinstrument.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/approach.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplan.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplanmanager.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/geocalc.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/nearestwaypoint.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/runway.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypoint.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypointloader.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/utils/datareadmanager.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/utils/radionav.d.ts create mode 100644 src/msfstypes/pages/vcockpit/instruments/shared/utils/xmllogic.d.ts create mode 100644 src/msfstypes/pages/vcockpit/systems/systems.d.ts create mode 100644 src/msfstypes/pages/vcockpit/systems/systems_as1000.d.ts create mode 100644 src/sdk/autopilot/directors/APPitchLvlDirector.ts create mode 100644 src/sdk/components/map/DefaultMapLabeledRingLabel.tsx create mode 100644 src/sdk/components/map/MapLabeledRingLabel.ts create mode 100644 src/sdk/components/map/layers/GenericMapSharedCanvasSubLayer.ts create mode 100644 src/sdk/components/map/layers/MapLabeledRingCanvasSubLayer.tsx create mode 100644 src/sdk/components/map/layers/MapSharedCanvasLayer.tsx create mode 100644 src/sdk/instruments/Accelerometer.ts create mode 100644 src/sdk/instruments/AircraftInertialPublisher.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Assets/Fonts/DejaVuSans-SemiBold.ttf delete mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.css delete mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.tsx create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.css create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.tsx create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicatorDataProvider.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/index.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/CasAlertsBridge.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/Config.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/DefaultConfigFactory.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/LookupTableConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/NumericConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/SpeedConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/index.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000PfdPlugin.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/ControlpadHEventHandler.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/AirspeedIndicatorConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/ColorRangeConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/VSpeedBugConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/index.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/AutopilotConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/index.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/ControlpadInputController.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/XpdrInputController.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.css create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.tsx create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/CourseNumberInput.tsx create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/TimeNumberInput.tsx create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeed.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedGroupConfig.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedUserSettings.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/index.ts create mode 100644 src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/package.json delete mode 100644 src/workingtitle-instruments-g1000/rollup-defs.config.js create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/CharInput.tsx create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/CharInputSlot.tsx create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/index.ts create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.css create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.tsx create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/index.ts create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.css create mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.tsx delete mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/rollup-defs.config.js delete mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/rollup-defs.config.js delete mode 100644 src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/rollup-defs.config.js delete mode 100644 src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/rollup-defs.config.js create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.css create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.tsx create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs1Menu.tsx create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.css create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.tsx create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefsMenu.css create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Config/DisplayUnitConfig.ts create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatInfo.css create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatSwitch.tsx create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/CyclicRadioItem.css create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/CyclicRadioList.css create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/FloatingRadioItem.tsx create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/FloatingRadioList.tsx create mode 100644 src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/WT21DisplayUnitFsInstrument.ts diff --git a/src/garminsdk/autopilot/GarminAPConfig.ts b/src/garminsdk/autopilot/GarminAPConfig.ts index 5a6aa7ec6..24a017290 100644 --- a/src/garminsdk/autopilot/GarminAPConfig.ts +++ b/src/garminsdk/autopilot/GarminAPConfig.ts @@ -1,13 +1,13 @@ import { - APAltCapDirector, APAltDirector, APBackCourseDirector, APConfig, APFLCDirector, APGPDirector, APGSDirector, APHdgDirector, APLateralModes, APLvlDirector, - APNavDirector, APPitchDirector, APRollDirector, APTogaPitchDirector, APValues, APVerticalModes, APVNavPathDirector, APVSDirector, EventBus, - FlightPlanner, LNavDirector, LNavDirectorOptions, NavMath, PlaneDirector, UnitType, VNavManager, VNavPathCalculator + APAltCapDirector, APAltDirector, APBackCourseDirector, APFLCDirector, APGPDirector, APGSDirector, APHdgDirector, APLateralModes, APLvlDirector, APNavDirector, + APPitchDirector, APPitchLvlDirector, APRollDirector, APTogaPitchDirector, APValues, APVerticalModes, APVNavPathDirector, APVSDirector, AutopilotDriverOptions, + EventBus, FlightPlanner, LNavDirector, LNavDirectorOptions, NavMath, PlaneDirector, UnitType, VNavManager, VNavPathCalculator } from '@microsoft/msfs-sdk'; import { GarminObsDirector } from './directors'; +import { GarminAPConfigInterface } from './GarminAPConfigInterface'; import { GarminNavToNavManager } from './GarminNavToNavManager'; import { GarminVNavGuidanceOptions, GarminVNavManager2 } from './GarminVNavManager2'; -import { AutopilotDriverOptions } from '@microsoft/msfs-sdk/autopilot/AutopilotDriver'; /** * Options for configuring a Garmin LNAV director. @@ -65,10 +65,21 @@ export type GarminAPConfigDirectorOptions = { hdgTurnReversalThreshold?: number; }; +/** + * Options for configuring Garmin autopilots. + */ +export type GarminAPConfigOptions = GarminAPConfigDirectorOptions & { + /** + * Whether the autopilot should use mach number calculated from the impact pressure derived from indicated airspeed + * and ambient pressure instead of the true mach number. Defaults to `false`. + */ + useIndicatedMach?: boolean; +} + /** * A Garmin Autopilot Configuration. */ -export class GarminAPConfig implements APConfig { +export class GarminAPConfig implements GarminAPConfigInterface { /** The default commanded pitch angle rate, in degrees per second. */ public static readonly DEFAULT_PITCH_RATE = 5; @@ -93,6 +104,12 @@ export class GarminAPConfig implements APConfig { public autopilotDriverOptions: AutopilotDriverOptions; + /** + * Whether the autopilot should use mach number calculated from the impact pressure derived from indicated airspeed + * and ambient pressure instead of the true mach number. + */ + public readonly useIndicatedMach: boolean; + /** Options for the LNAV director. */ private readonly lnavOptions: Partial>; @@ -120,13 +137,15 @@ export class GarminAPConfig implements APConfig { private readonly bus: EventBus, private readonly flightPlanner: FlightPlanner, private readonly verticalPathCalculator: VNavPathCalculator, - options?: Readonly + options?: Readonly ) { this.autopilotDriverOptions = { pitchServoRate: options?.defaultPitchRate ?? GarminAPConfig.DEFAULT_PITCH_RATE, bankServoRate: options?.defaultBankRate ?? GarminAPConfig.DEFAULT_BANK_RATE }; + this.useIndicatedMach = options?.useIndicatedMach ?? false; + this.lnavOptions = { ...options?.lnavOptions }; this.vnavOptions = { ...options?.vnavOptions }; this.rollMinBankAngle = options?.rollMinBankAngle ?? GarminAPConfig.DEFAULT_ROLL_MIN_BANK_ANGLE; @@ -157,6 +176,11 @@ export class GarminAPConfig implements APConfig { return new APLvlDirector(this.bus, apValues); } + /** @inheritdoc */ + public createPitchLevelerDirector(apValues: APValues): APPitchLvlDirector { + return new APPitchLvlDirector(apValues); + } + /** @inheritdoc */ public createGpssDirector(apValues: APValues): LNavDirector { const maxBankAngle = (): number => apValues.maxBankId.get() === 1 ? Math.min(this.lnavMaxBankAngle, this.lowBankAngle) : this.lnavMaxBankAngle; @@ -214,7 +238,7 @@ export class GarminAPConfig implements APConfig { /** @inheritdoc */ public createFlcDirector(apValues: APValues): APFLCDirector { - return new APFLCDirector(apValues); + return new APFLCDirector(apValues, { useIndicatedMach: this.useIndicatedMach }); } /** @inheritdoc */ diff --git a/src/garminsdk/autopilot/GarminAPConfigInterface.ts b/src/garminsdk/autopilot/GarminAPConfigInterface.ts new file mode 100644 index 000000000..ccd6c1748 --- /dev/null +++ b/src/garminsdk/autopilot/GarminAPConfigInterface.ts @@ -0,0 +1,12 @@ +import { APConfig } from '@microsoft/msfs-sdk'; + +/** + * A Garmin Autopilot Configuration. + */ +export interface GarminAPConfigInterface extends APConfig { + /** + * Whether the autopilot should use mach number calculated from the impact pressure derived from indicated airspeed + * and ambient pressure instead of the true mach number. + */ + readonly useIndicatedMach: boolean; +} \ No newline at end of file diff --git a/src/garminsdk/autopilot/GarminAPStateManager.ts b/src/garminsdk/autopilot/GarminAPStateManager.ts index 56df3bf39..6cd34beab 100644 --- a/src/garminsdk/autopilot/GarminAPStateManager.ts +++ b/src/garminsdk/autopilot/GarminAPStateManager.ts @@ -178,6 +178,15 @@ export class GarminAPStateManager extends APStateManager { case 'AP_WING_LEVELER_OFF': this.sendApModeEvent(APModeType.LATERAL, APLateralModes.LEVEL, false); break; + case 'AP_PITCH_LEVELER': + this.sendApModeEvent(APModeType.VERTICAL, APVerticalModes.LEVEL); + break; + case 'AP_PITCH_LEVELER_ON': + this.sendApModeEvent(APModeType.VERTICAL, APVerticalModes.LEVEL, true); + break; + case 'AP_PITCH_LEVELER_OFF': + this.sendApModeEvent(APModeType.VERTICAL, APVerticalModes.LEVEL, false); + break; case 'AP_PANEL_VS_HOLD': case 'AP_VS_HOLD': this.sendApModeEvent(APModeType.VERTICAL, APVerticalModes.VS); diff --git a/src/garminsdk/autopilot/GarminAutopilot.ts b/src/garminsdk/autopilot/GarminAutopilot.ts index b1d522ac2..0f1b7fa41 100644 --- a/src/garminsdk/autopilot/GarminAutopilot.ts +++ b/src/garminsdk/autopilot/GarminAutopilot.ts @@ -1,11 +1,13 @@ import { - AdcEvents, AltitudeSelectManager, AltitudeSelectManagerOptions, APAltitudeModes, APConfig, APEvents, APLateralModes, APStateManager, - APVerticalModes, Autopilot, ConsumerSubject, ConsumerValue, DirectorState, EventBus, FlightPlanner, MappedSubject, MetricAltitudeSettingsManager, - MinimumsMode, ObjectSubject, SetSubject, SimVarValueType, UnitType, VNavAltCaptureType, VNavState + AdcEvents, AltitudeSelectManager, AltitudeSelectManagerOptions, APAltitudeModes, APEvents, APLateralModes, APStateManager, + APVerticalModes, Autopilot, ConsumerSubject, ConsumerValue, DirectorState, EventBus, FlightPlanner, MappedSubject, + MetricAltitudeSettingsManager, MinimumsMode, ObjectSubject, SetSubject, SimVarValueType, UnitType, VNavAltCaptureType, + VNavState } from '@microsoft/msfs-sdk'; -import { FmaData, FmaDataEvents, FmaVNavState } from './FmaData'; import { MinimumsDataProvider } from '../minimums/MinimumsDataProvider'; +import { FmaData, FmaDataEvents, FmaVNavState } from './FmaData'; +import { GarminAPConfigInterface } from './GarminAPConfigInterface'; import { GarminVNavManager2 } from './GarminVNavManager2'; /** @@ -50,7 +52,7 @@ export type GarminAutopilotOptions = { /** * A Garmin autopilot. */ -export class GarminAutopilot extends Autopilot { +export class GarminAutopilot extends Autopilot { protected static readonly ALT_SELECT_OPTIONS_DEFAULT: AltitudeSelectManagerOptions = { supportMetric: true, minValue: UnitType.FOOT.createNumber(-1000), @@ -101,7 +103,7 @@ export class GarminAutopilot extends Autopilot { constructor( bus: EventBus, flightPlanner: FlightPlanner, - config: APConfig, + config: GarminAPConfigInterface, stateManager: APStateManager, options?: Readonly ) { @@ -169,7 +171,7 @@ export class GarminAutopilot extends Autopilot { // Whenever we switch between mach and IAS hold and we are in manual speed mode, we need to set the value to which // we are switching to be equal to the value we are switching from. - this.machToKias.setConsumer(sub.on('mach_to_kias_factor_1')); + this.machToKias.setConsumer(sub.on(this.config.useIndicatedMach ? 'indicated_mach_to_kias_factor_1' : 'mach_to_kias_factor_1')); this.selSpeedIsMach.setConsumer(sub.on('ap_selected_speed_is_mach')); const speedIsMachSub = this.selSpeedIsMach.sub(isMach => { diff --git a/src/garminsdk/autopilot/GarminNavToNavManager.ts b/src/garminsdk/autopilot/GarminNavToNavManager.ts index 95ec9f0ed..f5d4433b0 100644 --- a/src/garminsdk/autopilot/GarminNavToNavManager.ts +++ b/src/garminsdk/autopilot/GarminNavToNavManager.ts @@ -22,7 +22,8 @@ export class GarminNavToNavManager implements NavToNavManager { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }; private nav1Frequency = 0; diff --git a/src/garminsdk/autopilot/GarminVNavManager.ts b/src/garminsdk/autopilot/GarminVNavManager.ts index bff3bcc66..4ea269d5f 100644 --- a/src/garminsdk/autopilot/GarminVNavManager.ts +++ b/src/garminsdk/autopilot/GarminVNavManager.ts @@ -32,7 +32,8 @@ export class GarminVNavManager implements VNavManager { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }, FmsUtils.approachDetailsEquals); private readonly gpAvailable = ConsumerSubject.create(null, false); diff --git a/src/garminsdk/autopilot/GarminVNavManager2.ts b/src/garminsdk/autopilot/GarminVNavManager2.ts index 99ac99c52..05dd50686 100644 --- a/src/garminsdk/autopilot/GarminVNavManager2.ts +++ b/src/garminsdk/autopilot/GarminVNavManager2.ts @@ -100,7 +100,8 @@ export class GarminVNavManager2 implements VNavManager { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }, FmsUtils.approachDetailsEquals); private readonly isApproachLoc = this.approachDetails.map(details => { switch (details.type) { diff --git a/src/garminsdk/autopilot/index.ts b/src/garminsdk/autopilot/index.ts index 2d9b06501..e683975f6 100644 --- a/src/garminsdk/autopilot/index.ts +++ b/src/garminsdk/autopilot/index.ts @@ -1,5 +1,6 @@ export * from './FmaData'; export * from './GarminAPConfig'; +export * from './GarminAPConfigInterface'; export * from './GarminAPStateManager'; export * from './GarminAutopilot'; export * from './GarminGoAroundManager'; diff --git a/src/garminsdk/components/cas/CAS.tsx b/src/garminsdk/components/cas/CAS.tsx index dcc8e6571..223249e6f 100644 --- a/src/garminsdk/components/cas/CAS.tsx +++ b/src/garminsdk/components/cas/CAS.tsx @@ -165,9 +165,11 @@ export class CASDisplay extends DisplayComponent { private handleMessageChanged(idx: number, type: SubscribableArrayEventType.Added | SubscribableArrayEventType.Removed, item: CasActiveMessage): void { switch (type) { case SubscribableArrayEventType.Added: - this.addAnnunciation(idx, item); break; + this.addAnnunciation(idx, item); + break; case SubscribableArrayEventType.Removed: - this.removeAnnunciation(idx, item); break; + this.removeAnnunciation(idx, item); + break; } } @@ -183,13 +185,17 @@ export class CASDisplay extends DisplayComponent { if (this.props.alertCounts !== undefined) { switch (item.priority) { case AnnunciationType.Warning: - this.props.alertCounts.set('numWarning', this.props.alertCounts.get().numWarning + 1); break; + this.props.alertCounts.set('numWarning', this.props.alertCounts.get().numWarning + 1); + break; case AnnunciationType.Caution: - this.props.alertCounts.set('numCaution', this.props.alertCounts.get().numCaution + 1); break; + this.props.alertCounts.set('numCaution', this.props.alertCounts.get().numCaution + 1); + break; case AnnunciationType.Advisory: - this.props.alertCounts.set('numAdvisory', this.props.alertCounts.get().numAdvisory + 1); break; + this.props.alertCounts.set('numAdvisory', this.props.alertCounts.get().numAdvisory + 1); + break; case AnnunciationType.SafeOp: - this.props.alertCounts.set('numSafeOp', this.props.alertCounts.get().numSafeOp + 1); break; + this.props.alertCounts.set('numSafeOp', this.props.alertCounts.get().numSafeOp + 1); + break; } this.updateAlertCounts(); } @@ -217,13 +223,17 @@ export class CASDisplay extends DisplayComponent { if (this.props.alertCounts !== undefined) { switch (item.priority) { case AnnunciationType.Warning: - this.props.alertCounts.set('numWarning', this.props.alertCounts.get().numWarning - 1); break; + this.props.alertCounts.set('numWarning', this.props.alertCounts.get().numWarning - 1); + break; case AnnunciationType.Caution: - this.props.alertCounts.set('numCaution', this.props.alertCounts.get().numCaution - 1); break; + this.props.alertCounts.set('numCaution', this.props.alertCounts.get().numCaution - 1); + break; case AnnunciationType.Advisory: - this.props.alertCounts.set('numAdvisory', this.props.alertCounts.get().numAdvisory - 1); break; + this.props.alertCounts.set('numAdvisory', this.props.alertCounts.get().numAdvisory - 1); + break; case AnnunciationType.SafeOp: - this.props.alertCounts.set('numSafeOp', this.props.alertCounts.get().numSafeOp - 1); break; + this.props.alertCounts.set('numSafeOp', this.props.alertCounts.get().numSafeOp - 1); + break; } this.updateAlertCounts(); } diff --git a/src/garminsdk/components/common/BearingDisplay.tsx b/src/garminsdk/components/common/BearingDisplay.tsx index 47f8a2a76..1c015e8e0 100644 --- a/src/garminsdk/components/common/BearingDisplay.tsx +++ b/src/garminsdk/components/common/BearingDisplay.tsx @@ -1,95 +1,152 @@ import { - AbstractNumberUnitDisplay, AbstractNumberUnitDisplayProps, FSComponent, NavAngleUnit, NavAngleUnitFamily, NumberUnitInterface, Subject, SubscribableSet, Unit, VNode + AbstractNumberUnitDisplay, AbstractNumberUnitDisplayProps, FSComponent, NavAngleUnit, NavAngleUnitFamily, + NumberUnitInterface, Subject, Subscribable, SubscribableSet, ToggleableClassNameRecord, Unit, VNode } from '@microsoft/msfs-sdk'; /** * Component props for BearingDisplay. */ -export interface BearingDisplayProps extends AbstractNumberUnitDisplayProps { +export interface BearingDisplayProps extends Omit, 'value' | 'displayUnit'> { + /** The {@link NumberUnitInterface} value to display, or a subscribable which provides it. */ + value: NumberUnitInterface | Subscribable>; + + /** + * The unit type in which to display the value, or a subscribable which provides it. If the unit is `null`, then the + * native type of the value is used instead. + */ + displayUnit: NavAngleUnit | null | Subscribable; + /** A function which formats numbers. */ formatter: (number: number) => string; - /** Whether to display 360 in place of 0. True by default. */ + /** + * A function which formats units. The formatted unit text should be written to the 2-tuple passed to the `out` + * parameter, as `[bigText, smallText]`. `bigText` and `smallText` will be rendered into separate `` elements + * representing the big and small components of the rendered unit text, respectively. If not defined, then units + * will be formatted such that `bigText` is always the degree symbol (°) and `smallText` is empty for magnetic + * bearing or `'T'` for true bearing. + */ + unitFormatter?: (out: [string, string], unit: NavAngleUnit, number: number) => void; + + /** Whether to display `'360'` in place of `'0'`. Defaults to `true`. */ use360?: boolean; - /** Whether to hide the ° symbol when value is NaN. False by default. */ + /** Whether to hide the unit text when the displayed value is equal to `NaN`. Defaults to `false`. */ hideDegreeSymbolWhenNan?: boolean; /** CSS class(es) to add to the root of the bearing display component. */ - class?: string | SubscribableSet; + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** * Displays a bearing value. */ export class BearingDisplay extends AbstractNumberUnitDisplay { - private readonly unitTextSmallRef = FSComponent.createRef(); - private readonly bearingUnitRef = FSComponent.createRef(); - private readonly numberTextSub = Subject.create(''); - private readonly unitTextSmallSub = Subject.create(''); + /** + * A function which formats units to default text for BearingDisplay. + * @param out The 2-tuple to which to write the formatted text, as `[bigText, smallText]`. + * @param unit The unit to format. + */ + public static readonly DEFAULT_UNIT_FORMATTER = (out: [string, string], unit: NavAngleUnit): void => { + out[0] = '°'; + out[1] = unit.isMagnetic() ? '' : 'T'; + }; - /** @inheritdoc */ - constructor(props: BearingDisplayProps) { - super(props); + private static readonly unitTextCache: [string, string] = ['', '']; - this.props.use360 ??= true; - } + private readonly unitFormatter = this.props.unitFormatter ?? BearingDisplay.DEFAULT_UNIT_FORMATTER; - /** @inheritdoc */ - public onAfterRender(): void { - super.onAfterRender(); + private readonly unitTextBigDisplay = Subject.create(''); + private readonly unitTextSmallDisplay = Subject.create(''); - // We have to hide the "small" unit text when empty because an empty string will get rendered as a space. - this.unitTextSmallSub.sub((text): void => { this.unitTextSmallRef.instance.style.display = text === '' ? 'none' : ''; }, true); - } + private readonly numberText = Subject.create(''); + private readonly unitTextBig = Subject.create(''); + private readonly unitTextSmall = Subject.create(''); /** @inheritdoc */ protected onValueChanged(value: NumberUnitInterface): void { - this.setDisplay(value, this.displayUnit.get()); + let displayUnit = this.displayUnit.get(); + if (!displayUnit || !value.unit.canConvert(displayUnit)) { + displayUnit = value.unit; + } + + const numberValue = value.asUnit(displayUnit); + + this.updateNumberText(numberValue); + this.updateUnitText(numberValue, displayUnit as NavAngleUnit); + + if (this.props.hideDegreeSymbolWhenNan === true) { + this.updateUnitTextVisibility(numberValue); + } } /** @inheritdoc */ protected onDisplayUnitChanged(displayUnit: Unit | null): void { - this.setDisplay(this.value.get(), displayUnit); - } - - /** - * Displays this component's current value. - * @param value The current value. - * @param displayUnit The current display unit. - */ - private setDisplay(value: NumberUnitInterface, displayUnit: Unit | null): void { + const value = this.value.get(); if (!displayUnit || !value.unit.canConvert(displayUnit)) { displayUnit = value.unit; } - const number = value.asUnit(displayUnit); - let numberText = this.props.formatter(number); - if (this.props.use360 && parseFloat(numberText) === 0) { + const numberValue = value.asUnit(displayUnit); + + this.updateNumberText(numberValue); + this.updateUnitText(numberValue, displayUnit as NavAngleUnit); + this.updateUnitTextVisibility(numberValue); + } + + /** + * Updates this component's displayed number text. + * @param numberValue The numeric value to display. + */ + private updateNumberText(numberValue: number): void { + let numberText = this.props.formatter(numberValue); + if (this.props.use360 !== false && parseFloat(numberText) === 0) { numberText = this.props.formatter(360); } - this.numberTextSub.set(numberText); + this.numberText.set(numberText); + } + /** + * Updates this component's displayed unit text. + * @param numberValue The numeric value to display. + * @param displayUnit The unit type in which to display the value. + */ + private updateUnitText(numberValue: number, displayUnit: NavAngleUnit): void { + BearingDisplay.unitTextCache[0] = ''; + BearingDisplay.unitTextCache[1] = ''; + + this.unitFormatter(BearingDisplay.unitTextCache, displayUnit, numberValue); + this.unitTextBig.set(BearingDisplay.unitTextCache[0]); + this.unitTextSmall.set(BearingDisplay.unitTextCache[1]); + } + + /** + * Updates whether this component's unit text spans are visible. + * @param numberValue The numeric value displayed by this component. + */ + private updateUnitTextVisibility(numberValue: number): void { if (this.props.hideDegreeSymbolWhenNan === true) { - this.bearingUnitRef.instance.style.display = isNaN(number) ? 'none' : 'inline'; + if (isNaN(numberValue)) { + this.unitTextBigDisplay.set('none'); + this.unitTextSmallDisplay.set('none'); + return; + } } - if (this.props.hideDegreeSymbolWhenNan === true && isNaN(number)) { - this.unitTextSmallSub.set(''); - } else { - this.unitTextSmallSub.set((displayUnit as NavAngleUnit).isMagnetic() ? '' : 'T'); - } + // We have to hide the unit text when empty because an empty string will get rendered as a space. + this.unitTextBigDisplay.set(this.unitTextBig.get() === '' ? 'none' : ''); + this.unitTextSmallDisplay.set(this.unitTextSmall.get() === '' ? 'none' : ''); } /** @inheritdoc */ public render(): VNode { return (
- {this.numberTextSub} - ° - {this.unitTextSmallSub} + {this.numberText} + {this.unitTextBig} + {this.unitTextSmall}
); } diff --git a/src/garminsdk/components/common/LatLonDisplay.tsx b/src/garminsdk/components/common/LatLonDisplay.tsx index 18f46c4b1..73355d71c 100644 --- a/src/garminsdk/components/common/LatLonDisplay.tsx +++ b/src/garminsdk/components/common/LatLonDisplay.tsx @@ -10,6 +10,9 @@ export enum LatLonDisplayFormat { /** HDDD° MM.MM' */ HDDD_MMmm = 'HDDD° MM.MM\'', + /** HDDD° MM.MMM' */ + HDDD_MMmmm = 'HDDD° MM.MMM\'', + /** HDDD° MM' SS.S */ HDDD_MM_SSs = 'HDDD° MM\' SS.S' } @@ -24,6 +27,9 @@ export interface LatLonDisplayProps extends ComponentProps { /** The format to use to display the coordinates. */ format: LatLonDisplayFormat | Subscribable; + /** Whether to split the prefix into a separate `span` element within the `div.g-latlon-coord`. Defaults to `false`. */ + splitPrefix?: boolean; + /** CSS class(es) to add to the component's root element. */ class?: string | SubscribableSet; } @@ -34,11 +40,13 @@ export interface LatLonDisplayProps extends ComponentProps { export class LatLonDisplay extends DisplayComponent { private static readonly LAT_FORMATTERS = { [LatLonDisplayFormat.HDDD_MMmm]: DmsFormatter2.create('{+[N]-[S]} {dd}°{mm.mm}\'', UnitType.ARC_SEC, 0.6, 'N __°__.__\''), + [LatLonDisplayFormat.HDDD_MMmmm]: DmsFormatter2.create('{+[N]-[S]} {dd}°{mm.mmm}\'', UnitType.ARC_SEC, 0.6, 'N __°__.___\''), [LatLonDisplayFormat.HDDD_MM_SSs]: DmsFormatter2.create('{+[N]-[S]} {dd}°{mm}\'{ss.s}"', UnitType.ARC_SEC, 0.1, 'N __°__\'__._"'), }; private static readonly LON_FORMATTERS = { [LatLonDisplayFormat.HDDD_MMmm]: DmsFormatter2.create('{+[E]-[W]}{ddd}°{mm.mm}\'', UnitType.ARC_SEC, 0.6, 'E___°__.__\''), + [LatLonDisplayFormat.HDDD_MMmmm]: DmsFormatter2.create('{+[E]-[W]}{ddd}°{mm.mmm}\'', UnitType.ARC_SEC, 0.6, 'E___°__.___\''), [LatLonDisplayFormat.HDDD_MM_SSs]: DmsFormatter2.create('{+[E]-[W]}{ddd}°{mm}\'{ss.s}"', UnitType.ARC_SEC, 0.1, 'E___°__\'__._"'), }; @@ -51,7 +59,12 @@ export class LatLonDisplay extends DisplayComponent { ); private readonly latText = Subject.create(''); + private readonly latPrefixText = this.props.splitPrefix ? this.latText.map((it) => it[0]) : undefined; + private readonly latNumberText = this.props.splitPrefix ? this.latText.map((it) => it.substring(2) ?? '') : undefined; + private readonly lonText = Subject.create(''); + private readonly lonPrefixText = this.props.splitPrefix ? this.lonText.map((it) => it[0]) : undefined; + private readonly lonNumberText = this.props.splitPrefix ? this.lonText.map((it) => it.substring(1) ?? '') : undefined; /** @inheritdoc */ public onAfterRender(): void { @@ -68,8 +81,23 @@ export class LatLonDisplay extends DisplayComponent { public render(): VNode { return (
-
{this.latText}
-
{this.lonText}
+ {this.props.splitPrefix ? ( + <> +
+ {this.latPrefixText} + {this.latNumberText} +
+
+ {this.lonPrefixText} + {this.lonNumberText} +
+ + ) : ( + <> +
{this.latText}
+
{this.lonText}
+ + )}
); } diff --git a/src/garminsdk/components/common/NumberUnitDisplay.tsx b/src/garminsdk/components/common/NumberUnitDisplay.tsx index 073ead378..7c918a003 100644 --- a/src/garminsdk/components/common/NumberUnitDisplay.tsx +++ b/src/garminsdk/components/common/NumberUnitDisplay.tsx @@ -1,4 +1,7 @@ -import { AbstractNumberUnitDisplay, AbstractNumberUnitDisplayProps, FSComponent, NumberUnitInterface, Subject, SubscribableSet, Unit, VNode } from '@microsoft/msfs-sdk'; +import { + AbstractNumberUnitDisplay, AbstractNumberUnitDisplayProps, FSComponent, NumberUnitInterface, Subject, SubscribableSet, + ToggleableClassNameRecord, Unit, VNode +} from '@microsoft/msfs-sdk'; import { UnitFormatter } from '../../graphics/text/UnitFormatter'; @@ -9,70 +12,146 @@ export interface NumberUnitDisplayProps extends AbstractNumber /** A function which formats numbers. */ formatter: (number: number) => string; + /** + * A function which formats units. The formatted unit text should be written to the 2-tuple passed to the `out` + * parameter, as `[bigText, smallText]`. `bigText` and `smallText` will be rendered into separate `` elements + * representing the big and small components of the rendered unit text, respectively. If not defined, then units + * will be formatted based on the text generated by the {@link UnitFormatter} class. + */ + unitFormatter?: (out: [string, string], unit: Unit, number: number) => void; + + /** Whether to hide the unit text when the displayed value is equal to `NaN`. Defaults to `false`. */ + hideUnitWhenNaN?: boolean; + /** CSS class(es) to add to the root of the icon component. */ - class?: string | SubscribableSet; + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** * A component which displays a number with units. */ export class NumberUnitDisplay extends AbstractNumberUnitDisplay> { - private static readonly UNIT_FORMATTER = UnitFormatter.create(); - private readonly unitTextBigRef = FSComponent.createRef(); + // We create our own map instead of using UnitFormatter.create() so that we don't have to generate new big and small + // text substrings with every call to the default unit formatter function. + private static readonly DEFAULT_UNIT_TEXT_MAP = NumberUnitDisplay.createDefaultUnitTextMap(); + + /** + * A function which formats units to default text for NumberUnitDisplay. + * @param out The 2-tuple to which to write the formatted text, as `[bigText, smallText]`. + * @param unit The unit to format. + */ + public static readonly DEFAULT_UNIT_FORMATTER = (out: [string, string], unit: Unit): void => { + const text = NumberUnitDisplay.DEFAULT_UNIT_TEXT_MAP[unit.family]?.[unit.name]; + + if (text) { + out[0] = text[0]; + out[1] = text[1]; + } + }; + + private static readonly unitTextCache: [string, string] = ['', '']; + + private readonly unitFormatter = this.props.unitFormatter ?? NumberUnitDisplay.DEFAULT_UNIT_FORMATTER; + + private readonly unitTextBigDisplay = Subject.create(''); + private readonly unitTextSmallDisplay = Subject.create(''); private readonly numberText = Subject.create(''); private readonly unitTextBig = Subject.create(''); private readonly unitTextSmall = Subject.create(''); - /** @inheritdoc */ - public onAfterRender(): void { - super.onAfterRender(); - - // We have to hide the "big" unit text when empty because an empty string will get rendered as a space. - this.unitTextBig.sub((text): void => { this.unitTextBigRef.instance.style.display = text === '' ? 'none' : ''; }, true); - } - /** @inheritdoc */ protected onValueChanged(value: NumberUnitInterface): void { - this.setDisplay(value, this.displayUnit.get()); + this.updateDisplay(value, this.displayUnit.get()); } /** @inheritdoc */ protected onDisplayUnitChanged(displayUnit: Unit | null): void { - this.setDisplay(this.value.get(), displayUnit); + this.updateDisplay(this.value.get(), displayUnit); } /** - * Displays this component's current value. - * @param value The current value. - * @param displayUnit The current display unit. + * Updates this component's displayed number and unit text. + * @param value The value to display. + * @param displayUnit The unit type in which to display the value, or `null` if the value should be displayed in its + * native unit type. */ - private setDisplay(value: NumberUnitInterface, displayUnit: Unit | null): void { + private updateDisplay(value: NumberUnitInterface, displayUnit: Unit | null): void { if (!displayUnit || !value.unit.canConvert(displayUnit)) { displayUnit = value.unit; } - const numberText = this.props.formatter(value.asUnit(displayUnit)); + const numberValue = value.asUnit(displayUnit); + + const numberText = this.props.formatter(numberValue); this.numberText.set(numberText); - const unitText = NumberUnitDisplay.UNIT_FORMATTER(displayUnit); + NumberUnitDisplay.unitTextCache[0] = ''; + NumberUnitDisplay.unitTextCache[1] = ''; - if (unitText[0] === '°') { - this.unitTextBig.set('°'); - this.unitTextSmall.set(unitText.substring(1)); - } else { - this.unitTextBig.set(''); - this.unitTextSmall.set(unitText); + this.unitFormatter(NumberUnitDisplay.unitTextCache, displayUnit, numberValue); + this.unitTextBig.set(NumberUnitDisplay.unitTextCache[0]); + this.unitTextSmall.set(NumberUnitDisplay.unitTextCache[1]); + + this.updateUnitTextVisibility(numberValue, NumberUnitDisplay.unitTextCache[0], NumberUnitDisplay.unitTextCache[1]); + } + + /** + * Updates whether this component's unit text spans are visible. + * @param numberValue The numeric value displayed by this component. + * @param unitTextBig The text to display in the big text span. + * @param unitTextSmall The text to display in the small text span. + */ + private updateUnitTextVisibility(numberValue: number, unitTextBig: string, unitTextSmall: string): void { + if (this.props.hideUnitWhenNaN === true && isNaN(numberValue)) { + this.unitTextBigDisplay.set('none'); + this.unitTextSmallDisplay.set('none'); + return; } + + // We have to hide the unit text when empty because an empty string will get rendered as a space. + this.unitTextBigDisplay.set(unitTextBig === '' ? 'none' : ''); + this.unitTextSmallDisplay.set(unitTextSmall === '' ? 'none' : ''); } /** @inheritdoc */ public render(): VNode { return (
- {this.numberText}{this.unitTextBig}{this.unitTextSmall} + {this.numberText} + {this.unitTextBig} + {this.unitTextSmall}
); } + + /** + * Creates the default mapping from unit to displayed text. + * @returns The default mapping from unit to displayed text. + */ + private static createDefaultUnitTextMap(): Partial>>> { + const originalMap = UnitFormatter.getUnitTextMap(); + + const map = {} as Record>; + for (const family in originalMap) { + const nameMap = map[family] = {} as Record; + + const originalNameMap = originalMap[family] as Readonly>>; + for (const name in originalNameMap) { + const text = nameMap[name] = ['', '']; + + const originalText = originalNameMap[name] as string; + + if (originalText[0] === '°') { + text[0] = '°'; + text[1] = originalText.substring(1); + } else { + text[1] = originalText; + } + } + } + + return map; + } } \ No newline at end of file diff --git a/src/garminsdk/components/common/TimeDisplay.tsx b/src/garminsdk/components/common/TimeDisplay.tsx index ab857ea4f..7d8a24250 100644 --- a/src/garminsdk/components/common/TimeDisplay.tsx +++ b/src/garminsdk/components/common/TimeDisplay.tsx @@ -1,5 +1,6 @@ import { - ComponentProps, DisplayComponent, FSComponent, MappedSubscribable, Subject, Subscribable, SubscribableMapFunctions, SubscribableSet, Subscription, VNode + ComponentProps, DisplayComponent, FSComponent, MappedSubscribable, Subject, Subscribable, SubscribableMapFunctions, + SubscribableSet, SubscribableUtils, Subscription, ToggleableClassNameRecord, VNode } from '@microsoft/msfs-sdk'; /** @@ -27,8 +28,19 @@ export interface TimeDisplayProps extends ComponentProps { /** The local time offset, in milliseconds, or a subscribable which provides it. */ localOffset: number | Subscribable; + /** + * A function which formats suffixes to append to the displayed time. If not defined, then the suffix will be + * will be formatted as `'UTC'` if the display format is {@link TimeDisplayFormat.UTC}, `'LCL'` if the display format + * is {@link TimeDisplayFormat.Local24}, and either `'AM'` or `'PM'` if the display format is + * {@link TimeDisplayFormat.Local12}. + */ + suffixFormatter?: (format: TimeDisplayFormat, isAm: boolean) => string; + + /** Whether to hide the suffix when the displayed time is equal to `NaN`. Defaults to `false`. */ + hideSuffixWhenNaN?: boolean; + /** CSS class(es) to apply to the root of the component. */ - class?: string | SubscribableSet; + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** @@ -37,17 +49,35 @@ export interface TimeDisplayProps extends ComponentProps { export class TimeDisplay extends DisplayComponent { private static readonly SECOND_PRECISION_MAP = SubscribableMapFunctions.withPrecision(1000); + private static readonly HIDE_UNIT_TEXT_PIPE = (text: string): string => text === '' ? 'none' : ''; + + /** + * A function which formats suffixes for TimeDisplay. + * @param format The current format used to display the time. + * @param isAm Whether or not the current time is AM. + * @returns The suffix to append to the displayed time. + */ + public static readonly DEFAULT_SUFFIX_FORMATTER = (format: TimeDisplayFormat, isAm: boolean): string => { + if (format === TimeDisplayFormat.UTC) { + return 'UTC'; + } else if (format === TimeDisplayFormat.Local24) { + return 'LCL'; + } else { + return isAm ? 'AM' : 'PM'; + } + }; + private readonly timeSeconds = typeof this.props.time === 'object' ? (this.timeSub = this.props.time.map(TimeDisplay.SECOND_PRECISION_MAP)) : Subject.create(TimeDisplay.SECOND_PRECISION_MAP(this.props.time)); - private readonly format = typeof this.props.format === 'object' - ? this.props.format - : Subject.create(this.props.format); + private readonly format = SubscribableUtils.toSubscribable(this.props.format, true); + + private readonly localOffset = SubscribableUtils.toSubscribable(this.props.localOffset, true); - private readonly localOffset = typeof this.props.localOffset === 'object' - ? this.props.localOffset - : Subject.create(this.props.localOffset); + private readonly suffixFormatter = this.props.suffixFormatter ?? TimeDisplay.DEFAULT_SUFFIX_FORMATTER; + + private readonly suffixDisplay = Subject.create(''); private readonly date = new Date(); @@ -67,6 +97,9 @@ export class TimeDisplay extends DisplayComponent { this.formatSub = this.format.sub(this.updateHandler); this.localOffsetSub = this.localOffset.sub(this.updateHandler); this.timeSeconds.sub(this.updateHandler, true); + + // We have to hide the suffix text when empty because an empty string will get rendered as a space. + this.suffixText.pipe(this.suffixDisplay, TimeDisplay.HIDE_UNIT_TEXT_PIPE); } /** @@ -82,6 +115,8 @@ export class TimeDisplay extends DisplayComponent { this.hourText.set('__'); this.minText.set('__'); this.secText.set('__'); + + this.suffixText.set(this.props.hideSuffixWhenNaN ? '' : this.getSuffix(format, isAm)); } else { const offset = format === TimeDisplayFormat.UTC ? 0 : this.localOffset.get(); @@ -100,25 +135,19 @@ export class TimeDisplay extends DisplayComponent { this.minText.set(this.date.getUTCMinutes().toString().padStart(2, '0')); this.secText.set(this.date.getUTCSeconds().toString().padStart(2, '0')); - } - this.suffixText.set(this.getSuffix(format, isAm)); + this.suffixText.set(this.getSuffix(format, isAm)); + } } /** * Gets the suffix to append to the time display. * @param format The format of the time display. - * @param isAm Whether or not the current time is AM or PM. + * @param isAm Whether or not the current time is AM. * @returns The time display suffix. */ protected getSuffix(format: TimeDisplayFormat, isAm: boolean): string { - if (format === TimeDisplayFormat.UTC) { - return 'UTC'; - } else if (format === TimeDisplayFormat.Local24) { - return 'LCL'; - } else { - return isAm ? 'AM' : 'PM'; - } + return this.suffixFormatter(format, isAm); } /** @inheritdoc */ @@ -128,7 +157,7 @@ export class TimeDisplay extends DisplayComponent { {this.hourText} :{this.minText} :{this.secText} - {this.suffixText} + {this.suffixText} ); } diff --git a/src/garminsdk/components/list/ScrollList.tsx b/src/garminsdk/components/list/ScrollList.tsx index d00e35557..0e9a1c85c 100644 --- a/src/garminsdk/components/list/ScrollList.tsx +++ b/src/garminsdk/components/list/ScrollList.tsx @@ -1,5 +1,5 @@ import { - ComponentProps, DisplayComponent, FSComponent, MappedSubject, MappedSubscribable, MathUtils, ReadonlyFloat64Array, + ComponentProps, DisplayComponent, FSComponent, MappedSubject, MappedSubscribable, MathUtils, MutableSubscribable, ReadonlyFloat64Array, SetSubject, Subject, Subscribable, SubscribableMapFunctions, SubscribableSet, SubscribableUtils, Subscription, ToggleableClassNameRecord, Vec2Math, Vec2Subject, VNode, } from '@microsoft/msfs-sdk'; @@ -59,18 +59,23 @@ export class ScrollList

extends Dis protected readonly translatableRef = FSComponent.createRef(); protected readonly itemsContainerRef = FSComponent.createRef(); - protected readonly listItemLengthPx = SubscribableUtils.toSubscribable(this.props.listItemLengthPx, true); - protected readonly listItemSpacingPx = SubscribableUtils.toSubscribable(this.props.listItemSpacingPx ?? 0, true); + protected readonly listItemLengthPxProp = SubscribableUtils.toSubscribable(this.props.listItemLengthPx, true); + protected readonly listItemSpacingPxProp = SubscribableUtils.toSubscribable(this.props.listItemSpacingPx ?? 0, true); + protected readonly itemsPerPageProp = this.props.itemsPerPage === undefined ? undefined : SubscribableUtils.toSubscribable(this.props.itemsPerPage, true); + + protected readonly listItemLengthPx = Subject.create(this.listItemLengthPxProp.get()); + protected readonly listItemSpacingPx = Subject.create(this.listItemSpacingPxProp.get()); protected readonly itemCount = SubscribableUtils.toSubscribable(this.props.itemCount, true); /** The axis along which this list scrolls. */ public readonly scrollAxis = this.props.scrollAxis ?? 'y'; + protected readonly _itemsPerPage = this.itemsPerPageProp === undefined ? undefined : Subject.create(this.itemsPerPageProp.get()); /** * The number of visible list items per page displayed by this list, or `undefined` if the number of items per page * is not prescribed. */ - public readonly itemsPerPage = this.props.itemsPerPage === undefined ? undefined : SubscribableUtils.toSubscribable(this.props.itemsPerPage, true); + public readonly itemsPerPage = this._itemsPerPage as Subscribable | undefined; protected readonly snapToItem = this.itemsPerPage !== undefined; @@ -245,10 +250,30 @@ export class ScrollList

extends Dis protected goToAnimationTargetPos = false; protected interval?: number; + protected readonly listItemParamSubs: Subscription[] = []; + protected cssClassSub?: Subscription | Subscription[]; /** @inheritdoc */ public onAfterRender(): void { + if (this._itemsPerPage && this.itemsPerPageProp) { + this.listItemLengthPx.set(this.listItemLengthPxProp.get()); + this.listItemSpacingPx.set(this.listItemSpacingPxProp.get()); + + this._itemsPerPage.set(this.itemsPerPageProp.get()); + + this.listItemParamSubs.push( + this.listItemLengthPxProp.sub(this.onListItemParamChanged.bind(this, this.listItemLengthPx)), + this.listItemSpacingPxProp.sub(this.onListItemParamChanged.bind(this, this.listItemSpacingPx)), + this.itemsPerPageProp.sub(this.onListItemParamChanged.bind(this, this._itemsPerPage)) + ); + } else { + this.listItemParamSubs.push( + this.listItemLengthPxProp.pipe(this.listItemLengthPx), + this.listItemSpacingPxProp.pipe(this.listItemSpacingPx), + ); + } + this._lengthPx.sub(lengthPx => { this.rootRef.instance.style.setProperty('--scroll-list-length', lengthPx + 'px'); }, true); @@ -626,8 +651,14 @@ export class ScrollList

extends Dis } } + const maxOverscrollPx = this.maxOverscrollPx.get(); + // Apply velocity to the scroll position - this._scrollPos.set(this._scrollPos.get() + (this.velocity * deltaTimeSeconds)); + this._scrollPos.set(MathUtils.clamp( + this._scrollPos.get() + (this.velocity * deltaTimeSeconds), + -maxOverscrollPx, + this._maxScrollPos.get() + maxOverscrollPx + )); // If we have scrolled past our target, set scroll position to the target and stop if (direction > 0) { @@ -653,6 +684,23 @@ export class ScrollList

extends Dis return MathUtils.clamp(MathUtils.round(pos, this._listItemLengthWithMarginPx.get()), 0, this._maxScrollPos.get()); } + /** + * Responds to when one of this list's item parameters changes when the list supports snapping to items. + * @param pipeTo The mutable subscribable to which to pipe the new parameter value. + * @param value The new parameter value. + */ + protected onListItemParamChanged(pipeTo: MutableSubscribable, value: number): void { + // If a list item parameter changes, then after the change the list's scroll position may be misaligned with + // respect to item snapping. Therefore, we will store the first visible item in the list before the parameter + // change and force the list to snap to the stored item after the parameter change. + + const firstVisibleIndex = this._firstVisibleIndex.get(); + + pipeTo.set(value); + + this.scrollToIndex(firstVisibleIndex, 0, false); + } + /** * Updates this list's item render window. */ @@ -730,14 +778,31 @@ export class ScrollList

extends Dis * @returns a number used to dampen the mouse movement when overscrolled. */ protected getDampening(direction: number): number { - const overscrollDirection = this.scrollPosFraction.get() > 1 ? 1 : this.scrollPosFraction.get() < 0 ? -1 : 0; - const overscrollPercentage = Math.min(1, this.getOverscrollPx() / this.maxOverscrollPx.get()); - const overscrollDampening = overscrollPercentage > 0 ? 0.5 : 1; + const maxScrollPos = this.maxScrollPos.get(); + const maxOverscrollPx = this.maxOverscrollPx.get(); + + // If we can't scroll at all, always dampen velocity to zero. + if (maxScrollPos <= 0 && maxOverscrollPx <= 0) { + return 0; + } + + const scrollPosFraction = this.scrollPosFraction.get(); + const overscrollDirection = scrollPosFraction >= 1 ? 1 : scrollPosFraction <= 0 ? -1 : 0; + + // If we are not trying to increase overscroll, then do not dampen velocity. if (overscrollDirection !== direction) { - return overscrollDampening; + return 1; + } + + if (maxOverscrollPx > 0) { + // If we can overscroll, then dampen velocity to zero if we are at the overscroll limit or by half if we are not + // at the limit. + const overscrollPercentage = Math.min(1, this.getOverscrollPx() / maxOverscrollPx); + return overscrollPercentage === 1 ? 0 : 0.5; + } else { + // If we can't overscroll, then always dampen velocity to zero. + return 0; } - const dampening = overscrollPercentage === 1 ? 0 : overscrollDampening; - return dampening; } /** @@ -801,6 +866,10 @@ export class ScrollList

extends Dis /** @inheritdoc */ public destroy(): void { + for (const sub of this.listItemParamSubs) { + sub.destroy(); + } + this._listItemLengthWithMarginPx.destroy(); 'destroy' in this._lengthPx && this._lengthPx.destroy(); this.pageLength.destroy(); diff --git a/src/garminsdk/components/map/GarminMapBuilder.tsx b/src/garminsdk/components/map/GarminMapBuilder.tsx index 95a8bc3e6..fa701d34b 100644 --- a/src/garminsdk/components/map/GarminMapBuilder.tsx +++ b/src/garminsdk/components/map/GarminMapBuilder.tsx @@ -17,18 +17,20 @@ import { TrafficSystem } from '../../traffic/TrafficSystem'; import { WindDataProvider } from '../../wind/WindDataProvider'; import { MapAirspaceVisController, MapAirspaceVisControllerModules, MapAirspaceVisUserSettings, MapDataIntegrityRTRController, MapDataIntegrityRTRControllerContext, - MapDataIntegrityRTRControllerModules, MapFlightPlanFocusRTRController, MapFlightPlanFocusRTRControllerContext, MapFlightPlanFocusRTRControllerModules, + MapDataIntegrityRTRControllerModules, MapDesiredOrientationController, MapDesiredOrientationControllerContext, MapDesiredOrientationControllerModules, + MapFlightPlanFocusRTRController, MapFlightPlanFocusRTRControllerContext, MapFlightPlanFocusRTRControllerModules, MapGarminAutopilotPropsBinding, MapGarminAutopilotPropsController, MapGarminAutopilotPropsControllerModules, MapGarminAutopilotPropsKey, MapGarminTrafficController, MapGarminTrafficControllerModules, MapNexradController, MapNexradControllerModules, MapNexradUserSettings, - MapOrientationController, MapOrientationControllerContext, MapOrientationControllerModules, MapOrientationControllerSettings, MapOrientationRTRController, - MapOrientationRTRControllerContext, MapOrientationRTRControllerModules, MapPointerController, MapPointerControllerModules, MapPointerRTRController, - MapPointerRTRControllerContext, MapPointerRTRControllerModules, MapRangeCompassController, MapRangeCompassControllerModules, MapRangeController, - MapRangeControllerModules, MapRangeControllerSettings, MapRangeRTRController, MapRangeRTRControllerModules, MapTerrainColorsController, - MapTerrainColorsControllerModules, MapTerrainColorsDefinition, MapTerrainController, MapTerrainControllerModules, MapTerrainUserSettings, + MapOrientationModeController, MapOrientationModeControllerContext, MapOrientationModeControllerModules, MapOrientationRTRController, + MapOrientationRTRControllerContext, MapOrientationRTRControllerModules, MapOrientationSettingsController, MapOrientationSettingsControllerModules, + MapOrientationSettingsControllerSettings, MapPanningRTRController, MapPanningRTRControllerContext, MapPanningRTRControllerModules, MapPointerController, + MapPointerControllerModules, MapPointerRTRController, MapPointerRTRControllerModules, MapRangeCompassController, MapRangeCompassControllerModules, + MapRangeController, MapRangeControllerModules, MapRangeControllerSettings, MapRangeRTRController, MapRangeRTRControllerModules, MapTerrainColorsController, + MapTerrainColorsControllerModules, MapTerrainColorsDefinition, MapTerrainController, MapTerrainControllerModules, MapTerrainControllerOptions, MapTerrainUserSettings, MapTrafficController, MapTrafficControllerModules, MapTrafficUserSettings, MapWaypointsVisController, MapWaypointsVisControllerModules, - MapWaypointVisUserSettings, MapWindVectorController, MapWindVectorControllerModules, MapWindVectorUserSettings, MapWxrController, MapWxrControllerModules, - TrafficMapRangeController, TrafficMapRangeControllerModules, TrafficMapRangeControllerSettings, WeatherMapOrientationController, - WeatherMapOrientationControllerContext, WeatherMapOrientationControllerModules, WeatherMapOrientationControllerSettings + MapWaypointsVisControllerOptions, MapWaypointVisUserSettings, MapWindVectorController, MapWindVectorControllerModules, MapWindVectorUserSettings, + MapWxrController, MapWxrControllerModules, TrafficMapRangeController, TrafficMapRangeControllerModules, TrafficMapRangeControllerSettings, + WeatherMapOrientationSettingsController, WeatherMapOrientationSettingsControllerModules, WeatherMapOrientationSettingsControllerSettings } from './controllers'; import { MapActiveFlightPlanDataProvider, MapFlightPathPlanRenderer, MapFlightPathProcRenderer, MapFlightPlannerPlanDataProvider } from './flightplan'; import { MapFlightPlanDataProvider } from './flightplan/MapFlightPlanDataProvider'; @@ -48,7 +50,7 @@ import { MapWaypointDisplayBuilder, MapWaypointDisplayBuilderClass } from './Map import { MapWaypointRenderer, MapWaypointRenderRole } from './MapWaypointRenderer'; import { GarminAirspaceShowTypeMap, MapCrosshairModule, MapDeclutterMode, MapDeclutterModule, MapFlightPlanFocusModule, MapGarminAutopilotPropsModule, - MapGarminDataIntegrityModule, MapGarminTrafficModule, MapNexradModule, MapOrientation, MapOrientationModule, MapPointerModule, MapProcedurePreviewModule, + MapGarminDataIntegrityModule, MapGarminTrafficModule, MapNexradModule, MapOrientation, MapOrientationModule, MapPanningModule, MapPointerModule, MapProcedurePreviewModule, MapRangeCompassModule, MapRangeRingModule, MapTerrainMode, MapTerrainModule, MapTrackVectorModule, MapUnitsModule, MapWaypointHighlightModule, MapWaypointsModule, MapWindVectorModule } from './modules'; @@ -126,7 +128,7 @@ export type TrackVectorOptions = Omit, keyof MapLayerProps>; /** - * + * A builder for Garmin maps. */ export class GarminMapBuilder { @@ -282,19 +284,21 @@ export class GarminMapBuilder { * Adds the following... * * Context properties: - * * `'[MapSystemKeys.RotationControl]': ResourceModerator` + * * `[MapSystemKeys.RotationControl]: ResourceModerator` * * `[GarminMapKeys.OrientationControl]: ResourceModerator` + * * `[GarminMapKeys.DesiredOrientationControl]: ResourceModerator` * * Modules: * * `[MapSystemKeys.Rotation]: MapRotationModule` * * `[GarminMapKeys.Orientation]: MapOrientationModule` - * * `[GarminMapKeys.Range]: MapIndexedRangeModule` (only with user setting support) + * * `[GarminMapKeys.Range]: MapIndexedRangeModule` + * * `[MapSystemKeys.OwnAirplaneProps]: MapOwnAirplanePropsModule` * * Controllers: * * `[MapSystemKeys.Rotation]: MapRotationController` * * `[GarminMapKeys.OrientationRTR]: MapOrientationRTRController` - * * `[GarminMapKeys.Orientation]: MapOrientationController` (only with user setting support) - * {@link MapOrientationRTRController}. + * * `[GarminMapKeys.Orientation]: MapOrientationModeController` + * * `[GarminMapKeys.DesiredOrientation]: MapDesiredOrientationController` * @param mapBuilder The map builder to configure. * @param nominalTargetOffsets The nominal projected target offsets defined by each orientation. Each target offset * is a 2-tuple `[x, y]`, where each component is expressed relative to the width or height of the map's projected @@ -303,20 +307,18 @@ export class GarminMapBuilder { * is a 4-tuple `[x1, y1, x2, y2]`, where each component is expressed relative to the width or height of the map's * projected window, *excluding* the dead zone. If an orientation does not have defined range endpoints, it will * default to `[0.5, 0.5, 0.5, 0]` (center to top-center). - * @param settingManager A setting manager containing user settings used to control the map orientation. If not - * defined, map orientation will not be bound to user settings. * @returns The map builder, after it has been configured. */ - public static orientation( + private static orientationBase( mapBuilder: MapBuilder, nominalTargetOffsets?: Partial>>, - nominalRangeEndpoints?: Partial>>, - settingManager?: UserSettingManager> + nominalRangeEndpoints?: Partial>> ): MapBuilder { mapBuilder .withRotation() .withContext(GarminMapKeys.RotationModeControl, () => new ResourceModerator(undefined)) .withContext(GarminMapKeys.OrientationControl, () => new ResourceModerator(undefined)) + .withContext(GarminMapKeys.DesiredOrientationControl, () => new ResourceModerator(undefined)) .withModule(GarminMapKeys.Orientation, () => new MapOrientationModule()) .withController( GarminMapKeys.OrientationRTR, @@ -325,15 +327,69 @@ export class GarminMapBuilder { nominalTargetOffsets, nominalRangeEndpoints ) + ) + .withController( + GarminMapKeys.Orientation, + context => new MapOrientationModeController(context) + ) + .withModule(GarminMapKeys.Range, () => new MapIndexedRangeModule()) + .withModule(MapSystemKeys.OwnAirplaneProps, () => new MapOwnAirplanePropsModule()) + .withController( + GarminMapKeys.DesiredOrientation, + context => new MapDesiredOrientationController(context) ); + return mapBuilder; + } + + /** + * Configures a map builder to generate a map which supports different orientations, as enumerated by + * {@link MapOrientation}. Each orientation defines a different rotation behavior, target offset, and range + * endpoints. + * + * Adds the following... + * + * Context properties: + * * `[MapSystemKeys.RotationControl]: ResourceModerator` + * * `[GarminMapKeys.OrientationControl]: ResourceModerator` + * * `[GarminMapKeys.DesiredOrientationControl]: ResourceModerator` + * + * Modules: + * * `[MapSystemKeys.Rotation]: MapRotationModule` + * * `[GarminMapKeys.Orientation]: MapOrientationModule` + * * `[GarminMapKeys.Range]: MapIndexedRangeModule` + * + * Controllers: + * * `[MapSystemKeys.Rotation]: MapRotationController` + * * `[GarminMapKeys.OrientationRTR]: MapOrientationRTRController` + * * `[GarminMapKeys.Orientation]: MapOrientationModeController` + * * `[GarminMapKeys.DesiredOrientation]: MapDesiredOrientationController` + * * `[GarminMapKeys.OrientationSettings]: MapOrientationSettingsController` (only with user setting support) + * @param mapBuilder The map builder to configure. + * @param nominalTargetOffsets The nominal projected target offsets defined by each orientation. Each target offset + * is a 2-tuple `[x, y]`, where each component is expressed relative to the width or height of the map's projected + * window, *excluding* the dead zone. If an orientation does not have a defined offset, it will default to `[0, 0]`. + * @param nominalRangeEndpoints The nominal range endpoints defined by each orientation. Each set of range endpoints + * is a 4-tuple `[x1, y1, x2, y2]`, where each component is expressed relative to the width or height of the map's + * projected window, *excluding* the dead zone. If an orientation does not have defined range endpoints, it will + * default to `[0.5, 0.5, 0.5, 0]` (center to top-center). + * @param settingManager A setting manager containing user settings used to control the map orientation. If not + * defined, map orientation will not be bound to user settings. + * @returns The map builder, after it has been configured. + */ + public static orientation( + mapBuilder: MapBuilder, + nominalTargetOffsets?: Partial>>, + nominalRangeEndpoints?: Partial>>, + settingManager?: UserSettingManager> + ): MapBuilder { + mapBuilder.with(GarminMapBuilder.orientationBase, nominalTargetOffsets, nominalRangeEndpoints); + if (settingManager !== undefined) { - mapBuilder - .withModule(GarminMapKeys.Range, () => new MapIndexedRangeModule()) - .withController( - GarminMapKeys.Orientation, - context => new MapOrientationController(context, settingManager) - ); + mapBuilder.withController( + GarminMapKeys.OrientationSettings, + context => new MapOrientationSettingsController(context, settingManager) + ); } return mapBuilder; @@ -347,19 +403,21 @@ export class GarminMapBuilder { * Adds the following... * * Context properties: - * * `'[MapSystemKeys.RotationControl]': ResourceModerator` + * * `[MapSystemKeys.RotationControl]: ResourceModerator` * * `[GarminMapKeys.OrientationControl]: ResourceModerator` + * * `[GarminMapKeys.DesiredOrientationControl]: ResourceModerator` * * Modules: * * `[MapSystemKeys.Rotation]: MapRotationModule` * * `[GarminMapKeys.Orientation]: MapOrientationModule` - * * `[GarminMapKeys.Range]: MapIndexedRangeModule` (only with user setting support) + * * `[GarminMapKeys.Range]: MapIndexedRangeModule` * * Controllers: * * `[MapSystemKeys.Rotation]: MapRotationController` * * `[GarminMapKeys.OrientationRTR]: MapOrientationRTRController` - * * `[GarminMapKeys.Orientation]: MapOrientationController` (only with user setting support) - * {@link MapOrientationRTRController}. + * * `[GarminMapKeys.Orientation]: MapOrientationModeController` + * * `[GarminMapKeys.DesiredOrientation]: MapDesiredOrientationController` + * * `[GarminMapKeys.OrientationSettings]: WeatherMapOrientationSettingsController` (only with user setting support) * @param mapBuilder The map builder to configure. * @param nominalTargetOffsets The nominal projected target offsets defined by each orientation. Each target offset * is a 2-tuple `[x, y]`, where each component is expressed relative to the width or height of the map's projected @@ -376,29 +434,15 @@ export class GarminMapBuilder { mapBuilder: MapBuilder, nominalTargetOffsets?: Partial>>, nominalRangeEndpoints?: Partial>>, - settingManager?: UserSettingManager> + settingManager?: UserSettingManager> ): MapBuilder { - mapBuilder - .withRotation() - .withContext(GarminMapKeys.RotationModeControl, () => new ResourceModerator(undefined)) - .withContext(GarminMapKeys.OrientationControl, () => new ResourceModerator(undefined)) - .withModule(GarminMapKeys.Orientation, () => new MapOrientationModule()) - .withController( - GarminMapKeys.OrientationRTR, - context => new MapOrientationRTRController( - context, - nominalTargetOffsets, - nominalRangeEndpoints - ) - ); + mapBuilder.with(GarminMapBuilder.orientationBase, nominalTargetOffsets, nominalRangeEndpoints); if (settingManager !== undefined) { - mapBuilder - .withModule(GarminMapKeys.Range, () => new MapIndexedRangeModule()) - .withController( - GarminMapKeys.Orientation, - context => new WeatherMapOrientationController(context, settingManager) - ); + mapBuilder.withController( + GarminMapKeys.OrientationSettings, + context => new WeatherMapOrientationSettingsController(context, settingManager) + ); } return mapBuilder; @@ -517,8 +561,9 @@ export class GarminMapBuilder { * @param colors The terrain colors to use for each terrain mode. Ignored if `includeTerrain` is `false`. * @param settingManager A user setting manager containing settings which control terrain colors. If not defined, * terrain color mode will not be controlled by user settings. - * @param allowRelativeMode Whether to allow relative terrain mode. Defaults to `true`. Ignored if terrain - * colors is not controlled by user settings. + * @param terrainModeOptions Options with which to configure the terrain mode controller. If a `boolean` value is + * provided in place of an options object, then it will be interpreted as the `allowRelative` option. Ignored if + * terrain colors is not controlled by user settings. * @param groundRelativeBlendDuration The amount of time, in milliseconds, over which to blend the on-ground and * relative terrain mode colors when transitioning between the two. A blend transition is only possible if colors * are defined for both the on-ground and relative terrain modes, and the colors for both modes have the same number @@ -529,7 +574,7 @@ export class GarminMapBuilder { mapBuilder: MapBuilder, colors: Partial>, settingManager?: UserSettingManager>, - allowRelativeMode = true, + terrainModeOptions?: Readonly | boolean, groundRelativeBlendDuration = 0 ): MapBuilder { mapBuilder @@ -543,7 +588,7 @@ export class GarminMapBuilder { mapBuilder .withModule(GarminMapKeys.Range, () => new MapIndexedRangeModule()) .withController(GarminMapKeys.Terrain, context => { - return new MapTerrainController(context, settingManager, allowRelativeMode); + return new MapTerrainController(context, settingManager, terrainModeOptions as any); }); } @@ -651,7 +696,7 @@ export class GarminMapBuilder { * Controllers: * * `[GarminMapKeys.RangeCompass]: MapRangeCompassController` * @param mapBuilder The map builder to configure. - * @param options Styling options for the ring. + * @param options Styling options for the compass. * @param order The order to assign to the range compass layer. Layers with lower assigned order will be attached to * the map before and appear below layers with greater assigned order values. Defaults to the number of layers * already added to the map builder. @@ -752,7 +797,7 @@ export class GarminMapBuilder { * Controllers: * * `[MapSystemKeys.WaypointRenderer]: MapSystemCustomController` (handles initialization and updating of the * waypoint renderer) - * * `'waypointsVis': MapWaypointsVisController` (only if user settings are supported) + * * `[GarminMapKeys.WaypointsVisibility]: MapWaypointsVisController` (only if user settings are supported) * @param mapBuilder The map builder to configure. * @param configure A function used to configure the display and styling of waypoint icons and labels. * @param supportRunwayOutlines Whether to support the rendering of airport runway outlines. @@ -765,7 +810,7 @@ export class GarminMapBuilder { */ public static waypoints( mapBuilder: MapBuilder, - configure: (builder: MapWaypointDisplayBuilder) => void, + configure: (builder: MapWaypointDisplayBuilder, context: MapSystemContext) => void, supportRunwayOutlines: boolean, settingManager?: UserSettingManager>, order?: number @@ -807,7 +852,7 @@ export class GarminMapBuilder { any, any, any, { [GarminMapKeys.WaypointDisplayBuilder]: MapWaypointDisplayBuilderClass } >('waypointsLayerDisplayConfigure', context => { - configure(context[GarminMapKeys.WaypointDisplayBuilder]); + configure(context[GarminMapKeys.WaypointDisplayBuilder], context); }) .withController< MapSystemGenericController, @@ -830,13 +875,15 @@ export class GarminMapBuilder { * Adds the controller `[GarminMapKeys.WaypointsVisibility]: MapWaypointsVisController`. * @param mapBuilder The map builder to configure. * @param settingManager A setting manager containing the user settings controlling waypoint visibility. + * @param options Options with which to configure waypoint visibility. * @returns The map builder, after it has been configured. */ public static waypointVisSettings>( mapBuilder: MapBuilder, - settingManager: UserSettingManager> + settingManager: UserSettingManager>, + options?: Readonly ): MapBuilder { - return mapBuilder.withController(GarminMapKeys.WaypointsVisibility, context => new MapWaypointsVisController(context, settingManager)); + return mapBuilder.withController(GarminMapKeys.WaypointsVisibility, context => new MapWaypointsVisController(context, settingManager, options)); } public static flightPlans( @@ -1513,19 +1560,21 @@ export class GarminMapBuilder { * Configures a map builder to generate a map with pointer support. Activating the pointer allows the pointer to * control map panning and stops the map from actively rotating. * - * If map target and rotation control resource moderators exist on the map context, the pointer RTR controller will - * attempt to claim those resources with a priority of `100`. Otherwise, the controller assumes nothing else controls - * the map target or rotation. + * If map target, orientation, or rotation control resource moderators exist on the map context, the panning RTR + * controller will attempt to claim those resources with a priority of `100`. Otherwise, the controller assumes + * nothing else controls the map target or rotation. * * Adds the following... * * Modules: + * * `[GarminMapKeys.Panning]: MapPanningModule` * * `[GarminMapKeys.Pointer]: MapPointerModule` * * Layers: * * `[GarminMapKeys.Pointer]: MapPointerLayer` * * Controllers: + * * `[GarminMapKeys.PanningRTR]: MapPanningRTRController` * * `[GarminMapKeys.Pointer]: MapPointerController` (can be used to control the behavior of the pointer) * * `[GarminMapKeys.PointerRTR]: MapPointerRTRController` * @param mapBuilder The map builder to configure. @@ -1539,13 +1588,14 @@ export class GarminMapBuilder { * added to the map builder. * @returns The map builder, after it has been configured. */ - public static pointer>( + public static pointer>( mapBuilder: MapBuilder, pointerBoundsOffset: ReadonlyFloat64Array | Subscribable, icon?: VNode, order?: number ): MapBuilder { return mapBuilder + .withModule(GarminMapKeys.Panning, () => new MapPanningModule()) .withModule(GarminMapKeys.Pointer, () => new MapPointerModule()) .withLayer(GarminMapKeys.Pointer, (context): VNode => { return ( @@ -1554,14 +1604,15 @@ export class GarminMapBuilder { ); }, order) + .withController( + GarminMapKeys.PanningRTR, + context => new MapPanningRTRController(context) + ) .withController(GarminMapKeys.Pointer, context => new MapPointerController(context)) - .withController( + .withController( GarminMapKeys.PointerRTR, context => { - return new MapPointerRTRController( - context, - 'isSubscribable' in pointerBoundsOffset ? pointerBoundsOffset : Subject.create(pointerBoundsOffset) - ); + return new MapPointerRTRController(context, pointerBoundsOffset); } ); } diff --git a/src/garminsdk/components/map/GarminMapKeys.ts b/src/garminsdk/components/map/GarminMapKeys.ts index 981f03438..ebe1266bb 100644 --- a/src/garminsdk/components/map/GarminMapKeys.ts +++ b/src/garminsdk/components/map/GarminMapKeys.ts @@ -14,10 +14,16 @@ export class GarminMapKeys { public static readonly OrientationRTR = 'orientationRTR' as const; + public static readonly DesiredOrientation = 'desiredOrientation' as const; + + public static readonly OrientationSettings = 'orientationSettings' as const; + public static readonly RotationModeControl = 'rotationModeControlModerator' as const; public static readonly OrientationControl = 'orientationControlModerator' as const; + public static readonly DesiredOrientationControl = 'desiredOrientationControl' as const; + public static readonly Declutter = 'declutter' as const; public static readonly Terrain = 'terrain' as const; @@ -34,6 +40,10 @@ export class GarminMapKeys { public static readonly WaypointsVisibility = 'waypointsVis' as const; + public static readonly RunwayVisibility = 'runwayVisibility' as const; + + public static readonly RunwayLabelVisibility = 'runwayLabelVisibility' as const; + public static readonly WaypointHighlight = 'waypointHighlight' as const; public static readonly WaypointHighlightLine = 'waypointHighlightLine' as const; @@ -50,6 +60,10 @@ export class GarminMapKeys { public static readonly TrafficRange = 'trafficRange' as const; + public static readonly Panning = 'panning' as const; + + public static readonly PanningRTR = 'panningRTR' as const; + public static readonly Pointer = 'pointer' as const; public static readonly PointerRTR = 'pointerRTR' as const; diff --git a/src/garminsdk/components/map/MapRangeDisplay.tsx b/src/garminsdk/components/map/MapRangeDisplay.tsx index 90ca091b7..50bf404eb 100644 --- a/src/garminsdk/components/map/MapRangeDisplay.tsx +++ b/src/garminsdk/components/map/MapRangeDisplay.tsx @@ -19,7 +19,8 @@ export interface MapRangeDisplayProps extends ComponentProps { } /** - * The map layer showing the range display. + * A display which renders a map range value with units. Automatically switches between nautical miles/feet and + * kilometers/meters at predefined thresholds. */ export class MapRangeDisplay extends DisplayComponent { private readonly displayUnitSub = Subject.create | null>(null); diff --git a/src/garminsdk/components/map/MapResourcePriority.ts b/src/garminsdk/components/map/MapResourcePriority.ts index 4f99f0456..b6dcc31a8 100644 --- a/src/garminsdk/components/map/MapResourcePriority.ts +++ b/src/garminsdk/components/map/MapResourcePriority.ts @@ -8,9 +8,15 @@ export class MapResourcePriority { /** Orientation mode. */ public static readonly ORIENTATION = 0; + /** Desired orientation mode. */ + public static readonly DESIRED_ORIENTATION = 0; + /** Rotation behavior from orientation mode. */ public static readonly ORIENTATION_ROTATION = 0; + /** Panning. */ + public static readonly PANNING = 100; + /** Pointer. */ public static readonly POINTER = 100; diff --git a/src/garminsdk/components/map/MapWaypointIcon.ts b/src/garminsdk/components/map/MapWaypointIcon.ts index ad1e8e9a7..b313d28be 100644 --- a/src/garminsdk/components/map/MapWaypointIcon.ts +++ b/src/garminsdk/components/map/MapWaypointIcon.ts @@ -45,22 +45,22 @@ export class MapAirportIcon extends MapWaypointSprite * Initialization options for a MapWaypointHighlightIcon. */ export type MapWaypointHighlightIconOptions = { - /** The buffer of the ring around the base icon, in pixels. */ + /** The buffer of the ring around the base icon, in pixels. Defaults to `0`. */ ringRadiusBuffer?: number | Subscribable; - /** The width of the stroke for the ring, in pixels. */ + /** The width of the stroke for the ring, in pixels. Defaults to `2`. */ strokeWidth?: number | Subscribable; - /** The color of the stroke for the ring. */ + /** The color of the stroke for the ring. Defaults to `'white'`. */ strokeColor?: string | Subscribable; - /** The width of the outline for the ring, in pixels. */ + /** The width of the outline for the ring, in pixels. Defaults to `0`. */ outlineWidth?: number | Subscribable; - /** The color of the outline for the ring. */ + /** The color of the outline for the ring. Defaults to `'black'`. */ outlineColor?: string | Subscribable; - /** The color of the ring background. */ + /** The color of the ring background. Defaults to `'#3c3c3c'`. */ bgColor?: string | Subscribable; } @@ -144,7 +144,9 @@ export class MapWaypointHighlightIcon extends AbstractMapWay if (outlineWidth > 0) { this.applyStroke(context, (strokeWidth + 2 * outlineWidth), this.outlineColor.get()); } - this.applyStroke(context, strokeWidth, this.strokeColor.get()); + if (strokeWidth > 0) { + this.applyStroke(context, strokeWidth, this.strokeColor.get()); + } } /** diff --git a/src/garminsdk/components/map/NextGenGarminMapBuilder.tsx b/src/garminsdk/components/map/NextGenGarminMapBuilder.tsx new file mode 100644 index 000000000..e9502aae0 --- /dev/null +++ b/src/garminsdk/components/map/NextGenGarminMapBuilder.tsx @@ -0,0 +1,97 @@ +/* eslint-disable jsdoc/require-jsdoc */ + +import { MapSystemBuilder, MapSystemContext, MapSystemKeys, Subject, UserSettingManager } from '@microsoft/msfs-sdk'; + +import { MapSymbolVisController, MapSymbolVisControllerModules, MapWaypointVisUserSettings } from './controllers'; +import { GarminMapBuilder } from './GarminMapBuilder'; +import { GarminMapKeys } from './GarminMapKeys'; +import { MapWaypointDisplayBuilder } from './MapWaypointDisplayBuilder'; +import { MapDeclutterMode, MapWaypointsModule } from './modules'; + +/** + * A builder for next-generation (NXi, G3000, etc) Garmin maps. + */ +export class NextGenGarminMapBuilder { + + /** + * Configures a map builder to generate a map which supports the display of waypoints located within the boundaries + * of the map's projected window. Waypoints displayed in this manner are rendered by a {@link MapWaypointRenderer} + * under the role {@link MapWaypointRenderRole.Normal}. Optionally binds the visibility of waypoints to user + * settings. + * + * If a text layer has already been added to the builder, its order will be changed so that it is rendered above the + * waypoint layer. Otherwise, a text layer will be added to the builder after the waypoint layer. + * + * Adds the following... + * + * Context properties: + * * `[MapSystemKeys.TextManager]: MapCullableTextLabelManager` + * * `[MapSystemKeys.WaypointRenderer]: MapWaypointRenderer` + * * `[GarminMapKeys.WaypointDisplayBuilder]: MapWaypointDisplayBuilder` + * + * Modules: + * * `[MapSystemKeys.NearestWaypoints]: MapWaypointsModule` + * * `[GarminMapKeys.Range]: MapIndexedRangeModule` (only if user settings are supported) + * + * Layers: + * * `[MapSystemKeys.NearestWaypoints]: MapWaypointsLayer` + * * `[MapSystemKeys.TextLayer]: MapCullableTextLayer` + * + * Controllers: + * * `[MapSystemKeys.WaypointRenderer]: MapSystemCustomController` (handles initialization and updating of the + * waypoint renderer) + * * `[GarminMapKeys.WaypointsVisibility]: MapWaypointsVisController` (only if user settings are supported) + * * `[GarminMapKeys.RunwayVisibility]: MapSymbolVisController` (only if runway outlines are supported) + * * `[GarminMapKeys.RunwayLabelVisibility]: MapSymbolVisController` (only if runway outlines are supported) + * @param mapBuilder The map builder to configure. + * @param configure A function used to configure the display and styling of waypoint icons and labels. + * @param supportRunwayOutlines Whether to support the rendering of airport runway outlines. + * @param settingManager A setting manager containing the user settings controlling waypoint visibility. If not + * defined, waypoint visibility will not be bound to user settings. + * @param order The order to assign to the waypoint layer. Layers with lower assigned order will be attached to the + * map before and appear below layers with greater assigned order values. Defaults to the number of layers already + * added to the map builder. + * @returns The map builder, after it has been configured. + */ + public static waypoints( + mapBuilder: MapBuilder, + configure: (builder: MapWaypointDisplayBuilder, context: MapSystemContext) => void, + supportRunwayOutlines: boolean, + settingManager?: UserSettingManager>, + order?: number + ): MapBuilder { + mapBuilder + .with(GarminMapBuilder.waypoints, configure, supportRunwayOutlines, settingManager, order); + + if (supportRunwayOutlines && settingManager) { + const trueSubject = Subject.create(true); + const maxSafeIntegerSubject = Subject.create(Number.MAX_SAFE_INTEGER); + + mapBuilder + .withController< + MapSymbolVisController, MapSymbolVisControllerModules & { [MapSystemKeys.NearestWaypoints]: MapWaypointsModule } + >(GarminMapKeys.RunwayVisibility, context => { + return new MapSymbolVisController( + context, + trueSubject, + maxSafeIntegerSubject, + MapDeclutterMode.Level2, + context.model.getModule(MapSystemKeys.NearestWaypoints).runwayShow + ); + }) + .withController< + MapSymbolVisController, MapSymbolVisControllerModules & { [MapSystemKeys.NearestWaypoints]: MapWaypointsModule } + >(GarminMapKeys.RunwayLabelVisibility, context => { + return new MapSymbolVisController( + context, + trueSubject, + maxSafeIntegerSubject, + MapDeclutterMode.Level2, + context.model.getModule(MapSystemKeys.NearestWaypoints).runwayLabelShow + ); + }); + } + + return mapBuilder; + } +} \ No newline at end of file diff --git a/src/garminsdk/components/map/assembled/NextGenConnextMapBuilder.tsx b/src/garminsdk/components/map/assembled/NextGenConnextMapBuilder.tsx index 763e872fb..02634043f 100644 --- a/src/garminsdk/components/map/assembled/NextGenConnextMapBuilder.tsx +++ b/src/garminsdk/components/map/assembled/NextGenConnextMapBuilder.tsx @@ -26,6 +26,7 @@ import { NextGenMapWaypointStyles } from '../MapWaypointStyles'; import { MapFlightPlanFocusModule, MapOrientation, MapOrientationModule, MapPointerModule, MapUnitsModule } from '../modules'; +import { NextGenGarminMapBuilder } from '../NextGenGarminMapBuilder'; /** * Options for creating a next-generation (NXi, G3000, etc) Garmin Connext weather map. @@ -323,7 +324,7 @@ export class NextGenConnextMapBuilder { mapBuilder.with(GarminMapBuilder.airspaces, options.useAirspaceVisUserSettings ? options.settingManager : undefined); } - mapBuilder.with(GarminMapBuilder.waypoints, + mapBuilder.with(NextGenGarminMapBuilder.waypoints, (builder: MapWaypointDisplayBuilder): void => { builder.withNormalStyles( options.waypointIconImageCache, @@ -390,16 +391,15 @@ export class NextGenConnextMapBuilder { } if (options.includeAltitudeArc) { - mapBuilder - .with(GarminMapBuilder.altitudeArc, - { - renderMethod: 'svg', - verticalSpeedPrecision: UnitType.FPM.createNumber(50), - verticalSpeedThreshold: UnitType.FPM.createNumber(150), - altitudeDeviationThreshold: UnitType.FOOT.createNumber(150) - }, - options.useAltitudeArcUserSettings ? options.settingManager : undefined - ); + mapBuilder.with(GarminMapBuilder.altitudeArc, + { + renderMethod: 'svg', + verticalSpeedPrecision: UnitType.FPM.createNumber(50), + verticalSpeedThreshold: UnitType.FPM.createNumber(150), + altitudeDeviationThreshold: UnitType.FOOT.createNumber(150) + }, + options.useAltitudeArcUserSettings ? options.settingManager : undefined + ); } mapBuilder.with(GarminMapBuilder.crosshair); diff --git a/src/garminsdk/components/map/assembled/NextGenHsiMapBuilder.tsx b/src/garminsdk/components/map/assembled/NextGenHsiMapBuilder.tsx index 45657b724..7401f62b8 100644 --- a/src/garminsdk/components/map/assembled/NextGenHsiMapBuilder.tsx +++ b/src/garminsdk/components/map/assembled/NextGenHsiMapBuilder.tsx @@ -22,6 +22,7 @@ import { MapUtils } from '../MapUtils'; import { MapWaypointDisplayBuilder } from '../MapWaypointDisplayBuilder'; import { NextGenMapWaypointStyles } from '../MapWaypointStyles'; import { MapDeclutterMode, MapDeclutterModule, MapGarminTrafficModule, MapOrientation, MapOrientationModule, MapTerrainMode, MapUnitsModule } from '../modules'; +import { NextGenGarminMapBuilder } from '../NextGenGarminMapBuilder'; /** * Configurations for traffic intruder icons for next-generation (NXi, G3000, etc) HSI maps. @@ -334,7 +335,7 @@ export class NextGenHsiMapBuilder { mapBuilder.with(GarminMapBuilder.airspaces, options.useAirspaceVisUserSettings ? options.settingManager : undefined); } - mapBuilder.with(GarminMapBuilder.waypoints, + mapBuilder.with(NextGenGarminMapBuilder.waypoints, (builder: MapWaypointDisplayBuilder): void => { builder.withNormalStyles( options.waypointIconImageCache, diff --git a/src/garminsdk/components/map/assembled/NextGenNavMapBuilder.tsx b/src/garminsdk/components/map/assembled/NextGenNavMapBuilder.tsx index 6d6ed16e4..9e486b91e 100644 --- a/src/garminsdk/components/map/assembled/NextGenNavMapBuilder.tsx +++ b/src/garminsdk/components/map/assembled/NextGenNavMapBuilder.tsx @@ -30,6 +30,7 @@ import { MapDeclutterMode, MapDeclutterModule, MapFlightPlanFocusModule, MapGarminTrafficModule, MapOrientation, MapOrientationModule, MapPointerModule, MapTerrainMode, MapTerrainModule, MapUnitsModule } from '../modules'; +import { NextGenGarminMapBuilder } from '../NextGenGarminMapBuilder'; /** * Configurations for traffic intruder icons for next-generation (NXi, G3000, etc) navigation maps. @@ -449,7 +450,7 @@ export class NextGenNavMapBuilder { mapBuilder.with(GarminMapBuilder.airspaces, options.useAirspaceVisUserSettings ? options.settingManager : undefined); } - mapBuilder.with(GarminMapBuilder.waypoints, + mapBuilder.with(NextGenGarminMapBuilder.waypoints, (builder: MapWaypointDisplayBuilder): void => { builder.withNormalStyles( options.waypointIconImageCache, @@ -521,20 +522,15 @@ export class NextGenNavMapBuilder { } if (options.includeAltitudeArc) { - mapBuilder - .withAutopilotProps( - ['selectedAltitude'], - options.dataUpdateFreq - ) - .with(GarminMapBuilder.altitudeArc, - { - renderMethod: 'svg', - verticalSpeedPrecision: UnitType.FPM.createNumber(50), - verticalSpeedThreshold: UnitType.FPM.createNumber(150), - altitudeDeviationThreshold: UnitType.FOOT.createNumber(150) - }, - options.useAltitudeArcUserSettings ? options.settingManager : undefined - ); + mapBuilder.with(GarminMapBuilder.altitudeArc, + { + renderMethod: 'svg', + verticalSpeedPrecision: UnitType.FPM.createNumber(50), + verticalSpeedThreshold: UnitType.FPM.createNumber(150), + altitudeDeviationThreshold: UnitType.FOOT.createNumber(150) + }, + options.useAltitudeArcUserSettings ? options.settingManager : undefined + ); } mapBuilder.with(GarminMapBuilder.crosshair); diff --git a/src/garminsdk/components/map/assembled/NextGenNearestMapBuilder.tsx b/src/garminsdk/components/map/assembled/NextGenNearestMapBuilder.tsx index ea2d10f94..7bd81c326 100644 --- a/src/garminsdk/components/map/assembled/NextGenNearestMapBuilder.tsx +++ b/src/garminsdk/components/map/assembled/NextGenNearestMapBuilder.tsx @@ -30,6 +30,7 @@ import { MapDeclutterMode, MapDeclutterModule, MapGarminTrafficModule, MapOrientation, MapOrientationModule, MapPointerModule, MapTerrainMode, MapTerrainModule, MapUnitsModule } from '../modules'; +import { NextGenGarminMapBuilder } from '../NextGenGarminMapBuilder'; /** * Configurations for traffic intruder icons for next-generation (NXi, G3000, etc) nearest waypoint maps. @@ -429,7 +430,7 @@ export class NextGenNearestMapBuilder { mapBuilder.with(GarminMapBuilder.airspaces, options.useAirspaceVisUserSettings ? options.settingManager : undefined); } - mapBuilder.with(GarminMapBuilder.waypoints, + mapBuilder.with(NextGenGarminMapBuilder.waypoints, (builder: MapWaypointDisplayBuilder): void => { builder.withNormalStyles( options.waypointIconImageCache, @@ -505,16 +506,15 @@ export class NextGenNearestMapBuilder { } if (options.includeAltitudeArc) { - mapBuilder - .with(GarminMapBuilder.altitudeArc, - { - renderMethod: 'svg', - verticalSpeedPrecision: UnitType.FPM.createNumber(50), - verticalSpeedThreshold: UnitType.FPM.createNumber(150), - altitudeDeviationThreshold: UnitType.FOOT.createNumber(150) - }, - options.useAltitudeArcUserSettings ? options.settingManager : undefined - ); + mapBuilder.with(GarminMapBuilder.altitudeArc, + { + renderMethod: 'svg', + verticalSpeedPrecision: UnitType.FPM.createNumber(50), + verticalSpeedThreshold: UnitType.FPM.createNumber(150), + altitudeDeviationThreshold: UnitType.FOOT.createNumber(150) + }, + options.useAltitudeArcUserSettings ? options.settingManager : undefined + ); } mapBuilder.with(GarminMapBuilder.crosshair); diff --git a/src/garminsdk/components/map/assembled/NextGenWaypointMapBuilder.tsx b/src/garminsdk/components/map/assembled/NextGenWaypointMapBuilder.tsx index d7836af4c..9597a3f9c 100644 --- a/src/garminsdk/components/map/assembled/NextGenWaypointMapBuilder.tsx +++ b/src/garminsdk/components/map/assembled/NextGenWaypointMapBuilder.tsx @@ -19,6 +19,7 @@ import { MapUtils } from '../MapUtils'; import { MapWaypointDisplayBuilder } from '../MapWaypointDisplayBuilder'; import { NextGenMapWaypointStyles } from '../MapWaypointStyles'; import { MapDeclutterMode, MapDeclutterModule, MapOrientation, MapOrientationModule, MapPointerModule, MapTerrainMode, MapUnitsModule, WaypointMapSelectionModule } from '../modules'; +import { NextGenGarminMapBuilder } from '../NextGenGarminMapBuilder'; /** * Options for creating a next-generation (NXi, G3000, etc) Garmin waypoint map. @@ -41,8 +42,7 @@ export type NextGenWaypointMapOptions = { /** * Whether the map should automatically adjust its range when the selected waypoint is an airport to give an - * appropriate view of the selected runway, or all runways if there is no selected runway. If `false`, the map will - * attempt to apply the range index defined by `defaultTargetRangeIndex` instead. Defaults to `false`. + * appropriate view of the selected runway, or all runways if there is no selected runway. Defaults to `false`. */ supportAirportAutoRange?: boolean; @@ -346,7 +346,7 @@ export class NextGenWaypointMapBuilder { mapBuilder.with(GarminMapBuilder.airspaces, options.useAirspaceVisUserSettings ? options.settingManager : undefined); } - mapBuilder.with(GarminMapBuilder.waypoints, + mapBuilder.with(NextGenGarminMapBuilder.waypoints, (builder: MapWaypointDisplayBuilder): void => { builder.withNormalStyles( options.waypointIconImageCache, diff --git a/src/garminsdk/components/map/controllers/MapDataIntegrityRTRController.ts b/src/garminsdk/components/map/controllers/MapDataIntegrityRTRController.ts index dd2b71640..27f3e1511 100644 --- a/src/garminsdk/components/map/controllers/MapDataIntegrityRTRController.ts +++ b/src/garminsdk/components/map/controllers/MapDataIntegrityRTRController.ts @@ -1,6 +1,6 @@ import { - MapDataIntegrityModule, MapOwnAirplaneIconModule, MapSystemContext, MapSystemController, MapSystemKeys, MutableSubscribable, ReadonlyFloat64Array, - ResourceConsumer, ResourceModerator, Subscribable, Subscription + MapDataIntegrityModule, MapOwnAirplaneIconModule, MapSystemContext, MapSystemController, MapSystemKeys, MappedSubject, + MappedSubscribable, MutableSubscribable, ReadonlyFloat64Array, ResourceConsumer, ResourceModerator, Subscribable, Subscription } from '@microsoft/msfs-sdk'; import { GarminMapKeys } from '../GarminMapKeys'; @@ -56,10 +56,14 @@ export class MapDataIntegrityRTRController extends MapSystemController { - this.orientationModule?.orientation.set(MapOrientation.NorthUp); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationOverridePipe!.resume(true); }, - onCeded: () => { } + onCeded: () => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationOverridePipe!.pause(); + } }; private readonly canChangeAirplaneIcon @@ -70,6 +74,9 @@ export class MapDataIntegrityRTRController extends MapSystemController; + private orientationOverridePipe?: Subscription; + private headingSignalSub?: Subscription; private gpsSignalSub?: Subscription; @@ -122,17 +129,55 @@ export class MapDataIntegrityRTRController extends MapSystemController { + if (isHeadingValid && isGpsValid) { + return null; + } + + switch (desiredOrientation) { + case MapOrientation.HeadingUp: + return isHeadingValid ? desiredOrientation : MapOrientation.NorthUp; + case MapOrientation.TrackUp: + case MapOrientation.DtkUp: + return isGpsValid ? desiredOrientation : MapOrientation.NorthUp; + default: + return desiredOrientation; + } + }, + this.orientationModule.desiredOrientation, + this.dataIntegrityModule.headingSignalValid, + this.dataIntegrityModule.gpsSignalValid + ); + + this.orientationOverridePipe = this.orientationOverride.pipe(this.orientationModule.orientation, true); + + this.orientationOverride.sub(override => { + if (override === null) { + if (this.orientationControl === undefined) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationOverridePipe!.pause(); + } else { + this.orientationControl.forfeit(this.orientationControlConsumer); + } + } else { + if (this.orientationControl === undefined) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationOverridePipe!.resume(true); + } else { + this.orientationControl.claim(this.orientationControlConsumer); + } + } + }, true); + } + this.headingSignalSub = this.dataIntegrityModule.headingSignalValid.sub(isValid => { if (isValid) { this.orientationControl?.forfeit(this.orientationControlConsumer); this.setNormalAirplaneIcon(); } else { this.setNoHeadingAirplaneIcon(); - if (this.orientationControl === undefined) { - this.orientationModule?.orientation.set(MapOrientation.NorthUp); - } else { - this.orientationControl.claim(this.orientationControlConsumer); - } } }, true); @@ -176,11 +221,12 @@ export class MapDataIntegrityRTRController extends MapSystemController { + private readonly rangeModule = this.context.model.getModule(GarminMapKeys.Range); + private readonly orientationModule = this.context.model.getModule(GarminMapKeys.Orientation); + private readonly ownAirplanePropsModule = this.context.model.getModule(MapSystemKeys.OwnAirplaneProps); + + private readonly desiredOrientationControl = this.context[GarminMapKeys.DesiredOrientationControl]; + + private readonly desiredOrientationControlConsumer: ResourceConsumer = { + priority: MapResourcePriority.DESIRED_ORIENTATION, + + onAcquired: () => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationPipe!.resume(true); + }, + + onCeded: () => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationPipe!.pause(); + } + }; + + private orientation?: MappedSubscribable; + + private orientationPipe?: Subscription; + private isPointerActiveSub?: Subscription; + + /** @inheritdoc */ + public onAfterMapRender(): void { + this.orientation = MappedSubject.create( + ([commandedOrientation, isNorthUpAboveActive, northUpAboveRangeIndex, rangeIndex, isNorthUpOnGroundActive, isOnGround]): MapOrientation => { + return (isNorthUpAboveActive && rangeIndex > northUpAboveRangeIndex) || (isNorthUpOnGroundActive && isOnGround) + ? MapOrientation.NorthUp + : commandedOrientation; + }, + this.orientationModule.commandedOrientation, + this.orientationModule.northUpAboveActive, + this.orientationModule.northUpAboveRangeIndex, + this.rangeModule.nominalRangeIndex, + this.orientationModule.northUpOnGroundActive, + this.ownAirplanePropsModule.isOnGround + ); + + this.orientationPipe = this.orientation.pipe(this.orientationModule.desiredOrientation, true); + + this.desiredOrientationControl.claim(this.desiredOrientationControlConsumer); + } + + /** @inheritdoc */ + public onMapDestroyed(): void { + this.destroy(); + } + + /** @inheritdoc */ + public destroy(): void { + this.desiredOrientationControl.forfeit(this.desiredOrientationControlConsumer); + + this.orientation?.destroy(); + this.orientationPipe?.destroy(); + this.isPointerActiveSub?.destroy(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/garminsdk/components/map/controllers/MapFlightPlanFocusRTRController.ts b/src/garminsdk/components/map/controllers/MapFlightPlanFocusRTRController.ts index 180aedabc..ab5f26282 100644 --- a/src/garminsdk/components/map/controllers/MapFlightPlanFocusRTRController.ts +++ b/src/garminsdk/components/map/controllers/MapFlightPlanFocusRTRController.ts @@ -44,8 +44,8 @@ export interface MapFlightPlanFocusRTRControllerContext { /** Resource moderator for control of the map's projection target. */ [MapSystemKeys.TargetControl]?: ResourceModerator; - /** Resource moderator for control of the map's orientation mode. */ - [GarminMapKeys.OrientationControl]?: ResourceModerator; + /** Resource moderator for control of the map's desired orientation mode. */ + [GarminMapKeys.DesiredOrientationControl]?: ResourceModerator; /** Resource moderator for the use range setting subject. */ [GarminMapKeys.UseRangeSetting]?: ResourceModerator>; @@ -96,13 +96,13 @@ export class MapFlightPlanFocusRTRController extends MapSystemController< } }; - private readonly orientationControl = this.context[GarminMapKeys.OrientationControl]; + private readonly desiredOrientationControl = this.context[GarminMapKeys.DesiredOrientationControl]; - private readonly orientationControlConsumer: ResourceConsumer = { + private readonly desiredOrientationControlConsumer: ResourceConsumer = { priority: MapResourcePriority.FLIGHT_PLAN_FOCUS, onAcquired: () => { - this.orientationModule?.orientation.set(MapOrientation.NorthUp); + this.orientationModule?.desiredOrientation.set(MapOrientation.NorthUp); }, onCeded: () => { } @@ -232,16 +232,16 @@ export class MapFlightPlanFocusRTRController extends MapSystemController< */ private onIsFocusActiveChanged(isActive: boolean): void { if (isActive) { - if (this.orientationControl === undefined) { + if (this.desiredOrientationControl === undefined) { // If there is no moderator, assume we have control - this.orientationModule?.orientation.set(MapOrientation.NorthUp); + this.orientationModule?.desiredOrientation.set(MapOrientation.NorthUp); } else { - this.orientationControl.claim(this.orientationControlConsumer); + this.desiredOrientationControl.claim(this.desiredOrientationControlConsumer); } } else { this.focusDebounceTimer.clear(); - this.orientationControl?.forfeit(this.orientationControlConsumer); + this.desiredOrientationControl?.forfeit(this.desiredOrientationControlConsumer); } this.setFlightPlanFocusListenersActive(isActive); @@ -359,7 +359,7 @@ export class MapFlightPlanFocusRTRController extends MapSystemController< super.destroy(); this.targetControl?.forfeit(this.targetControlConsumer); - this.orientationControl?.forfeit(this.orientationControlConsumer); + this.desiredOrientationControl?.forfeit(this.desiredOrientationControlConsumer); this.useRangeSetting?.forfeit(this.useRangeSettingConsumer); this.isPlanFocusValid.destroy(); diff --git a/src/garminsdk/components/map/controllers/MapOrientationController.ts b/src/garminsdk/components/map/controllers/MapOrientationController.ts index 0b53fe55b..74231a825 100644 --- a/src/garminsdk/components/map/controllers/MapOrientationController.ts +++ b/src/garminsdk/components/map/controllers/MapOrientationController.ts @@ -11,6 +11,7 @@ import { MapOrientation, MapOrientationModule } from '../modules/MapOrientationM /** * Modules required for MapOrientationController. + * @deprecated */ export interface MapOrientationControllerModules { /** Range module. */ @@ -25,6 +26,7 @@ export interface MapOrientationControllerModules { /** * Context properties required by MapOrientationController. + * @deprecated */ export interface MapOrientationControllerContext { /** Resource moderator for control of the map's orientation mode. */ @@ -33,17 +35,21 @@ export interface MapOrientationControllerContext { /** * User settings required by MapOrientationController. + * @deprecated */ export type MapOrientationControllerSettings = Pick; /** * Controls the orientation of a map based on user settings. + * @deprecated New, preferred logic for controlling map orientation based on user settings is available using + * `MapOrientationSettingsController`. */ export class MapOrientationController extends MapSystemController { - private static readonly MODE_MAP = { + private static readonly MODE_MAP: Partial> = { [MapOrientationSettingMode.NorthUp]: MapOrientation.NorthUp, [MapOrientationSettingMode.HeadingUp]: MapOrientation.HeadingUp, - [MapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp + [MapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp, + [MapOrientationSettingMode.DtkUp]: MapOrientation.DtkUp }; private readonly rangeModule = this.context.model.getModule(GarminMapKeys.Range); diff --git a/src/garminsdk/components/map/controllers/MapOrientationModeController.ts b/src/garminsdk/components/map/controllers/MapOrientationModeController.ts new file mode 100644 index 000000000..a23cd0b76 --- /dev/null +++ b/src/garminsdk/components/map/controllers/MapOrientationModeController.ts @@ -0,0 +1,69 @@ +import { + MapSystemController, ResourceConsumer, ResourceModerator, Subscription +} from '@microsoft/msfs-sdk'; + +import { GarminMapKeys } from '../GarminMapKeys'; +import { MapOrientationModule } from '../modules/MapOrientationModule'; +import { MapResourcePriority } from '../MapResourcePriority'; + +/** + * Modules required for MapOrientationModeController. + */ +export interface MapOrientationModeControllerModules { + /** Orientation module. */ + [GarminMapKeys.Orientation]: MapOrientationModule; +} + +/** + * Context properties required by MapOrientationModeController. + */ +export interface MapOrientationModeControllerContext { + /** Resource moderator for control of the map's orientation mode. */ + [GarminMapKeys.OrientationControl]: ResourceModerator; +} + +/** + * Controls the orientation of a map based on the desired orientation mode. + */ +export class MapOrientationModeController extends MapSystemController { + private readonly orientationModule = this.context.model.getModule(GarminMapKeys.Orientation); + + private readonly orientationControl = this.context[GarminMapKeys.OrientationControl]; + + private readonly orientationControlConsumer: ResourceConsumer = { + priority: MapResourcePriority.ORIENTATION, + + onAcquired: () => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationPipe!.resume(true); + }, + + onCeded: () => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.orientationPipe!.pause(); + } + }; + + private orientationPipe?: Subscription; + + /** @inheritdoc */ + public onAfterMapRender(): void { + this.orientationPipe = this.orientationModule.desiredOrientation.pipe(this.orientationModule.orientation, true); + + this.orientationControl.claim(this.orientationControlConsumer); + } + + /** @inheritdoc */ + public onMapDestroyed(): void { + this.destroy(); + } + + /** @inheritdoc */ + public destroy(): void { + this.orientationControl.forfeit(this.orientationControlConsumer); + + this.orientationPipe?.destroy(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/garminsdk/components/map/controllers/MapOrientationRTRController.ts b/src/garminsdk/components/map/controllers/MapOrientationRTRController.ts index 4c53cbda9..fdd2fc66e 100644 --- a/src/garminsdk/components/map/controllers/MapOrientationRTRController.ts +++ b/src/garminsdk/components/map/controllers/MapOrientationRTRController.ts @@ -75,9 +75,11 @@ export class MapOrientationRTRController extends MapSystemController; + +/** + * Controls the orientation of a map based on user settings. + */ +export class MapOrientationSettingsController extends MapSystemController { + private static readonly MODE_MAP: Partial> = { + [MapOrientationSettingMode.NorthUp]: MapOrientation.NorthUp, + [MapOrientationSettingMode.HeadingUp]: MapOrientation.HeadingUp, + [MapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp, + [MapOrientationSettingMode.DtkUp]: MapOrientation.DtkUp + }; + + private readonly orientationModule = this.context.model.getModule(GarminMapKeys.Orientation); + + private readonly subs: Subscription[] = []; + + /** + * Creates a new instance of MapOrientationSettingsController. + * @param context This controller's map context. + * @param settingManager The setting manager used by this controller. + */ + public constructor( + context: MapSystemContext, + private readonly settingManager: UserSettingManager> + ) { + super(context); + } + + /** @inheritdoc */ + public onAfterMapRender(): void { + const orientationSetting = this.settingManager.tryGetSetting('mapOrientation'); + if (orientationSetting) { + this.subs.push(orientationSetting.pipe(this.orientationModule.commandedOrientation, setting => { + return MapOrientationSettingsController.MODE_MAP[setting] ?? MapOrientation.NorthUp; + })); + } + + const northUpAboveActiveSetting = this.settingManager.tryGetSetting('mapAutoNorthUpActive'); + if (northUpAboveActiveSetting) { + this.subs.push(northUpAboveActiveSetting.pipe(this.orientationModule.northUpAboveActive, setting => { + return setting === true; + })); + } + + const northUpAboveRangeIndexSetting = this.settingManager.tryGetSetting('mapAutoNorthUpRangeIndex'); + if (northUpAboveRangeIndexSetting) { + this.subs.push(northUpAboveRangeIndexSetting.pipe(this.orientationModule.northUpAboveRangeIndex, setting => { + return typeof setting === 'number' ? setting : Infinity; + })); + } + + const northUpOnGroundActiveSetting = this.settingManager.tryGetSetting('mapGroundNorthUpActive'); + if (northUpOnGroundActiveSetting) { + this.subs.push(northUpOnGroundActiveSetting.pipe(this.orientationModule.northUpOnGroundActive, setting => { + return setting === true; + })); + } + } + + /** @inheritdoc */ + public onMapDestroyed(): void { + this.destroy(); + } + + /** @inheritdoc */ + public destroy(): void { + for (const sub of this.subs) { + sub.destroy(); + } + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/garminsdk/components/map/controllers/MapPanningRTRController.ts b/src/garminsdk/components/map/controllers/MapPanningRTRController.ts new file mode 100644 index 000000000..edf4e7347 --- /dev/null +++ b/src/garminsdk/components/map/controllers/MapPanningRTRController.ts @@ -0,0 +1,206 @@ +/* eslint-disable @typescript-eslint/no-non-null-assertion */ + +import { + GeoPoint, GeoPointInterface, MapRotation, MapRotationModule, MapSystemController, MapSystemKeys, ResourceConsumer, ResourceModerator, + Subject, Subscription +} from '@microsoft/msfs-sdk'; + +import { GarminMapKeys } from '../GarminMapKeys'; +import { MapResourcePriority } from '../MapResourcePriority'; +import { MapPanningModule } from '../modules/MapPanningModule'; + +/** + * Modules required for MapPanningRTRController. + */ +export interface MapPanningRTRControllerModules { + /** Panning module. */ + [GarminMapKeys.Panning]: MapPanningModule; + + /** Rotation module. */ + [MapSystemKeys.Rotation]?: MapRotationModule; +} + +/** + * Context properties required for MapPanningRTRController. + */ +export interface MapPanningRTRControllerContext { + /** Resource moderator for control of the map's projection target. */ + [MapSystemKeys.TargetControl]?: ResourceModerator; + + /** Resource moderator for control of the map's rotation mode. */ + [GarminMapKeys.RotationModeControl]?: ResourceModerator; + + /** Resource moderator for control of the map's orientation mode. */ + [GarminMapKeys.OrientationControl]?: ResourceModerator; + + /** Resource moderator for control of the map's range. */ + [MapSystemKeys.RangeControl]?: ResourceModerator; + + /** Resource moderator for the use range setting subject. */ + [GarminMapKeys.UseRangeSetting]?: ResourceModerator>; +} + +/** + * Controls the target, orientation, and range of a map while manual map panning is active. + */ +export class MapPanningRTRController extends MapSystemController { + private readonly panningModule = this.context.model.getModule(GarminMapKeys.Panning); + private readonly rotationModule = this.context.model.getModule(MapSystemKeys.Rotation); + + private readonly mapProjectionParams = { + target: new GeoPoint(0, 0) + }; + + private readonly targetControl = this.context[MapSystemKeys.TargetControl]; + + private hasTargetControl = this.context.targetControlModerator === undefined; + + private readonly targetControlConsumer: ResourceConsumer = { + priority: MapResourcePriority.PANNING, + + onAcquired: () => { + this.hasTargetControl = true; + + if (this.panningModule.isActive.get()) { + this.setMapTarget(this.panningModule.target.get()); + } + }, + + onCeded: () => { + this.hasTargetControl = false; + } + }; + + private readonly rotationModeControl = this.context[GarminMapKeys.RotationModeControl]; + + private readonly rotationModeControlConsumer: ResourceConsumer = { + priority: MapResourcePriority.PANNING, + + onAcquired: () => { + // While panning is active, the map keeps its rotation from when panning was activated. + this.rotationModule?.rotationType.set(MapRotation.Undefined); + }, + + onCeded: () => { } + }; + + private readonly orientationControl = this.context[GarminMapKeys.OrientationControl]; + + private readonly orientationControlConsumer: ResourceConsumer = { + priority: MapResourcePriority.PANNING, + + onAcquired: () => { }, // While panning is active, the map keeps its desired orientation mode from when panning was activated, so we do nothing. + + onCeded: () => { } + }; + + private readonly rangeControl = this.context[MapSystemKeys.RangeControl]; + + private readonly rangeControlConsumer: ResourceConsumer = { + priority: MapResourcePriority.PANNING, + + onAcquired: () => { }, // We are just holding this to keep other things of lower priority from changing the range. + + onCeded: () => { } + }; + + private readonly useRangeSetting = this.context[GarminMapKeys.UseRangeSetting]; + + private readonly useRangeSettingConsumer: ResourceConsumer> = { + priority: MapResourcePriority.PANNING, + + onAcquired: () => { }, // Panning mode uses the use range setting state that was active when panning was activated, so we do nothing while we have control. + + onCeded: () => { } + }; + + private panningActiveSub?: Subscription; + private panningTargetSub?: Subscription; + + /** @inheritdoc */ + public onAfterMapRender(): void { + this.panningTargetSub = this.panningModule.target.sub(this.onTargetChanged.bind(this), false, true); + this.panningActiveSub = this.panningModule.isActive.sub(this.onPanningActiveChanged.bind(this), true); + } + + /** + * Responds to map panning activation changes. + * @param isActive Whether map panning is active. + */ + private onPanningActiveChanged(isActive: boolean): void { + if (isActive) { + this.onPanningActivated(); + } else { + this.onPanningDeactivated(); + } + } + + /** + * Responds to map panning activation. + */ + private onPanningActivated(): void { + this.targetControl?.claim(this.targetControlConsumer); + if (this.rotationModeControl) { + this.rotationModeControl.claim(this.rotationModeControlConsumer); + } else if (this.rotationModule) { + // While panning is active, the map keeps its rotation from when panning was activated. + this.rotationModule.rotationType.set(MapRotation.Undefined); + } + this.orientationControl?.claim(this.orientationControlConsumer); + this.rangeControl?.claim(this.rangeControlConsumer); + this.useRangeSetting?.claim(this.useRangeSettingConsumer); + + this.panningTargetSub!.resume(); + } + + /** + * Responds to map panning deactivation. + */ + private onPanningDeactivated(): void { + this.panningTargetSub!.pause(); + + this.targetControl?.forfeit(this.targetControlConsumer); + this.rotationModeControl?.forfeit(this.rotationModeControlConsumer); + this.orientationControl?.forfeit(this.orientationControlConsumer); + this.rangeControl?.forfeit(this.rangeControlConsumer); + this.useRangeSetting?.forfeit(this.useRangeSettingConsumer); + } + + /** + * Responds to when the map panning target changes. + * @param target The new map panning target. + */ + private onTargetChanged(target: GeoPointInterface): void { + if (this.hasTargetControl) { + this.setMapTarget(target); + } + } + + /** + * Sets the map projection's target. + * @param target The target to set. + */ + private setMapTarget(target: GeoPointInterface): void { + this.mapProjectionParams.target.set(target); + this.context.projection.setQueued(this.mapProjectionParams); + } + + /** @inheritdoc */ + public onMapDestroyed(): void { + this.destroy(); + } + + /** @inheritdoc */ + public destroy(): void { + this.targetControl?.forfeit(this.targetControlConsumer); + this.rotationModeControl?.forfeit(this.rotationModeControlConsumer); + this.orientationControl?.forfeit(this.orientationControlConsumer); + this.rangeControl?.forfeit(this.rangeControlConsumer); + this.useRangeSetting?.forfeit(this.useRangeSettingConsumer); + + this.panningActiveSub?.destroy(); + this.panningTargetSub?.destroy(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/garminsdk/components/map/controllers/MapPointerRTRController.ts b/src/garminsdk/components/map/controllers/MapPointerRTRController.ts index a3a6af46c..657cf5a8d 100644 --- a/src/garminsdk/components/map/controllers/MapPointerRTRController.ts +++ b/src/garminsdk/components/map/controllers/MapPointerRTRController.ts @@ -1,12 +1,12 @@ import { - BitFlags, GeoPoint, GeoPointInterface, MapProjection, MapProjectionChangeType, MapRotation, MapRotationModule, MapSystemContext, MapSystemController, - MapSystemKeys, MathUtils, ReadonlyFloat64Array, ResourceConsumer, ResourceModerator, Subject, Subscribable, Subscription, Vec2Math, + BitFlags, GeoPoint, MapProjection, MapProjectionChangeType, MapSystemContext, MapSystemController, + MathUtils, ReadonlyFloat64Array, Subscribable, SubscribableUtils, Subscription, Vec2Math, VecNMath, VecNSubject } from '@microsoft/msfs-sdk'; import { GarminMapKeys } from '../GarminMapKeys'; -import { MapResourcePriority } from '../MapResourcePriority'; import { MapOrientationModule } from '../modules/MapOrientationModule'; +import { MapPanningModule } from '../modules/MapPanningModule'; import { MapPointerModule } from '../modules/MapPointerModule'; /** @@ -16,8 +16,8 @@ export interface MapPointerRTRControllerModules { /** Pointer module. */ [GarminMapKeys.Pointer]: MapPointerModule; - /** Rotation module. */ - [MapSystemKeys.Rotation]?: MapRotationModule; + /** Panning module. */ + [GarminMapKeys.Panning]: MapPanningModule; /** Orientation module. */ [GarminMapKeys.Orientation]?: MapOrientationModule; @@ -26,119 +26,60 @@ export interface MapPointerRTRControllerModules { /** * Context properties required for MapPointerRTRController. */ -export interface MapPointerRTRControllerContext { - /** Resource moderator for control of the map's projection target. */ - [MapSystemKeys.TargetControl]?: ResourceModerator; - - /** Resource moderator for control of the map's rotation mode. */ - [GarminMapKeys.RotationModeControl]?: ResourceModerator; - - /** Resource moderator for control of the map's range. */ - [MapSystemKeys.RangeControl]?: ResourceModerator; - - /** Resource moderator for the use range setting subject. */ - [GarminMapKeys.UseRangeSetting]?: ResourceModerator>; -} +export type MapPointerRTRControllerContext = Record; /** - * Controls the pointer of a map. + * Controls the target, orientation, and range of a map while the map pointer is active. */ -export class MapPointerRTRController extends MapSystemController { +export class MapPointerRTRController extends MapSystemController { private readonly pointerModule = this.context.model.getModule(GarminMapKeys.Pointer); - private readonly rotationModule = this.context.model.getModule(MapSystemKeys.Rotation); + private readonly panningModule = this.context.model.getModule(GarminMapKeys.Panning); private readonly orientationModule = this.context.model.getModule(GarminMapKeys.Orientation); - private readonly mapProjectionParams = { - target: new GeoPoint(0, 0) - }; - - private readonly targetControl = this.context[MapSystemKeys.TargetControl]; - - private hasTargetControl = this.context.targetControlModerator === undefined; - - private readonly targetControlConsumer: ResourceConsumer = { - priority: MapResourcePriority.POINTER, - - onAcquired: () => { - this.hasTargetControl = true; - }, - - onCeded: () => { - this.hasTargetControl = false; - } - }; - - private readonly rotationModeControl = this.context[GarminMapKeys.RotationModeControl]; - - private readonly rotationModeControlConsumer: ResourceConsumer = { - priority: MapResourcePriority.POINTER, - - onAcquired: () => { - // While pointer is active, the map keeps its rotation from when the pointer was activated. - this.rotationModule?.rotationType.set(MapRotation.Undefined); - }, + protected readonly pointerBoundsOffset: Subscribable; - onCeded: () => { } - }; - - private readonly rangeControl = this.context[MapSystemKeys.RangeControl]; - - private readonly rangeControlConsumer: ResourceConsumer = { - priority: MapResourcePriority.POINTER, - - onAcquired: () => { }, // We are just holding this to keep other things of lower priority from changing the range. - - onCeded: () => { } - }; - - private readonly useRangeSetting = this.context[GarminMapKeys.UseRangeSetting]; - - private readonly useRangeSettingConsumer: ResourceConsumer> = { - priority: MapResourcePriority.POINTER, - - onAcquired: () => { }, // Pointer mode uses the use range setting state that was active when the pointer was activated, so we do nothing while we have control. - - onCeded: () => { } - }; - - private readonly pointerBounds = VecNSubject.createFromVector(VecNMath.create(4)); + private readonly pointerBounds = VecNSubject.create(VecNMath.create(4)); private needUpdatePointerScroll = false; + private targetPipe?: Subscription; + private pointerBoundsOffsetSub?: Subscription; private pointerActiveSub?: Subscription; private pointerBoundsSub?: Subscription; private pointerPositionSub?: Subscription; - private pointerTargetSub?: Subscription; - private orientationSub?: Subscription; + private commandedOrientationSub?: Subscription; /** - * Constructor. + * Creates a new instance of MapPointerRTRController. * @param context This controller's map context. - * @param pointerBoundsOffset A subscribable which provides the offset of the boundary surrounding the area in which - * the pointer can freely move, from the edge of the projected map, excluding the dead zone. Expressed as - * `[left, top, right, bottom]`, relative to the width and height, as appropriate, of the projected map. A positive - * offset is directed toward the center of the map. + * @param pointerBoundsOffset The offset of the boundary surrounding the area in which the pointer can freely move, + * from the edge of the projected map, excluding the dead zone. Expressed as `[left, top, right, bottom]`, relative + * to the width and height, as appropriate, of the projected map. A positive offset is directed toward the center of + * the map. */ constructor( - context: MapSystemContext, - protected readonly pointerBoundsOffset: Subscribable + context: MapSystemContext, + pointerBoundsOffset: ReadonlyFloat64Array | Subscribable ) { super(context); + + this.pointerBoundsOffset = SubscribableUtils.toSubscribable(pointerBoundsOffset, true); } /** @inheritdoc */ public onAfterMapRender(): void { + this.targetPipe = this.pointerModule.target.pipe(this.panningModule.target, true); + this.pointerBoundsSub = this.pointerBounds.sub(this.onPointerBoundsChanged.bind(this), false, true); this.pointerPositionSub = this.pointerModule.position.sub(this.onPointerPositionChanged.bind(this), false, true); - this.pointerTargetSub = this.pointerModule.target.sub(this.onPointerTargetChanged.bind(this), false, true); this.pointerBoundsOffsetSub = this.pointerBoundsOffset.sub(this.updatePointerBounds.bind(this), true); this.pointerActiveSub = this.pointerModule.isActive.sub(this.onPointerActiveChanged.bind(this), true); - this.orientationSub = this.orientationModule?.orientation.sub(() => { this.pointerModule.isActive.set(false); }, false, true); + this.commandedOrientationSub = this.orientationModule?.commandedOrientation.sub(() => { this.pointerModule.isActive.set(false); }, false, true); } /** @@ -171,8 +112,6 @@ export class MapPointerRTRController extends MapSystemController; +}; + /** * Controls the display of terrain based on user settings. */ @@ -48,11 +62,14 @@ export class MapTerrainController extends MapSystemController; private readonly showScaleSetting?: Subscribable; - private terrainModeState?: MappedSubscribable; + private readonly allowRelative: boolean; + private readonly defaultTerrainMode: Subscribable; + + private terrainModeState?: MappedSubscribable; private showScalePipe?: Subscription; /** - * Constructor. + * Creates a new instance of MapTerrainController. * @param context This controller's map context. * @param settingManager A setting manager containing the user settings controlling the display of terrain. If not * defined, the display of terrain will not be bound to user settings. @@ -62,10 +79,33 @@ export class MapTerrainController extends MapSystemController, settingManager?: UserSettingManager>, - private readonly allowRelative = true + allowRelative?: boolean + ); + /** + * Creates a new instance of MapTerrainController. + * @param context This controller's map context. + * @param settingManager A setting manager containing the user settings controlling the display of terrain. If not + * defined, the display of terrain will not be bound to user settings. + * @param options Options with which to configure the controller. + */ + constructor( + context: MapSystemContext, + settingManager?: UserSettingManager>, + options?: Readonly + ); + // eslint-disable-next-line jsdoc/require-jsdoc + constructor( + context: MapSystemContext, + settingManager?: UserSettingManager>, + arg3?: boolean | Readonly ) { super(context); + const options = arg3 === undefined ? undefined : typeof arg3 === 'object' ? arg3 : { allowRelative: arg3 }; + + this.allowRelative = options?.allowRelative ?? true; + this.defaultTerrainMode = SubscribableUtils.toSubscribable(options?.defaultMode ?? MapTerrainMode.None, true); + this.modeSetting = settingManager?.tryGetSetting('mapTerrainMode'); this.rangeIndexSetting = settingManager?.tryGetSetting('mapTerrainRangeIndex') ?? Subject.create(Number.MAX_SAFE_INTEGER); this.showScaleSetting = settingManager?.tryGetSetting('mapTerrainScaleShow'); @@ -75,6 +115,7 @@ export class MapTerrainController extends MapSystemController { + this.terrainModeState.sub(([defaultMode, modeSetting, rangeIndexSetting, rangeIndex, isOnGround, isGpsDataValid]): void => { let mode = MapTerrainMode.None; let isRelativeFailed = false; @@ -96,6 +137,7 @@ export class MapTerrainController extends MapSystemController, - settingManager: UserSettingManager> + settingManager: UserSettingManager>, + options?: Readonly ) { super(context); @@ -68,7 +117,7 @@ export class MapWaypointsVisController extends MapSystemController { - private static readonly MODE_MAP = { + private static readonly MODE_MAP: Partial> = { [MapOrientationSettingMode.NorthUp]: MapOrientation.NorthUp, [MapOrientationSettingMode.HeadingUp]: MapOrientation.HeadingUp, - [MapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp + [MapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp, + [MapOrientationSettingMode.DtkUp]: MapOrientation.DtkUp }; - private static readonly WEATHER_MODE_MAP = { + private static readonly WEATHER_MODE_MAP: Partial> = { [WeatherMapOrientationSettingMode.NorthUp]: MapOrientation.NorthUp, [WeatherMapOrientationSettingMode.HeadingUp]: MapOrientation.HeadingUp, [WeatherMapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp, - [WeatherMapOrientationSettingMode.SyncToNavMap]: MapOrientation.HeadingUp + [WeatherMapOrientationSettingMode.DtkUp]: MapOrientation.DtkUp }; private readonly rangeModule = this.context.model.getModule(GarminMapKeys.Range); diff --git a/src/garminsdk/components/map/controllers/WeatherMapOrientationSettingsController.ts b/src/garminsdk/components/map/controllers/WeatherMapOrientationSettingsController.ts new file mode 100644 index 000000000..4d36b6f4f --- /dev/null +++ b/src/garminsdk/components/map/controllers/WeatherMapOrientationSettingsController.ts @@ -0,0 +1,138 @@ +import { + MapSystemContext, MapSystemController, MappedSubject, Subscription, UserSettingManager +} from '@microsoft/msfs-sdk'; + +import { MapOrientationSettingMode, MapUserSettingTypes } from '../../../settings/MapUserSettings'; +import { WeatherMapOrientationSettingMode, WeatherMapUserSettingTypes } from '../../../settings/WeatherMapUserSettings'; +import { GarminMapKeys } from '../GarminMapKeys'; +import { MapOrientation, MapOrientationModule } from '../modules/MapOrientationModule'; + +/** + * Modules required for WeatherMapOrientationSettingsController. + */ +export interface WeatherMapOrientationSettingsControllerModules { + /** Orientation module. */ + [GarminMapKeys.Orientation]: MapOrientationModule; +} + +/** + * User settings required by WeatherMapOrientationSettingsController. + */ +export type WeatherMapOrientationSettingsControllerSettings = Pick< + MapUserSettingTypes & WeatherMapUserSettingTypes, + 'weatherMapOrientation' | 'mapOrientation' | 'mapAutoNorthUpActive' | 'mapAutoNorthUpRangeIndex' +>; + +/** + * Controls the orientation of a weather map based on user settings. + */ +export class WeatherMapOrientationSettingsController extends MapSystemController { + private static readonly MODE_MAP: Partial> = { + [MapOrientationSettingMode.NorthUp]: MapOrientation.NorthUp, + [MapOrientationSettingMode.HeadingUp]: MapOrientation.HeadingUp, + [MapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp, + [MapOrientationSettingMode.DtkUp]: MapOrientation.DtkUp + }; + private static readonly WEATHER_MODE_MAP: Partial> = { + [WeatherMapOrientationSettingMode.NorthUp]: MapOrientation.NorthUp, + [WeatherMapOrientationSettingMode.HeadingUp]: MapOrientation.HeadingUp, + [WeatherMapOrientationSettingMode.TrackUp]: MapOrientation.TrackUp, + [WeatherMapOrientationSettingMode.DtkUp]: MapOrientation.DtkUp + }; + + private readonly orientationModule = this.context.model.getModule(GarminMapKeys.Orientation); + + private readonly subs: Subscription[] = []; + + /** + * Creates a new instance of WeatherMapOrientationSettingsController. + * @param context This controller's map context. + * @param settingManager The setting manager used by this controller. + */ + public constructor( + context: MapSystemContext, + private readonly settingManager: UserSettingManager> + ) { + super(context); + } + + /** @inheritdoc */ + public onAfterMapRender(): void { + const weatherMapOrientationSetting = this.settingManager.tryGetSetting('weatherMapOrientation'); + + if (weatherMapOrientationSetting) { + const orientationSetting = this.settingManager.tryGetSetting('mapOrientation'); + + if (orientationSetting) { + const desiredOrientation = MappedSubject.create( + ([weatherOrientation, orientation]): MapOrientation => { + return weatherOrientation === WeatherMapOrientationSettingMode.SyncToNavMap + ? WeatherMapOrientationSettingsController.MODE_MAP[orientation] ?? MapOrientation.NorthUp + : WeatherMapOrientationSettingsController.WEATHER_MODE_MAP[weatherOrientation] ?? MapOrientation.NorthUp; + }, + weatherMapOrientationSetting, + orientationSetting, + ); + + this.subs.push( + desiredOrientation, + desiredOrientation.pipe(this.orientationModule.commandedOrientation) + ); + } else { + this.subs.push(weatherMapOrientationSetting.pipe(this.orientationModule.commandedOrientation, setting => { + return WeatherMapOrientationSettingsController.WEATHER_MODE_MAP[setting] ?? MapOrientation.NorthUp; + })); + } + + const northUpAboveActiveSetting = this.settingManager.tryGetSetting('mapAutoNorthUpActive'); + if (northUpAboveActiveSetting) { + const weatherNorthUpAboveActive = MappedSubject.create( + ([weatherOrientation, northUpAboveActive]) => { + return weatherOrientation === WeatherMapOrientationSettingMode.SyncToNavMap + ? northUpAboveActive === true + : false; + }, + weatherMapOrientationSetting, + northUpAboveActiveSetting, + ); + + this.subs.push( + weatherNorthUpAboveActive, + weatherNorthUpAboveActive.pipe(this.orientationModule.northUpAboveActive) + ); + } + + const northUpAboveRangeIndexSetting = this.settingManager.tryGetSetting('mapAutoNorthUpRangeIndex'); + if (northUpAboveRangeIndexSetting) { + const weatherNorthUpAboveRangeIndex = MappedSubject.create( + ([weatherOrientation, northUpAboveRangeIndex]) => { + return weatherOrientation === WeatherMapOrientationSettingMode.SyncToNavMap && typeof northUpAboveRangeIndex === 'number' + ? northUpAboveRangeIndex + : Infinity; + }, + weatherMapOrientationSetting, + northUpAboveRangeIndexSetting, + ); + + this.subs.push( + weatherNorthUpAboveRangeIndex, + weatherNorthUpAboveRangeIndex.pipe(this.orientationModule.northUpAboveRangeIndex) + ); + } + } + } + + /** @inheritdoc */ + public onMapDestroyed(): void { + this.destroy(); + } + + /** @inheritdoc */ + public destroy(): void { + for (const sub of this.subs) { + sub.destroy(); + } + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/garminsdk/components/map/controllers/index.ts b/src/garminsdk/components/map/controllers/index.ts index 1a25aadda..29638ce88 100644 --- a/src/garminsdk/components/map/controllers/index.ts +++ b/src/garminsdk/components/map/controllers/index.ts @@ -1,11 +1,15 @@ export * from './MapAirspaceVisController'; export * from './MapDataIntegrityRTRController'; +export * from './MapDesiredOrientationController'; export * from './MapFlightPlanFocusRTRController'; export * from './MapGarminAutopilotPropsController'; export * from './MapGarminTrafficController'; export * from './MapNexradController'; export * from './MapOrientationController'; +export * from './MapOrientationModeController'; export * from './MapOrientationRTRController'; +export * from './MapOrientationSettingsController'; +export * from './MapPanningRTRController'; export * from './MapPointerController'; export * from './MapPointerRTRController'; export * from './MapRangeCompassController'; @@ -22,4 +26,5 @@ export * from './NearestMapRTRController'; export * from './TrafficMapRangeController'; export * from './WaypointMapHighlightController'; export * from './WaypointMapRTRController'; -export * from './WeatherMapOrientationController'; \ No newline at end of file +export * from './WeatherMapOrientationController'; +export * from './WeatherMapOrientationSettingsController'; \ No newline at end of file diff --git a/src/garminsdk/components/map/index.ts b/src/garminsdk/components/map/index.ts index b560bd5e7..691d289cc 100644 --- a/src/garminsdk/components/map/index.ts +++ b/src/garminsdk/components/map/index.ts @@ -23,4 +23,5 @@ export * from './MapUtils'; export * from './MapWaypointDisplayBuilder'; export * from './MapWaypointIcon'; export * from './MapWaypointRenderer'; -export * from './MapWaypointStyles'; \ No newline at end of file +export * from './MapWaypointStyles'; +export * from './NextGenGarminMapBuilder'; \ No newline at end of file diff --git a/src/garminsdk/components/map/indicators/MapRelativeTerrainStatusIndicator.tsx b/src/garminsdk/components/map/indicators/MapRelativeTerrainStatusIndicator.tsx index 8d5efe150..abf261d5f 100644 --- a/src/garminsdk/components/map/indicators/MapRelativeTerrainStatusIndicator.tsx +++ b/src/garminsdk/components/map/indicators/MapRelativeTerrainStatusIndicator.tsx @@ -41,9 +41,9 @@ export class MapRelativeTerrainStatusIndicator extends DisplayComponent

- - - + + +
diff --git a/src/garminsdk/components/map/layers/MapRangeCompassLayer.tsx b/src/garminsdk/components/map/layers/MapRangeCompassLayer.tsx index 63a2d1918..8b37cbb29 100644 --- a/src/garminsdk/components/map/layers/MapRangeCompassLayer.tsx +++ b/src/garminsdk/components/map/layers/MapRangeCompassLayer.tsx @@ -183,6 +183,8 @@ export class MapRangeCompassLayer extends MapLayer { private static readonly vec2Cache = Array.from({ length: 4 }, () => new Float64Array(2)); + private thisNode?: VNode; + private readonly rootRef = FSComponent.createRef(); private readonly arcLayerRef = FSComponent.createRef>>(); private readonly roseLayerContainerRef = FSComponent.createRef(); @@ -240,6 +242,13 @@ export class MapRangeCompassLayer extends MapLayer { private needUpdateHeadingIndicatorVisibility = true; private needRepositionLabel = true; + private readonly subscriptions: Subscription[] = []; + + /** @inheritdoc */ + public onAfterRender(thisNode: VNode): void { + this.thisNode = thisNode; + } + /** @inheritdoc */ public onVisibilityChanged(isVisible: boolean): void { this.needUpdateRootVisibility = true; @@ -280,40 +289,30 @@ export class MapRangeCompassLayer extends MapLayer { * Initializes listeners. */ private initListeners(): void { - this.initParameterListeners(); - this.initModuleListeners(); - this.isFollowingAirplane.sub(() => { - this.needRechooseReferenceMarker = true; - this.needUpdateHeadingIndicatorVisibility = true; - }); - } - - /** - * Initializes parameter listeners. - */ - private initParameterListeners(): void { this.centerSubject.sub(this.onCenterChanged.bind(this)); this.radiusSubject.sub(this.onRadiusChanged.bind(this)); this.rotationSubject.sub(this.onRotationChanged.bind(this)); this.magVarCorrectionSubject.sub(this.onMagVarCorrectionChanged.bind(this)); - } - /** - * Initializes modules listeners. - */ - private initModuleListeners(): void { - this.rangeModule.nominalRange.sub(this.onRangeChanged.bind(this)); - this.orientationModule.orientation.sub(this.onOrientationChanged.bind(this)); - this.rangeCompassModule.show.sub(this.onRangeCompassShowChanged.bind(this)); + this.subscriptions.push( + this.rangeModule.nominalRange.sub(this.onRangeChanged.bind(this)), + + this.orientationModule.orientation.sub(this.onOrientationChanged.bind(this)), + + this.rangeCompassModule.show.sub(this.onRangeCompassShowChanged.bind(this)), + + this.isFollowingAirplane.sub(() => { + this.needRechooseReferenceMarker = true; + this.needUpdateHeadingIndicatorVisibility = true; + }) + ); } /** @inheritdoc */ public onMapProjectionChanged(mapProjection: MapProjection, changeFlags: number): void { this.arcLayerRef.instance.onMapProjectionChanged(mapProjection, changeFlags); this.roseLabelsLayerRef.instance.onMapProjectionChanged(mapProjection, changeFlags); - if (this.props.showHeadingBug) { - this.headingIndicatorRef.instance.onMapProjectionChanged(mapProjection, changeFlags); - } + this.headingIndicatorRef.getOrDefault()?.onMapProjectionChanged(mapProjection, changeFlags); if (BitFlags.isAll(changeFlags, MapProjectionChangeType.ProjectedSize)) { // resizing the map will cause synced canvas layers to clear themselves, so we need to force a redraw on these @@ -564,9 +563,7 @@ export class MapRangeCompassLayer extends MapLayer { this.roseLayerRef.instance.onUpdated(time, elapsed); this.roseLabelsLayerRef.instance.onUpdated(time, elapsed); this.referenceMarkerContainerRef.instance.onUpdated(time, elapsed); - if (this.props.showHeadingBug) { - this.headingIndicatorRef.instance.onUpdated(time, elapsed); - } + this.headingIndicatorRef.getOrDefault()?.onUpdated(time, elapsed); } /** @@ -736,6 +733,17 @@ export class MapRangeCompassLayer extends MapLayer { ) : null; } + + /** @inheritdoc */ + public destroy(): void { + this.thisNode && FSComponent.shallowDestroy(this.thisNode); + + for (const sub of this.subscriptions) { + sub.destroy(); + } + + super.destroy(); + } } /** @@ -1633,6 +1641,8 @@ class MapRangeCompassSelectedHeading extends MapLayer { return this.isUserVisible; } } else if (waypoint instanceof MapRunwayLabelWaypoint) { - return this.waypointsModule.runwayShow.get() + return this.waypointsModule.runwayLabelShow.get() && UnitType.METER.convertTo(waypoint.runway.length, UnitType.GA_RADIAN) / this.props.mapProjection.getProjectedResolution() >= this.waypointsModule.runwayLabelMinLength.get(); } else if (waypoint instanceof MapRunwayOutlineWaypoint) { diff --git a/src/garminsdk/components/map/layers/TrafficMapRangeLayer.tsx b/src/garminsdk/components/map/layers/TrafficMapRangeLayer.tsx index 34ea8bcf0..42faaf727 100644 --- a/src/garminsdk/components/map/layers/TrafficMapRangeLayer.tsx +++ b/src/garminsdk/components/map/layers/TrafficMapRangeLayer.tsx @@ -1,6 +1,8 @@ import { - BitFlags, FSComponent, MapIndexedRangeModule, MapLabeledRingLabel, MapLabeledRingLayer, MapLayer, MapLayerProps, MapProjection, MapProjectionChangeType, - MapSyncedCanvasLayer, NumberUnitInterface, NumberUnitSubject, ReadonlyFloat64Array, Subject, Subscribable, Unit, UnitFamily, UnitType, Vec2Math, VNode + BitFlags, FSComponent, GenericMapSharedCanvasSubLayer, MapIndexedRangeModule, MapLabeledRingCanvasSubLayer, + MapLabeledRingLabel, MapLayer, MapLayerProps, MapProjection, MapProjectionChangeType, MapSharedCanvasLayer, + MapSyncedCanvasLayer, MathUtils, NumberUnitInterface, NumberUnitSubject, ReadonlyFloat64Array, Subject, Subscribable, Unit, + UnitFamily, UnitType, VNode, Vec2Math } from '@microsoft/msfs-sdk'; import { GarminMapKeys } from '../GarminMapKeys'; @@ -36,6 +38,15 @@ export interface TrafficMapRangeLayerProps extends MapLayerProps { private static readonly DEFAULT_STROKE_WIDTH = 2; private static readonly DEFAULT_STROKE_STYLE = 'white'; private static readonly DEFAULT_STROKE_DASH = [4, 4]; + + private static readonly DEFAULT_OUTLINE_WIDTH = 0; + private static readonly DEFAULT_OUTLINE_STYLE = 'black'; + private static readonly DEFAULT_OUTLINE_DASH = []; + private static readonly DEFAULT_TICK_COLOR = 'white'; private static readonly DEFAULT_MAJOR_TICK_SIZE = 10; private static readonly DEFAULT_MINOR_TICK_SIZE = 5; private static readonly vec2Cache = [new Float64Array(2)]; + private readonly canvasLayerRef = FSComponent.createRef(); private readonly tickLayerRef = FSComponent.createRef>(); - private readonly innerRangeLayerRef = FSComponent.createRef>(); - private readonly outerRangeLayerRef = FSComponent.createRef>(); + private readonly innerRingLayerRef = FSComponent.createRef>(); + private readonly outerRingLayerRef = FSComponent.createRef>(); private readonly outerStrokeWidth = this.props.outerStrokeWidth ?? TrafficMapRangeLayer.DEFAULT_STROKE_WIDTH; private readonly outerStrokeStyle = this.props.outerStrokeStyle ?? TrafficMapRangeLayer.DEFAULT_STROKE_STYLE; private readonly outerStrokeDash = this.props.outerStrokeDash ?? TrafficMapRangeLayer.DEFAULT_STROKE_DASH; + private readonly outerOutlineWidth = this.props.outerOutlineWidth ?? TrafficMapRangeLayer.DEFAULT_OUTLINE_WIDTH; + private readonly outerOutlineStyle = this.props.outerOutlineStyle ?? TrafficMapRangeLayer.DEFAULT_OUTLINE_STYLE; + private readonly outerOutlineDash = this.props.outerOutlineDash ?? TrafficMapRangeLayer.DEFAULT_OUTLINE_DASH; + private readonly innerStrokeWidth = this.props.innerStrokeWidth ?? TrafficMapRangeLayer.DEFAULT_STROKE_WIDTH; private readonly innerStrokeStyle = this.props.innerStrokeStyle ?? TrafficMapRangeLayer.DEFAULT_STROKE_STYLE; private readonly innerStrokeDash = this.props.innerStrokeDash ?? TrafficMapRangeLayer.DEFAULT_STROKE_DASH; + private readonly innerOutlineWidth = this.props.innerOutlineWidth ?? TrafficMapRangeLayer.DEFAULT_OUTLINE_WIDTH; + private readonly innerOutlineStyle = this.props.innerOutlineStyle ?? TrafficMapRangeLayer.DEFAULT_OUTLINE_STYLE; + private readonly innerOutlineDash = this.props.innerOutlineDash ?? TrafficMapRangeLayer.DEFAULT_OUTLINE_DASH; - private readonly tickColor = this.props.tickColor ?? TrafficMapRangeLayer.DEFAULT_TICK_COLOR; + private readonly outerMajorTickColor = this.props.outerMajorTickColor ?? this.props.tickColor ?? TrafficMapRangeLayer.DEFAULT_TICK_COLOR; private readonly outerMajorTickSize = this.props.outerMajorTickSize ?? TrafficMapRangeLayer.DEFAULT_MAJOR_TICK_SIZE; + private readonly outerMinorTickColor = this.props.outerMinorTickColor ?? this.props.tickColor ?? TrafficMapRangeLayer.DEFAULT_TICK_COLOR; private readonly outerMinorTickSize = this.props.outerMinorTickSize ?? TrafficMapRangeLayer.DEFAULT_MINOR_TICK_SIZE; + private readonly innerMajorTickColor = this.props.innerMajorTickColor ?? this.props.tickColor ?? TrafficMapRangeLayer.DEFAULT_TICK_COLOR; private readonly innerMajorTickSize = this.props.innerMajorTickSize ?? TrafficMapRangeLayer.DEFAULT_MAJOR_TICK_SIZE; + private readonly innerMinorTickColor = this.props.innerMinorTickColor ?? this.props.tickColor ?? TrafficMapRangeLayer.DEFAULT_TICK_COLOR; private readonly innerMinorTickSize = this.props.innerMinorTickSize ?? TrafficMapRangeLayer.DEFAULT_MINOR_TICK_SIZE; private readonly rangeModule = this.props.model.getModule(GarminMapKeys.Range); private readonly trafficModule = this.props.model.getModule(GarminMapKeys.Traffic); - private readonly innerRange = NumberUnitSubject.createFromNumberUnit(UnitType.NMILE.createNumber(0)); - private readonly outerRange = NumberUnitSubject.createFromNumberUnit(UnitType.NMILE.createNumber(0)); + private readonly innerRange = NumberUnitSubject.create(UnitType.NMILE.createNumber(0)); + private readonly outerRange = NumberUnitSubject.create(UnitType.NMILE.createNumber(0)); + + private innerRadius = 0; + private outerRadius = 0; private innerLabel: MapLabeledRingLabel | null = null; private outerLabel: MapLabeledRingLabel | null = null; private needUpdateRings = false; + private needUpdateTicks = false; /** @inheritdoc */ public onAttached(): void { - this.tickLayerRef.instance.onAttached(); - this.innerRangeLayerRef.instance.onAttached(); - this.outerRangeLayerRef.instance.onAttached(); + this.canvasLayerRef.instance.onAttached(); this.initLabels(); this.initStyles(); @@ -142,7 +192,7 @@ export class TrafficMapRangeLayer extends MapLayer { const displayUnit = Subject.create(UnitType.NMILE); if (this.props.innerLabelRadial !== null && this.props.innerLabelRadial !== undefined) { - this.innerLabel = this.innerRangeLayerRef.instance.createLabel( + this.innerLabel = this.innerRingLayerRef.instance.createLabel( this.props.renderLabel !== undefined ? this.props.renderLabel(this.innerRange, displayUnit) : () @@ -153,7 +203,7 @@ export class TrafficMapRangeLayer extends MapLayer { } if (this.props.outerLabelRadial !== null && this.props.outerLabelRadial !== undefined) { - this.outerLabel = this.outerRangeLayerRef.instance.createLabel( + this.outerLabel = this.outerRingLayerRef.instance.createLabel( this.props.renderLabel !== undefined ? this.props.renderLabel(this.outerRange, displayUnit) : () @@ -168,10 +218,11 @@ export class TrafficMapRangeLayer extends MapLayer { * Initializes ring styles. */ private initStyles(): void { - this.tickLayerRef.instance.display.context.fillStyle = this.tickColor; + this.innerRingLayerRef.instance.setRingStrokeStyles(this.innerStrokeWidth, this.innerStrokeStyle, this.innerStrokeDash); + this.innerRingLayerRef.instance.setRingOutlineStyles(this.innerOutlineWidth, this.innerOutlineStyle, this.innerOutlineDash); - this.innerRangeLayerRef.instance.setRingStrokeStyles(this.innerStrokeWidth, this.innerStrokeStyle, this.innerStrokeDash); - this.outerRangeLayerRef.instance.setRingStrokeStyles(this.outerStrokeWidth, this.outerStrokeStyle, this.outerStrokeDash); + this.outerRingLayerRef.instance.setRingStrokeStyles(this.outerStrokeWidth, this.outerStrokeStyle, this.outerStrokeDash); + this.outerRingLayerRef.instance.setRingOutlineStyles(this.outerOutlineWidth, this.outerOutlineStyle, this.outerOutlineDash); } /** @@ -190,29 +241,19 @@ export class TrafficMapRangeLayer extends MapLayer { /** @inheritdoc */ public onMapProjectionChanged(mapProjection: MapProjection, changeFlags: number): void { - this.tickLayerRef.instance.onMapProjectionChanged(mapProjection, changeFlags); - this.innerRangeLayerRef.instance.onMapProjectionChanged(mapProjection, changeFlags); - this.outerRangeLayerRef.instance.onMapProjectionChanged(mapProjection, changeFlags); - - if (BitFlags.isAll(changeFlags, MapProjectionChangeType.ProjectedSize)) { - // Need to reset the canvas context fill style because a resize will wipe its state. - this.tickLayerRef.instance.display.context.fillStyle = this.tickColor; - } + this.canvasLayerRef.instance.onMapProjectionChanged(mapProjection, changeFlags); - this.needUpdateRings = BitFlags.isAny(changeFlags, MapProjectionChangeType.TargetProjected | MapProjectionChangeType.ProjectedResolution); + this.needUpdateRings ||= BitFlags.isAny(changeFlags, MapProjectionChangeType.TargetProjected | MapProjectionChangeType.ProjectedResolution); } /** @inheritdoc */ public onUpdated(time: number, elapsed: number): void { - this.tickLayerRef.instance.onUpdated(time, elapsed); - if (this.needUpdateRings) { this.updateRings(); this.needUpdateRings = false; } - this.innerRangeLayerRef.instance.onUpdated(time, elapsed); - this.outerRangeLayerRef.instance.onUpdated(time, elapsed); + this.canvasLayerRef.instance.onUpdated(time, elapsed); } /** @@ -220,71 +261,90 @@ export class TrafficMapRangeLayer extends MapLayer { */ private updateRings(): void { const center = this.props.mapProjection.getTargetProjected(); - const innerRadius = (this.innerRange.get().asUnit(UnitType.GA_RADIAN) as number) / this.props.mapProjection.getProjectedResolution(); - const outerRadius = (this.outerRange.get().asUnit(UnitType.GA_RADIAN) as number) / this.props.mapProjection.getProjectedResolution(); + const innerRadius = this.innerRange.get().asUnit(UnitType.GA_RADIAN) / this.props.mapProjection.getProjectedResolution(); + const outerRadius = this.outerRange.get().asUnit(UnitType.GA_RADIAN) / this.props.mapProjection.getProjectedResolution(); if (innerRadius > 0) { - this.innerRangeLayerRef.instance.setVisible(true); - this.innerRangeLayerRef.instance.setRingPosition(center, innerRadius); + this.innerRingLayerRef.instance.setVisible(true); + this.innerRingLayerRef.instance.setRingPosition(center, innerRadius); } else { - this.innerRangeLayerRef.instance.setVisible(false); + this.innerRingLayerRef.instance.setVisible(false); } if (outerRadius > 0) { - this.outerRangeLayerRef.instance.setVisible(true); - this.outerRangeLayerRef.instance.setRingPosition(center, outerRadius); + this.outerRingLayerRef.instance.setVisible(true); + this.outerRingLayerRef.instance.setRingPosition(center, outerRadius); } else { - this.outerRangeLayerRef.instance.setVisible(false); + this.outerRingLayerRef.instance.setVisible(false); } - this.updateTicks(center, innerRadius, outerRadius); + this.innerRadius = innerRadius; + this.outerRadius = outerRadius; + + this.needUpdateTicks = true; } /** - * Updates the ring tick marks. - * @param center The projected center of the rings. - * @param innerRadius The radius of the inner ring, in pixels. - * @param outerRadius The radius of the outer ring, in pixels. + * Updates this layer's ring tick marks. + * @param context A canvas 2D rendering context to which to render the ticks. */ - private updateTicks(center: ReadonlyFloat64Array, innerRadius: number, outerRadius: number): void { - const display = this.tickLayerRef.instance.display; - - display.clear(); + private updateTicks(context: CanvasRenderingContext2D): void { + const center = this.props.mapProjection.getTargetProjected(); - if (innerRadius > 0) { - this.drawTicks(display.context, center, innerRadius, this.innerMajorTickSize, this.innerMinorTickSize); + if (this.innerRadius > 0) { + this.drawTicks(context, center, this.innerRadius, this.innerMajorTickColor, this.innerMajorTickSize, this.innerMinorTickColor, this.innerMinorTickSize); } - if (outerRadius > 0) { - this.drawTicks(display.context, center, outerRadius, this.outerMajorTickSize, this.outerMinorTickSize); + if (this.outerRadius > 0) { + this.drawTicks(context, center, this.outerRadius, this.outerMajorTickColor, this.outerMajorTickSize, this.outerMinorTickColor, this.outerMinorTickSize); } } /** - * Draws ring ticks to a canvas. One major tick is drawn at each of the four cardinal positions, and one minor tick - * is drawn at each of the eight remaining hour positions. + * Draws this layer's ring tick marks to a canvas. One major tick is drawn at each of the four cardinal positions, + * and one minor tick is drawn at each of the eight remaining hour positions. * @param context A canvas 2D rendering context. * @param center The projected center of the outer ring. * @param radius The radius of the ring, in pixels. + * @param majorTickColor The color of each major tick. * @param majorTickSize The size of each major tick, in pixels. + * @param minorTickColor The color of each minor tick. * @param minorTickSize The size of each minor tick, in pixels. */ private drawTicks( context: CanvasRenderingContext2D, center: ReadonlyFloat64Array, radius: number, + majorTickColor: string, majorTickSize: number, + minorTickColor: string, minorTickSize: number ): void { - const step = Math.PI / 6; + // Minor ticks + + context.fillStyle = minorTickColor; + for (let i = 0; i < 12; i++) { - const pos = Vec2Math.setFromPolar(radius, i * step, TrafficMapRangeLayer.vec2Cache[0]); - this.drawTick(context, center[0] + pos[0], center[1] + pos[1], i % 3 === 0 ? majorTickSize : minorTickSize); + if (i % 3 === 0) { + continue; + } + + const pos = Vec2Math.setFromPolar(radius, i * Math.PI / 6, TrafficMapRangeLayer.vec2Cache[0]); + this.drawTick(context, center[0] + pos[0], center[1] + pos[1], minorTickSize); + } + + // Major ticks + + context.fillStyle = majorTickColor; + + for (let i = 0; i < 4; i++) { + const pos = Vec2Math.setFromPolar(radius, i * MathUtils.HALF_PI, TrafficMapRangeLayer.vec2Cache[0]); + this.drawTick(context, center[0] + pos[0], center[1] + pos[1], majorTickSize); } } /** - * Draws a tick to a canvas. + * Draws a ring tick to a canvas. * @param context A canvas 2D rendering context. * @param x The x-coordinate of the center of the tick. * @param y The y-coordinate of the center of the tick. @@ -313,11 +373,38 @@ export class TrafficMapRangeLayer extends MapLayer { /** @inheritdoc */ public render(): VNode { return ( -
- - - -
+ + + + this.needUpdateTicks} + onUpdated={(projection, display) => { + if (display.isInvalidated) { + this.needUpdateTicks = false; + this.updateTicks(display.context); + } + }} + /> + ); } + + /** @inheritdoc */ + public destroy(): void { + this.canvasLayerRef.getOrDefault()?.destroy(); + + super.destroy(); + } } \ No newline at end of file diff --git a/src/garminsdk/components/map/modules/MapOrientationModule.ts b/src/garminsdk/components/map/modules/MapOrientationModule.ts index 20311d2c1..ddcb69673 100644 --- a/src/garminsdk/components/map/modules/MapOrientationModule.ts +++ b/src/garminsdk/components/map/modules/MapOrientationModule.ts @@ -6,13 +6,29 @@ import { Subject } from '@microsoft/msfs-sdk'; export enum MapOrientation { NorthUp, TrackUp, - HeadingUp + HeadingUp, + DtkUp } /** * A module describing the map orientation. */ export class MapOrientationModule { - /** The orientation of the map. */ + /** The actual orientation of the map. */ public readonly orientation = Subject.create(MapOrientation.HeadingUp); + + /** The desired orientation of the map. */ + public readonly desiredOrientation = Subject.create(MapOrientation.HeadingUp); + + /** The map orientation commanded by the user. */ + public readonly commandedOrientation = Subject.create(MapOrientation.HeadingUp); + + /** Whether north up-above is active. */ + public readonly northUpAboveActive = Subject.create(false); + + /** The range index above which north up-above applies. */ + public readonly northUpAboveRangeIndex = Subject.create(Infinity); + + /** Whether north up on ground is active. */ + public readonly northUpOnGroundActive = Subject.create(false); } \ No newline at end of file diff --git a/src/garminsdk/components/map/modules/MapPanningModule.ts b/src/garminsdk/components/map/modules/MapPanningModule.ts new file mode 100644 index 000000000..db8024090 --- /dev/null +++ b/src/garminsdk/components/map/modules/MapPanningModule.ts @@ -0,0 +1,12 @@ +import { GeoPoint, GeoPointSubject, Subject } from '@microsoft/msfs-sdk'; + +/** + * A module describing manual panning of the map. + */ +export class MapPanningModule { + /** Whether panning is active. */ + public readonly isActive = Subject.create(false); + + /** The desired map target. */ + public readonly target = GeoPointSubject.create(new GeoPoint(0, 0)); +} \ No newline at end of file diff --git a/src/garminsdk/components/map/modules/MapPointerModule.ts b/src/garminsdk/components/map/modules/MapPointerModule.ts index aa2e24c63..f50aa5a20 100644 --- a/src/garminsdk/components/map/modules/MapPointerModule.ts +++ b/src/garminsdk/components/map/modules/MapPointerModule.ts @@ -8,8 +8,8 @@ export class MapPointerModule { public readonly isActive = Subject.create(false); /** The position of the pointer on the projected map, in pixel coordinates. */ - public readonly position = Vec2Subject.createFromVector(new Float64Array(2)); + public readonly position = Vec2Subject.create(new Float64Array(2)); /** The desired map target. */ - public readonly target = GeoPointSubject.createFromGeoPoint(new GeoPoint(0, 0)); + public readonly target = GeoPointSubject.create(new GeoPoint(0, 0)); } \ No newline at end of file diff --git a/src/garminsdk/components/map/modules/MapTrackVectorModule.ts b/src/garminsdk/components/map/modules/MapTrackVectorModule.ts index 2f50b14ac..206e1a5b9 100644 --- a/src/garminsdk/components/map/modules/MapTrackVectorModule.ts +++ b/src/garminsdk/components/map/modules/MapTrackVectorModule.ts @@ -8,5 +8,5 @@ export class MapTrackVectorModule { public readonly show = Subject.create(false); /** The track vector's lookahead time. */ - public readonly lookaheadTime = NumberUnitSubject.createFromNumberUnit(UnitType.SECOND.createNumber(60)); + public readonly lookaheadTime = NumberUnitSubject.create(UnitType.SECOND.createNumber(60)); } \ No newline at end of file diff --git a/src/garminsdk/components/map/modules/MapWaypointsModule.ts b/src/garminsdk/components/map/modules/MapWaypointsModule.ts index 6a0a2d96c..769a78142 100644 --- a/src/garminsdk/components/map/modules/MapWaypointsModule.ts +++ b/src/garminsdk/components/map/modules/MapWaypointsModule.ts @@ -25,9 +25,12 @@ export class MapWaypointsModule { /** Whether to show user waypoints. */ public readonly userShow = Subject.create(true); - /** Whether to show runway outlines and labels. */ + /** Whether to show runway outlines. */ public readonly runwayShow = Subject.create(true); + /** Whether to show runway labels. */ + public readonly runwayLabelShow = Subject.create(true); + /** The minimum projected length of a runway, in pixels, required to show its label. */ public readonly runwayLabelMinLength = Subject.create(50); } \ No newline at end of file diff --git a/src/garminsdk/components/map/modules/index.ts b/src/garminsdk/components/map/modules/index.ts index 854b3d0b7..8072587b6 100644 --- a/src/garminsdk/components/map/modules/index.ts +++ b/src/garminsdk/components/map/modules/index.ts @@ -7,6 +7,7 @@ export * from './MapGarminDataIntegrityModule'; export * from './MapGarminTrafficModule'; export * from './MapNexradModule'; export * from './MapOrientationModule'; +export * from './MapPanningModule'; export * from './MapPointerModule'; export * from './MapProcedurePreviewModule'; export * from './MapRangeCompassModule'; diff --git a/src/garminsdk/components/navdatabar/DefaultNavDataBarFieldModelFactory.ts b/src/garminsdk/components/navdatabar/DefaultNavDataBarFieldModelFactory.ts index 19d9427d6..1554e5289 100644 --- a/src/garminsdk/components/navdatabar/DefaultNavDataBarFieldModelFactory.ts +++ b/src/garminsdk/components/navdatabar/DefaultNavDataBarFieldModelFactory.ts @@ -3,20 +3,21 @@ import { EventBus, Subscribable } from '@microsoft/msfs-sdk'; import { Fms } from '../../flightplan/Fms'; import { NavDataFieldGpsValidity } from '../navdatafield/NavDataFieldModel'; import { NavDataFieldType } from '../navdatafield/NavDataFieldType'; -import { - GenericNavDataBarFieldModelFactory, NavDataBarFieldBrgModelFactory, NavDataBarFieldDestModelFactory, NavDataBarFieldDisModelFactory, - NavDataBarFieldDtgModelFactory, NavDataBarFieldDtkModelFactory, NavDataBarFieldEndModelFactory, NavDataBarFieldEnrModelFactory, NavDataBarFieldEtaModelFactory, - NavDataBarFieldEteModelFactory, NavDataBarFieldFobModelFactory, NavDataBarFieldFodModelFactory, NavDataBarFieldGsModelFactory, NavDataBarFieldIsaModelFactory, - NavDataBarFieldLdgModelFactory, NavDataBarFieldTasModelFactory, NavDataBarFieldTkeModelFactory, NavDataBarFieldTrkModelFactory, - NavDataBarFieldVsrModelFactory, NavDataBarFieldWptModelFactory, NavDataBarFieldXtkModelFactory -} from './GenericNavDataBarFieldModelFactory'; +import { GenericNavDataBarFieldModelFactory } from './GenericNavDataBarFieldModelFactory'; import { NavDataBarFieldModelFactory, NavDataBarFieldTypeModelMap } from './NavDataBarFieldModel'; +import { + NavDataBarFieldBrgModelFactory, NavDataBarFieldDestModelFactory, NavDataBarFieldDisModelFactory, NavDataBarFieldDtgModelFactory, + NavDataBarFieldDtkModelFactory, NavDataBarFieldEndModelFactory, NavDataBarFieldEnrModelFactory, NavDataBarFieldEtaModelFactory, + NavDataBarFieldEteModelFactory, NavDataBarFieldFobModelFactory, NavDataBarFieldFodModelFactory, NavDataBarFieldGsModelFactory, + NavDataBarFieldIsaModelFactory, NavDataBarFieldLdgModelFactory, NavDataBarFieldTasModelFactory, NavDataBarFieldTkeModelFactory, + NavDataBarFieldTrkModelFactory, NavDataBarFieldVsrModelFactory, NavDataBarFieldWptModelFactory, NavDataBarFieldXtkModelFactory +} from './NavDataBarFieldTypeModelFactories'; /** * A default implementation of NavDataBarFieldModelFactory. */ export class DefaultNavDataBarFieldModelFactory implements NavDataBarFieldModelFactory { - private readonly factory: GenericNavDataBarFieldModelFactory; + protected readonly factory: GenericNavDataBarFieldModelFactory; /** * Constructor. diff --git a/src/garminsdk/components/navdatabar/EventBusNavDataBarFieldTypeModelFactory.ts b/src/garminsdk/components/navdatabar/EventBusNavDataBarFieldTypeModelFactory.ts new file mode 100644 index 000000000..e1180926d --- /dev/null +++ b/src/garminsdk/components/navdatabar/EventBusNavDataBarFieldTypeModelFactory.ts @@ -0,0 +1,23 @@ +import { EventBus, Subscribable } from '@microsoft/msfs-sdk'; + +import { NavDataFieldGpsValidity } from '../navdatafield/NavDataFieldModel'; +import { NavDataFieldType } from '../navdatafield/NavDataFieldType'; +import { NavDataBarFieldTypeModelFactory, NavDataBarFieldTypeModelMap } from './NavDataBarFieldModel'; + +/** + * An abstract implementation of {@link NavDataBarFieldTypeModelFactory} which accesses data from the event bus to use + * to create its data models. + */ +export abstract class EventBusNavDataBarFieldTypeModelFactory implements NavDataBarFieldTypeModelFactory { + protected readonly sub = this.bus.getSubscriber(); + + /** + * Constructor. + * @param bus The event bus. + */ + constructor(private readonly bus: EventBus) { + } + + /** @inheritdoc */ + public abstract create(gpsValidity: Subscribable): NavDataBarFieldTypeModelMap[T]; +} \ No newline at end of file diff --git a/src/garminsdk/components/navdatabar/GenericNavDataBarFieldModelFactory.ts b/src/garminsdk/components/navdatabar/GenericNavDataBarFieldModelFactory.ts index c25cd779f..703cbf963 100644 --- a/src/garminsdk/components/navdatabar/GenericNavDataBarFieldModelFactory.ts +++ b/src/garminsdk/components/navdatabar/GenericNavDataBarFieldModelFactory.ts @@ -1,29 +1,8 @@ -import { - AdcEvents, AhrsEvents, BasicNavAngleSubject, BasicNavAngleUnit, ClockEvents, EngineEvents, EventBus, FlightPlanCopiedEvent, - FlightPlanIndicationEvent, FlightPlannerEvents, FlightPlanOriginDestEvent, GNSSEvents, ICAO, LNavEvents, NavAngleUnitFamily, NavMath, NumberUnitInterface, - NumberUnitSubject, OriginDestChangeType, Subject, Subscribable, UnitFamily, UnitType, VNavDataEvents, VNavEvents -} from '@microsoft/msfs-sdk'; +import { Subscribable } from '@microsoft/msfs-sdk'; -import { Fms } from '../../flightplan/Fms'; -import { LNavDataEvents } from '../../navigation/LNavDataEvents'; import { NavDataFieldGpsValidity } from '../navdatafield/NavDataFieldModel'; import { NavDataFieldType } from '../navdatafield/NavDataFieldType'; -import { - NavDataBarFieldConsumerValueModel, NavDataBarFieldConsumerValueNumberUnitModel, NavDataBarFieldGenericModel, NavDataBarFieldModel, NavDataBarFieldModelFactory, - NavDataBarFieldTypeModelMap -} from './NavDataBarFieldModel'; - -/** - * A factory which creates data models for a single type of navigation data bar field. - */ -export interface NavDataBarFieldTypeModelFactory { - /** - * Creates a navigation data bar field data model for this factory's data field type. - * @param gpsValidity The subscribable that provides the validity of the GPS data for the models. - * @returns A navigation data bar field data model for this factory's data field type. - */ - create(gpsValidity: Subscribable): NavDataBarFieldTypeModelMap[T]; -} +import { NavDataBarFieldModelFactory, NavDataBarFieldTypeModelFactory, NavDataBarFieldTypeModelMap } from './NavDataBarFieldModel'; /** * A generic implementation of a factory for navigation data bar field data models. For each data field type, a @@ -72,557 +51,4 @@ export class GenericNavDataBarFieldModelFactory implements NavDataBarFieldModelF return model as NavDataBarFieldTypeModelMap[T]; } -} - -/** - * An abstract implementation of {@link NavDataBarFieldTypeModelFactory} which accesses data from the event bus to use - * to create its data models. - */ -export abstract class EventBusNavDataBarFieldTypeModelFactory implements NavDataBarFieldTypeModelFactory { - protected readonly sub = this.bus.getSubscriber(); - - /** - * Constructor. - * @param bus The event bus. - */ - constructor(private readonly bus: EventBus) { - } - - /** @inheritdoc */ - public abstract create(gpsValidity: Subscribable): NavDataBarFieldTypeModelMap[T]; -} - -/** - * Creates data models for Bearing to Waypoint navigation data bar fields. - */ -export class NavDataBarFieldBrgModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - BasicNavAngleSubject.create(BasicNavAngleUnit.create(true).createNumber(0)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_waypoint_bearing_mag').whenChanged(), - this.sub.on('magvar') - ], - [false, 0, 0] as [boolean, number, number], - (sub, validity, [isTracking, bearing, magVar]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set((isTracking.get() && gpsValid) ? bearing.get() : NaN, magVar.get()); - } - ); - } -} - -/** - * Creates data models for Bearing to Waypoint navigation data bar fields. - */ -export class NavDataBarFieldDestModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** - * Constructor. - * @param bus The event bus. - * @param fms The flight management system. - */ - constructor(bus: EventBus, private readonly fms: Fms) { - super(bus); - } - - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel { - let destinationIdent = '____'; - - const originDestHandler = (event: FlightPlanOriginDestEvent): void => { - if (event.planIndex === Fms.PRIMARY_PLAN_INDEX && event.type === OriginDestChangeType.DestinationAdded) { - destinationIdent = event.airport === undefined ? '____' : ICAO.getIdent(event.airport); - } else if (event.type === OriginDestChangeType.DestinationRemoved) { - destinationIdent = '____'; - } - }; - const loadHandler = (event: FlightPlanIndicationEvent): void => { - if (event.planIndex !== Fms.PRIMARY_PLAN_INDEX) { - return; - } - - const primaryPlan = this.fms.getPrimaryFlightPlan(); - destinationIdent = primaryPlan.destinationAirport === undefined ? '____' : ICAO.getIdent(primaryPlan.destinationAirport); - }; - const copyHandler = (event: FlightPlanCopiedEvent): void => { - if (event.targetPlanIndex !== Fms.PRIMARY_PLAN_INDEX) { - return; - } - - const primaryPlan = this.fms.getPrimaryFlightPlan(); - destinationIdent = primaryPlan.destinationAirport === undefined ? '____' : ICAO.getIdent(primaryPlan.destinationAirport); - }; - - const originDestConsumer = this.sub.on('fplOriginDestChanged'); - originDestConsumer.handle(originDestHandler); - - const loadConsumer = this.sub.on('fplLoaded'); - loadConsumer.handle(loadHandler); - - const copyConsumer = this.sub.on('fplCopied'); - copyConsumer.handle(copyHandler); - - return new NavDataBarFieldGenericModel( - Subject.create('____'), - gpsValidity, - (sub) => { - sub.set(destinationIdent); - }, - () => { - originDestConsumer.off(originDestHandler); - loadConsumer.off(loadHandler); - copyConsumer.off(copyHandler); - } - ); - } -} - -/** - * Creates data models for Distance to Waypoint navigation data bar fields. - */ -export class NavDataBarFieldDisModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.NMILE.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_waypoint_distance').whenChanged() - ], - [false, 0] as [boolean, number], - (sub, validity, [isTracking, distance]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set((isTracking.get() && gpsValid) ? distance.get() : NaN); - } - ); - } -} - -/** - * Creates data models for Distance to Destination navigation data bar fields. - */ -export class NavDataBarFieldDtgModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.NMILE.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_destination_distance').whenChanged() - ], - [false, 0] as [boolean, number], - (sub, validity, [isTracking, distance]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set((isTracking.get() && gpsValid) ? distance.get() : NaN); - } - ); - } -} - -/** - * Creates data models for Desired Track navigation data bar fields. - */ -export class NavDataBarFieldDtkModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - BasicNavAngleSubject.create(BasicNavAngleUnit.create(true).createNumber(0)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_dtk_mag').whenChanged(), - this.sub.on('magvar') - ], - [false, 0, 0] as [boolean, number, number], - (sub, validity, [isTracking, track, magVar]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set((isTracking.get() && gpsValid) ? track.get() : NaN, magVar.get()); - } - ); - } -} - -/** - * Creates data models for Endurance navigation data bar fields. - */ -export class NavDataBarFieldEndModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.HOUR.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('fuel_usable_total').whenChanged(), - this.sub.on('fuel_flow_total').whenChanged() - ], - [0, 0] as [number, number], - (sub, validity, [fuelRemaining, fuelFlow]) => { - let endurance = NaN; - const fuelFlowGph = fuelFlow.get(); - if (fuelFlowGph > 0) { - const fuelGal = fuelRemaining.get(); - endurance = fuelGal / fuelFlowGph; - } - sub.set(endurance); - } - ); - } -} - -/** - * Creates data models for Time To Destination navigation data bar fields. - */ -export class NavDataBarFieldEnrModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.HOUR.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_destination_distance').whenChanged(), - this.sub.on('ground_speed').whenChanged() - ], - [false, 0, 0] as [boolean, number, number], - (sub, validity, [isTracking, distance, gs]) => { - let time = NaN; - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - - if (isTracking.get() && gpsValid) { - const gsKnots = gs.get(); - if (gsKnots > 30) { - const distanceNM = distance.get(); - time = distanceNM / gsKnots; - } - } - sub.set(time); - } - ); - } -} - -/** - * Creates data models for Estimated Time of Arrival navigation data bar fields. - */ -export class NavDataBarFieldEtaModelFactory - extends EventBusNavDataBarFieldTypeModelFactory { - - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel { - return new NavDataBarFieldConsumerValueModel( - Subject.create(NaN), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_waypoint_distance').whenChanged(), - this.sub.on('ground_speed').whenChanged(), - this.sub.on('simTime') - ], - [false, 0, 0, NaN] as [boolean, number, number, number], - (sub, validity, [isTracking, distance, gs, time]) => { - let eta = NaN; - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - - if (isTracking.get() && gpsValid) { - const gsKnots = gs.get(); - if (gsKnots > 30) { - const distanceNM = distance.get(); - eta = UnitType.HOUR.convertTo(distanceNM / gsKnots, UnitType.MILLISECOND) + time.get(); - } - } - sub.set(eta); - } - ); - } -} - -/** - * Creates data models for Time To Waypoint navigation data bar fields. - */ -export class NavDataBarFieldEteModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.HOUR.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_waypoint_distance').whenChanged(), - this.sub.on('ground_speed').whenChanged() - ], - [false, 0, 0] as [boolean, number, number], - (sub, validity, [isTracking, distance, gs]) => { - let time = NaN; - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - - if (isTracking.get() && gpsValid) { - const gsKnots = gs.get(); - if (gsKnots > 30) { - const distanceNM = distance.get(); - time = distanceNM / gsKnots; - } - } - sub.set(time); - } - ); - } -} - -/** - * Creates data models for Fuel on Board navigation data bar fields. - */ -export class NavDataBarFieldFobModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueNumberUnitModel( - gpsValidity, - this.sub.on('fuel_usable_total'), 0, UnitType.GALLON_FUEL - ); - } -} - -/** - * Creates data models for Fuel Over Destination navigation data bar fields. - */ -export class NavDataBarFieldFodModelFactory - extends EventBusNavDataBarFieldTypeModelFactory { - - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.GALLON_FUEL.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_destination_distance').whenChanged(), - this.sub.on('ground_speed').whenChanged(), - this.sub.on('fuel_usable_total').whenChanged(), - this.sub.on('fuel_flow_total').whenChanged() - ], - [false, 0, 0, 0, 0] as [boolean, number, number, number, number], - (sub, validity, [isTracking, distance, gs, fuelRemaining, fuelFlow]) => { - let fod = NaN; - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - - if (isTracking.get() && gpsValid) { - const gsKnots = gs.get(); - const fuelFlowGph = fuelFlow.get(); - if (gsKnots > 30 && fuelFlowGph > 0) { - const distanceNM = distance.get(); - const fuelGal = fuelRemaining.get(); - fod = fuelGal - distanceNM / gsKnots * fuelFlowGph; - } - } - sub.set(fod); - } - ); - } -} - -/** - * Creates data models for Ground Speed navigation data bar fields. - */ -export class NavDataBarFieldGsModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.KNOT.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('ground_speed') - ], - [0], - (sub, validity, [gs]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set(gpsValid ? gs.get() : NaN); - } - ); - } -} - -/** - * Creates data models for ISA navigation data bar fields. - */ -export class NavDataBarFieldIsaModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.DELTA_CELSIUS.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('ambient_temp_c'), - this.sub.on('isa_temp_c') - ], - [0], - (sub, validity, [sat, isa]) => { - sub.set(sat.get() - isa.get()); - } - ); - } -} - -/** - * Creates data models for Estimated Time of Arrival at Destination navigation data bar fields. - */ -export class NavDataBarFieldLdgModelFactory - extends EventBusNavDataBarFieldTypeModelFactory { - - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel { - return new NavDataBarFieldConsumerValueModel( - Subject.create(NaN), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_destination_distance').whenChanged(), - this.sub.on('ground_speed').whenChanged(), - this.sub.on('simTime') - ], - [false, 0, 0, NaN] as [boolean, number, number, number], - (sub, validity, [isTracking, distance, gs, time]) => { - let eta = NaN; - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - - if (isTracking.get() && gpsValid) { - const gsKnots = gs.get(); - if (gsKnots > 30) { - const distanceNM = distance.get(); - eta = UnitType.HOUR.convertTo(distanceNM / gsKnots, UnitType.MILLISECOND) + time.get(); - } - } - sub.set(eta); - } - ); - } -} - -/** - * Creates data models for True Airspeed navigation data bar fields. - */ -export class NavDataBarFieldTasModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueNumberUnitModel( - gpsValidity, - this.sub.on('tas'), 0, UnitType.KNOT - ); - } -} - -/** - * Creates data models for Track Angle Error navigation data bar fields. - */ -export class NavDataBarFieldTkeModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.DEGREE.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_dtk_true').whenChanged(), - this.sub.on('track_deg_true').whenChanged() - ], - [false, 0, 0] as [boolean, number, number], - (sub, validity, [isTracking, dtk, track]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set((isTracking.get() && gpsValid) ? NavMath.diffAngle(dtk.get(), track.get()) : NaN); - } - ); - } -} - -/** - * Creates data models for Ground Track navigation data bar fields. - */ -export class NavDataBarFieldTrkModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - BasicNavAngleSubject.create(BasicNavAngleUnit.create(true).createNumber(0)), - gpsValidity, - [ - this.sub.on('hdg_deg_true'), - this.sub.on('ground_speed'), - this.sub.on('track_deg_magnetic'), - this.sub.on('magvar') - ], - [0, 0, 0, 0] as [number, number, number, number], - (sub, validity, [hdg, gs, track, magVar]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - - if (gs.get() < 5) { - sub.set(gpsValid ? hdg.get() : NaN, magVar.get()); - } else { - sub.set(gpsValid ? track.get() : NaN, magVar.get()); - } - } - ); - } -} - -/** - * Creates data models for Vertical Speed Required navigation data bar fields. - */ -export class NavDataBarFieldVsrModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.FPM.createNumber(NaN)), - gpsValidity, - [this.sub.on('vnav_required_vs')], - [0], - (sub, validity, [vsrSub]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - const vsr = vsrSub.get(); - sub.set((gpsValid && vsr !== 0) ? vsr : NaN); - } - ); - } -} - -/** - * Creates data models for Active Wpt navigation data bar fields. - */ -export class NavDataBarFieldWptModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritDoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel { - return new NavDataBarFieldConsumerValueModel( - Subject.create('_____'), - gpsValidity, - [this.sub.on('lnavdata_waypoint_ident')], - [''], - (sub, validity, [identSubject]) => { - const ident = identSubject.get(); - sub.set(ident === '' ? '_____' : ident); - } - ); - } -} - -/** - * Creates data models for Cross Track navigation data bar fields. - */ -export class NavDataBarFieldXtkModelFactory extends EventBusNavDataBarFieldTypeModelFactory { - /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavDataBarFieldModel> { - return new NavDataBarFieldConsumerValueModel( - NumberUnitSubject.create(UnitType.NMILE.createNumber(NaN)), - gpsValidity, - [ - this.sub.on('lnav_is_tracking').whenChanged(), - this.sub.on('lnavdata_xtk').whenChanged() - ], - [false, 0] as [boolean, number], - (sub, validity, [isTracking, xtk]) => { - const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; - sub.set((isTracking.get() && gpsValid) ? xtk.get() : NaN); - } - ); - } } \ No newline at end of file diff --git a/src/garminsdk/components/navdatabar/NavDataBar.tsx b/src/garminsdk/components/navdatabar/NavDataBar.tsx index c4fe4a48e..cbee41aba 100644 --- a/src/garminsdk/components/navdatabar/NavDataBar.tsx +++ b/src/garminsdk/components/navdatabar/NavDataBar.tsx @@ -41,7 +41,7 @@ export class NavDataBar extends DisplayComponent { private static readonly RESERVED_CSS_CLASSES = ['nav-data-bar']; private readonly fieldCount = Math.max(0, this.props.fieldCount); - private readonly fieldSlots: VNode[] = Array.from({ length: this.fieldCount }, () =>
); + private readonly fieldSlots: VNode[] = Array.from({ length: this.fieldCount }, () =>
); private readonly fields: NavDataField[] = []; private readonly models: NavDataBarFieldModel[] = []; diff --git a/src/garminsdk/components/navdatabar/NavDataBarFieldModel.ts b/src/garminsdk/components/navdatabar/NavDataBarFieldModel.ts index 0d140e6e8..82974ff83 100644 --- a/src/garminsdk/components/navdatabar/NavDataBarFieldModel.ts +++ b/src/garminsdk/components/navdatabar/NavDataBarFieldModel.ts @@ -35,6 +35,18 @@ export interface NavDataBarFieldModelFactory { create(type: T): NavDataBarFieldTypeModelMap[T]; } +/** + * A factory which creates data models for a single type of navigation data bar field. + */ +export interface NavDataBarFieldTypeModelFactory { + /** + * Creates a navigation data bar field data model for this factory's data field type. + * @param gpsValidity The subscribable that provides the validity of the GPS data for the models. + * @returns A navigation data bar field data model for this factory's data field type. + */ + create(gpsValidity: Subscribable): NavDataBarFieldTypeModelMap[T]; +} + /** * A navigation data bar field data model which uses an arbitrary subscribable to provide its value and function to * update the value. diff --git a/src/garminsdk/components/navdatabar/NavDataBarFieldTypeModelFactories.ts b/src/garminsdk/components/navdatabar/NavDataBarFieldTypeModelFactories.ts new file mode 100644 index 000000000..fb55444cf --- /dev/null +++ b/src/garminsdk/components/navdatabar/NavDataBarFieldTypeModelFactories.ts @@ -0,0 +1,851 @@ +import { + AccelerometerEvents, AdcEvents, AhrsEvents, BasicNavAngleSubject, BasicNavAngleUnit, ClockEvents, EngineEvents, EventBus, + FlightPlanCopiedEvent, FlightPlanIndicationEvent, FlightPlannerEvents, FlightPlanOriginDestEvent, GNSSEvents, ICAO, + LNavEvents, NavAngleUnit, NavAngleUnitFamily, NavMath, NumberUnitInterface, NumberUnitSubject, OriginDestChangeType, + PressurizationEvents, Subject, Subscribable, UnitFamily, UnitType, VNavDataEvents, VNavEvents +} from '@microsoft/msfs-sdk'; + +import { Fms } from '../../flightplan/Fms'; +import { LNavDataEvents } from '../../navigation/LNavDataEvents'; +import { NavDataFieldGpsValidity } from '../navdatafield/NavDataFieldModel'; +import { NavDataFieldType } from '../navdatafield/NavDataFieldType'; +import { EventBusNavDataBarFieldTypeModelFactory } from './EventBusNavDataBarFieldTypeModelFactory'; +import { + NavDataBarFieldConsumerValueModel, NavDataBarFieldConsumerValueNumberUnitModel, NavDataBarFieldGenericModel, NavDataBarFieldModel +} from './NavDataBarFieldModel'; + +/** + * Creates data models for Above Ground Level navigation data bar fields. + */ +export class NavDataBarFieldAglModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FOOT.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('above_ground_height'), + ], + [0] as [number], + (sub, validity, [alt]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set(gpsValid ? alt.get() : NaN); + } + ); + } +} + +/** + * Creates data models for Bearing to Waypoint navigation data bar fields. + */ +export class NavDataBarFieldBrgModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + BasicNavAngleSubject.create(BasicNavAngleUnit.create(true).createNumber(0)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_waypoint_bearing_mag'), + this.sub.on('magvar') + ], + [false, 0, 0] as [boolean, number, number], + (sub, validity, [isTracking, bearing, magVar]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set((isTracking.get() && gpsValid) ? bearing.get() : NaN, magVar.get()); + } + ); + } +} + +/** + * Creates data models for Cabin Altitude navigation data bar fields. + */ +export class NavDataBarFieldCabinAltitudeModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FOOT.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('cabin_altitude'), + ], + [0] as [number], + (sub, validity, [alt]) => { + sub.set(alt.get()); + } + ); + } +} + +/** + * Creates data models for Climb Gradient navigation data bar fields. + */ +export class NavDataBarFieldClgModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create(NaN), + gpsValidity, + [ + this.sub.on('vertical_speed'), + this.sub.on('ground_speed'), + ], + [0, 0] as [number, number], + (sub, validity, [vs, gs]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + const gsValue = gs.get(); + if (gpsValid && gsValue >= 30) { + sub.set(vs.get() / UnitType.KNOT.convertTo(gsValue, UnitType.FPM) * 100); + } else { + sub.set(NaN); + } + } + ); + } +} + +/** + * Creates data models for Climb Gradient (height per distance) navigation data bar fields. + */ +export class NavDataBarFieldClmModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FOOT_PER_NMILE.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('vertical_speed'), + this.sub.on('ground_speed'), + ], + [0, 0] as [number, number], + (sub, validity, [vs, gs]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + const gsValue = gs.get(); + if (gpsValid && gsValue >= 30) { + sub.set(vs.get() / gsValue * 60); + } else { + sub.set(NaN); + } + } + ); + } +} + +/** + * Creates data models for Density Altitude navigation data bar fields. + */ +export class NavDataBarFieldDensityAltitudeModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FOOT.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('pressure_alt'), + ], + [0] as [number], + (sub, validity, [alt]) => { + sub.set(alt.get()); + } + ); + } +} + +/** + * Creates data models for Destination navigation data bar fields. + */ +export class NavDataBarFieldDestModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** + * Constructor. + * @param bus The event bus. + * @param fms The flight management system. + */ + constructor(bus: EventBus, private readonly fms: Fms) { + super(bus); + } + + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + let destinationIdent = '____'; + + const originDestHandler = (event: FlightPlanOriginDestEvent): void => { + if (event.planIndex === Fms.PRIMARY_PLAN_INDEX && event.type === OriginDestChangeType.DestinationAdded) { + destinationIdent = event.airport === undefined ? '____' : ICAO.getIdent(event.airport); + } else if (event.type === OriginDestChangeType.DestinationRemoved) { + destinationIdent = '____'; + } + }; + const loadHandler = (event: FlightPlanIndicationEvent): void => { + if (event.planIndex !== Fms.PRIMARY_PLAN_INDEX) { + return; + } + + const primaryPlan = this.fms.getPrimaryFlightPlan(); + destinationIdent = primaryPlan.destinationAirport === undefined ? '____' : ICAO.getIdent(primaryPlan.destinationAirport); + }; + const copyHandler = (event: FlightPlanCopiedEvent): void => { + if (event.targetPlanIndex !== Fms.PRIMARY_PLAN_INDEX) { + return; + } + + const primaryPlan = this.fms.getPrimaryFlightPlan(); + destinationIdent = primaryPlan.destinationAirport === undefined ? '____' : ICAO.getIdent(primaryPlan.destinationAirport); + }; + + const originDestConsumer = this.sub.on('fplOriginDestChanged'); + originDestConsumer.handle(originDestHandler); + + const loadConsumer = this.sub.on('fplLoaded'); + loadConsumer.handle(loadHandler); + + const copyConsumer = this.sub.on('fplCopied'); + copyConsumer.handle(copyHandler); + + return new NavDataBarFieldGenericModel( + Subject.create('____'), + gpsValidity, + (sub) => { + sub.set(destinationIdent); + }, + () => { + originDestConsumer.off(originDestHandler); + loadConsumer.off(loadHandler); + copyConsumer.off(copyHandler); + } + ); + } +} + +/** + * Creates data models for Distance to Waypoint navigation data bar fields. + */ +export class NavDataBarFieldDisModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.NMILE.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_waypoint_distance') + ], + [false, 0] as [boolean, number], + (sub, validity, [isTracking, distance]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set((isTracking.get() && gpsValid) ? distance.get() : NaN); + } + ); + } +} + +/** + * Creates data models for Distance to Destination navigation data bar fields. + */ +export class NavDataBarFieldDtgModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.NMILE.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_destination_distance') + ], + [false, 0] as [boolean, number], + (sub, validity, [isTracking, distance]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set((isTracking.get() && gpsValid) ? distance.get() : NaN); + } + ); + } +} + +/** + * Creates data models for Desired Track navigation data bar fields. + */ +export class NavDataBarFieldDtkModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + BasicNavAngleSubject.create(BasicNavAngleUnit.create(true).createNumber(0)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_dtk_mag'), + this.sub.on('magvar') + ], + [false, 0, 0] as [boolean, number, number], + (sub, validity, [isTracking, track, magVar]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set((isTracking.get() && gpsValid) ? track.get() : NaN, magVar.get()); + } + ); + } +} + +/** + * Creates data models for Fuel Economy navigation data bar fields. + */ +export class NavDataBarFieldEcoModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.NMILE_PER_GALLON_FUEL.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('fuel_flow_total'), + this.sub.on('ground_speed'), + ], + [0, 0] as [number, number], + (sub, validity, [ff, gs]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + const ffValue = ff.get(); + const gsValue = gs.get(); + sub.set(gpsValid && ffValue > 0 && gsValue >= 30 ? gsValue / ffValue : NaN); + } + ); + } +} + +/** + * Creates data models for Endurance navigation data bar fields. + */ +export class NavDataBarFieldEndModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.HOUR.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('fuel_usable_total'), + this.sub.on('fuel_flow_total') + ], + [0, 0] as [number, number], + (sub, validity, [fuelRemaining, fuelFlow]) => { + let endurance = NaN; + const fuelFlowGph = fuelFlow.get(); + if (fuelFlowGph > 0) { + const fuelGal = fuelRemaining.get(); + endurance = fuelGal / fuelFlowGph; + } + sub.set(endurance); + } + ); + } +} + +/** + * Creates data models for Time To Destination navigation data bar fields. + */ +export class NavDataBarFieldEnrModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.HOUR.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_destination_distance'), + this.sub.on('ground_speed') + ], + [false, 0, 0] as [boolean, number, number], + (sub, validity, [isTracking, distance, gs]) => { + let time = NaN; + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + + if (isTracking.get() && gpsValid) { + const gsKnots = gs.get(); + if (gsKnots > 30) { + const distanceNM = distance.get(); + time = distanceNM / gsKnots; + } + } + sub.set(time); + } + ); + } +} + +/** + * Creates data models for Estimated Time of Arrival navigation data bar fields. + */ +export class NavDataBarFieldEtaModelFactory + extends EventBusNavDataBarFieldTypeModelFactory { + + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create(NaN), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_waypoint_distance'), + this.sub.on('ground_speed'), + this.sub.on('simTime') + ], + [false, 0, 0, NaN] as [boolean, number, number, number], + (sub, validity, [isTracking, distance, gs, time]) => { + let eta = NaN; + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + + if (isTracking.get() && gpsValid) { + const gsKnots = gs.get(); + if (gsKnots > 30) { + const distanceNM = distance.get(); + eta = UnitType.HOUR.convertTo(distanceNM / gsKnots, UnitType.MILLISECOND) + time.get(); + } + } + sub.set(eta); + } + ); + } +} + +/** + * Creates data models for Time To Waypoint navigation data bar fields. + */ +export class NavDataBarFieldEteModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.HOUR.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_waypoint_distance'), + this.sub.on('ground_speed') + ], + [false, 0, 0] as [boolean, number, number], + (sub, validity, [isTracking, distance, gs]) => { + let time = NaN; + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + + if (isTracking.get() && gpsValid) { + const gsKnots = gs.get(); + if (gsKnots > 30) { + const distanceNM = distance.get(); + time = distanceNM / gsKnots; + } + } + sub.set(time); + } + ); + } +} + +/** + * Creates data models for Fuel Flow navigation data bar fields. + */ +export class NavDataBarFieldFuelFlowModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.GPH_FUEL.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('fuel_flow_total'), + ], + [0] as [number], + (sub, validity, [fuelFlow]) => { + sub.set(fuelFlow.get()); + } + ); + } +} + +/** + * Creates data models for Flight Level navigation data bar fields. + */ +export class NavDataBarFieldFlightLevelModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FOOT.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('gps-position'), + ], + [{ lat: 0, long: 0, alt: 0 }] as [LatLongAlt], + (sub, validity, [latLongAlt]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set(gpsValid ? latLongAlt.get().alt : NaN); + } + ); + } +} + +/** + * Creates data models for Fuel on Board navigation data bar fields. + */ +export class NavDataBarFieldFobModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueNumberUnitModel( + gpsValidity, + this.sub.on('fuel_usable_total'), 0, UnitType.GALLON_FUEL + ); + } +} + +/** + * Creates data models for Fuel Over Destination navigation data bar fields. + */ +export class NavDataBarFieldFodModelFactory + extends EventBusNavDataBarFieldTypeModelFactory { + + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.GALLON_FUEL.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_destination_distance'), + this.sub.on('ground_speed'), + this.sub.on('fuel_usable_total'), + this.sub.on('fuel_flow_total') + ], + [false, 0, 0, 0, 0] as [boolean, number, number, number, number], + (sub, validity, [isTracking, distance, gs, fuelRemaining, fuelFlow]) => { + let fod = NaN; + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + + if (isTracking.get() && gpsValid) { + const gsKnots = gs.get(); + const fuelFlowGph = fuelFlow.get(); + if (gsKnots > 30 && fuelFlowGph > 0) { + const distanceNM = distance.get(); + const fuelGal = fuelRemaining.get(); + fod = fuelGal - distanceNM / gsKnots * fuelFlowGph; + } + } + sub.set(fod); + } + ); + } +} + +/** + * Creates data models for G-Meter navigation data bar fields. + */ +export class NavDataBarFieldGMeterModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create(NaN), + gpsValidity, + [ + this.sub.on('g_force'), + ], + [0] as [number], + (sub, validity, [g]) => { + sub.set(g.get()); + } + ); + } +} + +/** + * Creates data models for GPS Altitude navigation data bar fields. + */ +export class NavDataBarFieldGpsAltitudeModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FOOT.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('gps-position'), + ], + [{ lat: 0, long: 0, alt: 0 }] as [LatLongAlt], + (sub, validity, [latLongAlt]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set(gpsValid ? latLongAlt.get().alt : NaN); + } + ); + } +} + +/** + * Creates data models for Ground Speed navigation data bar fields. + */ +export class NavDataBarFieldGsModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.KNOT.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('ground_speed') + ], + [0], + (sub, validity, [gs]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set(gpsValid ? gs.get() : NaN); + } + ); + } +} + +/** + * Creates data models for ISA navigation data bar fields. + */ +export class NavDataBarFieldIsaModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.DELTA_CELSIUS.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('ambient_temp_c'), + this.sub.on('isa_temp_c') + ], + [0], + (sub, validity, [sat, isa]) => { + sub.set(sat.get() - isa.get()); + } + ); + } +} + +/** + * Creates data models for Estimated Time of Arrival at Destination navigation data bar fields. + */ +export class NavDataBarFieldLdgModelFactory + extends EventBusNavDataBarFieldTypeModelFactory { + + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create(NaN), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_destination_distance'), + this.sub.on('ground_speed'), + this.sub.on('simTime') + ], + [false, 0, 0, NaN] as [boolean, number, number, number], + (sub, validity, [isTracking, distance, gs, time]) => { + let eta = NaN; + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + + if (isTracking.get() && gpsValid) { + const gsKnots = gs.get(); + if (gsKnots > 30) { + const distanceNM = distance.get(); + eta = UnitType.HOUR.convertTo(distanceNM / gsKnots, UnitType.MILLISECOND) + time.get(); + } + } + sub.set(eta); + } + ); + } +} + +/** + * Creates data models for Mach Number navigation data bar fields. + */ +export class NavDataBarFieldMachModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create(NaN), + gpsValidity, + [ + this.sub.on('mach_number'), + ], + [0] as [number], + (sub, validity, [mach]) => { + sub.set(mach.get()); + } + ); + } +} + +/** + * Creates data models for Outside Air Temperature navigation data bar fields. + */ +export class NavDataBarFieldOatModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.CELSIUS.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('ambient_temp_c'), + ], + [0] as [number], + (sub, validity, [temp]) => { + sub.set(temp.get()); + } + ); + } +} + +/** + * Creates data models for Ram Air Temperature navigation data bar fields. + */ +export class NavDataBarFieldRatModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.CELSIUS.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('ram_air_temp_c'), + ], + [0] as [number], + (sub, validity, [temp]) => { + sub.set(temp.get()); + } + ); + } +} + +/** + * Creates data models for True Airspeed navigation data bar fields. + */ +export class NavDataBarFieldTasModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueNumberUnitModel( + gpsValidity, + this.sub.on('tas'), 0, UnitType.KNOT + ); + } +} + +/** + * Creates data models for Track Angle Error navigation data bar fields. + */ +export class NavDataBarFieldTkeModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.DEGREE.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_dtk_true'), + this.sub.on('track_deg_true') + ], + [false, 0, 0] as [boolean, number, number], + (sub, validity, [isTracking, dtk, track]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set((isTracking.get() && gpsValid) ? NavMath.diffAngle(dtk.get(), track.get()) : NaN); + } + ); + } +} + +/** + * Creates data models for Ground Track navigation data bar fields. + */ +export class NavDataBarFieldTrkModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + BasicNavAngleSubject.create(BasicNavAngleUnit.create(true).createNumber(0)), + gpsValidity, + [ + this.sub.on('hdg_deg_true'), + this.sub.on('ground_speed'), + this.sub.on('track_deg_magnetic'), + this.sub.on('magvar') + ], + [0, 0, 0, 0] as [number, number, number, number], + (sub, validity, [hdg, gs, track, magVar]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + + if (gs.get() < 5) { + sub.set(gpsValid ? hdg.get() : NaN, magVar.get()); + } else { + sub.set(gpsValid ? track.get() : NaN, magVar.get()); + } + } + ); + } +} + +/** + * Creates data models for UTC Time navigation data bar fields. + */ +export class NavDataBarFieldUtcModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create(NaN), + gpsValidity, + [ + this.sub.on('simTime') + ], + [NaN] as [number], + (sub, validity, [time]) => { + sub.set(time.get()); + } + ); + } +} + +/** + * Creates data models for Vertical Speed Required navigation data bar fields. + */ +export class NavDataBarFieldVsrModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.FPM.createNumber(NaN)), + gpsValidity, + [this.sub.on('vnav_required_vs')], + [0], + (sub, validity, [vsrSub]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + const vsr = vsrSub.get(); + sub.set((gpsValid && vsr !== 0) ? vsr : NaN); + } + ); + } +} + +/** + * Creates data models for Active Waypoint navigation data bar fields. + */ +export class NavDataBarFieldWptModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritDoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel { + return new NavDataBarFieldConsumerValueModel( + Subject.create('_____'), + gpsValidity, + [this.sub.on('lnavdata_waypoint_ident')], + [''], + (sub, validity, [identSubject]) => { + const ident = identSubject.get(); + sub.set(ident === '' ? '_____' : ident); + } + ); + } +} + +/** + * Creates data models for Cross Track navigation data bar fields. + */ +export class NavDataBarFieldXtkModelFactory extends EventBusNavDataBarFieldTypeModelFactory { + /** @inheritdoc */ + public create(gpsValidity: Subscribable): NavDataBarFieldModel> { + return new NavDataBarFieldConsumerValueModel( + NumberUnitSubject.create(UnitType.NMILE.createNumber(NaN)), + gpsValidity, + [ + this.sub.on('lnav_is_tracking'), + this.sub.on('lnavdata_xtk') + ], + [false, 0] as [boolean, number], + (sub, validity, [isTracking, xtk]) => { + const gpsValid = validity.get() === NavDataFieldGpsValidity.DeadReckoning || validity.get() === NavDataFieldGpsValidity.Valid; + sub.set((isTracking.get() && gpsValid) ? xtk.get() : NaN); + } + ); + } +} diff --git a/src/garminsdk/components/navdatabar/NextGenNavDataBarFieldRenderer.ts b/src/garminsdk/components/navdatabar/NextGenNavDataBarFieldRenderer.ts index a5dafa773..d8806d7c6 100644 --- a/src/garminsdk/components/navdatabar/NextGenNavDataBarFieldRenderer.ts +++ b/src/garminsdk/components/navdatabar/NextGenNavDataBarFieldRenderer.ts @@ -10,14 +10,14 @@ import { NextGenNavDataFieldDtkRenderer, NextGenNavDataFieldEndRenderer, NextGenNavDataFieldEtaRenderer, NextGenNavDataFieldEteRenderer, NextGenNavDataFieldFobRenderer, NextGenNavDataFieldFodRenderer, NextGenNavDataFieldGsRenderer, NextGenNavDataFieldIsaRenderer, NavDataFieldLdgRenderer, NextGenNavDataFieldTasRenderer, NextGenNavDataFieldTkeRenderer, NextGenNavDataFieldTrkRenderer, NextGenNavDataFieldVsrRenderer, NextGenNavDataFieldXtkRenderer, NextGenNavDataFieldEnrRenderer -} from '../navdatafield/NextGenNavDataFieldRenderers'; +} from '../navdatafield/NextGenNavDataFieldTypeRenderers'; /** * A next-generation (NXi, G3000, etc) implementation of {@link NavDataFieldRenderer} which supports all navigation * data bar field types. */ export class NextGenNavDataBarFieldRenderer implements NavDataFieldRenderer { - private readonly renderer: GenericNavDataFieldRenderer; + protected readonly renderer: GenericNavDataFieldRenderer; /** * Constructor. diff --git a/src/garminsdk/components/navdatabar/index.ts b/src/garminsdk/components/navdatabar/index.ts index a939b831f..cacf99c80 100644 --- a/src/garminsdk/components/navdatabar/index.ts +++ b/src/garminsdk/components/navdatabar/index.ts @@ -1,5 +1,7 @@ export * from './DefaultNavDataBarFieldModelFactory'; +export * from './EventBusNavDataBarFieldTypeModelFactory'; export * from './GenericNavDataBarFieldModelFactory'; export * from './NavDataBar'; export * from './NavDataBarFieldModel'; +export * from './NavDataBarFieldTypeModelFactories'; export * from './NextGenNavDataBarFieldRenderer'; \ No newline at end of file diff --git a/src/garminsdk/components/navdatafield/NavDataField.tsx b/src/garminsdk/components/navdatafield/NavDataField.tsx index 26caeede2..6ae645cc2 100644 --- a/src/garminsdk/components/navdatafield/NavDataField.tsx +++ b/src/garminsdk/components/navdatafield/NavDataField.tsx @@ -1,5 +1,5 @@ import { - ComponentProps, DisplayComponent, DurationDisplay, DurationDisplayOptions, FamilyOfUnit, FSComponent, NavAngleUnitFamily, NumberUnitInterface, Subscribable, Unit, + ComponentProps, DisplayComponent, DurationDisplay, DurationDisplayOptions, FamilyOfUnit, FSComponent, NavAngleUnit, NavAngleUnitFamily, NumberUnitInterface, Subscribable, Unit, UnitFamily, UnitOfNumber, VNode } from '@microsoft/msfs-sdk'; @@ -86,10 +86,21 @@ export class NavDataGenericField = NavD */ export interface NavDataNumberUnitFieldProps> extends NavDataFieldProps { /** A subscribable which provides the display unit type. */ - displayUnit: Subscribable>>>; + displayUnit: Unit>> | null | Subscribable>> | null>; /** A function which formats numbers. */ formatter: (number: number) => string; + + /** + * A function which formats units. The formatted unit text should be written to the 2-tuple passed to the `out` + * parameter, as `[bigText, smallText]`. `bigText` and `smallText` will be rendered into separate `` elements + * representing the big and small components of the rendered unit text, respectively. If not defined, then units + * will be formatted based on the text generated by the {@link UnitFormatter} class. + */ + unitFormatter?: (out: [string, string], unit: Unit>>, number: number) => void; + + /** Whether to hide the unit text when the displayed value is equal to `NaN`. Defaults to `false`. */ + hideUnitWhenNaN?: boolean; } /** @@ -107,9 +118,11 @@ export class NavDataNumberUnitField> exten return ( >>>} displayUnit={this.props.displayUnit} formatter={this.props.formatter} + unitFormatter={this.props.unitFormatter} + hideUnitWhenNaN={this.props.hideUnitWhenNaN} /> ); } @@ -121,6 +134,14 @@ export class NavDataNumberUnitField> exten } } +/** + * Component props for {@link NavDataNumberField}. + */ +export interface NavDataNumberFieldProps extends NavDataFieldProps { + /** A function which formats numbers. */ + formatter: (number: number) => string; +} + /** * Component props for NavDataDurationField. */ @@ -162,10 +183,21 @@ export class NavDataDurationField { /** A subscribable which provides the time display format. */ - format: Subscribable; + format: TimeDisplayFormat | Subscribable; /** A subscribable which provides the local time offset, in milliseconds. */ - localOffset: Subscribable; + localOffset: number | Subscribable; + + /** + * A function which formats suffixes to append to the displayed time. If not defined, then the suffix will be + * will be formatted as `'UTC'` if the display format is {@link TimeDisplayFormat.UTC}, `'LCL'` if the display format + * is {@link TimeDisplayFormat.Local24}, and either `'AM'` or `'PM'` if the display format is + * {@link TimeDisplayFormat.Local12}. + */ + suffixFormatter?: (format: TimeDisplayFormat, isAm: boolean) => string; + + /** Whether to hide the suffix when the displayed time is equal to `NaN`. Defaults to `false`. */ + hideSuffixWhenNaN?: boolean; } /** @@ -186,6 +218,8 @@ export class NavDataTimeField extends NavDataField ); } @@ -200,13 +234,22 @@ export class NavDataTimeField extends NavDataField> extends NavDataFieldProps { +export interface NavDataBearingFieldProps> extends NavDataFieldProps { /** A subscribable which provides the display unit type. */ - displayUnit: Subscribable | null>; + displayUnit: NavAngleUnit | null | Subscribable; /** A function which formats numbers. */ formatter: (number: number) => string; + /** + * A function which formats units. The formatted unit text should be written to the 2-tuple passed to the `out` + * parameter, as `[bigText, smallText]`. `bigText` and `smallText` will be rendered into separate `` elements + * representing the big and small components of the rendered unit text, respectively. If not defined, then units + * will be formatted such that `bigText` is always the degree symbol (°) and `smallText` is empty for magnetic + * bearing or `'T'` for true bearing. + */ + unitFormatter?: (out: [string, string], unit: NavAngleUnit, number: number) => void; + /** Whether to display 360 in place of 0. True by default. */ use360?: boolean; } @@ -218,7 +261,7 @@ export interface NavDataBearingFieldProps> extends NavDataField> { +export class NavDataBearingField> extends NavDataField> { private readonly bearingRef = FSComponent.createRef(); /** @inheritdoc */ @@ -229,6 +272,7 @@ export class NavDataBearingField ); diff --git a/src/garminsdk/components/navdatafield/NavDataFieldModel.ts b/src/garminsdk/components/navdatafield/NavDataFieldModel.ts index d461d92bd..dca07d659 100644 --- a/src/garminsdk/components/navdatafield/NavDataFieldModel.ts +++ b/src/garminsdk/components/navdatafield/NavDataFieldModel.ts @@ -8,6 +8,11 @@ export interface NavDataFieldModel { readonly value: Subscribable; } +/** + * Utility type to get the value type from a NavDataFieldModel type. + */ +export type TypeOfNavDataFieldModel> = M extends NavDataFieldModel ? T : never; + /** * An enum describing the validity of the GPS data being provided to nav data field models. */ diff --git a/src/garminsdk/components/navdatafield/NavDataFieldType.ts b/src/garminsdk/components/navdatafield/NavDataFieldType.ts index ad9af3d70..8522d99fb 100644 --- a/src/garminsdk/components/navdatafield/NavDataFieldType.ts +++ b/src/garminsdk/components/navdatafield/NavDataFieldType.ts @@ -1,4 +1,4 @@ -import { NavAngleUnitFamily, NumberUnitInterface, UnitFamily } from '@microsoft/msfs-sdk'; +import { NavAngleUnit, NavAngleUnitFamily, NumberUnitInterface, UnitFamily } from '@microsoft/msfs-sdk'; import { NavDataFieldModel } from './NavDataFieldModel'; @@ -6,71 +6,166 @@ import { NavDataFieldModel } from './NavDataFieldModel'; * The different types of navigation data fields. */ export enum NavDataFieldType { + AboveGroundLevel = 'AGL', BearingToWaypoint = 'BRG', - Waypoint = 'WPT', + CabinAltitude = 'CAB', + ClimbGradient = 'CLG', + ClimbGradientPerDistance = 'CLM', + CarbonMonoxide = 'CO', + DensityAltitude = 'DA', Destination = 'DEST', DistanceToWaypoint = 'DIS', DistanceToDestination = 'DTG', DesiredTrack = 'DTK', + FuelEconomy = 'ECO', Endurance = 'END', TimeToDestination = 'ENR', TimeOfWaypointArrival = 'ETA', TimeToWaypoint = 'ETE', + EstimatedTimeToVnav = 'ETV', + FuelFlow = 'FF', + FlightLevel = 'FL', //FlightTimer = 'FLT', <-- Disabling this for now FuelOnBoard = 'FOB', FuelOverDestination = 'FOD', + GMeter = 'G', + GpsAltitude = 'GPSA', + GlideRatio = 'GR', GroundSpeed = 'GS', ISA = 'ISA', + LocalTime = 'LCL', TimeOfDestinationArrival = 'LDG', + MachNumber = 'MACH', + OutsideTemperature = 'OAT', + RamAirTemperature = 'RAT', TrueAirspeed = 'TAS', TrackAngleError = 'TKE', GroundTrack = 'TRK', + FuelUsed = 'USD', + UtcTime = 'UTC', VerticalSpeedRequired = 'VSR', - CrossTrack = 'XTK' + Waypoint = 'WPT', + CrossTrack = 'XTK', } /** * A map from navigation data field type to data model type. */ export type NavDataFieldTypeModelMap = { + /** Altitude above ground level. */ + [NavDataFieldType.AboveGroundLevel]: NavDataFieldModel>; + /** Bearing to next waypoint. */ - [NavDataFieldType.BearingToWaypoint]: NavDataFieldModel>, + [NavDataFieldType.BearingToWaypoint]: NavDataFieldModel>; + + /** Cabin altitude. */ + [NavDataFieldType.CabinAltitude]: NavDataFieldModel>; + + /** Climb gradient. */ + [NavDataFieldType.ClimbGradient]: NavDataFieldModel; + + /** Climb gradient (height per distance). */ + [NavDataFieldType.ClimbGradientPerDistance]: NavDataFieldModel>; + + /** Carbon monoxide sensor value. */ + [NavDataFieldType.CarbonMonoxide]: NavDataFieldModel; + + /** Density altitude. */ + [NavDataFieldType.DensityAltitude]: NavDataFieldModel>; + /** Destination ident. */ - [NavDataFieldType.Destination]: NavDataFieldModel, - /** Next waypoint ident. */ - [NavDataFieldType.Waypoint]: NavDataFieldModel, + [NavDataFieldType.Destination]: NavDataFieldModel; + /** Distance to next waypoint. */ - [NavDataFieldType.DistanceToWaypoint]: NavDataFieldModel>, + [NavDataFieldType.DistanceToWaypoint]: NavDataFieldModel>; + /** Distance to destination. */ - [NavDataFieldType.DistanceToDestination]: NavDataFieldModel>, + [NavDataFieldType.DistanceToDestination]: NavDataFieldModel>; + /** Desired track. */ - [NavDataFieldType.DesiredTrack]: NavDataFieldModel>, + [NavDataFieldType.DesiredTrack]: NavDataFieldModel>; + + /** Fuel economy. */ + [NavDataFieldType.FuelEconomy]: NavDataFieldModel>; + /** Endurance (time to zero fuel). */ - [NavDataFieldType.Endurance]: NavDataFieldModel>, + [NavDataFieldType.Endurance]: NavDataFieldModel>; + /** Estimated time enroute to destination. */ - [NavDataFieldType.TimeToDestination]: NavDataFieldModel>, + [NavDataFieldType.TimeToDestination]: NavDataFieldModel>; + /** Estimated time of arrival at next waypoint. */ - [NavDataFieldType.TimeOfWaypointArrival]: NavDataFieldModel, + [NavDataFieldType.TimeOfWaypointArrival]: NavDataFieldModel; + /** Estimated time enroute to next waypoint. */ - [NavDataFieldType.TimeToWaypoint]: NavDataFieldModel>, + [NavDataFieldType.TimeToWaypoint]: NavDataFieldModel>; + + /** Estimated time to VNAV intercept. */ + [NavDataFieldType.EstimatedTimeToVnav]: NavDataFieldModel>; + + /** Fuel flow. */ + [NavDataFieldType.FuelFlow]: NavDataFieldModel>; + + /** Flight level. */ + [NavDataFieldType.FlightLevel]: NavDataFieldModel>; + /** Total fuel remaining. */ - [NavDataFieldType.FuelOnBoard]: NavDataFieldModel>, + [NavDataFieldType.FuelOnBoard]: NavDataFieldModel>; + /** Estimated fuel remaining at destination. */ - [NavDataFieldType.FuelOverDestination]: NavDataFieldModel>, + [NavDataFieldType.FuelOverDestination]: NavDataFieldModel>; + + /** G meter. */ + [NavDataFieldType.GMeter]: NavDataFieldModel; + + /** GPS Altitude. */ + [NavDataFieldType.GpsAltitude]: NavDataFieldModel>; + + /** Glide ratio. */ + [NavDataFieldType.GlideRatio]: NavDataFieldModel; + /** Ground speed. */ - [NavDataFieldType.GroundSpeed]: NavDataFieldModel>, + [NavDataFieldType.GroundSpeed]: NavDataFieldModel>; + /** International standard atmosphere. */ - [NavDataFieldType.ISA]: NavDataFieldModel>, + [NavDataFieldType.ISA]: NavDataFieldModel>; + + /** Local time. */ + [NavDataFieldType.LocalTime]: NavDataFieldModel; + /** Estimated time of arrival at destination. */ - [NavDataFieldType.TimeOfDestinationArrival]: NavDataFieldModel, + [NavDataFieldType.TimeOfDestinationArrival]: NavDataFieldModel; + + /** Mach number. */ + [NavDataFieldType.MachNumber]: NavDataFieldModel; + + /** Outside air temperature. */ + [NavDataFieldType.OutsideTemperature]: NavDataFieldModel>; + + /** Ram air temperature. */ + [NavDataFieldType.RamAirTemperature]: NavDataFieldModel>; + /** True airspeed. */ - [NavDataFieldType.TrueAirspeed]: NavDataFieldModel>, + [NavDataFieldType.TrueAirspeed]: NavDataFieldModel>; + /** Track angle error. */ - [NavDataFieldType.TrackAngleError]: NavDataFieldModel>, + [NavDataFieldType.TrackAngleError]: NavDataFieldModel>; + /** Ground track. */ - [NavDataFieldType.GroundTrack]: NavDataFieldModel>, + [NavDataFieldType.GroundTrack]: NavDataFieldModel>; + + /** Fuel used. */ + [NavDataFieldType.FuelUsed]: NavDataFieldModel>; + + /** UTC time. */ + [NavDataFieldType.UtcTime]: NavDataFieldModel; + /** Vertical speed required to meet next VNAV restriction. */ - [NavDataFieldType.VerticalSpeedRequired]: NavDataFieldModel>, + [NavDataFieldType.VerticalSpeedRequired]: NavDataFieldModel>; + + /** Next waypoint ident. */ + [NavDataFieldType.Waypoint]: NavDataFieldModel; + /** Cross-track error. */ - [NavDataFieldType.CrossTrack]: NavDataFieldModel>, + [NavDataFieldType.CrossTrack]: NavDataFieldModel>; } \ No newline at end of file diff --git a/src/garminsdk/components/navdatafield/NavDataFieldTypeRenderers.tsx b/src/garminsdk/components/navdatafield/NavDataFieldTypeRenderers.tsx new file mode 100644 index 000000000..25586c4f6 --- /dev/null +++ b/src/garminsdk/components/navdatafield/NavDataFieldTypeRenderers.tsx @@ -0,0 +1,240 @@ +import { FSComponent, NavAngleUnit, NavAngleUnitFamily, NumberUnitInterface, Subscribable, UnitFamily, VNode } from '@microsoft/msfs-sdk'; + +import { NavDataBearingField, NavDataBearingFieldProps, NavDataDurationField, NavDataDurationFieldProps, NavDataGenericField, NavDataNumberUnitField, NavDataNumberUnitFieldProps, NavDataTimeField, NavDataTimeFieldProps } from './NavDataField'; +import { NavDataFieldModel, TypeOfNavDataFieldModel } from './NavDataFieldModel'; +import { NavDataFieldTypeRenderer } from './NavDataFieldRenderer'; +import { NavDataFieldType, NavDataFieldTypeModelMap } from './NavDataFieldType'; + +/** + * Basic configuration options for navigation data field renderers. + */ +export type BaseNavDataFieldTypeRendererOptions = { + /** The title to display for the field. */ + title: string; + + /** CSS class(es) to apply to the field's root element. */ + class?: string; +}; + +/** + * NavDataField types that have models whose values extend {@link NumberUnitInterface}. + */ +export type NumberUnitNavDataFieldTypes = keyof { + [P in NavDataFieldType as NavDataFieldTypeModelMap[P] extends NavDataFieldModel> ? P : never]: P +}; + +/** + * Configuration options for {@link NavDataFieldNumberUnitRenderer}. + */ +export type NavDataFieldNumberUnitRendererOptions> = Pick< + NavDataNumberUnitFieldProps, + 'displayUnit' | 'formatter' | 'unitFormatter' | 'hideUnitWhenNaN' +> & BaseNavDataFieldTypeRendererOptions; + +/** + * Renders Distance to Waypoint navigation data fields. + */ +export class NavDataFieldNumberUnitRenderer implements NavDataFieldTypeRenderer { + /** + * Creates a new instance of NavDataFieldNumberUnitRenderer. + * @param options Options with which to configure the renderer. + */ + public constructor( + protected readonly options: Readonly>> + ) { + } + + /** @inheritdoc */ + public render(model: NavDataFieldTypeModelMap[T]): VNode { + return ( + >} + displayUnit={this.options.displayUnit} + formatter={this.options.formatter} + unitFormatter={this.options.unitFormatter} + hideUnitWhenNaN={this.options.hideUnitWhenNaN} + class={this.options.class} + /> + ); + } +} + +/** + * NavDataField types that have models whose values are {@link NumberUnitInterface|NumberUnitInterfaces} with a + * navigation angle unit family. + */ +export type BearingNavDataFieldTypes = keyof { + [P in NavDataFieldType as NavDataFieldTypeModelMap[P] extends NavDataFieldModel> ? P : never]: P +}; + +/** + * Configuration options for {@link NavDataFieldBearingRenderer}. + */ +export type NavDataFieldBearingRendererOptions> = Pick< + NavDataBearingFieldProps, + 'displayUnit' | 'formatter' | 'unitFormatter' | 'use360' +> & BaseNavDataFieldTypeRendererOptions; + +/** + * Renders navigation data fields which display a bearing value. + */ +export class NavDataFieldBearingRenderer implements NavDataFieldTypeRenderer { + /** + * Creates a new instance of NavDataFieldBearingRenderer. + * @param options Options with which to configure the renderer. + */ + public constructor( + protected readonly options: Readonly>> + ) { + } + + /** @inheritdoc */ + public render(model: NavDataFieldTypeModelMap[T]): VNode { + return ( + + ); + } +} + +/** + * NavDataField types that have models whose values are {@link NumberUnitInterface|NumberUnitInterfaces} with a + * duration unit family. + */ +export type DurationNavDataFieldTypes = keyof { + [P in NavDataFieldType as NavDataFieldTypeModelMap[P] extends NavDataFieldModel> ? P : never]: P +}; + +/** + * Configuration options for {@link NavDataFieldDurationRenderer}. + */ +export type NavDataFieldDurationRendererOptions> = Pick< + NavDataDurationFieldProps, + 'options' +> & BaseNavDataFieldTypeRendererOptions; + +/** + * Renders navigation data fields which display a duration value. + */ +export class NavDataFieldDurationRenderer implements NavDataFieldTypeRenderer { + /** + * Creates a new instance of NavDataFieldDurationRenderer. + * @param options Options with which to configure the renderer. + */ + public constructor( + protected readonly options: Readonly>> + ) { + } + + /** @inheritdoc */ + public render(model: NavDataFieldTypeModelMap[T]): VNode { + return ( + + ); + } +} + +/** + * NavDataField types that have models whose values are numbers. + */ +export type TimeNavDataFieldTypes = keyof { + [P in NavDataFieldType as NavDataFieldTypeModelMap[P] extends NavDataFieldModel ? P : never]: P +}; + +/** + * Configuration options for {@link NavDataFieldTimeRenderer}. + */ +export type NavDataFieldTimeRendererOptions = Pick< + NavDataTimeFieldProps, + 'format' | 'localOffset' | 'suffixFormatter' | 'hideSuffixWhenNaN' +> & BaseNavDataFieldTypeRendererOptions; + +/** + * Renders navigation data fields which display a time value. + */ +export class NavDataFieldTimeRenderer implements NavDataFieldTypeRenderer { + /** + * Creates a new instance of NavDataFieldTimeRenderer. + * @param options Options with which to configure the renderer. + */ + public constructor( + protected readonly options: Readonly + ) { + } + + /** @inheritdoc */ + public render(model: NavDataFieldTypeModelMap[T]): VNode { + return ( + + ); + } +} + +/** + * Configuration options for {@link NavDataFieldTextRenderer}. + */ +export type NavDataFieldTextRendererOptions = { + /** + * A function which formats model values to displayed text. If not defined, then model values will be formatted using + * Javascript's built-in `toString()` function. + */ + formatter?: (value: T) => string; +} & BaseNavDataFieldTypeRendererOptions; + +/** + * Renders navigation data fields which display a text value. + */ +export class NavDataFieldTextRenderer implements NavDataFieldTypeRenderer { + + protected readonly formatter = this.options.formatter ?? ((value: any): string => `${value}`); + + /** + * Creates a new instance of NavDataFieldDestRenderer. + * @param options Options with which to configure the renderer. + */ + public constructor( + protected readonly options: Readonly>> + ) { + } + + /** @inheritdoc */ + public render(model: NavDataFieldTypeModelMap[T]): VNode { + // This seems silly but we need to create our own subscribable in order to be able unsubscribe from it when the + // component is destroyed. + const text = (model.value as Subscribable>).map(this.formatter); + + return ( + { + text.destroy(); + }} + class={this.options.class} + > +
{text}
+ + ); + } +} \ No newline at end of file diff --git a/src/garminsdk/components/navdatafield/NextGenNavDataFieldRenderers.tsx b/src/garminsdk/components/navdatafield/NextGenNavDataFieldTypeRenderers.tsx similarity index 57% rename from src/garminsdk/components/navdatafield/NextGenNavDataFieldRenderers.tsx rename to src/garminsdk/components/navdatafield/NextGenNavDataFieldTypeRenderers.tsx index d290f78be..3bcf2ef51 100644 --- a/src/garminsdk/components/navdatafield/NextGenNavDataFieldRenderers.tsx +++ b/src/garminsdk/components/navdatafield/NextGenNavDataFieldTypeRenderers.tsx @@ -1,28 +1,32 @@ import { - ConsumerSubject, DurationDisplayDelim, DurationDisplayFormat, FSComponent, NavAngleUnitFamily, NumberFormatter, NumberUnitInterface, Subject, UnitFamily, UnitType, - UserSettingManager, VNode + DurationDisplayDelim, DurationDisplayFormat, NavAngleUnit, NavAngleUnitFamily, + NumberFormatter, NumberUnitInterface, Subject, UnitFamily, UnitType, UserSettingManager, VNode } from '@microsoft/msfs-sdk'; import { DateTimeFormatSettingMode, DateTimeUserSettingTypes } from '../../settings/DateTimeUserSettings'; import { UnitsUserSettingManager } from '../../settings/UnitsUserSettings'; import { TimeDisplayFormat } from '../common/TimeDisplay'; -import { NavDataBearingField, NavDataDurationField, NavDataGenericField, NavDataNumberUnitField, NavDataTimeField } from './NavDataField'; import { NavDataFieldModel } from './NavDataFieldModel'; import { NavDataFieldTypeRenderer } from './NavDataFieldRenderer'; import { NavDataFieldType, NavDataFieldTypeModelMap } from './NavDataFieldType'; +import { + NavDataFieldBearingRenderer, NavDataFieldDurationRenderer, NavDataFieldNumberUnitRenderer, NavDataFieldTextRenderer, + NavDataFieldTimeRenderer +} from './NavDataFieldTypeRenderers'; /** * An abstract next-generation (NXi, G3000, etc) implementation of {@link NavDataFieldTypeRenderer} which supports * display unit settings. */ export abstract class NextGenDisplayUnitNavDataFieldTypeRenderer implements NavDataFieldTypeRenderer { + protected static readonly ALTITUDE_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '____' }); + protected static readonly ANGLE_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); protected static readonly BEARING_FORMATTER = NumberFormatter.create({ precision: 1, pad: 3, nanString: '___' }); protected static readonly DISTANCE_FORMATTER = NumberFormatter.create({ precision: 0.1, maxDigits: 3, forceDecimalZeroes: true, nanString: '__._' }); - protected static readonly SPEED_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); protected static readonly FUEL_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); - protected static readonly ANGLE_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); - protected static readonly TEMPERATURE_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); protected static readonly ISA_FORMATTER = NumberFormatter.create({ precision: 1, forceSign: true, nanString: '___' }); + protected static readonly SPEED_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); + protected static readonly TEMPERATURE_FORMATTER = NumberFormatter.create({ precision: 1, nanString: '___' }); protected static readonly DURATION_OPTIONS = { pad: 0, format: DurationDisplayFormat.hh_mm_or_mm_ss, @@ -52,8 +56,10 @@ export abstract class NextGenDateTimeNavDataFieldTypeRenderer NextGenDateTimeNavDataFieldTypeRenderer.FORMAT_SETTING_MAP[format]); /** * Constructor. @@ -70,42 +76,31 @@ export abstract class NextGenDateTimeNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldBearingRenderer({ + title: 'BRG', + displayUnit: this.unitsSettingManager.navAngleUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.BEARING_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ - public render(model: NavDataFieldModel>): VNode { - return ( - - ); + public render(model: NavDataFieldModel>): VNode { + return this.renderer.render(model); } } /** - * Renders next-generation (NXi, G3000, etc) Distance to Waypoint navigation data fields. + * Renders next-generation (NXi, G3000, etc) Destination navigation data fields. */ export class NextGenNavDataFieldDestRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldTextRenderer({ + title: 'DEST', + class: 'nav-data-field-white' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel): VNode { - // This seems silly but we need to create our own subscribable in order to be able unsubscribe from it when the - // component is destroyed. - const textSub = model.value.map(val => val); - - return ( - { - textSub.destroy(); - }} - class='nav-data-field-white' - > -
{textSub}
- - ); + return this.renderer.render(model); } } @@ -113,17 +108,16 @@ export class NextGenNavDataFieldDestRenderer extends NextGenDisplayUnitNavDataFi * Renders next-generation (NXi, G3000, etc) Distance to Waypoint navigation data fields. */ export class NextGenNavDataFieldDisRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'DIS', + displayUnit: this.unitsSettingManager.distanceUnitsLarge, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.DISTANCE_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -131,17 +125,16 @@ export class NextGenNavDataFieldDisRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Distance to Destination navigation data fields. */ export class NextGenNavDataFieldDtgRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'DTG', + displayUnit: this.unitsSettingManager.distanceUnitsLarge, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.DISTANCE_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -149,17 +142,16 @@ export class NextGenNavDataFieldDtgRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Desired Track navigation data fields. */ export class NextGenNavDataFieldDtkRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldBearingRenderer({ + title: 'DTK', + displayUnit: this.unitsSettingManager.navAngleUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.BEARING_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ - public render(model: NavDataFieldModel>): VNode { - return ( - - ); + public render(model: NavDataFieldModel>): VNode { + return this.renderer.render(model); } } @@ -167,16 +159,15 @@ export class NextGenNavDataFieldDtkRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Endurance navigation data fields. */ export class NextGenNavDataFieldEndRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldDurationRenderer({ + title: 'END', + options: NextGenDisplayUnitNavDataFieldTypeRenderer.DURATION_OPTIONS, + class: 'nav-data-field-magenta' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -184,16 +175,15 @@ export class NextGenNavDataFieldEndRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Time to Destination navigation data fields. */ export class NextGenNavDataFieldEnrRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldDurationRenderer({ + title: 'ENR', + options: NextGenDisplayUnitNavDataFieldTypeRenderer.DURATION_OPTIONS, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -201,17 +191,16 @@ export class NextGenNavDataFieldEnrRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Estimated Time of Arrival navigation data fields. */ export class NextGenNavDataFieldEtaRenderer extends NextGenDateTimeNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldTimeRenderer({ + title: 'ETA', + format: this.timeFormatMapped, + localOffset: this.localOffset, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel): VNode { - return ( - NextGenDateTimeNavDataFieldTypeRenderer.FORMAT_SETTING_MAP[format])} - localOffset={this.localOffset} - class='nav-data-field-gps' - /> - ); + return this.renderer.render(model); } } @@ -219,16 +208,15 @@ export class NextGenNavDataFieldEtaRenderer extends NextGenDateTimeNavDataFieldT * Renders next-generation (NXi, G3000, etc) Time to Waypoint navigation data fields. */ export class NextGenNavDataFieldEteRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldDurationRenderer({ + title: 'ETE', + options: NextGenDisplayUnitNavDataFieldTypeRenderer.DURATION_OPTIONS, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -236,17 +224,16 @@ export class NextGenNavDataFieldEteRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Fuel on Board navigation data fields. */ export class NextGenNavDataFieldFobRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'FOB', + displayUnit: this.unitsSettingManager.fuelUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.FUEL_FORMATTER, + class: 'nav-data-field-magenta' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -254,17 +241,16 @@ export class NextGenNavDataFieldFobRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Fuel Over Destination navigation data fields. */ export class NextGenNavDataFieldFodRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'FOD', + displayUnit: this.unitsSettingManager.fuelUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.FUEL_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -272,17 +258,16 @@ export class NextGenNavDataFieldFodRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Ground Speed navigation data fields. */ export class NextGenNavDataFieldGsRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'GS', + displayUnit: this.unitsSettingManager.speedUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.SPEED_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -290,17 +275,16 @@ export class NextGenNavDataFieldGsRenderer extends NextGenDisplayUnitNavDataFiel * Renders next-generation (NXi, G3000, etc) ISA navigation data fields. */ export class NextGenNavDataFieldIsaRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'ISA', + displayUnit: this.unitsSettingManager.temperatureDeltaUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.ISA_FORMATTER, + class: 'nav-data-field-white' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -308,17 +292,16 @@ export class NextGenNavDataFieldIsaRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Estimated Time of Arrival at Destination navigation data fields. */ export class NavDataFieldLdgRenderer extends NextGenDateTimeNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldTimeRenderer({ + title: 'LDG', + format: this.timeFormatMapped, + localOffset: this.localOffset, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel): VNode { - return ( - NextGenDateTimeNavDataFieldTypeRenderer.FORMAT_SETTING_MAP[format])} - localOffset={this.localOffset} - class='nav-data-field-gps' - /> - ); + return this.renderer.render(model); } } @@ -326,17 +309,16 @@ export class NavDataFieldLdgRenderer extends NextGenDateTimeNavDataFieldTypeRend * Renders next-generation (NXi, G3000, etc) True Airspeed navigation data fields. */ export class NextGenNavDataFieldTasRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'TAS', + displayUnit: this.unitsSettingManager.speedUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.SPEED_FORMATTER, + class: 'nav-data-field-magenta' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -344,17 +326,16 @@ export class NextGenNavDataFieldTasRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Track Angle Error navigation data fields. */ export class NextGenNavDataFieldTkeRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'TKE', + displayUnit: Subject.create(UnitType.DEGREE), + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.ANGLE_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -362,17 +343,16 @@ export class NextGenNavDataFieldTkeRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Ground Track navigation data fields. */ export class NextGenNavDataFieldTrkRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldBearingRenderer({ + title: 'TRK', + displayUnit: this.unitsSettingManager.navAngleUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.BEARING_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ - public render(model: NavDataFieldModel>): VNode { - return ( - - ); + public render(model: NavDataFieldModel>): VNode { + return this.renderer.render(model); } } @@ -380,17 +360,16 @@ export class NextGenNavDataFieldTrkRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Vertical Speed Required navigation data fields. */ export class NextGenNavDataFieldVsrRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'VSR', + displayUnit: this.unitsSettingManager.verticalSpeedUnits, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.SPEED_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } @@ -398,16 +377,15 @@ export class NextGenNavDataFieldVsrRenderer extends NextGenDisplayUnitNavDataFie * Renders next-generation (NXi, G3000, etc) Cross Track navigation data fields. */ export class NextGenNavDataFieldXtkRenderer extends NextGenDisplayUnitNavDataFieldTypeRenderer { + private readonly renderer = new NavDataFieldNumberUnitRenderer({ + title: 'XTK', + displayUnit: this.unitsSettingManager.distanceUnitsLarge, + formatter: NextGenDisplayUnitNavDataFieldTypeRenderer.DISTANCE_FORMATTER, + class: 'nav-data-field-gps' + }); + /** @inheritdoc */ public render(model: NavDataFieldModel>): VNode { - return ( - - ); + return this.renderer.render(model); } } \ No newline at end of file diff --git a/src/garminsdk/components/navdatafield/index.ts b/src/garminsdk/components/navdatafield/index.ts index a76bc76cb..5be92698f 100644 --- a/src/garminsdk/components/navdatafield/index.ts +++ b/src/garminsdk/components/navdatafield/index.ts @@ -3,4 +3,5 @@ export * from './NavDataField'; export * from './NavDataFieldModel'; export * from './NavDataFieldRenderer'; export * from './NavDataFieldType'; -export * from './NextGenNavDataFieldRenderers'; \ No newline at end of file +export * from './NavDataFieldTypeRenderers'; +export * from './NextGenNavDataFieldTypeRenderers'; \ No newline at end of file diff --git a/src/garminsdk/components/nextgenpfd/airspeed/AirspeedDefinitionFactory.ts b/src/garminsdk/components/nextgenpfd/airspeed/AirspeedDefinitionFactory.ts index 2da2bbb64..032257287 100644 --- a/src/garminsdk/components/nextgenpfd/airspeed/AirspeedDefinitionFactory.ts +++ b/src/garminsdk/components/nextgenpfd/airspeed/AirspeedDefinitionFactory.ts @@ -10,6 +10,9 @@ export type AirspeedDefinitionContext = { /** The current conversion factor from mach number to knots indicated airspeed. */ readonly machToKias: Subscribable; + /** The current conversion factor from true airspeed to indicated airspeed. */ + readonly tasToIas: Subscribable; + /** * The correlation coefficient between a given normalized angle of attack and the estimated indicated airspeed in * knots required to maintain level flight at that angle of attack for the current aircraft configuration and diff --git a/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicator.tsx b/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicator.tsx index 2839a774c..7ad67b663 100644 --- a/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicator.tsx +++ b/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicator.tsx @@ -1,7 +1,7 @@ import { - BitFlags, ComponentProps, DigitScroller, DisplayComponent, EventBus, FSComponent, MappedSubject, MappedSubscribable, MathUtils, + BitFlags, ComponentProps, DigitScroller, DisplayComponent, FSComponent, MappedSubject, MappedSubscribable, MathUtils, MutableSubscribable, NodeReference, NumberFormatter, NumberUnitSubject, ObjectSubject, SetSubject, SubEvent, Subject, Subscribable, - SubscribableMapFunctions, SubscribableSet, SubscribableUtils, Subscription, UnitType, UserSettingManager, VNode + SubscribableMapFunctions, SubscribableSet, SubscribableUtils, Subscription, ToggleableClassNameRecord, UnitType, UserSettingManager, VNode } from '@microsoft/msfs-sdk'; import { VSpeedUserSettingTypes, VSpeedUserSettingUtils } from '../../../settings/VSpeedUserSettings'; @@ -82,15 +82,15 @@ export type VSpeedBugOptions = { /** An iterable of definitions for each displayed reference V-speed bug. */ vSpeedBugDefinitions: Iterable; + + /** Whether to allow V-speed bugs to be displayed with a speed value of zero. */ + allowZeroValue?: boolean; }; /** * Component props for AirspeedIndicator. */ export interface AirspeedIndicatorProps extends ComponentProps { - /** An instance of the event bus. */ - bus: EventBus; - /** A data provider for the indicator. */ dataProvider: AirspeedIndicatorDataProvider; @@ -117,12 +117,26 @@ export interface AirspeedIndicatorProps extends ComponentProps { /** Options for reference V-speed bugs. */ vSpeedBugOptions: Readonly; + + /** CSS class(es) to apply to the indicator's root element. */ + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** * A next-generation (NXi, G3000, etc) Garmin PFD airspeed indicator. */ export class AirspeedIndicator extends DisplayComponent { + private static readonly RESERVED_CLASSES = [ + 'airspeed', + 'airspeed-reference-visible', + 'airspeed-bottom-display-visible', + 'airspeed-alert-overspeed', + 'airspeed-alert-trend-overspeed', + 'airspeed-alert-underspeed', + 'airspeed-alert-trend-underspeed', + 'data-failed' + ]; + private readonly referenceRef = FSComponent.createRef(); private readonly alertRef = FSComponent.createRef(); private readonly tapeRef = FSComponent.createRef(); @@ -146,21 +160,17 @@ export class AirspeedIndicator extends DisplayComponent } else { return AirspeedAlert.None; } - }); + }).pause(); private readonly showTopDisplay = this.props.declutter.map(SubscribableMapFunctions.not()); private readonly isReferenceDisplayVisible = Subject.create(false); private readonly isBottomDisplayVisible = Subject.create(false); - private isDataFailedSub?: Subscription; - - /** @inheritdoc */ - constructor(props: AirspeedIndicatorProps) { - super(props); - - this.activeAlert.pause(); - } + private readonly subscriptions: Subscription[] = [ + this.activeAlert, + this.showTopDisplay + ]; /** @inheritdoc */ public onAfterRender(): void { @@ -184,13 +194,15 @@ export class AirspeedIndicator extends DisplayComponent this.activeAlert.sub(this.updateAlertClass.bind(this), true); - this.isDataFailedSub = this.props.dataProvider.isDataFailed.sub(isDataFailed => { - if (isDataFailed) { - this.rootCssClass.add('data-failed'); - } else { - this.rootCssClass.delete('data-failed'); - } - }, true); + this.subscriptions.push( + this.props.dataProvider.isDataFailed.sub(isDataFailed => { + if (isDataFailed) { + this.rootCssClass.add('data-failed'); + } else { + this.rootCssClass.delete('data-failed'); + } + }, true) + ); } /** @@ -221,6 +233,19 @@ export class AirspeedIndicator extends DisplayComponent /** @inheritdoc */ public render(): VNode { + if (typeof this.props.class === 'object') { + const sub = FSComponent.bindCssClassSet(this.rootCssClass, this.props.class, AirspeedIndicator.RESERVED_CLASSES); + if (Array.isArray(sub)) { + this.subscriptions.push(...sub); + } else { + this.subscriptions.push(sub); + } + } else if (this.props.class) { + for (const classToAdd of FSComponent.parseCssClassesFromString(this.props.class, classToFilter => !AirspeedIndicator.RESERVED_CLASSES.includes(classToFilter))) { + this.rootCssClass.add(classToAdd); + } + } + let isTasDisplayVisible: Subject | undefined; let isMachDisplayVisible: Subject | undefined; let isTakeoffVSpeedAnnuncVisible: Subject | undefined; @@ -296,7 +321,7 @@ export class AirspeedIndicator extends DisplayComponent {...this.props.tapeScaleOptions} colorRanges={this.props.colorRanges} {...this.props.trendVectorOptions} - {...this.props.vSpeedBugOptions} + vSpeedBugOptions={this.props.vSpeedBugOptions} />
this.alertRef.getOrDefault()?.destroy(); this.tapeRef.getOrDefault()?.destroy(); - this.activeAlert.destroy(); - - this.showTopDisplay.destroy(); - - this.isDataFailedSub?.destroy(); + for (const sub of this.subscriptions) { + sub.destroy(); + } super.destroy(); } @@ -405,11 +428,8 @@ interface AirspeedTapeProps extends ComponentProps { /** The minimum absolute value of the airspeed trend, in knots, required to display the trend vector. */ trendThreshold: number | Subscribable; - /** A user setting manager containing reference V-speed settings. */ - vSpeedSettingManager: UserSettingManager; - - /** An iterable of definitions for each displayed reference V-speed bug. */ - vSpeedBugDefinitions: Iterable; + /** Options for reference V-speed bugs. */ + vSpeedBugOptions: Readonly; } /** @@ -897,19 +917,24 @@ class AirspeedTape extends DisplayComponent { const legends: VNode[] = []; const legendShow: Subscribable[] = []; - for (const def of this.props.vSpeedBugDefinitions) { - const showSetting = this.props.vSpeedSettingManager.tryGetSetting(`vSpeedShow_${def.name}`); + const options = this.props.vSpeedBugOptions; + const allowZeroValue = options.allowZeroValue ?? false; + + for (const def of options.vSpeedBugDefinitions) { + const showSetting = options.vSpeedSettingManager.tryGetSetting(`vSpeedShow_${def.name}`); if (showSetting !== undefined) { const bugRef = FSComponent.createRef(); this.vSpeedBugRefs.push(bugRef); - const activeValue = VSpeedUserSettingUtils.activeValue(def.name, this.props.vSpeedSettingManager, true); - const isFmsValueActive = VSpeedUserSettingUtils.isFmsValueActive(def.name, this.props.vSpeedSettingManager); - const isFmsConfigMiscompare = this.props.vSpeedSettingManager.tryGetSetting(`vSpeedFmsConfigMiscompare_${def.name}`) ?? Subject.create(false); + const activeValue = VSpeedUserSettingUtils.activeValue(def.name, options.vSpeedSettingManager, true, allowZeroValue); + const isFmsValueActive = VSpeedUserSettingUtils.isFmsValueActive(def.name, options.vSpeedSettingManager); + const isFmsConfigMiscompare = options.vSpeedSettingManager.tryGetSetting(`vSpeedFmsConfigMiscompare_${def.name}`) ?? Subject.create(false); const showBug = MappedSubject.create( - ([showAirspeedData, isIasOffScale, show, value, isConfigMiscompare]): boolean => showAirspeedData && !isIasOffScale && show && value > 0 && !isConfigMiscompare, + ([showAirspeedData, isIasOffScale, show, value, isConfigMiscompare]): boolean => { + return showAirspeedData && !isIasOffScale && show && (allowZeroValue ? value >= 0 : value > 0) && !isConfigMiscompare; + }, this.showAirspeedData, this.isIasOffScale, showSetting, @@ -938,7 +963,7 @@ class AirspeedTape extends DisplayComponent { this.vSpeedOffScaleLabelRefs.push(labelRef); const showLabel = MappedSubject.create( - ([showAirspeedData, show, value]): boolean => showAirspeedData && show && value > 0, + ([showAirspeedData, show, value]): boolean => showAirspeedData && show && (allowZeroValue ? value >= 0 : value > 0), this.showAirspeedData, showSetting, activeValue @@ -2153,6 +2178,7 @@ class AirspeedTasDisplay extends DisplayComponent { /** @inheritdoc */ public destroy(): void { + this.showSub?.destroy(); this.tasSub?.destroy(); this.isDataFailedSub?.destroy(); diff --git a/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicatorDataProvider.ts b/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicatorDataProvider.ts index ee3d04cc1..7c344c4f1 100644 --- a/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicatorDataProvider.ts +++ b/src/garminsdk/components/nextgenpfd/airspeed/AirspeedIndicatorDataProvider.ts @@ -34,6 +34,9 @@ export interface AirspeedIndicatorDataProvider { /** The current conversion factor from mach number to knots indicated airspeed. */ readonly machToKias: Subscribable; + /** The current conversion factor from true airspeed to indicated airspeed. */ + readonly tasToIas: Subscribable; + /** The current pressure altitude, in feet. */ readonly pressureAlt: Subscribable; @@ -109,7 +112,7 @@ export type AirspeedIndicatorDataProviderOptions = { * A default implementation of {@link AirspeedIndicatorDataProvider}. */ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDataProvider { - private static readonly MACH_TO_KIAS_SMOOTHING_TAU = 5000 / Math.LN2; // milliseconds + private static readonly SPEED_CONVERSION_SMOOTHING_TAU = 5000 / Math.LN2; // milliseconds private static readonly DEFAULT_IAS_TREND_INPUT_SMOOTHING_TAU = 2000 / Math.LN2; // milliseconds private static readonly DEFAULT_IAS_TREND_TREND_SMOOTHING_TAU = 1000 / Math.LN2; // milliseconds @@ -129,6 +132,10 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa /** @inheritdoc */ public readonly machToKias = this._machToKias as Subscribable; + private readonly _tasToIas = Subject.create(0); + /** @inheritdoc */ + public readonly tasToIas = this._tasToIas as Subscribable; + private readonly _pressureAlt = ConsumerSubject.create(null, 0); /** @inheritdoc */ public readonly pressureAlt = this._pressureAlt as Subscribable; @@ -165,7 +172,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa public readonly isUnderspeedProtectionActive = this._isUnderspeedProtectionActive as Subscribable; /** @inheritdoc */ - public readonly normAoaIasCoef = this.aoaDataProvider.normAoaIasCoef; + public readonly normAoaIasCoef = this.aoaDataProvider?.normAoaIasCoef ?? Subject.create(null); private readonly _isDataFailed = Subject.create(false); /** @inheritdoc */ @@ -174,13 +181,15 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa private readonly adcIndex: Subscribable; private readonly adcSystemState = ConsumerSubject.create(null, { previous: undefined, current: undefined }); - private readonly machToKiasSmoother = new ExpSmoother(DefaultAirspeedIndicatorDataProvider.MACH_TO_KIAS_SMOOTHING_TAU); + private readonly machToKiasSmoother = new ExpSmoother(DefaultAirspeedIndicatorDataProvider.SPEED_CONVERSION_SMOOTHING_TAU); + private lastMachToKiasTime = 0; + + private readonly tasToIasSmoother = new ExpSmoother(DefaultAirspeedIndicatorDataProvider.SPEED_CONVERSION_SMOOTHING_TAU); + private lastTasToIasTime = 0; private readonly simTime = ConsumerSubject.create(null, 0); private readonly isOnGround = ConsumerSubject.create(null, false); - private lastMachToKiasTime = 0; - private readonly referenceIasSource = ConsumerSubject.create(null, 0); private readonly referenceMachSource = ConsumerSubject.create(null, 0); private readonly referenceIsMach = ConsumerSubject.create(null, false); @@ -209,6 +218,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa private adcIndexSub?: Subscription; private machToKiasSub?: Subscription; + private tasToIasSub?: Subscription; private trendLookaheadSub?: Subscription; /** @@ -226,7 +236,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa private readonly bus: EventBus, adcIndex: number | Subscribable, options: Readonly, - private readonly aoaDataProvider: AirspeedAoaDataProvider, + private readonly aoaDataProvider?: AirspeedAoaDataProvider, trendInputSmoothingTau = DefaultAirspeedIndicatorDataProvider.DEFAULT_IAS_TREND_INPUT_SMOOTHING_TAU, trendTrendSmoothingTau = DefaultAirspeedIndicatorDataProvider.DEFAULT_IAS_TREND_TREND_SMOOTHING_TAU ) { @@ -298,17 +308,26 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa this.machToKiasSub?.destroy(); this.machToKiasSmoother.reset(); + this.tasToIasSub?.destroy(); + this.tasToIasSmoother.reset(); + this._iasKnots.setConsumer(sub.on(`adc_ias_${index}`)); this._tasKnots.setConsumer(sub.on(`adc_tas_${index}`)); this._mach.setConsumer(sub.on(`adc_mach_number_${index}`)); this._pressureAlt.setConsumer(sub.on(`adc_pressure_alt_${index}`)); this.adcSystemState.setConsumer(sub.on(`adc_state_${index}`)); - this.machToKiasSub = sub.on(`adc_mach_to_kias_factor_${index}`).handle(machToKias => { + this.machToKiasSub = sub.on(`adc_mach_to_kias_factor_${index}`).handle(machToKcas => { const time = Date.now(); - this._machToKias.set(this.machToKiasSmoother.next(machToKias, time - this.lastMachToKiasTime)); + this._machToKias.set(this.machToKiasSmoother.next(machToKcas, time - this.lastMachToKiasTime)); this.lastMachToKiasTime = time; }); + + this.tasToIasSub = sub.on(`adc_tas_to_ias_factor_${index}`).handle(tasToCas => { + const time = Date.now(); + this._tasToIas.set(this.tasToIasSmoother.next(tasToCas, time - this.lastTasToIasTime)); + this.lastTasToIasTime = time; + }); }, true); this.referenceIasSource.setConsumer(sub.on('ap_ias_selected')); @@ -377,7 +396,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa /** @inheritdoc */ public estimateIasFromNormAoa(normAoa: number): number { - return this.aoaDataProvider.estimateIasFromNormAoa(normAoa); + return this.aoaDataProvider?.estimateIasFromNormAoa(normAoa) ?? NaN; } /** @@ -403,6 +422,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa this._tasKnots.resume(); this._mach.resume(); this.machToKiasSub?.resume(true); + this.tasToIasSub?.resume(true); this._pressureAlt.resume(); this.referenceIasSource.resume(); @@ -440,6 +460,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa this._tasKnots.pause(); this._mach.pause(); this.machToKiasSub?.pause(); + this.tasToIasSub?.pause(); this._pressureAlt.pause(); this.machToKiasSmoother.reset(); @@ -495,6 +516,7 @@ export class DefaultAirspeedIndicatorDataProvider implements AirspeedIndicatorDa this.adcIndexSub?.destroy(); this.machToKiasSub?.destroy(); + this.tasToIasSub?.destroy(); this.trendLookaheadSub?.destroy(); } } \ No newline at end of file diff --git a/src/garminsdk/components/nextgenpfd/horizon/ArtificialHorizon.tsx b/src/garminsdk/components/nextgenpfd/horizon/ArtificialHorizon.tsx index 85dc0356c..f5c30db82 100644 --- a/src/garminsdk/components/nextgenpfd/horizon/ArtificialHorizon.tsx +++ b/src/garminsdk/components/nextgenpfd/horizon/ArtificialHorizon.tsx @@ -1,26 +1,42 @@ import { - BitFlags, ComponentProps, HorizonProjection, HorizonProjectionChangeType, HorizonSharedCanvasSubLayer, - Subscribable, Subscription, Transform2D, Vec2Math + ArrayUtils, BitFlags, ColorUtils, ComponentProps, HorizonProjection, HorizonProjectionChangeType, + HorizonSharedCanvasSubLayer, Subscribable, Subscription, Transform2D, Vec2Math } from '@microsoft/msfs-sdk'; +/** + * A color gradient stop for {@link ArtificialHorizon}. The first member (`distance`) defines the distance of the + * stop from the horizon line, in pixels. The second member (`color`) defines the color of the stop. The optional + * third member (`step`) defines the distance, in pixels, between adjacent interpolated colors used to draw the + * gradient. The value of `step` must be at least `2` and defaults to `4`. + */ +export type ArtificialHorizonColorStop = [distance: number, color: string, step?: number]; + +/** + * A color gradient stop in the artificial horizon sky. + * @deprecated + */ +export type ArtificialHorizonSkyColor = ArtificialHorizonColorStop; + /** * Options for {@link ArtificialHorizon}. */ export interface ArtificialHorizonOptions { - /** The color of the ground. */ - groundColor: string; + /** The color of the ground. Overridden by `groundColors`. */ + groundColor?: string; /** - * The colors of the sky, represented by pixel distance from the horizon - * and a color string. + * The color stops of the ground gradient. */ - skyColors: ArtificialHorizonSkyColor[]; -} + groundColors?: ArtificialHorizonColorStop[]; -/** - * A color gradient stop in the artificial horizon sky. - */ -export type ArtificialHorizonSkyColor = [distance: number, color: string]; + /** The color of the sky. Overridden by `skyColors`. */ + skyColor?: string; + + /** + * The color stops of the sky gradient. + */ + skyColors?: ArtificialHorizonColorStop[]; +} /** * Component props for ArtificialHorizon. @@ -30,9 +46,20 @@ export interface ArtificalHorizonProps extends ComponentProps { show: Subscribable; /** Options for the artificial horizon. */ - options: ArtificialHorizonOptions; + options: Readonly; } +/** + * An interpolated color gradient stop for ArtificialHorizon. + */ +type GradientStop = { + /** The distance of this stop from the horizon line, in pixels. */ + distance: number; + + /** The color of this stop. */ + color: string; +}; + /** * A PFD artificial horizon. Renders sky and ground boxes. */ @@ -51,7 +78,13 @@ export class ArtificialHorizon extends HorizonSharedCanvasSubLayer c[0])); + private readonly groundColors = this.props.options.groundColors + ? ArtificialHorizon.createColorGradient(this.props.options.groundColors) + : undefined; + + private readonly skyColors = this.props.options.skyColors + ? ArtificialHorizon.createColorGradient(this.props.options.skyColors) + : undefined; private needUpdate = false; @@ -130,56 +163,103 @@ export class ArtificialHorizon extends HorizonSharedCanvasSubLayer 0) { - context.beginPath(); - let p = inverted.apply(Vec2Math.set(minX, 0, this.vec2Cache[0]), this.vec2Cache[0]); - context.moveTo(p[0], p[1]); + context.setTransform( + invertedParams[0], invertedParams[3], + invertedParams[1], invertedParams[4], + invertedParams[2], invertedParams[5] + ); - p = inverted.apply(Vec2Math.set(maxX, 0, this.vec2Cache[0]), this.vec2Cache[0]); - context.lineTo(p[0], p[1]); - - p = inverted.apply(Vec2Math.set(maxX, maxY, this.vec2Cache[0]), this.vec2Cache[0]); - context.lineTo(p[0], p[1]); - - p = inverted.apply(Vec2Math.set(minX, maxY, this.vec2Cache[0]), this.vec2Cache[0]); - context.lineTo(p[0], p[1]); - context.closePath(); - - context.fillStyle = this.props.options.groundColor; - context.fill(); + if (maxY > 0) { + if (this.groundColors) { + this.drawGradientRect(context, this.groundColors, minX, maxX, maxY); + } else if (this.props.options.groundColor) { + this.drawSolidRect(context, this.props.options.groundColor, minX, maxX, maxY); + } } if (minY < 0) { - context.beginPath(); - let p = inverted.apply(Vec2Math.set(minX, 0, this.vec2Cache[0]), this.vec2Cache[0]); - context.moveTo(p[0], p[1]); - - p = inverted.apply(Vec2Math.set(maxX, 0, this.vec2Cache[0]), this.vec2Cache[0]); - context.lineTo(p[0], p[1]); - - p = inverted.apply(Vec2Math.set(maxX, minY, this.vec2Cache[0]), this.vec2Cache[0]); - context.lineTo(p[0], p[1]); + if (this.skyColors) { + this.drawGradientRect(context, this.skyColors, minX, maxX, minY); + } else if (this.props.options.skyColor) { + this.drawSolidRect(context, this.props.options.skyColor, minX, maxX, minY); + } + } - p = inverted.apply(Vec2Math.set(minX, minY, this.vec2Cache[0]), this.vec2Cache[0]); - context.lineTo(p[0], p[1]); - context.closePath(); + context.resetTransform(); + } - // The gradient distance must be at least as long as the longest color stop distance - // or else the gradient becomes invalid (as addColorStop throws for values above 1) - const gradientDistance = Math.min(minY, -this.maxSkyColorStopPx); - const gradientStart = inverted.apply(Vec2Math.set(0, gradientDistance, this.vec2Cache[0]), this.vec2Cache[0]); - const gradientEnd = inverted.apply(Vec2Math.set(0, 0, this.vec2Cache[1]), this.vec2Cache[1]); + /** + * Draws a solid rectangle. + * @param context The canvas rendering context to which to draw. + * @param color The color of the rectangle. + * @param x1 The minimum x-coordinate to which to extend the rectangle. + * @param x2 The maximum x-coordinate to which to extend the rectangle. + * @param y The y-coordinate to which to extend the rectangle. + */ + private drawSolidRect( + context: CanvasRenderingContext2D, + color: string, + x1: number, + x2: number, + y: number + ): void { + const width = x2 - x1; + const height = y * Math.sign(y); + + context.fillStyle = color; + context.fillRect(x1, Math.min(y, 0), width, height); + } - const gradient = context.createLinearGradient(gradientStart[0], gradientStart[1], gradientEnd[0], gradientEnd[1]); + /** + * Draws a gradient rectangle. + * @param context The canvas rendering context to which to draw. + * @param stops The interpolated color stops of the rectangle gradient. + * @param x1 The minimum x-coordinate to which to extend the rectangle. + * @param x2 The maximum x-coordinate to which to extend the rectangle. + * @param y The y-coordinate to which to extend the rectangle. + */ + private drawGradientRect( + context: CanvasRenderingContext2D, + stops: GradientStop[], + x1: number, + x2: number, + y: number + ): void { + // We avoid using actual CanvasGradient objects to render the gradient because they are bugged in Coherent. + + const sign = y < 0 ? -1 : 1; + + const width = x2 - x1; + const maxDistance = y * sign; + let prevDistance = 0; + + for (let i = 0; i < stops.length; i++) { + const stop = stops[i]; + + // Overlap each stripe with the next one to avoid sub-pixel rendering artifacts. + const currentDistance = Math.min(stop.distance, maxDistance) + 1; + const height = currentDistance - prevDistance; + + if (height > 0) { + context.fillStyle = stop.color; + context.fillRect(x1, Math.min(prevDistance * sign, currentDistance * sign), width, height); + } - for (let i = 0; i < this.props.options.skyColors.length; i++) { - const color = this.props.options.skyColors[i]; - gradient.addColorStop(1 - (color[0] / -gradientDistance), color[1]); + if (stop.distance >= maxDistance) { + break; } - context.fillStyle = gradient; - context.fill(); + prevDistance = stop.distance; + } + + const lastStop = stops[stops.length - 1]; + if (lastStop && prevDistance < maxDistance) { + const currentDistance = maxDistance + 1; + const height = currentDistance - prevDistance; + context.fillStyle = lastStop.color; + context.fillRect(x1, Math.min(prevDistance * sign, currentDistance * sign), width, height); } } @@ -189,4 +269,47 @@ export class ArtificialHorizon extends HorizonSharedCanvasSubLayer a[0] - b[0]), (stop, index, array) => { + const next = array[index + 1]; + + // If this is the last stop, then we will return the stop with no further interpolation. + if (!next) { + return { distance: stop[0], color: stop[1] }; + } + + const step = Math.max(Math.round(next[2] ?? 4), 2); + + // If this stop and the next one has the same color or the distance between them is less than the interpolation + // step, then we will return the current stop with no interpolation. + if (next[0] - stop[0] <= step || stop[1] === next[1]) { + return { distance: stop[0], color: stop[1] }; + } + + const distance = next[0] - stop[0]; + const stepCount = Math.ceil(distance / step); + + const steps = ColorUtils.interpolateHex(stop[1], next[1], ArrayUtils.range(stepCount, 0, step / distance)) + .map((stepColor, stepIndex) => { + return { + distance: stop[0] + stepIndex * step, + color: stepColor + }; + }); + + // If there are at least two steps and the last step is less than 2 pixels from the next stop, then remove the + // last step. + if (steps.length > 1 && distance - steps[steps.length - 1].distance < 2) { + steps.length--; + } + + return steps; + }); + } } \ No newline at end of file diff --git a/src/garminsdk/components/nextgenpfd/horizon/HorizonDisplay.tsx b/src/garminsdk/components/nextgenpfd/horizon/HorizonDisplay.tsx index ecbb0ec61..2bc31c869 100644 --- a/src/garminsdk/components/nextgenpfd/horizon/HorizonDisplay.tsx +++ b/src/garminsdk/components/nextgenpfd/horizon/HorizonDisplay.tsx @@ -101,7 +101,7 @@ export interface HorizonDisplayProps extends ComponentProps { bingDelay?: number; /** Options for the artificial horizon. */ - artificialHorizonOptions: ArtificialHorizonOptions; + artificialHorizonOptions: Readonly; /** Options for the horizon line. */ horizonLineOptions: Readonly; @@ -273,12 +273,12 @@ export class HorizonDisplay extends DisplayComponent { private readonly showFpm = this.props.supportAdvancedSvt ? MappedSubject.create( - ([isHeadingDataValid, isAttitudeDataValid, svtEnabledSetting, svtDisabledFpmShowSetting]): boolean => { - return isHeadingDataValid && isAttitudeDataValid && (svtEnabledSetting || svtDisabledFpmShowSetting); + ([isHeadingDataValid, isAttitudeDataValid, isSvtEnabled, svtDisabledFpmShowSetting]): boolean => { + return isHeadingDataValid && isAttitudeDataValid && (isSvtEnabled || svtDisabledFpmShowSetting); }, this.isHeadingDataValid, this.isAttitudeDataValid, - this.props.svtSettingManager.getSetting('svtEnabled'), + this.isSvtEnabled, this.props.svtSettingManager.getSetting('svtDisabledFpmShow') ) : undefined; diff --git a/src/garminsdk/components/nextgenpfd/horizon/PitchLadder.tsx b/src/garminsdk/components/nextgenpfd/horizon/PitchLadder.tsx index 1e7638342..2812dd988 100644 --- a/src/garminsdk/components/nextgenpfd/horizon/PitchLadder.tsx +++ b/src/garminsdk/components/nextgenpfd/horizon/PitchLadder.tsx @@ -85,8 +85,9 @@ export interface PitchLadderProps extends HorizonLayerProps { } /** - * A PFD attitude indicator. Displays a roll scale arc with pointer indicating the current roll angle, a pitch ladder - * indicating the current pitch angle, and a slip/skid indicator. + * A PFD pitch ladder. Displays major, medium, and minor pitch lines, each with optional pitch angle labels. Also + * displays unusual attitude chevrons between major pitch lines above threshold positive and negative pitch angles. + * Does not display a zero-pitch line. */ export class PitchLadder extends HorizonLayer { private readonly svgRef = FSComponent.createRef(); diff --git a/src/garminsdk/components/nextgenpfd/horizon/index.ts b/src/garminsdk/components/nextgenpfd/horizon/index.ts index f326e66f3..c73c8634a 100644 --- a/src/garminsdk/components/nextgenpfd/horizon/index.ts +++ b/src/garminsdk/components/nextgenpfd/horizon/index.ts @@ -3,6 +3,7 @@ export * from './AttitudeAircraftSymbol'; export * from './FlightDirectorDualCue'; export * from './FlightDirectorFormat'; export * from './FlightDirectorSingleCue'; +export * from './FlightDirectorDataProvider'; export * from './FlightPathMarker'; export * from './HorizonDisplay'; export * from './HorizonLine'; diff --git a/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldModel.ts b/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldModel.ts index a7db384ec..88749fb88 100644 --- a/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldModel.ts +++ b/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldModel.ts @@ -82,7 +82,7 @@ export class NavStatusBoxFieldBrgModelFactory implements NavStatusBoxFieldTypeMo } /** @inheritdoc */ - public create(gpsValidity: Subscribable): NavStatusBoxFieldModel> { + public create(gpsValidity: Subscribable): NavStatusBoxFieldModel> { return new NavStatusBoxFieldBrgModel(this.bus, gpsValidity); } } diff --git a/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldRenderer.tsx b/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldRenderer.tsx index eeee697e3..e4f8ca146 100644 --- a/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldRenderer.tsx +++ b/src/garminsdk/components/nextgenpfd/navstatusbox/NavStatusBoxFieldRenderer.tsx @@ -1,8 +1,9 @@ import { VNode } from '@microsoft/msfs-sdk'; + import { UnitsUserSettingManager } from '../../../settings/UnitsUserSettings'; import { GenericNavDataFieldRenderer } from '../../navdatafield/GenericNavDataFieldRenderer'; import { NavDataFieldType, NavDataFieldTypeModelMap } from '../../navdatafield/NavDataFieldType'; -import { NextGenNavDataFieldBrgRenderer, NextGenNavDataFieldDisRenderer, NextGenNavDataFieldEteRenderer } from '../../navdatafield/NextGenNavDataFieldRenderers'; +import { NextGenNavDataFieldBrgRenderer, NextGenNavDataFieldDisRenderer, NextGenNavDataFieldEteRenderer } from '../../navdatafield/NextGenNavDataFieldTypeRenderers'; import { NavStatusBoxFieldType } from './NavStatusBoxFieldType'; /** diff --git a/src/garminsdk/components/touchbutton/TouchButton.tsx b/src/garminsdk/components/touchbutton/TouchButton.tsx index e34667170..346dee24c 100644 --- a/src/garminsdk/components/touchbutton/TouchButton.tsx +++ b/src/garminsdk/components/touchbutton/TouchButton.tsx @@ -404,6 +404,9 @@ export class TouchButton

extends this.setPrimed(true); break; case TouchButtonOnTouchedAction.Press: + if (this.focusOnDrag) { + e.stopPropagation(); + } this.onPressed(); break; case TouchButtonOnTouchedAction.Hold: diff --git a/src/garminsdk/components/touchpad/TouchPad.tsx b/src/garminsdk/components/touchpad/TouchPad.tsx index 160a94354..91a1e4954 100644 --- a/src/garminsdk/components/touchpad/TouchPad.tsx +++ b/src/garminsdk/components/touchpad/TouchPad.tsx @@ -364,6 +364,8 @@ export class TouchPad

} this.props.onDragMoved && this.props.onDragMoved(this.currentMousePosition, this.prevMousePosition, this.mouseDownPosition, this); + + Vec2Math.set(e.clientX, e.clientY, this.prevMousePosition); } } diff --git a/src/garminsdk/components/waypoint/WaypointIcon.tsx b/src/garminsdk/components/waypoint/WaypointIcon.tsx index 8d3c797bf..8e2cdadcb 100644 --- a/src/garminsdk/components/waypoint/WaypointIcon.tsx +++ b/src/garminsdk/components/waypoint/WaypointIcon.tsx @@ -1,4 +1,8 @@ -import { ComputedSubject, FacilityWaypointUtils, FSComponent, NavMath, Subscribable, Subscription, VNode, Waypoint } from '@microsoft/msfs-sdk'; +import { + ComputedSubject, FacilityWaypointUtils, FSComponent, NavMath, SetSubject, Subscribable, SubscribableSet, Subscription, + ToggleableClassNameRecord, VNode, Waypoint +} from '@microsoft/msfs-sdk'; + import { WaypointIconImageCache } from '../../graphics'; import { AirportWaypoint } from '../../navigation'; import { WaypointComponent, WaypointComponentProps } from './WaypointComponent'; @@ -12,20 +16,21 @@ export interface WaypointIconProps extends WaypointComponentProps { * If not provided, airport icons will show the heading of the longest runway. */ planeHeading?: Subscribable; - /** CSS class(es) to add to the root of the icon component. */ - class?: string; - /** The size of each square icon in the texture atlas. */ atlasIconSize: number; /** The image waypoint icon image cache to use. */ imageCache: WaypointIconImageCache; + + /** CSS class(es) to add to the root of the icon component. */ + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** A waypoint icon. */ export class WaypointIcon extends WaypointComponent { + private static readonly RESERVED_CLASSES = []; + private readonly imgRef = FSComponent.createRef(); - private subs = [] as Subscription[]; private readonly srcSub = ComputedSubject.create(null, (waypoint): string => { if (waypoint !== null && FacilityWaypointUtils.isFacilityWaypoint(waypoint)) { @@ -38,6 +43,8 @@ export class WaypointIcon extends WaypointComponent { private imgFrameColCount = 1; private imgOffset?: string = undefined; + private readonly subscriptions: Subscription[] = []; + /** @inheritdoc */ public onAfterRender(): void { this.initImageLoadListener(); @@ -45,7 +52,7 @@ export class WaypointIcon extends WaypointComponent { super.onAfterRender(); if (this.props.planeHeading) { - this.subs.push(this.props.planeHeading.sub(this.updateOffset.bind(this), true)); + this.subscriptions.push(this.props.planeHeading.sub(this.updateOffset.bind(this), true)); } } @@ -79,8 +86,11 @@ export class WaypointIcon extends WaypointComponent { const waypoint = this.props.waypoint.get(); if (this.imgFrameRowCount > 1 && this.imgFrameColCount > 1 && waypoint instanceof AirportWaypoint && waypoint.longestRunway !== null) { - const headingOffset = this.props.planeHeading?.get() ?? 0; - this.updateAirpotIconOffset(headingOffset, waypoint.longestRunway.direction); + let headingOffset = this.props.planeHeading ? this.props.planeHeading.get() : NaN; + if (isNaN(headingOffset)) { + headingOffset = 0; + } + this.updateAirportIconOffset(headingOffset, waypoint.longestRunway.direction); } else { this.setImgOffset('unset'); } @@ -91,7 +101,7 @@ export class WaypointIcon extends WaypointComponent { * @param headingOffset How mush to offset the runway heading by. * @param runwayHeading The heading of the runway. */ - private updateAirpotIconOffset(headingOffset: number, runwayHeading: number): void { + private updateAirportIconOffset(headingOffset: number, runwayHeading: number): void { const headingDelta = runwayHeading - headingOffset; const frame = Math.round(NavMath.normalizeHeading(headingDelta) / 22.5) % 8; const row = Math.min(Math.floor(frame / 4), this.imgFrameRowCount - 1); @@ -126,10 +136,24 @@ export class WaypointIcon extends WaypointComponent { public render(): VNode { const { atlasIconSize } = this.props; + let cssClass: string | SetSubject | undefined; + + if (typeof this.props.class === 'object') { + cssClass = SetSubject.create(); + const sub = FSComponent.bindCssClassSet(cssClass, this.props.class, WaypointIcon.RESERVED_CLASSES); + if (Array.isArray(sub)) { + this.subscriptions.push(...sub); + } else { + this.subscriptions.push(sub); + } + } else { + cssClass = this.props.class; + } + return ( @@ -138,12 +162,15 @@ export class WaypointIcon extends WaypointComponent { /** @inheritdoc */ public destroy(): void { - super.destroy(); + for (const sub of this.subscriptions) { + sub.destroy(); + } - this.subs.forEach(sub => sub.destroy()); const img = this.imgRef.getOrDefault(); if (img) { img.onload = null; } + + super.destroy(); } } \ No newline at end of file diff --git a/src/garminsdk/flightplan/Fms.ts b/src/garminsdk/flightplan/Fms.ts index 716dca99c..8a3bc244c 100644 --- a/src/garminsdk/flightplan/Fms.ts +++ b/src/garminsdk/flightplan/Fms.ts @@ -82,6 +82,9 @@ export type ApproachDetails = { /** The reference navaid facility for the approach. */ referenceFacility: VorFacility | null; + + /** The runway which belongs to the selected approach */ + runway: OneWayRunway | null; } /** @@ -170,9 +173,11 @@ export class Fms { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }); private needPublishApproachDetails = false; + private updateApproachDetailsOpId = 0; private readonly flightPhase = ObjectSubject.create({ isApproachActive: false, @@ -375,6 +380,15 @@ export class Fms { return this.flightPlanner.getFlightPlan(Fms.DTO_RANDOM_PLAN_INDEX); } + + /** + * Gets the approach runway: + * @returns Selected approach runway + */ + public getApproachRunway(): OneWayRunway | null { + return this.approachDetails.get().runway; + } + /** * Sets the name of the flight plan. * @param planIndex The index of the plan the change the name for. @@ -478,11 +492,22 @@ export class Fms { let approachIsCircling = false; let approachIsVtf = false; let referenceFacility: VorFacility | null = null; + let approachRunway: OneWayRunway | null = null; + + const visualRunwayDesignation = plan.getUserData('visual_approach') as string | undefined; - if (plan.destinationAirport && (plan.procedureDetails.approachIndex > -1 || plan.getUserData('visual_approach') !== undefined)) { + if (plan.destinationAirport && (plan.procedureDetails.approachIndex > -1 || visualRunwayDesignation !== undefined)) { approachLoaded = true; + + const opId = ++this.updateApproachDetailsOpId; + + const facility = await this.facLoader.getFacility(FacilityType.Airport, plan.destinationAirport); + + if (opId !== this.updateApproachDetailsOpId) { + return; + } + if (plan.procedureDetails.approachIndex > -1) { - const facility = await this.facLoader.getFacility(FacilityType.Airport, plan.destinationAirport); const approach = facility.approaches[plan.procedureDetails.approachIndex]; if (approach) { approachType = approach.approachType; @@ -493,14 +518,16 @@ export class Fms { if (FmsUtils.approachHasNavFrequency(approach)) { referenceFacility = (await ApproachUtils.getReferenceFacility(approach, this.facLoader) as VorFacility | undefined) ?? null; } + approachRunway = RunwayUtils.matchOneWayRunway(facility, approach.runwayNumber, approach.runwayDesignator) ?? null; } } else { approachType = AdditionalApproachType.APPROACH_TYPE_VISUAL; approachRnavType = RnavTypeFlags.None; + approachRunway = RunwayUtils.matchOneWayRunwayFromDesignation(facility, visualRunwayDesignation as string) ?? null; } } - this.setApproachDetails(false, approachLoaded, approachType, approachRnavType, approachRnavTypeFlags, approachIsCircling, approachIsVtf, referenceFacility); + this.setApproachDetails(false, approachLoaded, approachType, approachRnavType, approachRnavTypeFlags, approachIsCircling, approachIsVtf, referenceFacility, approachRunway); } /** @@ -1244,7 +1271,8 @@ export class Fms { }); } - this.setApproachDetails(true, false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, RnavTypeFlags.None, false, false, null); + ++this.updateApproachDetailsOpId; + this.setApproachDetails(true, false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, RnavTypeFlags.None, false, false, null, null); plan.deleteUserData(Fms.VTF_FAF_DATA_KEY); plan.calculate(0); @@ -1825,7 +1853,8 @@ export class Fms { referenceFacility = (await ApproachUtils.getReferenceFacility(facility.approaches[approachIndex], this.facLoader) as VorFacility | undefined) ?? null; } - this.setApproachDetails(true, true, approachType, bestRnavType, rnavTypeFlags, approachIsCircling, isVtf, referenceFacility); + ++this.updateApproachDetailsOpId; + this.setApproachDetails(true, true, approachType, bestRnavType, rnavTypeFlags, approachIsCircling, isVtf, referenceFacility, approachRunway); this.autoDesignateProcedureConstraints(plan, approachSegment.segmentIndex); @@ -2813,7 +2842,8 @@ export class Fms { public async removeApproach(): Promise { const plan = this.getFlightPlan(); - this.setApproachDetails(true, false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, RnavTypeFlags.None, false, false, null); + ++this.updateApproachDetailsOpId; + this.setApproachDetails(true, false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, RnavTypeFlags.None, false, false, null, null); plan.deleteUserData(Fms.VTF_FAF_DATA_KEY); const hasArrival = plan.procedureDetails.arrivalIndex >= 0; @@ -3674,7 +3704,8 @@ export class Fms { plan.deleteUserData('visual_approach'); plan.deleteUserData('skipCourseReversal'); - this.setApproachDetails(true, false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, RnavTypeFlags.None, false, false, null); + ++this.updateApproachDetailsOpId; + this.setApproachDetails(true, false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, RnavTypeFlags.None, false, false, null, null); plan.deleteUserData(Fms.VTF_FAF_DATA_KEY); plan.setCalculatingLeg(0); @@ -4914,23 +4945,23 @@ export class Fms { // We need to remove the entry leg, then move the first leg in the airway segment out of the airway segment // and into the previous enroute segment to serve as the new entry leg. - const segment = plan.getSegment(segmentIndex + 1); - const leg = segment.legs[0].leg; + const airwaySegment = plan.getSegment(segmentIndex + 1); + const legToMove = airwaySegment.legs[0].leg; plan.removeLeg(segmentIndex + 1, 0); this.checkAndRemoveEmptySegment(plan, segmentIndex + 1); - this.planAddLeg(segmentIndex, leg); + this.planAddLeg(segmentIndex, legToMove, segmentLegIndex + 1); } else if (plan.getSegment(segmentIndex).segmentType === FlightPlanSegmentType.Departure) { // We need to remove the entry leg, then move the first leg in the airway segment out of the airway segment // and into a newly created enroute segment placed before the airway segment to serve as the new entry leg. this.planInsertSegmentOfType(FlightPlanSegmentType.Enroute, segmentIndex + 1); - const segment = plan.getSegment(segmentIndex + 2); - const leg = segment.legs[0].leg; + const airwaySegment = plan.getSegment(segmentIndex + 2); + const legToMove = airwaySegment.legs[0].leg; plan.removeLeg(segmentIndex + 2, 0); this.checkAndRemoveEmptySegment(plan, segmentIndex + 2); - this.planAddLeg(segmentIndex + 1, leg); + this.planAddLeg(segmentIndex + 1, legToMove, 0); } removed = plan.removeLeg(segmentIndex, segmentLegIndex) !== null; break; @@ -5503,6 +5534,7 @@ export class Fms { * @param isCircling Whether the approach is a circling approach. * @param isVtf Whether the approach is a vectors-to-final approach. * @param referenceFacility The approach's reference facility. + * @param runway The assigned runway for the approach */ private setApproachDetails( sync: boolean, @@ -5512,7 +5544,8 @@ export class Fms { rnavTypeFlags?: RnavTypeFlags, isCircling?: boolean, isVtf?: boolean, - referenceFacility?: VorFacility | null + referenceFacility?: VorFacility | null, + runway?: OneWayRunway | null ): void { isLoaded !== undefined && this.approachDetails.set('isLoaded', isLoaded); type !== undefined && this.approachDetails.set('type', type); @@ -5521,6 +5554,7 @@ export class Fms { isCircling !== undefined && this.approachDetails.set('isCircling', isCircling); isVtf !== undefined && this.approachDetails.set('isVtf', isVtf); referenceFacility !== undefined && this.approachDetails.set('referenceFacility', referenceFacility); + runway !== undefined && this.approachDetails.set('runway', runway); const approachDetails = this.approachDetails.get(); diff --git a/src/garminsdk/flightplan/FmsUtils.ts b/src/garminsdk/flightplan/FmsUtils.ts index 439a915c9..77bf496e9 100644 --- a/src/garminsdk/flightplan/FmsUtils.ts +++ b/src/garminsdk/flightplan/FmsUtils.ts @@ -1254,7 +1254,8 @@ export class FmsUtils { && a.rnavTypeFlags === b.rnavTypeFlags && a.isCircling === b.isCircling && a.isVtf === b.isVtf - && a.referenceFacility?.icao === b.referenceFacility?.icao; + && a.referenceFacility?.icao === b.referenceFacility?.icao + && a.runway?.designation === b.runway?.designation; } } diff --git a/src/garminsdk/graphics/text/UnitFormatter.ts b/src/garminsdk/graphics/text/UnitFormatter.ts index f23cdf2d1..53b23fe9f 100644 --- a/src/garminsdk/graphics/text/UnitFormatter.ts +++ b/src/garminsdk/graphics/text/UnitFormatter.ts @@ -6,7 +6,7 @@ import { Unit, UnitFamily, UnitType } from '@microsoft/msfs-sdk'; * Each unit formatter is a function which generates output strings from input measurement units. */ export class UnitFormatter { - private static readonly UNIT_TEXT: Record> = { + private static readonly UNIT_TEXT: Partial>>> = { [UnitFamily.Distance]: { [UnitType.METER.name]: 'M', [UnitType.FOOT.name]: 'FT', @@ -61,8 +61,8 @@ export class UnitFormatter { } }; - private static UNIT_TEXT_LOWER?: Record>; - private static UNIT_TEXT_UPPER?: Record>; + private static UNIT_TEXT_LOWER?: Partial>>>; + private static UNIT_TEXT_UPPER?: Partial>>>; /** * Creates a function which formats measurement units to strings representing their abbreviated names. @@ -89,14 +89,15 @@ export class UnitFormatter { * Creates a record of lowercase unit abbreviated names. * @returns A record of lowercase unit abbreviated names. */ - private static createLowerCase(): Record> { + private static createLowerCase(): Partial>>> { const lower: Record> = {}; for (const family in UnitFormatter.UNIT_TEXT) { const familyText = UnitFormatter.UNIT_TEXT[family]; lower[family] = {}; for (const unit in familyText) { - lower[family][unit] = familyText[unit].toLowerCase(); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + lower[family][unit] = familyText[unit]!.toLowerCase(); } } @@ -114,10 +115,20 @@ export class UnitFormatter { const familyText = UnitFormatter.UNIT_TEXT[family]; upper[family] = {}; for (const unit in familyText) { - upper[family][unit] = familyText[unit].toUpperCase(); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + upper[family][unit] = familyText[unit]!.toUpperCase(); } } return upper; } + + /** + * Gets a mapping of unit family and name to text used by UnitFormatter to format units. The returned object maps + * unit families to objects that map unit names within each family to formatted text. + * @returns A mapping of unit family and name to text used by UnitFormatter to format units. + */ + public static getUnitTextMap(): Readonly>>>>> { + return UnitFormatter.UNIT_TEXT; + } } \ No newline at end of file diff --git a/src/garminsdk/navigation/NavIndicatorController.ts b/src/garminsdk/navigation/NavIndicatorController.ts index 77d4d8f4b..c2835a65d 100644 --- a/src/garminsdk/navigation/NavIndicatorController.ts +++ b/src/garminsdk/navigation/NavIndicatorController.ts @@ -139,7 +139,8 @@ export class NavIndicatorController { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }; private flightPhase: Readonly = { @@ -986,4 +987,4 @@ export class NavIndicatorController { } return -1; } -} \ No newline at end of file +} diff --git a/src/garminsdk/navigation/NavdataComputer.ts b/src/garminsdk/navigation/NavdataComputer.ts index aa29b2868..c783a581b 100644 --- a/src/garminsdk/navigation/NavdataComputer.ts +++ b/src/garminsdk/navigation/NavdataComputer.ts @@ -35,7 +35,8 @@ export class NavdataComputer { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }; private readonly lnavIsTracking: ConsumerSubject; diff --git a/src/garminsdk/navigation/VNavDataProvider.ts b/src/garminsdk/navigation/VNavDataProvider.ts index 54f607336..b8aa8bc28 100644 --- a/src/garminsdk/navigation/VNavDataProvider.ts +++ b/src/garminsdk/navigation/VNavDataProvider.ts @@ -171,7 +171,8 @@ export class DefaultVNavDataProvider implements VNavDataProvider { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }); private readonly flightPhase = ConsumerValue.create>(null, { isApproachActive: false, diff --git a/src/garminsdk/navigation/WaypointInfoStore.ts b/src/garminsdk/navigation/WaypointInfoStore.ts index 38bf995da..6130c2c38 100644 --- a/src/garminsdk/navigation/WaypointInfoStore.ts +++ b/src/garminsdk/navigation/WaypointInfoStore.ts @@ -1,11 +1,7 @@ -/** - * A store for commonly used waypoint info. - */ import { AirportUtils, BasicNavAngleSubject, BasicNavAngleUnit, Facility, FacilityType, FacilityUtils, FacilityWaypointUtils, - GeoPoint, GeoPointInterface, GeoPointSubject, ICAO, NavAngleUnit, NavAngleUnitFamily, NavMath, - NumberUnitInterface, NumberUnitSubject, Subject, Subscribable, SubscribableUtils, Subscription, UnitFamily, UnitType, - Waypoint, + GeoPoint, GeoPointInterface, GeoPointSubject, ICAO, NavAngleUnit, NavAngleUnitFamily, NumberUnitInterface, + NumberUnitSubject, Subject, Subscribable, SubscribableUtils, Subscription, UnitFamily, UnitType, Waypoint } from '@microsoft/msfs-sdk'; import { Regions } from './Regions'; @@ -19,7 +15,9 @@ export class WaypointInfoStore { /** This store's current waypoint. */ public readonly waypoint = Subject.create(null); - private readonly facility = Subject.create(null); + private readonly _facility = Subject.create(null); + /** The facility associated with this store's current waypoint. */ + public readonly facility = this._facility as Subscribable; private readonly _location = GeoPointSubject.create(WaypointInfoStore.NULL_LOCATION.copy()); // eslint-disable-next-line jsdoc/require-returns @@ -28,7 +26,7 @@ export class WaypointInfoStore { return this._location; } - private readonly _name = this.facility.map(facility => { + private readonly _name = this._facility.map(facility => { if (facility?.name) { return Utils.Translate(facility.name); } @@ -38,7 +36,7 @@ export class WaypointInfoStore { /** The name of this store's current waypoint, or `undefined` if there is no such value. */ public readonly name = this._name as Subscribable; - private readonly _region = this.facility.map(facility => { + private readonly _region = this._facility.map(facility => { if (facility === null) { return undefined; } @@ -64,7 +62,7 @@ export class WaypointInfoStore { /** The region of this store's current waypoint, or `undefined` if there is no such value. */ public readonly region = this._region as Subscribable; - private readonly _city = this.facility.map(facility => { + private readonly _city = this._facility.map(facility => { if (facility?.city) { return facility.city.split(', ').map(name => Utils.Translate(name)).join(', '); } @@ -83,11 +81,18 @@ export class WaypointInfoStore { private readonly _bearing = BasicNavAngleSubject.create(BasicNavAngleUnit.create(false).createNumber(NaN)); // eslint-disable-next-line jsdoc/require-returns - /** The true bearing from the airplane to this store's current waypoint. */ + /** The true bearing, in degrees, from the airplane to this store's current waypoint. */ public get bearing(): Subscribable> { return this._bearing; } + private readonly _radial = BasicNavAngleSubject.create(BasicNavAngleUnit.create(false).createNumber(NaN)); + // eslint-disable-next-line jsdoc/require-returns + /** The radial relative to true north, in degrees, from this store's current waypoint along which the airplane lies. */ + public get radial(): Subscribable> { + return this._radial; + } + private waypointPipe?: Subscription; private waypointSub?: Subscription; private pposSub?: Subscription; @@ -129,7 +134,7 @@ export class WaypointInfoStore { const planePos = this.planePos?.get() ?? WaypointInfoStore.NULL_LOCATION; this.updateLocation(waypoint); this.updateDistance(waypoint, planePos); - this.updateBearing(waypoint, planePos); + this.updateBearingRadial(waypoint, planePos); if (waypoint !== null) { this.locationSub = waypoint.location.sub(() => { @@ -137,16 +142,16 @@ export class WaypointInfoStore { this.updateLocation(waypoint); this.updateDistance(waypoint, planePos2); - this.updateBearing(waypoint, planePos2); + this.updateBearingRadial(waypoint, planePos2); }); if (FacilityWaypointUtils.isFacilityWaypoint(waypoint)) { - this.facilityPipe = waypoint.facility.pipe(this.facility); + this.facilityPipe = waypoint.facility.pipe(this._facility); } else { - this.facility.set(null); + this._facility.set(null); } } else { - this.facility.set(null); + this._facility.set(null); } } @@ -158,7 +163,7 @@ export class WaypointInfoStore { const waypoint = this.waypoint.get(); if (waypoint) { this.updateDistance(waypoint, planePos); - this.updateBearing(waypoint, planePos); + this.updateBearingRadial(waypoint, planePos); } } @@ -189,14 +194,16 @@ export class WaypointInfoStore { * @param waypoint The store's current waypoint. * @param planePos The current position of the airplane. */ - private updateBearing(waypoint: Waypoint | null, planePos: GeoPointInterface): void { + private updateBearingRadial(waypoint: Waypoint | null, planePos: GeoPointInterface): void { if (!waypoint || isNaN(planePos.lat) || isNaN(planePos.lon)) { this._bearing.set(NaN); + this._radial.set(NaN); return; } - const brg = NavMath.normalizeHeading(planePos.bearingTo(waypoint.location.get())); - this._bearing.set(brg, planePos.lat, planePos.lon); + const waypointPos = waypoint.location.get(); + this._bearing.set(planePos.bearingTo(waypointPos), planePos.lat, planePos.lon); + this._radial.set(waypointPos.bearingTo(planePos), waypointPos.lat, waypointPos.lon); } /** diff --git a/src/garminsdk/settings/DateTimeUserSettings.ts b/src/garminsdk/settings/DateTimeUserSettings.ts index 982a1e1a9..4e93e9de6 100644 --- a/src/garminsdk/settings/DateTimeUserSettings.ts +++ b/src/garminsdk/settings/DateTimeUserSettings.ts @@ -1,4 +1,4 @@ -import { DefaultUserSettingManager, EventBus } from '@microsoft/msfs-sdk'; +import { DefaultUserSettingManager, EventBus, UserSettingManager, UserSettingMap } from '@microsoft/msfs-sdk'; /** * Setting modes for date/time format. @@ -10,7 +10,7 @@ export enum DateTimeFormatSettingMode { } /** - * Type descriptions for date/time user settings. + * Garmin date/time user settings. */ export type DateTimeUserSettingTypes = { /** Date/time format. */ @@ -20,27 +20,72 @@ export type DateTimeUserSettingTypes = { dateTimeLocalOffset: number; } +/** + * Instrument-local versions of Garmin date/time user settings. + */ +export type LocalDateTimeUserSettingTypes = { + [P in keyof DateTimeUserSettingTypes as `${P}_local`]: DateTimeUserSettingTypes[P]; +} + /** * Utility class for retrieving date/time user setting managers. */ export class DateTimeUserSettings { - private static INSTANCE: DefaultUserSettingManager | undefined; + private static INSTANCE: UserSettingManager | undefined; + private static LOCAL_INSTANCE: UserSettingManager | undefined; /** * Retrieves a manager for date/time user settings. * @param bus The event bus. * @returns A manager for date/time user settings. */ - public static getManager(bus: EventBus): DefaultUserSettingManager { - return DateTimeUserSettings.INSTANCE ??= new DefaultUserSettingManager(bus, [ - { - name: 'dateTimeFormat', - defaultValue: DateTimeFormatSettingMode.UTC - }, - { - name: 'dateTimeLocalOffset', - defaultValue: 0 - } - ]); + public static getManager(bus: EventBus): UserSettingManager { + return DateTimeUserSettings.INSTANCE ??= new DefaultUserSettingManager( + bus, + Object.entries(DateTimeUserSettings.getDefaultValues()).map(([name, defaultValue]) => { + return { + name, + defaultValue + }; + }) + ); + } + + /** + * Retrieves a manager for instrument-local date/time user settings. + * @param bus The event bus. + * @returns A manager for instrument-local date/time user settings. + */ + public static getLocalManager(bus: EventBus): UserSettingManager { + if (DateTimeUserSettings.LOCAL_INSTANCE) { + return DateTimeUserSettings.LOCAL_INSTANCE; + } + + const defaultValues = Object.entries(DateTimeUserSettings.getDefaultValues()) as [keyof DateTimeUserSettingTypes, DateTimeUserSettingTypes[keyof DateTimeUserSettingTypes]][]; + + const defs = defaultValues.map(([name, defaultValue]) => { + return { + name: `${name}_local`, + defaultValue + }; + }); + + const map = {} as UserSettingMap; + for (const [name] of defaultValues) { + map[name] = `${name}_local`; + } + + return DateTimeUserSettings.LOCAL_INSTANCE = new DefaultUserSettingManager(bus, defs, true).mapTo(map); + } + + /** + * Gets the default values for a full set of standard display units user settings. + * @returns The default values for a full set of standard display units user settings. + */ + private static getDefaultValues(): DateTimeUserSettingTypes { + return { + dateTimeFormat: DateTimeFormatSettingMode.UTC, + dateTimeLocalOffset: 0 + }; } } \ No newline at end of file diff --git a/src/garminsdk/settings/MapUserSettings.ts b/src/garminsdk/settings/MapUserSettings.ts index 3dd9386f6..d60ce1a82 100644 --- a/src/garminsdk/settings/MapUserSettings.ts +++ b/src/garminsdk/settings/MapUserSettings.ts @@ -4,7 +4,8 @@ export enum MapOrientationSettingMode { NorthUp = 'NorthUp', TrackUp = 'TrackUp', - HeadingUp = 'HeadingUp' + HeadingUp = 'HeadingUp', + DtkUp = 'DtkUp' } /** @@ -43,12 +44,15 @@ export type MapUserSettingTypes = { /** The orientation setting. */ mapOrientation: MapOrientationSettingMode; - /** The auto-north-up active setting. */ + /** Whether north-up above is active. */ mapAutoNorthUpActive: boolean; - /** The auto-north-up range setting. */ + /** The range index above which north-up above applies. */ mapAutoNorthUpRangeIndex: number; + /** Whether north-up on ground is active. */ + mapGroundNorthUpActive: boolean; + /** Declutter setting. */ mapDeclutter: MapDeclutterSettingMode; @@ -183,6 +187,7 @@ export class MapUserSettingsUtils { 'mapOrientation', 'mapAutoNorthUpActive', 'mapAutoNorthUpRangeIndex', + 'mapGroundNorthUpActive', 'mapDeclutter', 'mapTerrainMode', 'mapTerrainRangeIndex', diff --git a/src/garminsdk/settings/UnitsUserSettings.ts b/src/garminsdk/settings/UnitsUserSettings.ts index f04eeb3b1..bcc2cdbd1 100644 --- a/src/garminsdk/settings/UnitsUserSettings.ts +++ b/src/garminsdk/settings/UnitsUserSettings.ts @@ -1,7 +1,6 @@ import { - BasicNavAngleUnit, - DefaultUserSettingManager, EventBus, NavAngleUnit, Subject, Subscribable, Unit, UnitFamily, UnitType, UserSettingDefinition, UserSettingManagerEntry, - UserSettingManagerSyncData, UserSettingValue + BasicNavAngleUnit, Consumer, DefaultUserSettingManager, EventBus, NavAngleUnit, Subject, Subscribable, Unit, + UnitFamily, UnitType, UserSetting, UserSettingManager, UserSettingMap, UserSettingRecord, UserSettingValue } from '@microsoft/msfs-sdk'; /** @@ -58,7 +57,7 @@ export enum UnitsFuelSettingMode { } /** - * Type descriptions for display units user settings. + * Garmin display units user settings. */ export type UnitsUserSettingTypes = { /** The nav angle units setting. */ @@ -78,167 +77,197 @@ export type UnitsUserSettingTypes = { /** The fuel units setting. */ unitsFuel: UnitsFuelSettingMode; +} +/** + * Instrument-local versions of Garmin display units user settings. + */ +export type LocalUnitsUserSettingTypes = { + [P in keyof UnitsUserSettingTypes as `${P}_local`]: UnitsUserSettingTypes[P]; } /** - * A user setting manager for display units. In addition to syncing settings across instruments and managing event - * bus events related to the settings, this manager also provides subscribables for the unit types controlled by its - * settings. + * A manager for Garmin display units user settings. */ -export class UnitsUserSettingManager extends DefaultUserSettingManager { - private static readonly TRUE_BEARING = BasicNavAngleUnit.create(false); - private static readonly MAGNETIC_BEARING = BasicNavAngleUnit.create(true); +export interface UnitsUserSettingManager extends UserSettingManager { + /** The nav angle units to use for the current nav angle units setting. */ + readonly navAngleUnits: Subscribable; - private readonly navAngleUnitsSub = Subject.create(UnitsUserSettingManager.MAGNETIC_BEARING); - public readonly navAngleUnits = this.navAngleUnitsSub as Subscribable; + /** The large distance units to use (nautical mile, kilometer, etc.) for the current distance units setting. */ + readonly distanceUnitsLarge: Subscribable>; - private readonly distanceUnitsLargeSub = Subject.create(UnitType.NMILE); - public readonly distanceUnitsLarge = this.distanceUnitsLargeSub as Subscribable>; + /** The small distance units to use (foot, meter, etc.) for the current distance units setting. */ + readonly distanceUnitsSmall: Subscribable>; - private readonly distanceUnitsSmallSub = Subject.create(UnitType.FOOT); - public readonly distanceUnitsSmall = this.distanceUnitsSmallSub as Subscribable>; + /** The speed units to use for the current distance units setting. */ + readonly speedUnits: Subscribable>; - private readonly speedUnitsSub = Subject.create(UnitType.KNOT); - public readonly speedUnits = this.speedUnitsSub as Subscribable>; + /** The altitude units to use for the current altitude units setting. */ + readonly altitudeUnits: Subscribable>; - private readonly altitudeUnitsSub = Subject.create(UnitType.FOOT); - public readonly altitudeUnits = this.altitudeUnitsSub as Subscribable>; + /** The vertical speed units to use for the current altitude units setting. */ + readonly verticalSpeedUnits: Subscribable>; - private readonly verticalSpeedUnitsSub = Subject.create(UnitType.FPM); - public readonly verticalSpeedUnits = this.verticalSpeedUnitsSub as Subscribable>; + /** The temperature units to use for the current temperature units setting. */ + readonly temperatureUnits: Subscribable>; - private readonly temperatureUnitsSub = Subject.create(UnitType.CELSIUS); - public readonly temperatureUnits = this.temperatureUnitsSub as Subscribable>; + /** The temperature delta units to use for the current temperature units setting. */ + readonly temperatureDeltaUnits: Subscribable>; - private readonly temperatureDeltaUnitsSub = Subject.create(UnitType.DELTA_CELSIUS); - public readonly temperatureDeltaUnits = this.temperatureDeltaUnitsSub as Subscribable>; + /** The weight units to use for the current weight units setting. */ + readonly weightUnits: Subscribable>; - private readonly weightUnitsSub = Subject.create(UnitType.POUND); - public readonly weightUnits = this.weightUnitsSub as Subscribable>; + /** The fuel units to use for the current fuel units setting. */ + readonly fuelUnits: Subscribable>; - private readonly fuelUnitsSub = Subject.create(UnitType.GALLON_FUEL); - public readonly fuelUnits = this.fuelUnitsSub as Subscribable>; + /** The fuel flow units to use for the current fuel units setting. */ + readonly fuelFlowUnits: Subscribable>; +} - private readonly fuelFlowUnitsSub = Subject.create(UnitType.GPH_FUEL); - public readonly fuelFlowUnits = this.fuelFlowUnitsSub as Subscribable>; +/** + * A default implementation of {@link UnitsUserSettingManager} which sources setting values from another setting + * manager. + */ +export class DefaultUnitsUserSettingManager implements UnitsUserSettingManager { + private static readonly TRUE_BEARING = BasicNavAngleUnit.create(false); + private static readonly MAGNETIC_BEARING = BasicNavAngleUnit.create(true); - private areSubscribablesInit = false; + private readonly _navAngleUnits = Subject.create(DefaultUnitsUserSettingManager.MAGNETIC_BEARING); + public readonly navAngleUnits = this._navAngleUnits as Subscribable; - /** @inheritdoc */ - constructor(bus: EventBus, settingDefs: UserSettingDefinition[]) { - super(bus, settingDefs); + private readonly _distanceUnitsLarge = Subject.create(UnitType.NMILE); + public readonly distanceUnitsLarge = this._distanceUnitsLarge as Subscribable>; - this.areSubscribablesInit = true; + private readonly _distanceUnitsSmall = Subject.create(UnitType.FOOT); + public readonly distanceUnitsSmall = this._distanceUnitsSmall as Subscribable>; - for (const entry of this.settings.values()) { - this.updateUnitsSubjects(entry.setting.definition.name, entry.setting.value); - } + private readonly _speedUnits = Subject.create(UnitType.KNOT); + public readonly speedUnits = this._speedUnits as Subscribable>; + + private readonly _altitudeUnits = Subject.create(UnitType.FOOT); + public readonly altitudeUnits = this._altitudeUnits as Subscribable>; + + private readonly _verticalSpeedUnits = Subject.create(UnitType.FPM); + public readonly verticalSpeedUnits = this._verticalSpeedUnits as Subscribable>; + + private readonly _temperatureUnits = Subject.create(UnitType.CELSIUS); + public readonly temperatureUnits = this._temperatureUnits as Subscribable>; + + private readonly _temperatureDeltaUnits = Subject.create(UnitType.DELTA_CELSIUS); + public readonly temperatureDeltaUnits = this._temperatureDeltaUnits as Subscribable>; + + private readonly _weightUnits = Subject.create(UnitType.POUND); + public readonly weightUnits = this._weightUnits as Subscribable>; + + private readonly _fuelUnits = Subject.create(UnitType.GALLON_FUEL); + public readonly fuelUnits = this._fuelUnits as Subscribable>; + + private readonly _fuelFlowUnits = Subject.create(UnitType.GPH_FUEL); + public readonly fuelFlowUnits = this._fuelFlowUnits as Subscribable>; + + /** @inheritdoc */ + public constructor(private readonly sourceSettingManager: UserSettingManager) { + sourceSettingManager.getSetting('unitsNavAngle').pipe(this._navAngleUnits, value => { + return value === UnitsNavAngleSettingMode.True ? DefaultUnitsUserSettingManager.TRUE_BEARING : DefaultUnitsUserSettingManager.MAGNETIC_BEARING; + }); + + sourceSettingManager.getSetting('unitsDistance').sub(value => { + switch (value) { + case UnitsDistanceSettingMode.Metric: + this._distanceUnitsLarge.set(UnitType.KILOMETER); + this._distanceUnitsSmall.set(UnitType.METER); + this._speedUnits.set(UnitType.KPH); + break; + case UnitsDistanceSettingMode.Statute: + this._distanceUnitsLarge.set(UnitType.MILE); + this._distanceUnitsSmall.set(UnitType.FOOT); + this._speedUnits.set(UnitType.MPH); + break; + default: + this._distanceUnitsLarge.set(UnitType.NMILE); + this._distanceUnitsSmall.set(UnitType.FOOT); + this._speedUnits.set(UnitType.KNOT); + } + }, true); + + sourceSettingManager.getSetting('unitsAltitude').sub(value => { + switch (value) { + case UnitsAltitudeSettingMode.Meters: + this._altitudeUnits.set(UnitType.METER); + this._verticalSpeedUnits.set(UnitType.MPM); + break; + case UnitsAltitudeSettingMode.MetersMps: + this._altitudeUnits.set(UnitType.METER); + this._verticalSpeedUnits.set(UnitType.MPS); + break; + default: + this._altitudeUnits.set(UnitType.FOOT); + this._verticalSpeedUnits.set(UnitType.FPM); + } + }, true); + + sourceSettingManager.getSetting('unitsTemperature').sub(value => { + if (value === UnitsTemperatureSettingMode.Fahrenheit) { + this._temperatureUnits.set(UnitType.FAHRENHEIT); + this._temperatureDeltaUnits.set(UnitType.DELTA_FAHRENHEIT); + } else { + this._temperatureUnits.set(UnitType.CELSIUS); + this._temperatureDeltaUnits.set(UnitType.DELTA_CELSIUS); + } + }, true); + + sourceSettingManager.getSetting('unitsWeight').pipe(this._weightUnits, value => { + return value === UnitsWeightSettingMode.Kilograms ? UnitType.KILOGRAM : UnitType.POUND; + }); + + sourceSettingManager.getSetting('unitsFuel').sub(value => { + switch (value) { + case UnitsFuelSettingMode.ImpGal: + this._fuelUnits.set(UnitType.IMP_GALLON_FUEL); + this._fuelFlowUnits.set(UnitType.IGPH_FUEL); + break; + case UnitsFuelSettingMode.Liters: + this._fuelUnits.set(UnitType.LITER_FUEL); + this._fuelFlowUnits.set(UnitType.LPH_FUEL); + break; + case UnitsFuelSettingMode.Kilograms: + this._fuelUnits.set(UnitType.KILOGRAM); + this._fuelFlowUnits.set(UnitType.KGH); + break; + case UnitsFuelSettingMode.Pounds: + this._fuelUnits.set(UnitType.POUND); + this._fuelFlowUnits.set(UnitType.PPH); + break; + default: + this._fuelUnits.set(UnitType.GALLON_FUEL); + this._fuelFlowUnits.set(UnitType.GPH_FUEL); + } + }, true); } /** @inheritdoc */ - protected onSettingValueChanged( - entry: UserSettingManagerEntry, - value: UnitsUserSettingTypes[K] - ): void { - if (this.areSubscribablesInit) { - this.updateUnitsSubjects(entry.setting.definition.name, value); - } + public tryGetSetting(name: K): K extends keyof UnitsUserSettingTypes ? UserSetting> : undefined { + return this.sourceSettingManager.tryGetSetting(name) as any; + } - super.onSettingValueChanged(entry, value); + /** @inheritdoc */ + public getSetting(name: K): UserSetting> { + return this.sourceSettingManager.getSetting(name); } /** @inheritdoc */ - protected syncSettingFromEvent( - entry: UserSettingManagerEntry, - data: UserSettingManagerSyncData - ): void { - if (this.areSubscribablesInit) { - this.updateUnitsSubjects(entry.setting.definition.name, data.value); - } + public whenSettingChanged(name: K): Consumer> { + return this.sourceSettingManager.whenSettingChanged(name); + } - super.syncSettingFromEvent(entry, data); + /** @inheritdoc */ + public getAllSettings(): UserSetting[] { + return this.sourceSettingManager.getAllSettings(); } - /** - * Updates this manager's units subjects in response to a setting value change. - * @param settingName The name of the setting that was changed. - * @param value The new value of the changed setting. - */ - protected updateUnitsSubjects(settingName: string, value: UserSettingValue): void { - switch (settingName) { - case 'unitsNavAngle': - this.navAngleUnitsSub.set(value === UnitsNavAngleSettingMode.True ? UnitsUserSettingManager.TRUE_BEARING : UnitsUserSettingManager.MAGNETIC_BEARING); - break; - case 'unitsDistance': - switch (value) { - case UnitsDistanceSettingMode.Metric: - this.distanceUnitsLargeSub.set(UnitType.KILOMETER); - this.distanceUnitsSmallSub.set(UnitType.METER); - this.speedUnitsSub.set(UnitType.KPH); - break; - case UnitsDistanceSettingMode.Statute: - this.distanceUnitsLargeSub.set(UnitType.MILE); - this.distanceUnitsSmallSub.set(UnitType.FOOT); - this.speedUnitsSub.set(UnitType.MPH); - break; - default: - this.distanceUnitsLargeSub.set(UnitType.NMILE); - this.distanceUnitsSmallSub.set(UnitType.FOOT); - this.speedUnitsSub.set(UnitType.KNOT); - } - break; - case 'unitsAltitude': - switch (value) { - case UnitsAltitudeSettingMode.Meters: - this.altitudeUnitsSub.set(UnitType.METER); - this.verticalSpeedUnitsSub.set(UnitType.MPM); - break; - case UnitsAltitudeSettingMode.MetersMps: - this.altitudeUnitsSub.set(UnitType.METER); - this.verticalSpeedUnitsSub.set(UnitType.MPS); - break; - default: - this.altitudeUnitsSub.set(UnitType.FOOT); - this.verticalSpeedUnitsSub.set(UnitType.FPM); - } - break; - case 'unitsTemperature': - if (value === UnitsTemperatureSettingMode.Fahrenheit) { - this.temperatureUnitsSub.set(UnitType.FAHRENHEIT); - this.temperatureDeltaUnitsSub.set(UnitType.DELTA_FAHRENHEIT); - } else { - this.temperatureUnitsSub.set(UnitType.CELSIUS); - this.temperatureDeltaUnitsSub.set(UnitType.DELTA_CELSIUS); - } - break; - case 'unitsWeight': - this.weightUnitsSub.set(value === UnitsWeightSettingMode.Kilograms ? UnitType.KILOGRAM : UnitType.POUND); - break; - case 'unitsFuel': - switch (value) { - case UnitsFuelSettingMode.ImpGal: - this.fuelUnitsSub.set(UnitType.IMP_GALLON_FUEL); - this.fuelFlowUnitsSub.set(UnitType.IGPH_FUEL); - break; - case UnitsFuelSettingMode.Liters: - this.fuelUnitsSub.set(UnitType.LITER_FUEL); - this.fuelFlowUnitsSub.set(UnitType.LPH_FUEL); - break; - case UnitsFuelSettingMode.Kilograms: - this.fuelUnitsSub.set(UnitType.KILOGRAM); - this.fuelFlowUnitsSub.set(UnitType.KGH); - break; - case UnitsFuelSettingMode.Pounds: - this.fuelUnitsSub.set(UnitType.POUND); - this.fuelFlowUnitsSub.set(UnitType.PPH); - break; - default: - this.fuelUnitsSub.set(UnitType.GALLON_FUEL); - this.fuelFlowUnitsSub.set(UnitType.GPH_FUEL); - } - break; - } + /** @inheritdoc */ + public mapTo(map: UserSettingMap): UserSettingManager { + return this.sourceSettingManager.mapTo(map); } } @@ -247,38 +276,65 @@ export class UnitsUserSettingManager extends DefaultUserSettingManager { + return { + name, + defaultValue + }; + })) + ); + } + + /** + * Retrieves a manager for instrument-local display units user settings. + * @param bus The event bus. + * @returns A manager for instrument-local display units user settings. + */ + public static getLocalManager(bus: EventBus): UnitsUserSettingManager { + if (UnitsUserSettings.LOCAL_INSTANCE) { + return UnitsUserSettings.LOCAL_INSTANCE; + } + + const defaultValues = Object.entries(UnitsUserSettings.getDefaultValues()) as [keyof UnitsUserSettingTypes, UnitsUserSettingTypes[keyof UnitsUserSettingTypes]][]; + + const defs = defaultValues.map(([name, defaultValue]) => { + return { + name: `${name}_local`, + defaultValue + }; + }); + + const map = {} as UserSettingMap; + for (const [name] of defaultValues) { + map[name] = `${name}_local`; + } + + return UnitsUserSettings.LOCAL_INSTANCE = new DefaultUnitsUserSettingManager( + new DefaultUserSettingManager(bus, defs, true).mapTo(map) + ); + } + + /** + * Gets the default values for a full set of standard display units user settings. + * @returns The default values for a full set of standard display units user settings. + */ + private static getDefaultValues(): UnitsUserSettingTypes { + return { + unitsNavAngle: UnitsNavAngleSettingMode.Magnetic, + unitsDistance: UnitsDistanceSettingMode.Nautical, + unitsAltitude: UnitsAltitudeSettingMode.Feet, + unitsTemperature: UnitsTemperatureSettingMode.Celsius, + unitsWeight: UnitsWeightSettingMode.Pounds, + unitsFuel: UnitsFuelSettingMode.Gallons + }; } } \ No newline at end of file diff --git a/src/garminsdk/settings/VSpeedUserSettings.ts b/src/garminsdk/settings/VSpeedUserSettings.ts index 59c6c57d7..c43f10a09 100644 --- a/src/garminsdk/settings/VSpeedUserSettings.ts +++ b/src/garminsdk/settings/VSpeedUserSettings.ts @@ -39,7 +39,8 @@ export class VSpeedUserSettingUtils { public static activeValue( name: string, settingManager: UserSettingManager>, - useFmsValue: true + useFmsValue: true, + allowZeroValue?: boolean ): MappedSubscribable; /** * Creates a mapped subscribable which provides the active value of a reference V-speed, in knots. The active value @@ -55,13 +56,15 @@ export class VSpeedUserSettingUtils { public static activeValue( name: string, settingManager: UserSettingManager>, - useFmsValue: false + useFmsValue: false, + allowZeroValue?: boolean ): MappedSubscribable; // eslint-disable-next-line jsdoc/require-jsdoc public static activeValue( name: string, settingManager: UserSettingManager>, - useFmsValue: boolean + useFmsValue: boolean, + allowZeroValue = false ): MappedSubscribable { return useFmsValue ? MappedSubject.create( @@ -69,12 +72,12 @@ export class VSpeedUserSettingUtils { let val = -1; if (userVal >= 0) { - if (userVal > 0) { + if (allowZeroValue || userVal > 0) { val = userVal; } - } else if (fmsVal > 0) { + } else if (allowZeroValue ? fmsVal >= 0 : fmsVal > 0) { val = fmsVal; - } else if (defaultVal > 0) { + } else if (allowZeroValue ? defaultVal >= 0 : defaultVal > 0) { val = defaultVal; } @@ -89,10 +92,10 @@ export class VSpeedUserSettingUtils { let val = -1; if (userVal >= 0) { - if (userVal > 0) { + if (allowZeroValue || userVal > 0) { val = userVal; } - } else if (defaultVal > 0) { + } else if (allowZeroValue ? defaultVal >= 0 : defaultVal > 0) { val = defaultVal; } @@ -181,7 +184,7 @@ export class VSpeedUserSettingUtils { return false; } - if (userVal > 0) { + if (userVal >= 0) { return userVal === fmsVal; } else { return true; diff --git a/src/garminsdk/settings/WeatherMapUserSettings.ts b/src/garminsdk/settings/WeatherMapUserSettings.ts index c66c93bbe..faaed2f78 100644 --- a/src/garminsdk/settings/WeatherMapUserSettings.ts +++ b/src/garminsdk/settings/WeatherMapUserSettings.ts @@ -5,6 +5,7 @@ export enum WeatherMapOrientationSettingMode { NorthUp = 'NorthUp', TrackUp = 'TrackUp', HeadingUp = 'HeadingUp', + DtkUp = 'DtkUp', SyncToNavMap = 'SyncToNavMap' } diff --git a/src/garminsdk/system/AdcSystem.ts b/src/garminsdk/system/AdcSystem.ts index 4914ff038..b505e5639 100644 --- a/src/garminsdk/system/AdcSystem.ts +++ b/src/garminsdk/system/AdcSystem.ts @@ -3,7 +3,7 @@ import { AdcEvents, AvionicsSystemState, AvionicsSystemStateEvent, BaseAdcEvents /** * Topics for bus events from which ADC data is sourced. */ -type AdcDataSourceTopics = 'ias' | 'tas' | 'mach_number' | 'mach_to_kias_factor' +type AdcDataSourceTopics = 'ias' | 'indicated_alt' | 'pressure_alt' | 'vertical_speed' | 'altimeter_baro_setting_inhg' | 'altimeter_baro_preselect_inhg' | 'altimeter_baro_preselect_mb' | 'altimeter_baro_preselect_raw' | 'altimeter_baro_is_std' | 'ambient_temp_c' | 'ambient_pressure_inhg' | 'isa_temp_c' | 'ram_air_temp_c'; @@ -21,6 +21,18 @@ type AdcDataEvents = { export interface AdcSystemEvents extends AdcDataEvents { /** An event fired when the ADC system state changes. */ [adc_state: `adc_state_${number}`]: AvionicsSystemStateEvent; + + /** The airplane's measured true airspeed, in knots. */ + [adc_tas: `adc_tas_${number}`]: number; + + /** The airplane's measured mach number. */ + [adc_mach_number: `adc_mach_number_${number}`]: number; + + /** The conversion factor from measured mach number to knots indicated airspeed in the airplane's current environment. */ + [adc_mach_to_kias_factor: `adc_mach_to_kias_factor_${number}`]: number; + + /** The conversion factor from measured true airspeed to knots indicated airspeed in the airplane's current environment. */ + [adc_tas_to_ias_factor: `adc_tas_to_ias_factor_${number}`]: number; } /** @@ -31,15 +43,16 @@ export class AdcSystem extends BasicAvionicsSystem { private readonly dataSourceTopicMap = { [`adc_ias_${this.index}`]: `ias_${this.airspeedIndicatorIndex}`, - [`adc_tas_${this.index}`]: `tas_${this.airspeedIndicatorIndex}`, - [`adc_mach_to_kias_factor_${this.index}`]: `mach_to_kias_factor_${this.airspeedIndicatorIndex}`, + [`adc_tas_${this.index}`]: `indicated_tas_${this.airspeedIndicatorIndex}`, + [`adc_mach_number_${this.index}`]: `indicated_mach_number_${this.airspeedIndicatorIndex}`, + [`adc_mach_to_kias_factor_${this.index}`]: `indicated_mach_to_kias_factor_${this.airspeedIndicatorIndex}`, + [`adc_tas_to_ias_factor_${this.index}`]: `indicated_tas_to_ias_factor_${this.airspeedIndicatorIndex}`, [`adc_indicated_alt_${this.index}`]: `indicated_alt_${this.altimeterIndex}`, [`adc_altimeter_baro_setting_inhg_${this.index}`]: `altimeter_baro_setting_inhg_${this.altimeterIndex}`, [`adc_altimeter_baro_preselect_inhg_${this.index}`]: `altimeter_baro_preselect_inhg_${this.altimeterIndex}`, [`adc_altimeter_baro_preselect_mb_${this.index}`]: `altimeter_baro_preselect_mb_${this.altimeterIndex}`, [`adc_altimeter_baro_preselect_raw_${this.index}`]: `altimeter_baro_preselect_raw_${this.altimeterIndex}`, [`adc_altimeter_baro_is_std_${this.index}`]: `altimeter_baro_is_std_${this.altimeterIndex}`, - [`adc_mach_number_${this.index}`]: 'mach_number', [`adc_pressure_alt_${this.index}`]: 'pressure_alt', [`adc_vertical_speed_${this.index}`]: 'vertical_speed', [`adc_ambient_temp_c_${this.index}`]: 'ambient_temp_c', diff --git a/src/garminsdk/system/GpsReceiverSystem.ts b/src/garminsdk/system/GpsReceiverSystem.ts index beffa72b6..957cee4a1 100644 --- a/src/garminsdk/system/GpsReceiverSystem.ts +++ b/src/garminsdk/system/GpsReceiverSystem.ts @@ -25,6 +25,18 @@ export interface GpsReceiverSystemEvents extends GpsReceiverGPSSatComputerDataEv [gps_rec_state: `gps_rec_state_${number}`]: AvionicsSystemStateEvent; } +/** + * Options for {@link GpsReceiverSystem}. + */ +export type GpsReceiverSystemOptions = { + /** + * Whether the system should execute a warm start instead of a cold start on initial power-up. During a warm start, + * the system uses almanac data to predict satellite geometry in order to choose a set of satellites to acquire + * that will minimize time to first fix. Defaults to `false`. + */ + warmStartOnInit?: boolean; +}; + /** * A Garmin GPS receiver system. */ @@ -54,6 +66,8 @@ export class GpsReceiverSystem extends BasicAvionicsSystem[] = []; private readonly sbasState = ConsumerSubject.create(null, GPSSystemSBASState.Disabled); + private readonly warmStartOnInit: boolean; + /** * Creates an instance of a GPS receiver system. * @param index The index of the GPS receiver. @@ -61,15 +75,19 @@ export class GpsReceiverSystem extends BasicAvionicsSystem ) { super(index, bus, `gps_rec_state_${index}` as const); + this.warmStartOnInit = options?.warmStartOnInit ?? false; + gpsSatComputer.init(); if (powerSource !== undefined) { @@ -123,11 +141,19 @@ export class GpsReceiverSystem extends BasicAvionicsSystem, - cdiScalingLabel: CDIScaleLabel, + cdiScalingLabel?: CDIScaleLabel, radarAltitude?: NumberUnitInterface ): number { const altFeet = altitude.asUnit(UnitType.FOOT); diff --git a/src/garminsdk/traffic/GarminTcasII.ts b/src/garminsdk/traffic/GarminTcasII.ts index 716e35cc4..54e84d910 100644 --- a/src/garminsdk/traffic/GarminTcasII.ts +++ b/src/garminsdk/traffic/GarminTcasII.ts @@ -120,12 +120,19 @@ export class GarminTcasII extends Tcas, + radarAltitude: NumberUnitInterface + ): void; + /** + * Updates the sensitivity with ADS-B support. * @param adsbMode The ADS-B operating mode. * @param altitude The indicated altitude of the own airplane. * @param cdiScalingLabel The CDI scaling sensitivity of the own airplane. @@ -204,21 +220,45 @@ export class GarminTcasIISensitivity implements TcasSensitivity { public update( adsbMode: AdsbOperatingMode, altitude: NumberUnitInterface, - cdiScalingLabel: CDIScaleLabel, + cdiScalingLabel: CDIScaleLabel | undefined, radarAltitude: NumberUnitInterface + ): void; + // eslint-disable-next-line jsdoc/require-jsdoc + public update( + arg1: AdsbOperatingMode | NumberUnitInterface, + arg2: NumberUnitInterface, + arg3?: CDIScaleLabel, + arg4?: NumberUnitInterface ): void { - this.tcasIILevel = this.tcasIISensitivity.selectLevel(altitude, radarAltitude); - this.adsbLevel = this.adsbSensitivity.selectLevel(altitude, cdiScalingLabel, radarAltitude); + let altitude: NumberUnitInterface; + let radarAltitude: NumberUnitInterface; + let supportAdsb: boolean; + + if (typeof arg1 === 'object') { + altitude = arg1; + radarAltitude = arg2; + supportAdsb = false; + } else { + altitude = arg2; + radarAltitude = arg4 as NumberUnitInterface; + supportAdsb = true; + } + this.tcasIILevel = this.tcasIISensitivity.selectLevel(altitude, radarAltitude); this.tcasIIParams.parametersPA = this.tcasIISensitivity.getPA(this.tcasIILevel); this.tcasIIParams.parametersTA = this.tcasIISensitivity.getTA(this.tcasIILevel); this.tcasIIParams.parametersRA = this.tcasIISensitivity.getRA(this.tcasIILevel); - this.adsbParams.parametersPA = this.tcasIISensitivity.getPA(this.tcasIILevel); - this.adsbParams.parametersTA = this.adsbSensitivity.getTA(this.adsbLevel); - this.adsbParams.parametersRA = this.tcasIISensitivity.getRA(this.tcasIILevel); + if (supportAdsb) { + this.adsbLevel = this.adsbSensitivity.selectLevel(altitude, arg3, radarAltitude); + this.adsbParams.parametersPA = this.tcasIISensitivity.getPA(this.tcasIILevel); + this.adsbParams.parametersTA = this.adsbSensitivity.getTA(this.adsbLevel); + this.adsbParams.parametersRA = this.tcasIISensitivity.getRA(this.tcasIILevel); - // Right now we just assume every intruder is tracked by ADS-B if ADS-B is operating - this.activeParams = adsbMode === AdsbOperatingMode.Standby ? this.tcasIIParams : this.adsbParams; + // Right now we just assume every intruder is tracked by ADS-B if ADS-B is operating + this.activeParams = arg1 === AdsbOperatingMode.Standby ? this.tcasIIParams : this.adsbParams; + } else { + this.activeParams = this.tcasIIParams; + } } } \ No newline at end of file diff --git a/src/garminsdk/traffic/TrafficAdvisorySystem.ts b/src/garminsdk/traffic/TrafficAdvisorySystem.ts index 3c0256a66..7333ff3ab 100644 --- a/src/garminsdk/traffic/TrafficAdvisorySystem.ts +++ b/src/garminsdk/traffic/TrafficAdvisorySystem.ts @@ -102,13 +102,20 @@ export class TrafficAdvisorySystem extends Tcas, + radarAltitude?: NumberUnitInterface + ): void; + /** + * Updates the sensitivity with ADS-B support. * @param adsbMode The ADS-B operating mode. * @param altitude The indicated altitude of the own airplane. * @param groundSpeed The ground speed of the own airplane. @@ -283,19 +299,44 @@ export class TasSensitivity implements TcasSensitivity { adsbMode: AdsbOperatingMode, altitude: NumberUnitInterface, groundSpeed: NumberUnitInterface, - cdiScalingLabel: CDIScaleLabel, + cdiScalingLabel?: CDIScaleLabel, radarAltitude?: NumberUnitInterface + ): void; + // eslint-disable-next-line jsdoc/require-jsdoc + public update( + arg1: AdsbOperatingMode | NumberUnitInterface, + arg2: NumberUnitInterface, + arg3?: NumberUnitInterface, + arg4?: CDIScaleLabel, + arg5?: NumberUnitInterface ): void { - const tasLevel = this.tasSensitivity.selectLevel(groundSpeed, radarAltitude); - const adsbLevel = this.adsbTASensitivity.selectLevel(altitude, cdiScalingLabel, radarAltitude); + let groundSpeed: NumberUnitInterface; + let radarAltitude: NumberUnitInterface | undefined; + let supportAdsb: boolean; + + if (typeof arg1 === 'object') { + groundSpeed = arg1; + radarAltitude = arg2; + supportAdsb = false; + } else { + groundSpeed = arg3 as NumberUnitInterface; + radarAltitude = arg5; + supportAdsb = true; + } - this.tasParams.parametersPA = this.tasSensitivity.getPA(tasLevel); - this.tasParams.parametersTA = this.tasSensitivity.getTA(tasLevel); + const tisLevel = this.tasSensitivity.selectLevel(groundSpeed, radarAltitude); + this.tasParams.parametersPA = this.tasSensitivity.getPA(tisLevel); + this.tasParams.parametersTA = this.tasSensitivity.getTA(tisLevel); - this.tasParams.parametersPA = this.tasSensitivity.getPA(tasLevel); - this.tasParams.parametersTA = this.adsbTASensitivity.getTA(adsbLevel); + if (supportAdsb) { + const adsbLevel = this.adsbTASensitivity.selectLevel(arg2, arg4, radarAltitude); + this.adsbParams.parametersPA = this.tasSensitivity.getPA(tisLevel); + this.adsbParams.parametersTA = this.adsbTASensitivity.getTA(adsbLevel); - // Right now we just assume every intruder is tracked by ADS-B if ADS-B is operating - this.activeParams = adsbMode === AdsbOperatingMode.Standby ? this.tasParams : this.adsbParams; + // Right now we just assume every intruder is tracked by ADS-B if ADS-B is operating + this.activeParams = arg1 === AdsbOperatingMode.Standby ? this.tasParams : this.adsbParams; + } else { + this.activeParams = this.tasParams; + } } } \ No newline at end of file diff --git a/src/garminsdk/traffic/TrafficInfoService.ts b/src/garminsdk/traffic/TrafficInfoService.ts index cc442ddc5..d4d396295 100644 --- a/src/garminsdk/traffic/TrafficInfoService.ts +++ b/src/garminsdk/traffic/TrafficInfoService.ts @@ -1,12 +1,71 @@ import { - EventBus, MappedSubject, MathUtils, NumberUnitInterface, Subject, Tcas, TcasAdvisoryParameters, TcasAlertLevel, TcasOperatingMode, TcasSensitivity, - TcasSensitivityParameters, TcasTcaParameters, TrafficContact, TrafficInstrument, UnitFamily, UnitType, Vec2Math + AdsbOperatingMode, EventBus, MappedSubject, MappedSubscribable, MathUtils, NumberUnitInterface, Subject, Subscribable, + Tcas, TcasAdvisoryParameters, TcasAlertLevel, TcasOperatingMode, TcasSensitivity, TcasSensitivityParameters, + TcasTcaParameters, TrafficContact, TrafficInstrument, UnitFamily, UnitType, UserSetting, Vec2Math } from '@microsoft/msfs-sdk'; import { TrafficOperatingModeSetting, TrafficUserSettings } from '../settings/TrafficUserSettings'; import { GarminTcasIntruder } from './GarminTcasIntruder'; import { TrafficSystem } from './TrafficSystem'; import { TrafficSystemType } from './TrafficSystemType'; +import { GarminAdsb } from './GarminAdsb'; +import { AdsbSensitivityParameters } from './AdsbSensitivityParameters'; +import { CDIScaleLabel, LNavDataEvents } from '../navigation/LNavDataEvents'; + +/** + * Configuration options for {@link TrafficInfoService}. + */ +export type TrafficInfoServiceOptions = { + /** Whether the TIS supports radar altitude. Defaults to `false`. */ + supportRadarAltitude?: boolean; + + /** + * The maximum number of intruders tracked at any one time by the TIS when ADS-B is not available. Defaults to + * {@link TrafficInfoService.DEFAULT_MAX_INTRUDER_COUNT}. + */ + maxIntruderCount?: number; + + /** + * The maximum update frequency (Hz) in real time when ADS-B is not available. Defaults to + * {@link TrafficInfoService.DEFAULT_REAL_TIME_UPDATE_FREQ}. + */ + realTimeUpdateFreq?: number; + + /** + * The maximum update frequency (Hz) in sim time when ADS-B is not available. Defaults to + * {@link TrafficInfoService.DEFAULT_SIM_TIME_UPDATE_FREQ}. + */ + simTimeUpdateFreq?: number; + + /** + * The ADS-B system associated with the TIS, or `null` if the TIS does not support ADS-B. + */ + adsb?: GarminAdsb | null; + + /** + * The maximum number of intruders tracked at any one time by the TIS when ADS-B is available. Defaults to + * {@link TrafficInfoService.DEFAULT_ADSB_MAX_INTRUDER_COUNT}. + */ + adsbMaxIntruderCount?: number; + + /** + * The maximum update frequency (Hz) in real time when ADS-B is available. Defaults to + * {@link TrafficInfoService.DEFAULT_ADSB_REAL_TIME_UPDATE_FREQ}. + */ + adsbRealTimeUpdateFreq?: number; + + /** + * The maximum update frequency (Hz) in sim time when ADS-B is available. Defaults to + * {@link TrafficInfoService.DEFAULT_ADSB_SIM_TIME_UPDATE_FREQ}. + */ + adsbSimTimeUpdateFreq?: number; + + /** + * Whether the ADS-B traffic alerting algorithm supports using GPS phase of flight information to select sensitivity + * levels. Ignored if ADS-B is not supported. Defaults to `false`. + */ + supportGpsFlightPhase?: boolean; +}; /** * Garmin Traffic Information Service. @@ -16,6 +75,10 @@ export class TrafficInfoService extends Tcas public static readonly DEFAULT_REAL_TIME_UPDATE_FREQ = 2; // hz public static readonly DEFAULT_SIM_TIME_UPDATE_FREQ = 0.2; // hz + public static readonly DEFAULT_ADSB_MAX_INTRUDER_COUNT = 30; + public static readonly DEFAULT_ADSB_REAL_TIME_UPDATE_FREQ = 2; // hz + public static readonly DEFAULT_ADSB_SIM_TIME_UPDATE_FREQ = 1; // hz + private static readonly MAX_INTRUDER_ALTITUDE_BELOW = UnitType.FOOT.createNumber(3000); private static readonly MAX_INTRUDER_ALTITUDE_ABOVE = UnitType.FOOT.createNumber(3500); private static readonly MAX_INTRUDER_DISTANCE = UnitType.NMILE.createNumber(7.5); @@ -23,34 +86,122 @@ export class TrafficInfoService extends Tcas private static readonly TA_ON_HYSTERESIS = 2000; // ms private static readonly TA_OFF_HYSTERESIS = 8000; // ms - public readonly type = TrafficSystemType.Tis; - public readonly adsb = null; + /** @inheritdoc */ + public readonly type: TrafficSystemType; + + /** @inheritdoc */ + public readonly adsb: GarminAdsb | null; + + private readonly supportsRadarAltitude: boolean; + + private readonly _isPowered: Subject; + private readonly operatingModeSetting: UserSetting; + private readonly operatingModeState: MappedSubscribable; - private readonly _isPowered = Subject.create(true); - private readonly operatingModeSetting = TrafficUserSettings.getManager(this.bus).getSetting('trafficOperatingMode'); - private readonly operatingModeState = MappedSubject.create(this._isPowered, this.operatingModeSetting); + private readonly supportsGpsFlightPhase: boolean; + private cdiScalingLabel?: CDIScaleLabel; /** - * Constructor. + * Creates a new instance of TrafficInfoService. * @param bus The event bus. - * @param tfcInstrument The traffic instrument which provides traffic contacts for this TIS. - * @param supportsRadarAltitude Whether this TIS supports radar altitude. - * @param maxIntruderCount The maximum number of intruders tracked at any one time by this TIS. Defaults to + * @param tfcInstrument The traffic instrument which provides traffic contacts for the TIS. + * @param supportRadarAltitude Whether the TIS supports radar altitude. + * @param maxIntruderCount The maximum number of intruders tracked at any one time by the TIS. Defaults to * {@link TrafficInfoService.DEFAULT_MAX_INTRUDER_COUNT}. * @param realTimeUpdateFreq The maximum update frequency (Hz) in real time. Defaults to * {@link TrafficInfoService.DEFAULT_REAL_TIME_UPDATE_FREQ}. * @param simTimeUpdateFreq The maximum update frequency (Hz) in sim time. Defaults to * {@link TrafficInfoService.DEFAULT_SIM_TIME_UPDATE_FREQ}. */ - constructor( + public constructor( bus: EventBus, tfcInstrument: TrafficInstrument, - private readonly supportsRadarAltitude: boolean, - maxIntruderCount = TrafficInfoService.DEFAULT_MAX_INTRUDER_COUNT, - realTimeUpdateFreq = TrafficInfoService.DEFAULT_REAL_TIME_UPDATE_FREQ, - simTimeUpdateFreq = TrafficInfoService.DEFAULT_SIM_TIME_UPDATE_FREQ + supportRadarAltitude: boolean, + maxIntruderCount?: number, + realTimeUpdateFreq?: number, + simTimeUpdateFreq?: number + ); + /** + * Creates a new instance of TrafficInfoService. + * @param bus The event bus. + * @param tfcInstrument The traffic instrument which provides traffic contacts for the TIS. + * @param options Options with which to configure the TIS. + */ + public constructor( + bus: EventBus, + tfcInstrument: TrafficInstrument, + options?: Readonly + ); + // eslint-disable-next-line jsdoc/require-jsdoc + public constructor( + bus: EventBus, + tfcInstrument: TrafficInstrument, + arg3?: Readonly | boolean, + arg4?: number, + arg5?: number, + arg6?: number ) { + let opts: Readonly | undefined; + let maxIntruderCount: number | Subscribable; + let realTimeUpdateFreq: number | Subscribable; + let simTimeUpdateFreq: number | Subscribable; + + if (arg3 === undefined || typeof arg3 === 'object') { + opts = arg3; + + const noAdsbMaxIntruderCount = opts?.maxIntruderCount ?? TrafficInfoService.DEFAULT_MAX_INTRUDER_COUNT; + const noAdsbRealTimeUpdateFreq = opts?.realTimeUpdateFreq ?? TrafficInfoService.DEFAULT_REAL_TIME_UPDATE_FREQ; + const noAdsbSimTimeUpdateFreq = opts?.simTimeUpdateFreq ?? TrafficInfoService.DEFAULT_SIM_TIME_UPDATE_FREQ; + + if (opts?.adsb) { + const adsbMaxIntruderCount = opts?.adsbMaxIntruderCount ?? TrafficInfoService.DEFAULT_ADSB_MAX_INTRUDER_COUNT; + const adsbRealTimeUpdateFreq = opts?.adsbRealTimeUpdateFreq ?? TrafficInfoService.DEFAULT_ADSB_REAL_TIME_UPDATE_FREQ; + const adsbSimTimeUpdateFreq = opts?.adsbSimTimeUpdateFreq ?? TrafficInfoService.DEFAULT_ADSB_SIM_TIME_UPDATE_FREQ; + + maxIntruderCount = Subject.create(noAdsbMaxIntruderCount); + realTimeUpdateFreq = Subject.create(noAdsbRealTimeUpdateFreq); + simTimeUpdateFreq = Subject.create(noAdsbSimTimeUpdateFreq); + + opts.adsb.getEventSubscriber().on('adsb_operating_mode').handle(mode => { + if (mode === AdsbOperatingMode.Standby) { + (maxIntruderCount as Subject).set(noAdsbMaxIntruderCount); + (realTimeUpdateFreq as Subject).set(noAdsbRealTimeUpdateFreq); + (simTimeUpdateFreq as Subject).set(noAdsbSimTimeUpdateFreq); + } else { + (maxIntruderCount as Subject).set(adsbMaxIntruderCount); + (realTimeUpdateFreq as Subject).set(adsbRealTimeUpdateFreq); + (simTimeUpdateFreq as Subject).set(adsbSimTimeUpdateFreq); + } + }); + } else { + maxIntruderCount = noAdsbMaxIntruderCount; + realTimeUpdateFreq = noAdsbRealTimeUpdateFreq; + simTimeUpdateFreq = noAdsbSimTimeUpdateFreq; + } + } else { + maxIntruderCount = arg4 ?? TrafficInfoService.DEFAULT_MAX_INTRUDER_COUNT; + realTimeUpdateFreq = arg5 ?? TrafficInfoService.DEFAULT_REAL_TIME_UPDATE_FREQ; + simTimeUpdateFreq = arg6 ?? TrafficInfoService.DEFAULT_SIM_TIME_UPDATE_FREQ; + } + super(bus, tfcInstrument, maxIntruderCount, realTimeUpdateFreq, simTimeUpdateFreq); + + this.type = TrafficSystemType.Tis; + + if (opts) { + this.adsb = opts.adsb ?? null; + this.supportsRadarAltitude = opts.supportRadarAltitude ?? false; + this.supportsGpsFlightPhase = opts.supportGpsFlightPhase ?? false; + } else { + this.adsb = null; + this.supportsRadarAltitude = arg3 as boolean; + this.supportsGpsFlightPhase = false; + } + + this._isPowered = Subject.create(true); + + this.operatingModeSetting = TrafficUserSettings.getManager(this.bus).getSetting('trafficOperatingMode'); + this.operatingModeState = MappedSubject.create(this._isPowered, this.operatingModeSetting); } /** @inheritdoc */ @@ -62,6 +213,10 @@ export class TrafficInfoService extends Tcas public init(): void { super.init(); + if (this.adsb && this.supportsGpsFlightPhase) { + this.bus.getSubscriber().on('lnavdata_cdi_scale_label').whenChanged().handle(label => { this.cdiScalingLabel = label; }); + } + this.operatingModeState.sub(([isPowered, operatingModeSetting]) => { if (!isPowered) { this.operatingModeSub.set(TcasOperatingMode.Off); @@ -77,6 +232,8 @@ export class TrafficInfoService extends Tcas } } }, true); + + this.adsb?.init(); } /** @inheritdoc */ @@ -96,6 +253,10 @@ export class TrafficInfoService extends Tcas /** @inheritdoc */ protected filterIntruder(intruder: GarminTcasIntruder): boolean { + if (this.adsb && this.adsb.getOperatingMode() !== AdsbOperatingMode.Standby) { + return true; + } + const relativePosVec = intruder.relativePositionVec; return TrafficInfoService.MAX_INTRUDER_ALTITUDE_BELOW.compare(-relativePosVec[2], UnitType.METER) >= 0 @@ -105,10 +266,20 @@ export class TrafficInfoService extends Tcas /** @inheritdoc */ protected updateSensitivity(): void { - this.sensitivity.update( - this.ownAirplaneSubs.groundSpeed.get(), - this.supportsRadarAltitude ? this.ownAirplaneSubs.radarAltitude.get() : undefined - ); + if (this.adsb) { + this.sensitivity.update( + this.adsb.getOperatingMode(), + this.ownAirplaneSubs.altitude.get(), + this.ownAirplaneSubs.groundSpeed.get(), + this.cdiScalingLabel, + this.supportsRadarAltitude ? this.ownAirplaneSubs.radarAltitude.get() : undefined + ); + } else { + this.sensitivity.update( + this.ownAirplaneSubs.groundSpeed.get(), + this.supportsRadarAltitude ? this.ownAirplaneSubs.radarAltitude.get() : undefined + ); + } } /** @inheritdoc */ @@ -227,16 +398,17 @@ export class TisSensitivityParameters { } /** - * An implementation of {@link TCASSensitivity} which provides sensitivity parameters for the Garmin Traffic + * An implementation of {@link TcasSensitivity} which provides sensitivity parameters for the Garmin Traffic * Information Service. */ export class TisSensitivity implements TcasSensitivity { - private readonly sensitivity = new TisSensitivityParameters(); + private readonly adsbTASensitivity = new AdsbSensitivityParameters(); + private readonly tisSensitivity = new TisSensitivityParameters(); - private readonly params = { - parametersPA: this.sensitivity.getPA(0), + private readonly tisParams = { + parametersPA: this.tisSensitivity.getPA(0), - parametersTA: this.sensitivity.getTA(0), + parametersTA: this.tisSensitivity.getTA(0), parametersRA: { tau: UnitType.SECOND.createNumber(NaN), @@ -246,28 +418,90 @@ export class TisSensitivity implements TcasSensitivity { } }; + private readonly adsbParams = { + parametersPA: this.tisSensitivity.getPA(0), + + parametersTA: this.adsbTASensitivity.getTA(0), + + parametersRA: { + tau: UnitType.SECOND.createNumber(NaN), + protectedRadius: UnitType.NMILE.createNumber(NaN), + protectedHeight: UnitType.FOOT.createNumber(NaN), + alim: UnitType.FOOT.createNumber(NaN) + } + }; + + private activeParams = this.tisParams; + /** @inheritdoc */ public selectParameters(): TcasSensitivityParameters { - return this.params; + return this.activeParams; } /** @inheritdoc */ public selectRAAlim(): NumberUnitInterface { - return this.params.parametersRA.alim; + return this.tisParams.parametersRA.alim; } /** - * Updates the sensitivity. + * Updates the sensitivity without ADS-B support. * @param groundSpeed The ground speed of the own airplane. * @param radarAltitude The radar altitude of the own airplane. */ public update( groundSpeed: NumberUnitInterface, radarAltitude?: NumberUnitInterface + ): void; + /** + * Updates the sensitivity with ADS-B support. + * @param adsbMode The ADS-B operating mode. + * @param altitude The indicated altitude of the own airplane. + * @param groundSpeed The ground speed of the own airplane. + * @param cdiScalingLabel The CDI scaling sensitivity of the own airplane. + * @param radarAltitude The radar altitude of the own airplane. + */ + public update( + adsbMode: AdsbOperatingMode, + altitude: NumberUnitInterface, + groundSpeed: NumberUnitInterface, + cdiScalingLabel?: CDIScaleLabel, + radarAltitude?: NumberUnitInterface + ): void; + // eslint-disable-next-line jsdoc/require-jsdoc + public update( + arg1: AdsbOperatingMode | NumberUnitInterface, + arg2: NumberUnitInterface, + arg3?: NumberUnitInterface, + arg4?: CDIScaleLabel, + arg5?: NumberUnitInterface ): void { - const level = this.sensitivity.selectLevel(groundSpeed, radarAltitude); + let groundSpeed: NumberUnitInterface; + let radarAltitude: NumberUnitInterface | undefined; + let supportAdsb: boolean; + + if (typeof arg1 === 'object') { + groundSpeed = arg1; + radarAltitude = arg2; + supportAdsb = false; + } else { + groundSpeed = arg3 as NumberUnitInterface; + radarAltitude = arg5; + supportAdsb = true; + } + + const tisLevel = this.tisSensitivity.selectLevel(groundSpeed, radarAltitude); + this.tisParams.parametersPA = this.tisSensitivity.getPA(tisLevel); + this.tisParams.parametersTA = this.tisSensitivity.getTA(tisLevel); + + if (supportAdsb) { + const adsbLevel = this.adsbTASensitivity.selectLevel(arg2, arg4, radarAltitude); + this.adsbParams.parametersPA = this.tisSensitivity.getPA(tisLevel); + this.adsbParams.parametersTA = this.adsbTASensitivity.getTA(adsbLevel); - this.params.parametersPA = this.sensitivity.getPA(level); - this.params.parametersTA = this.sensitivity.getTA(level); + // Right now we just assume every intruder is tracked by ADS-B if ADS-B is operating + this.activeParams = arg1 === AdsbOperatingMode.Standby ? this.tisParams : this.adsbParams; + } else { + this.activeParams = this.tisParams; + } } } \ No newline at end of file diff --git a/src/msfstypes/coherent/apcontroller.d.ts b/src/msfstypes/coherent/apcontroller.d.ts new file mode 100644 index 000000000..9c7d9525a --- /dev/null +++ b/src/msfstypes/coherent/apcontroller.d.ts @@ -0,0 +1,33 @@ +declare class APController { + static apGetAutopilotModeActive(apMode: MSFSAPStates): number; +} + +declare enum MSFSAPStates { + LogicOn = 1 << 0, + APOn = 1 << 1, + FDOn = 1 << 2, + FLC = 1 << 3, + Alt = 1 << 4, + AltArm = 1 << 5, + GS = 1 << 6, + GSArm = 1 << 7, + Pitch = 1 << 8, + VS = 1 << 9, + Heading = 1 << 10, + Nav = 1 << 11, + NavArm = 1 << 12, + WingLevel = 1 << 13, + Attitude = 1 << 14, + ThrottleSpd = 1 << 15, + ThrottleMach = 1 << 16, + ATArm = 1 << 17, + YD = 1 << 18, + EngineRPM = 1 << 19, + TOGAPower = 1 << 20, + Autoland = 1 << 21, + TOGAPitch = 1 << 22, + Bank = 1 << 23, + FBW = 1 << 24, + AvionicsManaged = 1 << 25, + None = 1 << 31 +} \ No newline at end of file diff --git a/src/msfstypes/coherent/facilities.d.ts b/src/msfstypes/coherent/facilities.d.ts new file mode 100644 index 000000000..2ff2cb91f --- /dev/null +++ b/src/msfstypes/coherent/facilities.d.ts @@ -0,0 +1,3 @@ +declare class Facilities { + static getMagVar(lat: number, lon: number): number; +} \ No newline at end of file diff --git a/src/msfstypes/index.d.ts b/src/msfstypes/index.d.ts new file mode 100644 index 000000000..ebfa6dd6b --- /dev/null +++ b/src/msfstypes/index.d.ts @@ -0,0 +1 @@ +/// \ No newline at end of file diff --git a/src/msfstypes/js/animation/animation.d.ts b/src/msfstypes/js/animation/animation.d.ts new file mode 100644 index 000000000..ed6799a34 --- /dev/null +++ b/src/msfstypes/js/animation/animation.d.ts @@ -0,0 +1,173 @@ +declare type AnimationDirection = 'normal' | 'reverse' | 'alternate-reverse' | 'alternate'; +interface TimelineOptions { + direction?: AnimationDirection; + playBackRate?: number; + initialDelay?: number; + startWithInitialValues?: boolean; + iterations?: number; + startingValues?: { + [P in keyof CSSStyleDeclaration]?: string; + }; + startingTransition?: number; +} +interface AnimationOptions extends TimelineOptions { + elements: HTMLElement | HTMLElement[]; + duration: number; + keepsFinalState?: boolean; + animationStart?: number; + offset?: number; + properties: AnimationProperties; +} +interface AnimationData extends AnimationOptions { + delay: number; +} +declare type UIAnimationEventName = 'oncomplete' | 'onstart' | 'oniteration' | 'ontransitionend'; +interface UITimelineConfiguration extends TimelineOptions { + timeline: Array; +} +interface AnimationPropertyData { + percent: number; + value: any; + easing?: string; +} +interface AnimationEventData extends AnimationPropertyData { + value: Function; + timeoutID?: number; +} +interface ComponentAnimationData { + delay?: number; + play?: boolean; +} +declare type AnimationProperties = { + [P in keyof CSSStyleDeclaration | 'event']?: AnimationPropertyData[]; +}; +interface TimelineEventData { + delay: number; + timeoutId?: number; + event: Function; +} +interface AnimationPropertyChange { + property: AnimationStyleSubProperties; + value: string; +} +declare type AnimationStyleSubProperties = 'animationName' | 'animationDuration' | 'animationTimingFunction' | 'animationDelay' | 'animationIterationCount' | 'animationDirection' | 'animationFillMode' | 'animationPlayState'; +declare let g_timelineCounter: number; +declare let g_KeyframesMgr: any; +declare class UITimeline { + animations: Array; + id: number; + rewinding: boolean; + playing: boolean; + direction: AnimationDirection; + private _animationStartCallbacks; + private _animationEndCallbacks; + private _animationIterationCallbacks; + private _started; + private completedAnimations; + private completedTransitions; + private iteratedAnimations; + private events; + private currentTime; + private _transitionTimestamp; + private lastUpdate; + private configuration; + private _transition; + private _playBackRate; + private _iterationEvents; + static selectorToElements(element: HTMLElement | ShadowRoot, selector: string): HTMLElement[]; + static createFromPath(JSONPath: string, element: HTMLElement): Promise; + private static timelineOptionsValidator; + private static animationOptionsValidator; + private static animationPropertyValidator; + static checkConfigurationIntegrity(data: any): data is UITimelineConfiguration; + constructor(opt?: TimelineOptions); + add(opt: AnimationOptions): this; + addEvent(eventData: TimelineEventData): void; + private computeTransitionTime; + play(): void; + apply(displayAtPercent?: number): void; + getCurrentTime(): number; + setPlaybackRate(rate: number): void; + private animationIsFromTimeline; + private checkAnimationComplete; + private checkTransitionEnd; + private checkAnimationIteration; + pause(): void; + stop(): void; + rewind(): void; + getCurrentDirection(): "normal" | "reverse"; + getDuration(): number; + private calcStartTime; + addTimelineEventListener(key: 'onstart' | 'oncomplete' | 'oniteration', callback: (events: AnimationEvent[]) => void): void; + removeTimelineEventListener(key: 'onstart' | 'oncomplete' | 'oniteration', callback: (events: AnimationEvent[]) => void): void; + removeAllTimelineEventListener(key: 'onstart' | 'oncomplete' | 'oniteration'): void; + static launchComponentsAnimation(elements: T | T[], stateFunction: (opt?: ComponentAnimationData) => UITimeline, opt?: ComponentAnimationData): Function; + handleAnimationOptions(stateOptions: ComponentAnimationData): void; +} +declare let g_id: number; +declare class UIAnimation { + data: AnimationData; + currentTime: number; + playTimestamp: number; + animationNames: string[]; + currentDirection: 'normal' | 'reverse'; + private id; + private name; + private configuration; + private elements; + private events; + private _playing; + private _transition; + private _direction; + private _delay; + private _rewinding; + private _playbackRate; + private _animationLocked; + private _storedAnimationDeclaration; + private _eventCallbacks; + BUGFIX_TIMEOUT: number; + constructor(data: AnimationData); + private onAnimationEnd; + getCurrentTime(): number; + getDuration(): number; + pause(): void; + setDirection(direction: AnimationDirection): void; + rewind(callback: () => void): void; + resume(direction: AnimationDirection): void; + setPlaybackRate(rate: number): void; + setTransition(direction: 'in' | 'out' | 'none' | 'done', duration: number): void; + private startLock; + private stopLock; + static animationPropertiesOrder: AnimationStyleSubProperties[]; + restartAnimation(propertyChanges?: AnimationPropertyChange[]): void; + reset: () => void; + stop(): void; + cleanup(): void; + private setAnimationState; + private setAnimationProperty; + play(): void; + private getAnimationEventName; + addEventListener(eventName: UIAnimationEventName, callback: (event: AnimationEvent) => any): void; + private boundEventChecks; + private addListener; + private removeListener; + removeEventListener(eventName: UIAnimationEventName, callback: (event: AnimationEvent) => any): void; + removeAllEventListeners(eventName: UIAnimationEventName): void; +} +declare type StyleDeclaration = { + [s in keyof CSSStyleDeclaration]?: string; +}; +declare class KeyframesMgr { + sheet: CSSStyleSheet; + declaredKeyframes: { + [property: string]: string; + }; + counter: number; + constructor(); + 0: any; + addKeyFrame(name: string, frames: { + [s: string]: StyleDeclaration; + }, ctx: HTMLElement): void; + applyPropertiesAsFrames(properties: AnimationProperties, ctx: HTMLElement): string[]; + static camelCaseToDash(myStr: any): any; +} diff --git a/src/msfstypes/js/avionics.d.ts b/src/msfstypes/js/avionics.d.ts new file mode 100644 index 000000000..c445f1251 --- /dev/null +++ b/src/msfstypes/js/avionics.d.ts @@ -0,0 +1,150 @@ +declare namespace Avionics { + class Utils { + static DEG2RAD: number; + static RAD2DEG: number; + static DEGREE_SYMBOL: string; + static METER2FEET: number; + static FEET2METER: number; + static make_bcd16(arg: number): number; + static make_adf_bcd32(arg: number): number; + static Vor2Tacan(freq: number): number; + static Tacan2Vor(channel: number, yband: boolean): number; + static make_xpndr_bcd16(arg: number): number; + static computeETEinSeconds(distance: number): any; + static computeThousandsAltitude(altitude: number): any; + static bearingDistanceToCoordinates(bearing: number, distance: number, referentialLat: number, referentialLong: number): LatLongAlt; + static computeDistance(from: LatLong | LatLongAlt, to: LatLong | LatLongAlt): number; + static computeGreatCircleHeading(lla0: LatLong | LatLongAlt, lla1: LatLong | LatLongAlt): number; + static computeGreatCircleDistance(lla0: LatLong | LatLongAlt, lla1: LatLong | LatLongAlt): number; + static lerpAngle(from: number, to: number, d: number): number; + static meanAngle(a: number, b: number): number; + static diffAngle(a: number, b: number): number; + static clampAngle(a: number): number; + static fmod(a: any, b: any): number; + private static runwayRegex; + static formatRunway(_designation: string, _trimWhiteSpaces?: boolean): string; + private static identRegex; + static isIdent(_value: string): boolean; + } + class SVG { + static NS: string; + static InlineSvg(url: string, image: SVGSVGElement): void; + static computeDashLine(_startX: number, _startY: number, _length: number, _steps: number, _width: number, _color: string): Element; + } + class SVGGraduation { + IsPrimary: boolean; + SVGLine: Element; + SVGText1: Element; + SVGText2: Element; + } + class Scroller { + offsetY: number; + protected _nbItems: number; + protected _increment: number; + protected _canBeNegative: boolean; + protected _moduloValue: number; + protected _notched: number; + private _baseValue; + private _curIndex; + private OLDoffsetY; + private OLD_baseValue; + constructor(_nbItems: number, _increment: number, _canBeNegative?: boolean, _moduloValue?: number, _notched?: number); + protected resetOldBaseValue(): void; + scroll(_value: number): boolean; + get increment(): number; + get firstValue(): number; + get nextValue(): number; + private getCurrentValue; + } + class AirspeedScroller extends Scroller { + protected allTexts: Array; + protected posX: number; + protected posY: number; + protected spacing: number; + constructor(_spacing: number, _notched?: number); + construct(_parent: Element, _posX: number, _posY: number, _width: number, _fontFamily: string, _fontSize: number, _fontColor: string): void; + clear(_value?: string): void; + update(_value: number, _divider?: number, _hideIfLower?: number): void; + } + class AltitudeScroller extends Scroller { + protected allTexts: Array; + protected posX: number; + protected posY: number; + protected spacing: number; + constructor(_nbItems: number, _spacing: number, _increment: number, _moduloValue: number, _notched?: number); + construct(_parent: Element, _posX: number, _posY: number, _width: number, _fontFamily: string, _fontSize: number, _fontColor: string): void; + clear(_value?: string): void; + update(_value: number, _divider?: number, _hideIfLower?: number): void; + } + class SVGArc { + private arc; + private arcRadius; + private arcSize; + private arcColor; + private percent; + private angle; + private gaugeCenterX; + private gaugeCenterY; + private gaugeCloseThreshold; + private computedStartX; + private computedStartY; + private computedEndX; + private computedEndY; + private computedEndAngle; + static readonly radiansPerPercent: number; + init(_arcName: string, _radius: number, _size: number, _color: string): void; + setPercent(_percent: any): void; + translate(_x: any, _y: any): void; + rotate(_angle: any): void; + get svg(): Element; + get centerX(): number; + get centerY(): number; + get radius(): number; + get startX(): number; + get startY(): number; + get endX(): number; + get endY(): number; + get startAngle(): number; + get endAngle(): number; + get currentPercent(): number; + private updateShape; + private getArcPath; + } + class CurveTimeValuePair { + time: number; + value: T; + constructor(time: number, value: T); + } + class CurveTool { + static NumberInterpolation(n1: number, n2: number, dt: number): number; + static StringColorRGBInterpolation(c1: string, c2: string, dt: number): string; + } + class Curve { + private _values; + interpolationFunction: (v1: T, v2: T, t: number) => T; + add(time: number, value: T): void; + evaluate(t: number): T; + debugLog(): void; + } + class Dictionary { + private items; + changed: boolean; + set(_key: any, _value: string): void; + get(_key: any): string; + remove(_key: any): void; + exists(_key: any): boolean; + } + class Intersect { + private rectIntersections; + private rectTopLeft; + private rectTopRight; + private rectBottomRight; + private rectBottomLeft; + private rectWidth; + private rectHeight; + constructor(); + initRect(_width: number, _height: number): void; + segmentVsRect(s1: IVec2, s2: IVec2, out1: IVec2, out2: IVec2): boolean; + segmentVsSegment(a1: IVec2, a2: IVec2, b1: IVec2, b2: IVec2, out: IVec2): boolean; + } +} diff --git a/src/msfstypes/js/buttons.d.ts b/src/msfstypes/js/buttons.d.ts new file mode 100644 index 000000000..1350699d9 --- /dev/null +++ b/src/msfstypes/js/buttons.d.ts @@ -0,0 +1,106 @@ +declare class ButtonElement extends TemplateElement { + protected mainFrameElem: HTMLElement; + protected isInteractive: boolean; + protected isPadInteractive: boolean; + get childActiveClass(): string; + get canFocusOnMouseOver(): boolean; + get interactive(): boolean; + set interactive(val: boolean); + get padInteractive(): boolean; + set padInteractive(val: boolean); + get focusedClassName(): string; + get notHighlightableClassName(): string; + get hasMouseOver(): boolean; + set hasMouseOver(val: boolean); + connectedCallback(): void; + get defaultClick(): boolean; + get defaultSoundType(): string; + get soundType(): string; + set soundType(type: string); + disconnectedCallback(): void; + protected canPlaySound(): boolean; + set playSoundOnValidate(val: boolean); + protected canPlaySoundOnValidate(): boolean; + protected onClick: (e: MouseEvent) => void; + protected onMouseEnter: () => void; + protected mouseEnter(): void; + protected onLeave(): void; + protected onMouseLeave: () => void; + protected mouseLeave(): void; + private onMouseDown; + protected mouseDown(): void; + private onMouseUp; + protected onKeysMode(): void; + private privateOnKeysMode; + protected mouseUp(): void; + private hasSound; + focus(): void; + protected onHover(): void; + private m_inputbarValid; + setInputBarTitle(title: string): void; + private checkInputbar; + getInputBarButtonName(): string; + blur(): void; + get tooltip(): string; + get tooltipFollowsMouse(): boolean; + get tooltipPosition(): [number, number]; + get cuttableTextBoxes(): HTMLElement[]; + needsTooltip(): boolean; + get maxTooltipWidth(): number; + updateTooltip(): void; + get canBeSelected(): boolean; + protected get validateOnReturn(): boolean; + protected onKeyUp(keycode: any): boolean; + protected onKeyDown(keycode: number): boolean; + private keydownRouter; + private keyupRouter; + protected OnNavigationModeChanged: () => void; + protected OnLockButtonChanged: () => void; + protected CanRegisterButton(): boolean; + protected IsActive(): boolean; + set selected(bool: boolean); + get selected(): boolean; + Validate(): void; + protected onValidate(): void; + private findChildButton; + static get observedAttributes(): string[]; + attributeChangedCallback(name: string, oldValue: string, newValue: string): void; +} +declare class UINavigationBlocElement extends ButtonElement { + protected m_insideMode: boolean; + constructor(); + get hasMouseOver(): boolean; + connectedCallback(): void; + disconnectedCallback(): void; + private onMouseMode; + protected onKeysMode(): void; + private onActiveElementChanged; + get canBeSelected(): boolean; + focusByKeys(keycode?: number): void; + focus(): void; + get needInputbar(): boolean; + forceInsideMode(): void; + private m_inputName; + private m_inputbarExit; + private exitInside; + private setInsideMode; + onKeyUp(keycode: any): boolean; + onKeyDown(keycode: any): boolean; + getInputBarButtonName(): string; + getKeyNavigationDirection(): KeyNavigationDirection; + static get observedAttributes(): string[]; + attributeChangedCallback(name: any, oldValue: any, newValue: any): void; + private updateCursorSelectable; +} +declare class ExternalLink extends ButtonElement { + connectedCallback(): void; + get interactive(): boolean; + canBeSelectedWithKeys(): boolean; + onValidate(): void; + getInputBarButtonName(): string; +} +declare class InternalLink extends ButtonElement { + connectedCallback(): void; + getInputBarButtonName(): string; + onValidate(): void; +} diff --git a/src/msfstypes/js/common.d.ts b/src/msfstypes/js/common.d.ts new file mode 100644 index 000000000..ce2438fef --- /dev/null +++ b/src/msfstypes/js/common.d.ts @@ -0,0 +1,1133 @@ +interface CustomElementConstructor { + new(...params: any[]): HTMLElement; +} +declare var bDebugKeyNavigation: boolean; +declare var bDebugKeyNavClearConsole: boolean; +declare var bLiveReload: boolean; +declare var bAutoReloadCSS: boolean; +declare var bDebugListeners: boolean; +declare var bDebugCursor: boolean; +declare var bDebugElementsCreation: boolean; +declare var g_externalVariables: { + minTextSize?: string | number; + colorPreset?: string | number; + backgroundOpacity?: string | number; + showTooltips?: boolean; + instrumentDescriptionTooltipsDelay?: number; + instrumentNameTooltipsDelay?: number; + animationsEnabled?: boolean; + uiScaling?: number; + vrMode?: boolean; + debugMode?: "NONE"; + cursorSize?: number; + navigationMode?: number; + debugScreenReader?: boolean; + useScreenReader?: boolean; +}; +declare namespace ScreenReader { + class SRRuleEvent { + __Type: string; + text: string; + delay: number; + noCut: boolean; + } + export function forceEvent(nodeName: string, event: SRRuleEvent): void; + export function onFocus(elem: UIElement): void; + export function onValidate(elem: UIElement): void; + export function updateStatus(): void; + export function onShow(elem: UIElement): void; + export { }; +} +interface CustomWindow extends Window { + globalVars: { + [s: string]: string | number; + }; +} +declare function GameConfiguration(): string; +declare function DEBUG(): boolean; +declare function RELEASE(): boolean; +declare function MASTER(): boolean; +declare function SUBMISSION(): boolean; +declare enum GAME_CONFIGURATION { + DEBUG = "DEBUG", + RELEASE = "RELEASE", + MASTER = "MASTER", + SUBMISSION = "SUBMISSION" +} +declare const GAME_CONFIGURATION_ORDER: GAME_CONFIGURATION[]; +declare function GamePlatform(): string; +declare function PC(): boolean; +declare function XBOX(): boolean; +declare enum GAME_PLATFORM { + PC = "PC", + XBOX = "XBOX" +} +interface LoggerConfiguration { + [s: string]: keyof typeof GAME_CONFIGURATION | LoggerConfiguration; +} +declare namespace Logger { + function trace(...args: any[]): void; + function log(...args: any[]): void; + function info(...args: any[]): void; + function warn(...args: any[]): void; + function error(...args: any[]): void; +} +declare function GetUIEditionMode(): string; +declare function UI_USE_DATA_FOLDER(): boolean; +declare function EDITION_MODE(): boolean; +declare class ImportTemplateElement extends HTMLElement { + constructor(); + connectedCallback(): void; +} +declare class ImportScriptElement extends HTMLElement { + constructor(); + connectedCallback(): void; +} +declare namespace Include { + class IncludeMgr { + private scriptList; + resourceLoadedCallbacks: Function[]; + loadScriptAsync: boolean; + static AbsolutePath(current: string, relativePath: string): string; + processPath(path: string): string; + addImport(path: string, callback?: any): void; + addImports(path: string[], callback?: any): void; + addScript(path: string, callback?: () => void): void; + private requestScript; + private onScriptLoaded; + isLoadingScript(_pattern: string): boolean; + } + export var g_IncludeMgr: IncludeMgr; + export function addImport(path: string, callback?: any): void; + export function addImports(path: string[], callback?: any): void; + export function addScript(path: string, callback?: () => void): void; + export function isLoadingScript(pattern: string): boolean; + export function absolutePath(current: string, relativePath: string): string; + export function absoluteURL(current: string, relativePath: string): string; + export function setAsyncLoading(_async: boolean): void; + export function onAllResourcesLoaded(): void; + export { }; +} +declare namespace LiveReload { + function reloadCSS(): void; + function startAutoReload(autoRefresh?: boolean): void; +} +declare var Coherent: CoherentEngine; +declare var debugDuplicateRegister: boolean; +declare var debugLocalization: boolean; +declare function cancelAllRequestAnimationFrame(): void; +declare namespace CoherentSetup { + function CheckCoherentEngine(windowElem: Window): void; + function updateScreenSize(): void; +} +declare namespace Utils { + function isRectInRect(inner: ClientRect, outer: ClientRect): boolean; + function dispatchToAllWindows(event: Event): void; + function toArray(array: any): any[]; + function inIframe(): boolean; + function createDiv(...classList: string[]): HTMLDivElement; + function joinPaths(path1: string, path2: string, separatorChar?: string): string; + function getAbsoluteURI(absoluteOrRelativeURI: string, prependForRelativeURI: string): string; + function getVh(percent: number): string; + function getSize(px: number): number; + function getVhNumber(percent: number): number; + function getScreenRatio(): number; + function getVirtualHeight(): any; + function scrollbarVisible(element: HTMLElement): boolean; + function getExternalImageUrl(url: string, prefix?: string): string; + function Modulo(num: number, mod: number): number; + function pad(num: any, size: any): string; + function replace_nth(str: string, find: string, replace: string, index: number): string; + function forceParagraphLines(text: string, n?: number): string; + function dashToCamelCase(myStr: any): any; + function timeLine(str: string): void; + function DisplayTimeToSeconds(str: string): number; + function urlEqual(url1: string, url2: string): boolean; + function RemoveAllChildren(elem: Node): void; + function formatNumber(x: any, _bInteger?: boolean): string; + function formatInteger(x: number): string; + function Clamp(n: number, min: number, max: number): number; + function Loop(n: number, min: number, max: number): number; + function isHidden(el: Element, recurs: boolean): boolean; + function isVisible(elem: HTMLElement): boolean; + function strToBool(str: string): boolean; + function setInputFilter(textbox: HTMLElement, inputFilter: Function): void; + function isNumeric(str: string): boolean; + function isInteger(str: string): boolean; + function SmoothPow(origin: number, destination: number, smoothFactor: number, dTime: number): number; + function SmoothLinear(origin: number, destination: number, smoothFactor: number, dTime: number): number; + function SmoothSin(origin: number, destination: number, smoothFactor: number, dTime: number): number; + function ClearIframe(elem: HTMLElement): void; + function generateGUID(): string; + function containStr(str: string, title: string): boolean; + function getCaretPosition(ctrl: any): number; + function setCaretPosition(ctrl: any, pos: any): void; + function generateRandomName(): string; + function generateLorem(length: number): string; + function filterProfanity(str: string): Promise; + function Translate(key: string): string; + function SetTextVariable(varName: string, value: string): void; + function RemoveTextVariable(varName: string): void; + function SecondsToDisplayDuration(totalSeconds: number, withMinutes: boolean, withSeconds: boolean, doLocalize?: boolean): string; + function SecondsToDisplayTime(totalSeconds: number, withMinutes: boolean, withSeconds: boolean, doLocalize?: boolean): string; + function timeToString(hours: number, minutes: number, seconds: number): string; + function doesFileExist(file: string): boolean; + function loadFile(file: string, callbackSuccess?: (content: string) => void): Promise; + function getMarketItemMediaURL(name: string): string; + function slowDeepClone(object: any): any; + function showTooltip(id: string, tooltip: string, posXRel: number, posYRel: number, maxWidth?: number): void; + function hideTooltip(id: string): void; + function leadingZeros(_value: number, _nbDigits: number, _pointFixed?: number): string; + function decimalDegreesToDMS(decimalDegrees: number, leadingZeros?: number, maxDigits?: number, signed?: boolean): string; + function decimalDegreesToDDM(decimalDegrees: number, leadingZeros?: number, maxDigits?: number, signed?: boolean): string; + function countDecimals(_step: number): number; + function preLoadDeviceIcons(subPath: string, imgNameList: Array): void; +} +declare function SetBackgroundImage(img: string): void; +declare namespace BackgroundSlider { + function SetBackgroundImageSlider(imgs: string[]): void; + function ToggleBackground(toggle: boolean): void; + function JumpSlider(index: number): void; +} +declare function SetBlurredBackgroundRatio(val: number): void; +declare function SetBlurredBackground(bVal: boolean): void; +declare class SoundManager { + static SND_VALID: string; + static SND_OVER: string; + static SND_INVALID: string; + private m_registered; + RegisterSoundButton(elem: HTMLElement, type?: string): () => void; + private canPlaySound; + private OnMouseOverOnElement; + private OnMouseLeaveElement; + private OnMouseDownOnElement; + private OnClickOnElement; + PlaySound(sndNType: string, buttonType?: string): void; +} +declare var g_SoundMgr: SoundManager; +declare function LaunchFlowEvent(eventName: string, ...args: any[]): void; +declare function LaunchFlowEventToGlobalFlow(eventName: string, ...args: any[]): void; +declare function OpenBrowser(url: string): void; +declare function InstanciateTemplate2(selector: string, templatedElement?: HTMLElement): DocumentFragment; +declare function InstanciateTemplate(parent: HTMLElement, selector: string): Element; +declare enum UINavigationMode { + None = -1, + Mouse = 0, + Keys = 1, + PadCursor = 2, + VrController = 3 +} +declare class UINavigation { + static get lockFocus(): boolean; + static set lockFocus(val: boolean); + static get previous(): UIElement; + static get previousRaw(): UIElement; + static set previous(elem: UIElement); + static get current(): UIElement; + static get currentRaw(): UIElement; + private static m_myExclusiveFocusGuid; + private static m_currentExclusiveFocusGuid; + static get myExclusiveFocusGuid(): string; + static set currentExclusiveFocusGuid(guid: string); + static get currentExclusiveFocusGuid(): string; + static get canFocusProximity(): boolean; + static get hasFocus(): boolean; + static askGrabKeys(): void; + static releaseKeys(): void; + static addPadSelectable(elt: ButtonElement): void; + static removePadSelectable(elt: ButtonElement): void; + private static m_padSelectables; + static OnButtonFocus(target: UIElement): void; + static OnButtonBlur(): void; + static forcePadCursorPositionOnDefaultButton(): void; + static forcePadCursorPosition(target: any): void; + static set current(elem: UIElement); + static get MouseMode(): boolean; + static get PadCursorMode(): boolean; + static get VrControllerMode(): boolean; + private static m_navigationMode; + private static set NavigationMode(value); + private static get NavigationMode(); + static switchNativigationMode(mode: UINavigationMode): void; + static leaveCurrentNavigationMode(): void; + static addMouseModeEventListener(callback: () => void): void; + static removeMouseModeEventListener(callback: () => void): void; + static addKeysModeEventListener(callback: () => void): void; + static removeKeysModeEventListener(callback: () => void): void; + static enterVrControllerMode(): void; + static exitVrControllerMode(): void; + static enterCursorMode(mode: number): void; + static exitCursorMode(): void; + private static requestClosest; + static m_mouseDebug: HTMLCanvasElement; + static m_TestPoints: Vec2[]; + static m_currentClosest: ButtonElement; + static isSelectableElement(elt: Element): boolean; + static set currentPadCursorHoverElement(elt: UIElement); + static get currentPadCursorHoverElement(): UIElement; + private static m_currentPadCursorHoverElement; + private static updateCurrentPadCursorHoverElement; + private static m_prevX; + private static m_prevY; + static focusUnderMouse(e: MouseEvent): void; + protected static isSelectionableInHtmlTree(elt: UIElement): boolean; + protected static isSelectionableInHtmlTreeDebug(elt: UIElement): [boolean, string]; + protected static findClosestButtonElement(mx: number, my: number): void; + protected static FilterRectsInsideRadius(array: Array, center: Vec2, sqrRadius: number): ButtonElement[]; + protected static TagPath(elt: Element): string; + protected static DrawDebugLine(ctx: CanvasRenderingContext2D, from: Vec2, to: Vec2, color: string): void; + protected static DrawDebugCircle(ctx: CanvasRenderingContext2D, center: Vec2, radius: number, color: string, isFilled: boolean): void; + protected static clearCurrentClosest(): void; + static clearOnMouseLeaveView(e: MouseEvent): void; + static clearNonFocusedPanel(): void; + static enterMouseMode(): void; + static onKeyDown(e: KeyboardEvent): void; + static onEnableChange(): void; + private static m_pageVisible; + static setPageVisible(val: boolean): void; + static isPageVisible(): boolean; + static get KeysMode(): boolean; + static findFocusedUIElement(root: Element): UIElement | void; + static findDefaultUIElement(root: Element, startFromLast?: boolean): UIElement | void; + static findSelectedUIElement(root: Element): UIElement | void; + static findDefaultChildUIElement(root: Element, startFromLast?: boolean): UIElement | void; + static findSelectedParentUIElement(root: Element): UIElement | void; + static findTabIndexUIElement(root: Element): UIElement | void; + static findFocusableUIElement(uiElem: UIElement, startFromLast?: boolean): UIElement | void; + static getDefaultButton(root?: Element): UIElement | void; + static canNavigate(): boolean; + static onShow(): void; + static onHide(): void; + static disableKeyNavigation(): void; + static onKeyDownOnRoot(keycode: number): void; + static enterKeysMode(): boolean; +} +declare enum KeyNavigationDirection { + KeyNavigation_None = 0, + KeyNavigation_Horizontal = 1, + KeyNavigation_Vertical = 2, + KeyNavigation_Grid = 3 +} +interface GridPosition { + row: string; + col: string; + rowEnd: string; + colEnd: string; +} +declare class UIElement extends HTMLElement { + private m_DummyUIElement; + static getUIElement(elem: HTMLElement): UIElement; + constructor(); + disconnectedCallback(): void; + canUseScreenReader(): boolean; + get childActiveClass(): string; + shouldDispatchChildActive(): boolean; + private m_canEnterKeysMode; + get canEnterKeysMode(): boolean; + set canEnterKeysMode(val: boolean); + onActiveChildBlurred(child: UIElement): void; + onActiveChildFocused(child: UIElement): void; + private onDefaultKeyDown; + private onDefaultKeyUp; + registerDefaultKeyEvents(): void; + private get _localgridColumn(); + private get _localgridColumnEnd(); + private get _localgridRow(); + private get _localgridRowEnd(); + private m_localGrid; + get localGrid(): GridPosition; + get localgridColumn(): string; + get localgridColumnEnd(): string; + get localgridRow(): string; + get localgridRowEnd(): string; + set localgridColumn(value: string); + private m_globalGridColumn; + private m_globalGridColumnEnd; + private m_globalGridRow; + private m_globalGridRowEnd; + get globalGridColumn(): string[]; + get globalGridColumnEnd(): string[]; + get globalGridRow(): string[]; + get globalGridRowEnd(): string[]; + unregisterDefaultKeyEvents(): void; + spreadToChildren(parent: Element, parentClass: string, childClass: string): void; + unspreadToChildren(parent: Element, parentClass: string, childClass: string): void; + setVisible(val: boolean): void; + isVisible(): boolean; + onVisibilityChange(visible: boolean): void; + get enabled(): boolean; + enable(bool: boolean): void; + disable(bool: boolean): void; + set disabled(bool: boolean); + isOneParentHidden(): boolean; + isOneParentDisabled(): boolean; + get disabled(): boolean; + canBeSelectedDisabled(): boolean; + canBeSelectedLocked(): boolean; + canBeSelectedWithKeys(): boolean; + get forceNoKeyNavigation(): boolean; + get canBeSelected(): boolean; + get locked(): boolean; + set locked(val: boolean); + get loading(): boolean; + set loading(val: boolean); + get loadingText(): string; + set loadingText(val: string); + connectedCallback(): void; + protected requestPadFilterRectInfo: () => void; + protected applyDataInputGroup(): void; + isTransparent(): boolean; + static get observedAttributes(): string[]; + attributeChangedCallback(name: any, oldValue: any, newValue: any): void; + static getRenderSize?(data: any, direction: ScrollDirection): number; + isParentOf(child: HTMLElement): boolean; + isChildOf(parentToTest: HTMLElement): boolean; + hasParentHidden(): boolean; + focus(): void; + get focused(): boolean; + queryElement(selector: any): UIElement; + setJSONData(data: string): void; + setAnyData(data: any): void; + getKeyNavigationDirection(): KeyNavigationDirection; + getAllFocusableChildren(): HTMLElement[]; + getKeyNavigationStayInside(keycode: any): boolean; + getKeyOrthogonalStayInside(keycode: any): boolean; + selectDefaultButton(): void; + selectDefaultChildButton(): void; + getDefaultButton(): UIElement | void; + private _getDefaultChildButton; + getLastDefaultChildButton(): UIElement | void; + getDefaultChildButton(): UIElement | void; + virtualScrollIntoView(elt?: HTMLElement): void; + sendSizeUpdate: () => void; + protected onButtonSelected(button: UIElement): void; + protected onButtonUnselected(button: UIElement): void; + protected onKeyUp(keycode: any): boolean; + private previousButton; + protected onKeyDown(keycode: any): boolean; + get autoInside(): boolean; + focusByKeys(keycode?: number): void; +} +declare let g_checkComponentsTimeout: number; +declare function IsTemplateElement(elem: UIElement): boolean; +declare class TemplateElement extends UIElement { + created: boolean; + constructor(); + get templateID(): string; + mustCheckCSSIsApplied(): boolean; + onCSSApplied: Promise; + protected Instanciate(_forcedTemplate?: string): any; + querySelectorH(str: any): HTMLElement; + getTemplateSlot(name?: string): HTMLElement; + appendContent(element: HTMLElement): void; + static copyAttributes(from: HTMLElement, to: HTMLElement): void; + protected onResourceLoaded: (e: CustomEvent) => void; + protected convertPath(path: string): string; + disconnectedCallback(): void; + isTransparent(): boolean; + private m_cssAppliedCheckImg; + connectedCallback(): void; + protected instantciatePopupToolbar: () => void; + callbackCreated: () => void; +} +interface ConfigurableElement extends TemplateElement { + SetData(data: any): any; + PatchData?(data: any): any; + relyOnRealHeight?: boolean; +} +declare namespace TemplateElement { + function call(obj: TemplateElement, fnc: Function, ...args: any[]): void; + function callNoBinding(obj: TemplateElement, callback: () => void): void; +} +declare class UIMarquee extends UIElement { + static get observedAttributes(): string[]; + private m_animation; + private m_savedContentWidth; + private m_savedOffsetWidth; + connectedCallback(): void; + disconnectedCallback(): void; + needsTooltip(): boolean; + needsEllipsis(): boolean; + private updateScrollBehaviour; + onVisibilityChange(visible: boolean): void; + get noSizeCheck(): boolean; + get manual(): boolean; + set manual(bool: boolean); + updateScrollAnimation: () => void; + updateSavedSizes: () => void; + setText: (text: string, translate?: boolean) => void; + setContent: (value: string, translate?: boolean) => void; + startScrollAnimation: () => void; + stopScrollAnimation: () => void; + private scrollAnimation; + attributeChangedCallback(name: string, oldValue: string, newValue: string): void; +} +declare class LabelizeElement extends UIElement { + static get observedAttributes(): string[]; + get key(): string; + set key(value: string); + connectedCallback(): void; + private updateText; + attributeChangedCallback(name: string, oldValue: string, newValue: string): void; +} +declare class UIImageElement extends TemplateElement { + private m_src; + private m_mainElem; + private m_imageElement; + private m_mainContentElement; + private m_backBufferElement; + private m_backBuffer; + private m_timeout; + private m_transitionTime; + private get transition(); + constructor(); + get noBackElement(): boolean; + SetData(data: any): void; + LoadContentURL(srcImage: string, urlContent: string, contentTag: string, contentData: any): void; + clear(): void; + set src(_src: string); + get src(): string; + get transitionTime(): number; + set transitionTime(n: number); + connectedCallback(): void; + private onImageLoaded; + private onImageError; + private updateBackground; +} +declare namespace ViewListener { + class ViewListener { + private m_name; + urlCaller: string; + m_onConnected: any; + connected: boolean; + private m_handlers; + constructor(name: string); + private CheckCoherentEvent; + private onGlobalEvent; + unregister: () => void; + off(name: any, callback: any, context?: any): void; + on(name: any, callback: any, context?: any): void; + call(name: any, ...args: any[]): Promise; + trigger(name: any, ...args: any[]): void; + triggerToAllSubscribers(event: string, ...args: any[]): void; + private onEventToAllSubscribers; + } + class ViewListenerMgr { + private m_hash; + constructor(); + private OnListenerRegistered; + onRegister(name: string, vl: ViewListener): void; + getListenerByName(name: string): ViewListener; + onUnregister(name: string, vl: ViewListener, force?: boolean): void; + } + var g_ViewListenersMgr: ViewListenerMgr; +} +declare function RegisterViewListenerT(name: string, callback: () => void, type: { + new(name: string): T; +}, requiresSingleton?: boolean): T; +declare function RegisterViewListener(name: string, callback?: any, requiresSingleton?: boolean): ViewListener.ViewListener; +declare class Name_Z { + refresh(): any; + idLow: number; + idHigh: number; + originalStr: string; + str: string; + __Type: string; + static isValid(a: Name_Z): boolean; + static compare(a: Name_Z, b: Name_Z): boolean; + static compareStr(a: Name_Z, b: string): boolean; + private RequestNameZ; + constructor(str: string, eventHandler?: any); +} +declare function checkAutoload(forcedUrl?: string): void; +declare function EaseInOutQuad(t: any, b: any, c: any, d: any): any; +declare function ScrollHTo(element: any, to: any, duration: any): void; +declare function ScrollVTo(element: any, to: any, duration: any): void; +declare function GetViewUrl(): string; +declare enum EResizeType { + NONE = 0, + X = 1, + Y = 2, + BOTH = 3, + RATIO = 4, + COUNT = 5 +} +interface ResizableHTMLElement extends HTMLElement { + _minWidth?: number; + _minHeight?: number; +} +declare class ResizeHandler { + private element; + private _resizeStartCallbacks; + private _resizeUpdateCallbacks; + private _resizeEndCallbacks; + private _type; + private _resizeHandleSize; + private _startX; + private _startY; + private _currentHandle; + private _startClientRect; + private _startRight; + private resizing; + private _handleByGame; + setResizeType(direction: string): void; + constructor(element: ResizableHTMLElement, handleByGame?: boolean); + private initResizeX; + private removeResize; + private initResizeY; + private handleMouseOut; + private initResizeXY; + private startResize; + private resizeUpdate; + private updateResizeX; + private updateResizeY; + private resizeEnd; + OnResizeStart(callback: (data: any) => void): void; + OnResizeUpdate(callback: (data: any) => void): void; + OnResizeEnd(callback: (data: any) => void): void; + RemoveHandlers(): void; +} +interface DragDropOptions { + dragElement?: HTMLElement; + saving?: boolean; + container?: HTMLElement; + boundByWidth?: boolean; + boundByHeight?: boolean; + handleByGame?: boolean; +} +declare class DragDropHandler { + private element; + private dragElement; + private _initialX; + private _initialY; + private _initialMouseX; + private _initialMouseY; + private _deltaX; + private _deltaY; + private _maxLeft; + private _maxTop; + private _bodyRect; + canBeDragged: boolean; + private _dragStartCallbacks; + private _dragUpdateCallbacks; + private _dragEndCallbacks; + private _body; + private _options; + constructor(element: HTMLElement, options?: DragDropOptions); + release(): void; + private getSizes; + private onResize; + private checkCanDrag; + private leaveDrag; + private startDrag; + private dragUpdate; + private dragEnd; + OnDragStart(callback: (data: any) => void): void; + OnDragUpdate(callback: (data: any) => void): void; + OnDragEnd(callback: (data: any) => void): void; + isDragging(): boolean; +} +declare function saveElementPosition(element: HTMLElement): void; +declare function eraseElementPosition(id: string): void; +declare function setElementWidth(element: HTMLElement): void; +declare function setElementPosition(element: HTMLElement): void; +declare function OnInputFieldFocus(e: FocusEvent): void; +declare function OnInputFieldUnfocus(e: FocusEvent): void; +declare function LogCallstack(message: string): void; +declare var bDebugLoading: boolean; +declare class SmartLoader { + private _resourcesLoaded; + private _resourcesToLoad; + private _htmlPath; + private convertPath; + constructor(); + addResource(path: string): void; + private m_documentLoaded; + onDocumentLoaded: () => void; + private m_timeoutCheckLoaded; + onResourceLoaded: (e: CustomEvent) => void; + private m_OnViewLoadedSend; + checkLoaded: () => void; + private onInputRemoved; + OnNodeRemoved: (e: Event) => void; +} +declare var loader: SmartLoader; +declare class DebugMgr { + private m_defaultPosRight; + private m_defaultPosTop; + private m_debugPanel; + private m_ConsoleCallback; + private m_consoleElem; + private dragDropHandler; + private CreateDebugPanel; + setDefaultPos(right: number, top: number): void; + AddDebugButton(text: string, callback: any, autoStart?: boolean): void; + private UpdateConsole; + private m_defaultLog; + private m_defaultWarn; + private m_defaultError; + AddConsole(callback: any, force?: boolean): void; + private log; + private warn; + private error; + private logConsole; +} +declare var g_debugMgr: DebugMgr; +declare enum MouseCursor { + DRAG = 0, + RESIZE_H = 1, + RESIZE_V = 2, + RESIZE_HV = 3 +} +declare namespace Cursor { + function setCursor(_Cursor: MouseCursor): void; + function unsetCursor(): void; +} +declare class DataValue { + ID: number; + icon: string; + name: string; + valueStr: string; + value: number; + unit: string; + quality: number; + type: string; + html: string; + userTag: number; + constructor(data?: any); + static set(name: string, value: number, unit: string, valueStr?: string, icon?: string): DataValue; + static fromValueWithUnit(value: number, unit: string, valueStr?: string): DataValue; + static fromValue(name: string, value: number, valueStr: string): DataValue; + static compare(arg0: DataValue, arg1: DataValue): boolean; +} +declare class TreeDataValue extends DataValue { + children: DataValue[]; + static compare(arg0: DataValue, arg1: DataValue): boolean; +} +declare class RangeDataValue extends DataValue { + min: number; + max: number; + clamp_min: number; + clamp_max: number; + step: number; + percent: number; +} +declare class DataTable { + header: string[]; + rows: string[][]; +} +declare class TableDataValue { + headers: DataValue[]; + values: DataValue[][]; +} +interface IVec2 { + x: number; + y: number; +} +declare class Vec2 implements IVec2 { + x: number; + y: number; + constructor(_x?: number, _y?: number); + static FromRect(rect: ClientRect): Vec2; + static Delta(vec1: IVec2, vec2: IVec2): Vec2; + Set(x: number, y: number): void; + VectorTo(other: IVec2): Vec2; + Add(x: number, y: number, z: number): Vec2; + Substract(x: number, y: number, z: number): Vec2; + AddVec(other: IVec2): Vec2; + SubstractVec(other: IVec2): Vec2; + toCurvePointString(): string; + Dot(other: IVec2): number; + GetNorm(): number; + Normalize(): void; + SetNorm(n: number): void; + SqrDistance(other: IVec2): number; + RectSqrDistance(rect: ClientRect): number; + Distance(other: IVec2): number; + IsInside(rect: ClientRect): boolean; + Equals(other: IVec2): boolean; +} +interface IVec3 { + x: number; + y: number; + z: number; +} +declare class Vec3 { + x: number; + y: number; + z: number; + constructor(x?: number, y?: number, z?: number); + toString(): string; + static Delta(vec1: IVec3, vec2: IVec3): Vec3; + Set(x: number, y: number, z: number): void; + VectorTo(other: IVec3): Vec3; + Add(x: number, y: number, z: number): Vec3; + Substract(x: number, y: number, z: number): Vec3; + AddVec(other: IVec3): Vec3; + SubstractVec(other: IVec3): Vec3; + toCurvePointString(): string; + Dot(other: IVec3): number; + GetNorm(): number; + Normalize(): void; + SetNorm(n: number): void; + SqrDistance(other: IVec3): number; + Distance(other: IVec3): number; + Equals(other: IVec3): boolean; +} +declare class IconTextElement extends UIElement { + constructor(); + get basePath(): string; + get subPath(): string; + get imageName(): string; + get altText(): string; + static CLASS_NAME: string; + get observedAttributes(): any[]; + connectedCallback(): void; + protected updateIcon(): void; + displayAltText(icon: HTMLElement, altText: string): void; +} +declare class DeviceButtonElement extends IconTextElement { + constructor(); + get basePath(): string; + get subPath(): string; + get imageName(): string; + get altText(): string; + get observedAttributes(): any[]; + setData(subPath: string, imageName: string, altText: string): void; + attributeChangedCallback(name: any, oldValue: any, newValue: any): void; +} +declare class AtlasItemInfos { + elem: UIElement; + rect: DOMRect | ClientRect; + needToSendRegisteredRectOnly: boolean; +} +declare class AltasElementsMgr { + private m_elements; + constructor(); + private sendItemCB; + private SendItem; + RemoveAtlasElement(elem: HTMLElement): void; + AddAtlasElement(elem: UIElement): void; + InvalidateAtlasElement(elem: Element): void; + RequestSendRegirsteredRectOnNextAdd(elem: UIElement): void; + RebuildAtlasElements: () => void; +} +declare var g_AtlasMgr: AltasElementsMgr; +declare namespace InputBar { + const MENU_BUTTON_A: string; + const MENU_BUTTON_B: string; + const MENU_BUTTON_X: string; + const MENU_BUTTON_Y: string; + const MENU_BUTTON_START: string; + const MENU_BUTTON_SELECT: string; + const MENU_BUTTON_OPEN: string; + const MENU_BUTTON_RESET: string; + const MENU_BUTTON_APPLY: string; + const MENU_BUTTON_PRESET_MANAGER = "MENU_PRESET_MANAGER"; + const MENU_BUTTON_PROFILE_MANAGER = "MENU_PROFILE_MANAGER"; + const MENU_BUTTON_CONTENT_MANAGER = "MENU_CONTENT_MANAGER"; + const MENU_BUTTON_QUIT: string; + const MENU_BUTTON_CLOSE: string; + const MENU_BUTTON_BACK: string; + const MENU_BUTTON_WM_FILTERS: string; + const MENU_BUTTON_WM_LEGEND: string; + const MENU_BUTTON_CUSTOMIZE: string; + const MENU_BUTTON_FLY: string; + const MENU_BUTTON_FAVORITE: string; + const MENU_BUTTON_TAB_LEFT: string; + const MENU_BUTTON_TAB_RIGHT: string; + const MENU_BUTTON_RANALOG_X: string; + const MENU_BUTTON_RANALOG_Y: string; + const MENU_BUTTON_RANALOG_XY: string; + interface InputBarContainer { + getButtons(): InputBarButtonParams[]; + } + function isContainer(elem: any): boolean; + class InputBarButtonParams { + __Type: string; + constructor(id: string, _text: string, _inputActionName: string, _event: string, _inputActionContext?: string, _alsoToGlobalFlow?: boolean, _disabled?: boolean); + m_coherentHandle: EventHandle; + release(): void; + static setCallback(id: string, _text: string, _inputActionName: string, callback: any, _inputActionContext?: string, _alsoToGlobalFlow?: boolean, _disabled?: boolean): InputBarButtonParams; + id: string; + inputActionName: string; + inputContextName: string; + enabled: boolean; + pressed: boolean; + text: string; + inputText: string; + inputName: string; + eventToView: string; + alsoToGlobalFlow: boolean; + themes: string[]; + } + class InputBarParams { + __Type: string; + buttons: InputBarButtonParams[]; + description: string; + release(): void; + } + function setInputBar(id: string, params: InputBarParams): void; + function addInputBar(id: string, parentId: string, params: InputBarParams): void; + function clearInputBar(id: string): void; +} +declare type NotificationButtonThemes = "warning" | "secondary" | ""; +declare class NotificationButton { + __Type: string; + title: string; + event: string; + theme: NotificationButtonThemes; + toGlobalFlow: boolean; + close: boolean; + enabled: boolean; + constructor(_title?: string, _event?: string, _close?: boolean, _theme?: NotificationButtonThemes, _toGlobalFlow?: boolean); +} +declare function isWindowEnabled(): boolean; +declare function setWindowEnabled(val: boolean): void; +declare namespace PopUp { + function isBlockedByPopUp(): boolean; + type PopUpStyle = "small" | "normal" | "big" | "sensitivity" | "big-help"; + class NotiticationParams { + __Type: string; + title: string; + description: string; + contentUrl: string; + contentTemplate: string; + contentData: string; + buttons: NotificationButton[]; + closePopupTitle: string; + style: PopUpStyle; + displayGlobalPopup: boolean; + } + function showPopUp(params: NotiticationParams): void; +} +declare class ComponentRegister { + tagname: string; + import: string; + imported: boolean; + addImport(): void; +} +declare class ComponentMgr { + private m_registered; + constructor(); + private onNodeInserted; + checkAllComponents(): void; + registerComponent(tag: string, includePath: string): void; +} +declare let g_ComponentMgr: ComponentMgr; +declare function updateGlobalVar(key: string, value: string | number | boolean): void; +declare const sizeVariables: string[]; +declare function updateMinimalTextSize(size: number): void; +declare let currentDebugMode: any; +declare function updateDebugMode(value: string): void; +declare function updateUiScaling(scale: number): void; +declare function updateShowTooltip(show: boolean): void; +declare function updateExclusiveFocusGuid(focusGuid: string): void; +declare var g_tipMgr: TipsMgr; +declare class TipsMgr { + private tipsMap; + static create(): void; + CreateTips(_elem: UIElement, _strId: string, _strTipDesc: string): void; + CreateChoiceTips(_elem: UIElement, _strId: string, _daChoiceDescs: string[], _default: number): void; + displayTip(tipId: string, forcedTipsContainer?: VirtualScrollElement, bDisplayChangePrivilege?: boolean): void; +} +declare enum COLOR_PRESETS { + DEFAULT = "--color-cyan/--color-yellow", + HIGH_CONTRAST = "#1900FF/#F0C808", + PROTANOPIA = "#5a81df/#e4ca14", + PROTANOPIA_HIGH_CONTRAST = "#0011FF/#FFDF00", + DEUTERANOPIA = "#2f86e5/#ffbf32", + DEUTERANOPIA_HIGH_CONTRAST = "#002ECD/#ffce83", + TRITANOPIA = "#d53031/#00929c", + TRITANOPIA_HIGH_CONTRAST = "#fd1700/#00edff" +} +declare function updateColorPreset(preset: keyof typeof COLOR_PRESETS): void; +declare function updateBackgroundOpacity(opacity: number): void; +declare function updateAnimationsEnabled(enabled: boolean): void; +declare var _optiPow10: any[]; +declare function fastPow10(_frac: any): any; +declare function fastToFixed(_val: any, _fraction: any): any; +declare function prepareForSetText(_element: Element): Text; +declare function setText(_node: Text, _text: string): void; +declare function diffAndSetText(_element: Element, _newValue: string): void; +declare function diffAndSetHTML(_element: HTMLElement | SVGElement, _newValue: string): void; +declare function diffAndSetAttribute(_element: Element, _attribute: string, _newValue: string): void; +declare enum StyleProperty { + display = 0, + color = 1, + opacity = 2, + backgroundColor = 3, + transform = 4, + textAlign = 5, + fontSize = 6, + letterSpacing = 7, + pointerEvents = 8, + visibility = 9, + border = 10 +} +declare function diffAndSetStyle(_element: HTMLElement | SVGElement, _property: StyleProperty, _newValue: string): void; +declare namespace KeyCode { + const KEY_CANCEL = 3; + const KEY_HELP = 6; + const KEY_BACK_SPACE = 8; + const KEY_TAB = 9; + const KEY_CLEAR = 12; + const KEY_RETURN = 13; + const KEY_ENTER = 13; + const KEY_SHIFT = 16; + const KEY_CONTROL = 17; + const KEY_ALT = 18; + const KEY_PAUSE = 19; + const KEY_CAPS_LOCK = 20; + const KEY_ESCAPE = 27; + const KEY_SPACE = 32; + const KEY_PAGE_UP = 33; + const KEY_PAGE_DOWN = 34; + const KEY_END = 35; + const KEY_HOME = 36; + const KEY_LEFT = 37; + const KEY_UP = 38; + const KEY_RIGHT = 39; + const KEY_DOWN = 40; + const KEY_PRINTSCREEN = 44; + const KEY_INSERT = 45; + const KEY_DELETE = 46; + const KEY_0 = 48; + const KEY_1 = 49; + const KEY_2 = 50; + const KEY_3 = 51; + const KEY_4 = 52; + const KEY_5 = 53; + const KEY_6 = 54; + const KEY_7 = 55; + const KEY_8 = 56; + const KEY_9 = 57; + const KEY_SEMICOLON = 59; + const KEY_EQUALS = 61; + const KEY_A = 65; + const KEY_B = 66; + const KEY_C = 67; + const KEY_D = 68; + const KEY_E = 69; + const KEY_F = 70; + const KEY_G = 71; + const KEY_H = 72; + const KEY_I = 73; + const KEY_J = 74; + const KEY_K = 75; + const KEY_L = 76; + const KEY_M = 77; + const KEY_N = 78; + const KEY_O = 79; + const KEY_P = 80; + const KEY_Q = 81; + const KEY_R = 82; + const KEY_S = 83; + const KEY_T = 84; + const KEY_U = 85; + const KEY_V = 86; + const KEY_W = 87; + const KEY_X = 88; + const KEY_Y = 89; + const KEY_Z = 90; + const KEY_LEFT_CMD = 91; + const KEY_RIGHT_CMD = 93; + const KEY_CONTEXT_MENU = 93; + const KEY_NUMPAD0 = 96; + const KEY_NUMPAD1 = 97; + const KEY_NUMPAD2 = 98; + const KEY_NUMPAD3 = 99; + const KEY_NUMPAD4 = 100; + const KEY_NUMPAD5 = 101; + const KEY_NUMPAD6 = 102; + const KEY_NUMPAD7 = 103; + const KEY_NUMPAD8 = 104; + const KEY_NUMPAD9 = 105; + const KEY_MULTIPLY = 106; + const KEY_ADD = 107; + const KEY_SEPARATOR = 108; + const KEY_SUBTRACT = 109; + const KEY_DECIMAL = 110; + const KEY_DIVIDE = 111; + const KEY_F1 = 112; + const KEY_F2 = 113; + const KEY_F3 = 114; + const KEY_F4 = 115; + const KEY_F5 = 116; + const KEY_F6 = 117; + const KEY_F7 = 118; + const KEY_F8 = 119; + const KEY_F9 = 120; + const KEY_F10 = 121; + const KEY_F11 = 122; + const KEY_F12 = 123; + const KEY_F13 = 124; + const KEY_F14 = 125; + const KEY_F15 = 126; + const KEY_F16 = 127; + const KEY_F17 = 128; + const KEY_F18 = 129; + const KEY_F19 = 130; + const KEY_F20 = 131; + const KEY_F21 = 132; + const KEY_F22 = 133; + const KEY_F23 = 134; + const KEY_F24 = 135; + const KEY_NUM_LOCK = 144; + const KEY_SCROLL_LOCK = 145; + const KEY_COMMA = 188; + const KEY_SUBTRACT_TOP = 189; + const KEY_PERIOD = 190; + const KEY_SLASH = 191; + const KEY_BACK_QUOTE = 192; + const KEY_OPEN_BRACKET = 219; + const KEY_BACK_SLASH = 220; + const KEY_CLOSE_BRACKET = 221; + const KEY_QUOTE = 222; + const KEY_META = 224; +} +interface ISvgMapParams { + configPath?: string; + svgElementId?: string; + svgElement?: Element; +} +declare abstract class ISvgMapRootElement extends TemplateElement { + abstract getWidth(): any; + abstract getHeight(): any; + abstract onBeforeMapRedraw(): any; +} +declare class EmptyCallback { + static Void: () => void; + static Boolean: (result: boolean) => void; +} +declare class IconCacheMgr { + private m_cache; + private m_loading; + private m_loadingCallbacks; + loadURL(url: string, callback: any): void; + addCachedAsString(url: string, content: string | null): void; + getCached(url: string): string | null | undefined; +} +declare function getIconCacheMgr(): IconCacheMgr; +declare class IconElement extends UIElement { + static get observedAttributes(): string[]; + protected template: HTMLElement; + protected svgAsString: string; + protected iconsPath: string; + protected image: HTMLImageElement; + protected imagePaths: Array; + constructor(); + connectedCallback(): void; + set iconUrl(src: string); + get iconUrl(): string; + private refreshDataUrl; + private htmlToElement; + private onIconLoaded; + private getSvg; + private createContent; + private updateAspectOverride; + attributeChangedCallback(name: any, oldValue: any, newValue: any): void; + private setImage; + private imageFound; + private imageNotFound; +} diff --git a/src/msfstypes/js/datastorage.d.ts b/src/msfstypes/js/datastorage.d.ts new file mode 100644 index 000000000..33aadd204 --- /dev/null +++ b/src/msfstypes/js/datastorage.d.ts @@ -0,0 +1,7 @@ +declare function OnDataStorageReady(): void; +declare var datastorage: any; +declare function GetDataStorage(): any; +declare function GetStoredData(_key: any): any; +declare function SearchStoredData(_key: any): any; +declare function SetStoredData(_key: any, _data: any): any; +declare function DeleteStoredData(_key: any): any; diff --git a/src/msfstypes/js/datavalidator.d.ts b/src/msfstypes/js/datavalidator.d.ts new file mode 100644 index 000000000..62f84e194 --- /dev/null +++ b/src/msfstypes/js/datavalidator.d.ts @@ -0,0 +1,15 @@ +declare namespace DataValidator { + interface ObjectValidator { + _name: string; + properties: { + [key: string]: { + type: string; + mandatory?: boolean; + values?: string; + }; + }; + } + function registerValidator(validator: ObjectValidator): void; + function checkChildIntegrity(childObject: any, validatorType: string): boolean; + function checkDataIntegrity(data: any, mainValidator: ObjectValidator, ...additionalValidators: ObjectValidator[]): boolean; +} diff --git a/src/msfstypes/js/flight.d.ts b/src/msfstypes/js/flight.d.ts new file mode 100644 index 000000000..2ae2e5c39 --- /dev/null +++ b/src/msfstypes/js/flight.d.ts @@ -0,0 +1,298 @@ +declare enum LocationType { + Departure = 0, + Arrival = 1, + Free = 2 +} +declare class AirportInfos { + runways: DataValue[]; + taxis: DataValue[]; + frequencies: DataValue[]; + departures: DataValue[]; + arrivals: DataValue[]; + approaches: DataValue[]; + runwaySelected: number; +} +declare class WaypointInfos { + waypointType: string; + frequency: DataValue; +} +declare class POIInfos { + POIType: string; + creator: string; +} +declare class NPCPlaneInfo { + infos: DataValue[]; + ID: string; + from: WorldLocation; + to: WorldLocation; + percent: number; + server: ServerInfoData; +} +declare class WorldLocation { + type: string; + wlType: number; + name: string; + city: string; + country: string; + icon: string; + icao: string; + lla: LatLongAlt; + altitude: DataValue; + latDMS: string; + longDMS: string; + image: string; + waypointInfos: WaypointInfos; + poiInfos: POIInfos; + weather: WeatherData; + airportInfos: AirportInfos; + npcInfos: NPCPlaneInfo; + toString(): string; + constructor(data?: any); + static getDebugValue(): WorldLocation; +} +declare class WeatherData { + index: number; + name: string; + icon: string; + pressure: number; + weatherImage: string; + weatherImageLayered: string; + live: boolean; + wind: string; + visibility: string; + locked: boolean; + static isEqual(a: WeatherData, b: WeatherData): boolean; + static getDebugValue(): WeatherData; +} +declare class TimeData { + timeImage: string; + live: boolean; + year: number; + month: number; + dayInMonth: number; + dateShort: string; + dateLong: string; + yearLocal: number; + monthLocal: number; + dayInMonthLocal: number; + dateShortLocal: string; + dateLongLocal: string; + timeLocal: RangeDataValue; + timeUTC: RangeDataValue; + dateLocal: RangeDataValue; + dateUTC: RangeDataValue; + static getDebugValue(): TimeData; +} +declare class ATC_FLIGHTPLAN_TYPE { + __Type: string; + FLIGHTPLAN_TYPE_NONE: number; + FLIGHTPLAN_TYPE_IFR: number; + FLIGHTPLAN_TYPE_VFR: number; + value: number; + constructor(value?: number); + static getName(obj: ATC_FLIGHTPLAN_TYPE): string; +} +declare class ATC_ROUTE_TYPE { + __Type: string; + ROUTE_TYPE_DIRECT: number; + ROUTE_TYPE_VOR: number; + ROUTE_TYPE_LOWALT: number; + ROUTE_TYPE_HIGHALT: number; + ROUTE_TYPE_UNAVAILABLE: number; + value: number; + available: boolean; + constructor(value?: number); + static getName(obj: ATC_ROUTE_TYPE): string; +} +declare class RouteAlgorithmChoice { + __Type: string; + flightPlanType: ATC_FLIGHTPLAN_TYPE; + routeTypes: ATC_ROUTE_TYPE[]; +} +declare enum FlightLegStateEnum { + LEG_NOT_STARTED = 0, + LEG_STARTED = 1, + LEG_FINISHED = 2 +} +declare class FlightLegInfo { + index: number; + distance: DataValue; + ete: DataValue; + state: FlightLegStateEnum; + from: WorldLocation; + to: WorldLocation; + strFrom: string; + strTo: string; + strImageFrom: string; + strImageTo: string; + weather: WeatherData; +} +declare type FlightConditionID = "MULTIPLAYERLIVE" | "MULTIPLAYERALL" | "MULTIPLAYEROFF" | "AIRTRAFFICLIVE" | "AIRTRAFFICAI" | "AIRTRAFFICOFF" | "WEATHERLIVE" | "WEATHERPRESET" | "WEATHERCUSTOM"; +interface FlightConfigurationButton { + id: FlightConditionID; + selected: boolean; + disabled: boolean; +} +interface FlightConditions { + multiplayer: FlightConfigurationButton[]; + airtraffic: FlightConfigurationButton[]; + weather: FlightConfigurationButton[]; + multiplayerDisabledReason: string; + multiplayerDisabledShowButtons: boolean; +} +declare class Flight { + canBeEdited: boolean; + canWeatherBeLive: boolean; + weatherCanBeEdited: boolean; + flightConditionsCanBeEdited: boolean; + timeCanBeEdited: boolean; + canLaunchFlight: boolean; + departure: WorldLocation; + departurePlateIndex: number; + departureRunwayIndex: number; + departureTaxiIndex: number; + arrival: WorldLocation; + approachIndex: number; + arrivalPlateIndex: number; + arrivalRunwayIndex: number; + arrivalTaxiIndex: number; + aircraftData: AircraftData; + weatherData: WeatherData; + timeData: TimeData; + flightName: string; + activityType: string; + activityTypeID: string; + activityTypeStringID: any; + string: any; + briefingText: string; + descriptionText: string; + briefingImages: string[]; + briefingImagesOverlay: string[]; + briefingHTMLUrl: string; + activityInfos: DataValue[]; + widgetImage: string; + aircraftCanBeEdited: boolean; + algorithms: RouteAlgorithmChoice[]; + flightPlanType: number; + routeType: number; + hasLeaderboards: boolean; + canBeResumed: boolean; + hasLegs: boolean; + currentLeg: number; + legsInfos: FlightLegInfo[]; + departureTime: string; + timeToComplete: string; + aircraftName: string; + aircraftImage: string; + aircraftPayload: string; + aircraftFuel: string; + timeElapsed: string; + timeRemaining: string; + distanceFlown: string; + distanceToGo: string; + stepsCount: number; + currentStep: number; + currentStepName: string; + nextWaypoints: Array; + constructor(data?: any); +} +declare class WorldMapListener extends ViewListener.ViewListener { + onWorldmapSelectionChange(callback: (location: WorldLocation) => void): void; + selectRunway(index: number): void; + selectWaypointByIndex(index: number): void; + onWorldMapScaleChanged(callback: (scale: DataValue) => void): void; + onWorldMapFilterChange(callback: (str: string) => void): void; + getWorldMapFilters(): Promise; + getSelectedFilter(): Promise; + getWorldMapLegend(): Promise; + onPanelOpened(): void; + onPanelClosed(): void; +} +declare class GameFlightListener extends ViewListener.ViewListener { + constructor(name: string); + onGameFlightUpdated(callback: (flight: Flight) => void): void; + onWeatherAndTimeUpdated(callback: (flight: Flight) => void): void; + onShowFlightPlan(callback: () => void): void; + onLeaderbaordUpdated(callback: (flight: Flight, data: LeaderBoards) => void): void; + onEnterActivityMode(callback: (flight: Flight) => void): void; + onExitActivityMode(callback: (flight: Flight) => void): void; + resetGameFlight(): void; + setSelectionAsDeparture(): void; + resetDeparture(): void; + onGameFlightReseted(callback: () => void): void; + setDepartureRunwayIndex(index: number): void; + setDepartureTaxiIndex(index: number): void; + setDeparturePlateIndex(index: number): void; + setArrivalRunwayIndex(index: number): void; + setArrivalTaxiIndex(index: number): void; + setArrivalPlateIndex(index: number): void; + setApproachIndex(index: number): void; + setAlgorithmType(fpType: ATC_FLIGHTPLAN_TYPE, routeType: ATC_ROUTE_TYPE): void; + viewGamercard(strXuid: string): void; + switchDepartureArrival(): void; + setSelectionAsArrival(): void; + resetArrival(): void; + addSelectionToFlightPlan(): void; + removeSelectionFromFlightPlan(): void; + setDepartureTime(timeInSeconds: number, utc: boolean): void; + increaseDepartureTime(utc: boolean): void; + decreaseDepartureTime(utc: boolean): void; + setDepartureDate(year: number, monthStart0: number, dayStart0: number): void; + setWeatherPreset(iPreset: number): void; + resetToSystemTime(val: boolean): void; + setSelectedLegIndex(index: number): void; + onFlightLegChanged(callback: (leg: FlightLegInfo, flight: Flight) => void): void; + launchFlight(): void; + launchFlightWithNPC(): void; + showLoadSavePopUp(): void; + setAircraftTailNumber(value: string): any; + setAircraftCallSign(value: string): any; + setAircraftFlightNumber(value: string): any; + setAppendHeavyToCallSign(value: boolean): any; + setShowTailNumber(value: boolean): any; + setElevatorAuthorityValue(value: number): any; + setRudderAuthorityValue(value: number): any; + setAileronAuthorityValue(value: number): any; + setWearTearValue(value: number): any; + setFlightConditionConfiguration(id: string): void; + updateFlightConditions(): void; + onUpdateFlightConditionConfiguration(callback: (data: FlightConditions) => void): void; + requestGameFlight(callback: any): void; +} +declare function RegisterGameFlightListener(callback?: any): GameFlightListener; +declare function RegisterFlightBriefingListener(callback?: any): GameFlightListener; +declare function RegisterWorldMapListener(callback?: any): WorldMapListener; +declare class WaypointData { + index: number; + name: string; + heading: DataValue; + distance: DataValue; + altitude: DataValue; + frequency: DataValue; + speed: DataValue; + ete: DataValue; + eta: DataValue; + type: string; + icon: string; +} +declare class LocationInfo { + IDEN: string; + name: string; + date: string; + time: string; + valid: boolean; +} +declare class FlightPlanData { + cruisingAltitude: DataValue; + altitudeData: AltitudeGraphData; + departure: LocationInfo; + arrival: LocationInfo; + waypoints: WaypointData[]; +} +declare class FlightPlanListener extends ViewListener.ViewListener { + constructor(name: string); + onUpdateFlightPlan(callback: (data: FlightPlanData) => void): void; + setCruisingAltitude(value: number): void; + requestFlightPlan(): void; +} +declare function RegisterFlightPlanListener(callback?: any): FlightPlanListener; diff --git a/src/msfstypes/js/inputs.d.ts b/src/msfstypes/js/inputs.d.ts new file mode 100644 index 000000000..9859c9047 --- /dev/null +++ b/src/msfstypes/js/inputs.d.ts @@ -0,0 +1,21 @@ +declare class InputsListener extends ViewListener.ViewListener { + addInputChangeCallback(context: any, action: any, callback: (down: boolean) => void): string; + removeInputChangeCallback(id: string): void; +} +declare function RegisterInputsListener(callback?: any): InputsListener; +declare var globalInputsListener: any; +interface InputsManager { + getInputStatus(context: string, action: string): EInputStatus; + getInputValue(context: string, action: string): number; +} +declare var inputs: InputsManager; +declare function GetInputs(): InputsManager; +declare enum EInputStatus { + idle = 0, + pressed = 1, + down = 2, + released = 3 +} +declare function registerGlobalInputListener(): void; +declare function GetInputStatus(_context: any, _action: any): EInputStatus; +declare function GetInputValue(_context: any, _action: any): number; diff --git a/src/msfstypes/js/leaderboards.d.ts b/src/msfstypes/js/leaderboards.d.ts new file mode 100644 index 000000000..9f1dbbfb7 --- /dev/null +++ b/src/msfstypes/js/leaderboards.d.ts @@ -0,0 +1,65 @@ +declare class LeaderboardEntry { + name: string; + xuid: string; + score: number; + rank: number; + time: string; + plane: string; + breadcrumb: boolean; + pylons: boolean; + hud: boolean; + notifications: boolean; + pageType: LeaderBoardPageType; + isMe: boolean; + constructor(data?: any); + getScoreStr(): string; + static getDebugValue(rank: number): LeaderboardEntry; +} +interface AdditionalData { + __Type: string; +} +declare class RenoAditionalData implements AdditionalData { + __Type: string; + Category: RenoRaceCategory; + RenoLeaderboardType: RenoLeaderboardType; +} +declare class RenoQuickMatchAdditionalData extends RenoAditionalData { + __Type: string; +} +declare class RenoTimeTrialAdditionalData extends RenoAditionalData { + __Type: string; + daPlanes: string[]; +} +declare class LeaderboardTableWithAdditionalDataFields { + columnsID: string[]; + daPlayerData: string[]; + table: LeaderboardTable; + constructor(); +} +declare class LeaderboardTableWithAdditionalDataObject { + Table: LeaderboardTable; + AdditionalData: AdditionalData; + constructor(); +} +declare class LeaderboardTable { + entries: LeaderboardEntry[]; + playerPosition: number; + name: string; + isUpToDate: boolean; + static getDebugValue(): LeaderboardTable; + static mapEntriesWithAdditionalData(leaderboardTable: LeaderboardTable, columnsID: string[], playerDataFields: string[]): LeaderboardTable; + static mapEntriesWithAdditionalDataObject(leaderboardTable: LeaderboardTable, context: LeaderBoards, additionalData: AdditionalData): LeaderboardTable; +} +declare enum LeaderboardScoreType { + Points = 0, + TimeMilliseconds = 1 +} +declare class LeaderBoards { + worldTable: LeaderboardTableWithAdditionalDataObject; + aroundTable: LeaderboardTableWithAdditionalDataObject; + friendsTable: LeaderboardTableWithAdditionalDataObject; + isOnline: boolean; + InverseScore: boolean; + ScoreType: LeaderboardScoreType; + static getDebugValue(): LeaderBoards; +} diff --git a/src/msfstypes/js/netbingmap.d.ts b/src/msfstypes/js/netbingmap.d.ts new file mode 100644 index 000000000..cc6b6d001 --- /dev/null +++ b/src/msfstypes/js/netbingmap.d.ts @@ -0,0 +1,102 @@ +interface IBingMapsParams { + lla?: LatLong | LatLongAlt; + radius?: number; + topViewZoom?: number; +} +interface IBingMapsRoad { + lod: number; + id: number; + type: number; + path: LatLong[]; +} +interface IBingMapsTopView { + altitudeMin: number; + altitudeMax: number; + zoomLevels: number; +} +declare enum EBingMode { + CURSOR = "Cursor", + PLANE = "Plane", + VFR = "Vfr", + HORIZON = "Horizon", + TOPVIEW = "Topview" +} +declare enum EBingReference { + SEA = "Sea", + PLANE = "Plane", + AERIAL = "Aerial" +} +declare enum EWeatherRadar { + OFF = "Off", + TOPVIEW = "Topview", + HORIZONTAL = "Horizontal", + VERTICAL = "Vertical" +} +declare enum BingMapsFlags { + FL_BINGMAP_REF_PLANE = 1, + FL_BINGMAP_REF_AERIAL = 2, + FL_BINGMAP_3D = 4, + FL_BINGMAP_3D_TOPVIEW = 8 +} +declare class BingMapsConfig { + resolution: number; + heightColors: number[]; + clearColor: number; +} +declare class BingMapsBinder { + friendlyName: string; +} +declare class BingMapElement extends HTMLElement { + onRoadAddedCallback: (road: IBingMapsRoad[]) => void; + private static nullLatLong; + constructor(); + connectedCallback(): void; + disconnectedCallback(): void; + private onListenerRegistered; + private onListenerBinded; + isReady(): boolean; + setBingId(_id: string): void; + setMode(_mode: EBingMode): void; + setReference(_ref: EBingReference): void; + setAspectRatio(_ratio: number): void; + getAspectRatio(): number; + addConfig(_config: BingMapsConfig): void; + setConfig(_configId: number): void; + setParams(_value: IBingMapsParams): void; + setTopView(_value: IBingMapsTopView): void; + showIsolines(_show: boolean): void; + getIsolines(): boolean; + showWeather(_mode: EWeatherRadar, _cone: number): void; + getWeather(): EWeatherRadar; + setVisible(_show: boolean): void; + private updateMapImage; + is3D(): boolean; + private getFlags; + private updateBinding; + private updateConfig; + private updateParams; + private updateTopView; + private updateVisibility; + private updateIsolines; + private updateWeather; + protected OnDestroy: () => void; + private m_params; + private m_topView; + private m_configs; + private m_configId; + private m_bingRef; + private m_bingMode; + private m_bingId; + private m_showIsolines; + private m_showWeather; + private m_weatherCone; + private m_isVisible; + private m_aspectRatio; + private m_imgElement; + private m_listener; + private m_listenerRegistered; + private m_listenerBinded; + private m_listenerUId; + private m_mapImageName; + get topView(): IBingMapsTopView; +} diff --git a/src/msfstypes/js/padscroll.d.ts b/src/msfstypes/js/padscroll.d.ts new file mode 100644 index 000000000..564aa577d --- /dev/null +++ b/src/msfstypes/js/padscroll.d.ts @@ -0,0 +1,110 @@ +declare var padScrollManager: PadScrollManager; +declare function getGlobalPadScrollManager(): PadScrollManager; +declare enum PADSCROLL_AXIS { + horizontal = "horizontal", + vertical = "vertical" +} +declare enum PADSCROLL_CARDINALS { + up = "up", + down = "down", + left = "left", + right = "right" +} +declare enum PADSCROLL_SIGN { + negative = -1, + positive = 1 +} +declare type PadScrollAxisDataType = { + label: string; + context: string; + action: string; + cardinals: { + [sign in PADSCROLL_SIGN]: PADSCROLL_CARDINALS; + }; +}; +declare const PADSCROLL_AXIS_DATA: { + [axis in PADSCROLL_AXIS]: PadScrollAxisDataType; +}; +declare type PadScrollCardinalsDataType = { + label: string; + axis: PADSCROLL_AXIS; + sign: PADSCROLL_SIGN; + factor: number; +}; +declare const PADSCROLL_CARDINALS_DATA: { + [cardinal in PADSCROLL_CARDINALS]: PadScrollCardinalsDataType; +}; +declare const PADSCROLL_MASKS: { + [direction in 'no' | PADSCROLL_CARDINALS | PADSCROLL_AXIS | 'all']: number; +}; +declare type PadScrollCardinalNumber = { + [cardinal in PADSCROLL_CARDINALS]: number; +}; +declare type PadScrollCardinalBool = { + [cardinal in PADSCROLL_CARDINALS]: boolean; +}; +declare type PadScrollAnalog = PadScrollCardinalNumber; +declare type PadScrollDigital = PadScrollCardinalBool; +declare type PadScrollTarget = (baseType & { + onAnalogPadScroll?: (PadScrollAnalog: any) => void; + onAnalogPadScrollUp?: (number: any) => void; + onAnalogPadScrollDown?: (number: any) => void; + onAnalogPadScrollLeft?: (number: any) => void; + onAnalogPadScrollRight?: (number: any) => void; + onDigitalPadScroll?: (PadScrollDigital: any) => void; + onDigitalPadScrollUp?: Function; + onDigitalPadScrollDown?: Function; + onDigitalPadScrollLeft?: Function; + onDigitalPadScrollRight?: Function; + onPadScrollRelease?: Function; + onPadScrollReleaseUp?: Function; + onPadScrollReleaseDown?: Function; + onPadScrollReleaseLeft?: Function; + onPadScrollReleaseRight?: Function; +}); +declare class PadScrollManager { + private m_scrollTargetList; + private m_currentDirectionMask; + private m_rawValues; + private m_analogValues; + private m_digitalValues; + private m_fetchingLoopID; + private m_lastFrameTimestamp; + static SCROLL_FRAMERATE_MS: number; + static SCROLL_DIAGONAL_THINNESS: number; + static SCROLL_DEADZONE: number; + static SCROLL_DIGITAL_BREAKPOINT: number; + static SCROLL_DIGITAL_HYSTERESIS: number; + private m_isLockedInThreshold; + private m_isScrolling; + private m_wasScrolling; + static SCROLL_ACCELERATION_BREAKPOINT: number; + static SCROLL_ACCELERATION_HYSTERESIS: number; + static SCROLL_ACCELERATION_MULTIPLIER: number; + private m_currentAccelerations; + constructor(); + private onActiveElementChanged; + private onPadCursorHoverElementChanged; + private onElementChanged; + private UIElementToScrollTargetList; + private fetchAnalogValues; + private computeAcceleration; + private computeDigitalValues; + private notifyValuesToTargets; + private startValuesFetchingLoop; + private stopValuesFetchingLoop; + isCurrentTargetList(otherElementList: PadScrollManager['m_scrollTargetList']): boolean; + isElementInTargetList(element: UIElement, searchList: PadScrollManager['m_scrollTargetList']): boolean; + set scrollTargetList(elementList: PadScrollManager['m_scrollTargetList']); + private updateDatas; + private updateCurrentDirectionMask; + private attachTargetListeners; + private detachTargetListeners; + private UIElementToMask; + private get currentDirectionMask(); + get hasTarget(): boolean; + private canTargetScroll; + get canScroll(): boolean; + private debugLog; +} +declare function installPadscrollPassthrough(from: PadScrollTarget, to: PadScrollTarget): void; diff --git a/src/msfstypes/js/radionav.d.ts b/src/msfstypes/js/radionav.d.ts new file mode 100644 index 000000000..6b644bd70 --- /dev/null +++ b/src/msfstypes/js/radionav.d.ts @@ -0,0 +1,6 @@ +declare namespace RadioNav { + function isHz833Compliant(_MHz: number): boolean; + function isHz25Compliant(_MHz: number): boolean; + function isHz50Compliant(_MHz: number): boolean; + function isXPDRCompliant(_code: number): boolean; +} diff --git a/src/msfstypes/js/services/aircraft.d.ts b/src/msfstypes/js/services/aircraft.d.ts new file mode 100644 index 000000000..d04b0694a --- /dev/null +++ b/src/msfstypes/js/services/aircraft.d.ts @@ -0,0 +1,61 @@ +declare class AircraftData { + imagePath: string; + manufacturer: string; + name: string; + modelName: string; + variationName: string; + infos: DataValue[]; + index: number; + aircraftId: number; + variation: number; + nbVariation: number; + icon: string; + type: string; + fuel: RangeDataValue; + tailNumber: string; + callSign: string; + flightNumber: string; + appendHeavy: boolean; + showTailNumber: boolean; + wearAndTear: number; + elevatorAuthority: number; + aileronAuthority: number; + rudderAuthority: number; + _selected: boolean; + autoValidate: boolean; + displayVariationName: boolean; + description: string; + shortDescription: string; + specs: TreeDataValue; + moreInfoPath: string; + selectedVariation: boolean; + static getDebugValue(empty?: boolean): AircraftData; +} +declare class AircraftFilterData { + name: string; + ID: string; + nb: number; +} +declare class AircraftSelectionData { + selectedIndex: number; + selectedType: string; + typeFilters: AircraftFilterData[]; + rangeFilters: RangeDataValue[]; + selectedManufacturer: string; + manufacturerFilters: AircraftFilterData[]; + planes: AircraftData[]; + variations: AircraftData[]; + current: AircraftData; + static getFakeData(nbPlanes: number): AircraftSelectionData; + static getDebugValue(): AircraftSelectionData; +} +declare class AircraftListener extends ViewListener.ViewListener { + onAircraftListUpdated(callback: (data: AircraftSelectionData, recreate: boolean) => void): void; + onSelectedPlaneUpdated(callback: (plane: AircraftData, index: number) => void): void; + setSelectedPlane(index: number, variation: number, validate: boolean): void; + setSelectedPlaneInHangar(index: number, variation: number): void; + updatePlaneRangeFilter(value: number, id: number): void; + onSetPlaneRangeFilters(callback: (rangeData: RangeDataValue[]) => void): void; + requestPlaneList(): void; +} +declare function RegisterAircraftListener(callback?: any): AircraftListener; diff --git a/src/msfstypes/js/services/checklistmanager.d.ts b/src/msfstypes/js/services/checklistmanager.d.ts new file mode 100644 index 000000000..b90ec1e27 --- /dev/null +++ b/src/msfstypes/js/services/checklistmanager.d.ts @@ -0,0 +1,123 @@ +declare enum _EEvaluationMode { + eFree = 0, + eProgressive = 1, + eCopilot = 2 +} +declare enum _EEvaluationScope { + eTest = 0, + eCheckpoint = 1, + ePage = 2, + eStep = 3, + eChecklist = 4 +} +declare enum _EHelperFlags { + eNone = 0, + eAutoCheck = 1, + eCopilotAutoCheck = 2 +} +declare namespace _CheckpointColors { + const cAutoComplete: string; + const cManualValidation: string; + const cHighlight: string; + const cPageAutoComplete: string; +} +declare class ChecklistData { + sDesc: string; + aGroups: ChecklistPageDataGroup[]; +} +declare class ChecklistPageDataGroup { + sId: string; + sDesc: string; + aPages: ChecklistPageData[]; +} +declare class ChecklistPageData { + nPageId: number; + sDesc: string; + aCheckpoints: CheckpointData[]; +} +declare class ChecklistCompletion { + aPages: ChecklistPageCompletion[]; + aCheckpoints: CheckpointCompletion[]; + aBlocks: CheckpointCompletion[]; +} +declare class ChecklistPageCompletion { + nPageId: number; + bUIComplete: boolean; +} +declare class CheckpointCompletion { + nPageId: number; + nCheckpointId: number; + bUISkipped: boolean; + bUIChecked: boolean; + bUIHelpAvailable: boolean; + bUIHelpActivated: boolean; + bUICopilotAvailable: boolean; + bManual: boolean; +} +declare class ChecklistEvaluation { + nCurrentPageId: number; + nCurrentCheckpointId: number; + nCursorPageId: number; + nCursorCheckpointId: number; + bAutocheckActivated: boolean; + bCopilotActivated: boolean; + eCopilotScope: _EEvaluationScope; +} +declare class ChecklistHelpers { + bAutoCheck: boolean; +} +declare class ChecklistConfiguration { + oHelpers: ChecklistHelpers; +} +declare class ChecklistFeedback { + sFooterText: string; +} +declare class ChecklistListener extends ViewListener.ViewListener { + onSetChecklist(callback: (_oData: ChecklistData, _oCompletion: ChecklistCompletion, _oEvaluation: ChecklistEvaluation, _oConfig: ChecklistConfiguration) => void): void; + onUpdateChecklistCompletion(callback: (_oCompletion: ChecklistCompletion) => void): void; + onUpdateChecklistConfig(callback: (_oConfig: ChecklistConfiguration) => void): void; + onUpdateChecklistEvaluation(callback: (_oMode: ChecklistEvaluation) => void): void; + onUpdateChecklistFeedback(callback: (_oFeedback: ChecklistFeedback) => void): void; + onDisplay(callback: (_nPageId: number) => void): void; + pushManualCheck(_pageId: number, _checkpointId: number, _bool: boolean): void; + pushManualUncheck(_pageId: number, _checkpointId: number, _bool: boolean): void; + pushSelectChecklist(_pageId: number, _checkpointId: number): void; + pushStartCopilotPage(_pageId: number, _checkpointId: number): void; + pushStopCopilotPage(_pageId: number): void; + pushPreviousPage(): void; + pushNextPage(): void; + pushResetCurrentPage(_pageId: number): void; + pushToggleAssistance(_pageId: number, _checkpointId: number): void; + pushSetAssistance(_pageId: number, _checkpointId: number, _value: boolean): void; +} +declare function RegisterChecklistListener(callback?: any): ChecklistListener; +interface IData { + Reset(): any; + SetData(_oData: T): any; +} +declare class Evaluation implements IData { + data: ChecklistEvaluation; + private m_checklist; + constructor(_checklist: ChecklistElement); + Reset(): void; + SetData(_oData: ChecklistEvaluation): void; + isAutocheckActivated(): boolean; + IsAutocheckCurrentPage(_oPage: ChecklistPageElement): boolean; + IsAutocheckCurrentCheckpoint(_oCheckpoint: ChecklistCheckpointLineElement): boolean; + IsCopilotCurrentPage(_oPage: ChecklistPageElement): boolean; + IsCopilotCurrentCheckpoint(_oCheckpoint: ChecklistCheckpointLineElement): boolean; +} +declare class Helpers implements IData { + data: ChecklistHelpers; + private HelperAutoCheckElement; + private HelperManualCheck; + constructor(); + Reset(): void; + SetData(_oData: ChecklistHelpers): void; +} +declare class Configuration implements IData { + oHelpers: Helpers; + constructor(); + Reset(): void; + SetData(_oData: ChecklistConfiguration): void; +} diff --git a/src/msfstypes/js/services/community.d.ts b/src/msfstypes/js/services/community.d.ts new file mode 100644 index 000000000..1d04537a8 --- /dev/null +++ b/src/msfstypes/js/services/community.d.ts @@ -0,0 +1,251 @@ +declare type CommunityPanelBase = CommunityPanelPlayerInfoElement | CommunityPanelNotificationsElement | CommunityPanelFriendsElement; +declare type CommunityPanelPlayerNotificationAcknowldgeAction = null | "click" | "clickDeleteTimer" | "actions" | "hover"; +declare type CommunityPanelPlayerNotificationTypeAction = null | "primary" | "warn" | "danger"; +declare type CommpunityPanelPlayerNotificationIcon = null | "ICON_INVIT_FRIEND" | "ICON_INVIT_ACCEPTED" | "ICON_DOWNLOAD_COMPLETED" | "ICON_NOTE_SENT" | "COMMUNITY_SEND_NOTE"; +declare type PlayerStatus = null | "online" | "away" | "busy" | "offline" | "blocked"; +declare enum PlayerStatusFriendStatusDataMapping { + online = "tOnline", + away = "tAway", + busy = "tBusy", + offline = "tOffline", + blocked = "tBlocked" +} +declare enum PlayerStatusConnectionModeMapping { + online = 0, + offline = 1, + busy = 2, + away = 3 +} +declare enum PlayerStatusOptionListDisplayMapping { + online = "m_online_list", + away = "m_away_list", + busy = "m_busy_list", + offline = "m_offline_list", + blocked = "m_blocked_list" +} +declare enum PlayerStatusOptionListTitleMapping { + online = "ONLINE", + away = "AWAY", + busy = "BUSY", + offline = "DISCONNECTED", + blocked = "BLOCKED" +} +interface CommunityPanelPlayerData { + sName: string; + sCurrency: string; + sMoney: string; + sAvatar: string; + sStatus: PlayerStatus; + sBuildVersion: string; + sRichPresence: string; + bDisable: boolean; + bCanSignOut: boolean; + serverList: TreeDataValue; +} +interface CommunityPanelPlayerAvatarData { + sName: string; + sStatus: PlayerStatus; + sRichPresence: string; + sAvatar: string; +} +interface CommunityPanelPlayerNotificationsData { + tNotifications: CommunityPanelPlayerNotificationData[]; +} +interface CommunityPanelPlayerNotificationData { + sId: string; + bUnseen: boolean; + bHidden: boolean; + sTitle: string; + sDescription: string; + sIcon: CommpunityPanelPlayerNotificationIcon; + sContentID: string; + closeAction: CommunityPanelPlayerNotificationActionData; + tActions: CommunityPanelPlayerNotificationActionData[]; + acknowledgeOn: CommunityPanelPlayerNotificationAcknowldgeAction; + sCreationTime: string; + bFloating: boolean; +} +interface CommunityPanelPlayerNotificationActionData { + sLabel: string; + sEvent: string; + sButtonId: string; + sType: CommunityPanelPlayerNotificationTypeAction; + bDisabled: boolean; +} +declare class CommunityPanelNotificationSeenEvent extends Event { + eventId: string; + constructor(sId: string); +} +declare class CommunityPanelNotificationDeleteEvent extends Event { + eventId: string; + constructor(sId: string); +} +declare class CommunityPanelNotificationFloatingDisplayedEvent extends Event { + eventId: string; + constructor(sId: string); +} +interface CommunityPanelLocalPlayersData { + tLocalPlayers: CommunityPanelLocalPlayerData[]; +} +interface CommunityPanelLocalPlayerData { +} +interface CommunityPanelFriendsData { + tOnline: CommunityPanelFriendData[]; + tAway: CommunityPanelFriendData[]; + tBusy: CommunityPanelFriendData[]; + tOffline: CommunityPanelFriendData[]; + tBlocked: CommunityPanelFriendData[]; + bDisabled: boolean; +} +interface CommunityPanelFriendData { + sId: string; + sXuid: string; + sName: string; + sAvatar: string; + sStatus: PlayerStatus; + sRichPresence: string; + bIsUser: boolean; + bIsFriend: boolean; + bIsFriendOnPlayfab: boolean; + bIsFriendOnXboxLive: boolean; + bIsFriendOnSteam: boolean; + bBlocked: boolean; + bHasGroup: boolean; + bIsGroupLeader: boolean; + bCanViewGamercard: boolean; + bCanInviteToGroup: boolean; + bCandExpluseFromGroup: boolean; + dvPending: DataValue; + sInviteToCustomServerTitle: string; + sCancelInviteToCustomServerTitle: string; + bCanInviteToCustomServer: boolean; +} +interface CommunityPanelGroupsData { + tGroups: CommunityPanelGroupData[]; +} +interface CommunityPanelGroupData { +} +interface CommunityPanelNoteSenderData { + sId: string; + sName: string; + sAvatar: string; + sStatus: PlayerStatus; + sRichPresence: string; +} +interface CommunityPanelNoteData { + iId: number; + from: CommunityPanelNoteSenderData; + content: string; +} +declare class CommunityPanelToggleClassnameEvent extends Event { + className: string; + value: boolean; + constructor(className: string, value: boolean); +} +declare class CommunityPanelCreateFriendRequestBySearchEvent extends Event { + nametag: string; + constructor(nametag: string); +} +declare class CommunityPanelCreateFriendRequestByID extends Event { + id: string; + constructor(id: string); +} +declare class CommunityPanelAskAddFriendEvent extends Event { + data: CommunityPanelFriendData; + constructor(data: CommunityPanelFriendData); +} +declare class CommunityPanelAskRemoveFriendEvent extends Event { + data: CommunityPanelFriendData; + constructor(data: CommunityPanelFriendData); +} +declare class CommunityPanelUpdateLocalDataEvent extends Event { + data: CommunityPanelFriendsData; + constructor(data: CommunityPanelFriendsData); +} +declare class CommunityPanelSendMessageEvent extends Event { + sIdReceiver: string; + content: string; + constructor(sIdReceiver: string, content: string); +} +declare class CommunityPanelSendReportEvent extends Event { + sId: string; + content: string; + constructor(sId: string, content: string); +} +declare class CommunityPanelBlockPlayerEvent extends Event { + sPlayerId: string; + bBlocked: boolean; + constructor(sPlayerId: string, bBlocked: boolean); +} +declare class CommunityPanelInviteFriendToGroupEvent extends Event { + sPlayerId: string; + constructor(sPlayerId: string); +} +declare class CommunityPanelInviteFriendToGameModeEvent extends Event { + sPlayerId: string; + bAccept: boolean; + constructor(sPlayerId: string, accept: boolean); +} +declare class CommunityPanelCancelInvitationToGroupEvent extends Event { + sPlayerId: string; + constructor(sPlayerId: string); +} +declare class CommunityPanelRemoveFriendFromGroupEvent extends Event { + sPlayerId: string; + constructor(sPlayerId: string); +} +declare class CommunityPanelChangedStatusEvent extends Event { + status: PlayerStatus; + constructor(status: PlayerStatus); +} +declare class CommunityPanelChangedServerEvent extends Event { + serverName: string; + constructor(server: string); +} +declare class CommunityPanelViewGamercardEvent extends Event { + sXuid: string; + constructor(sXuid: CommunityPanelViewGamercardEvent['sXuid']); +} +declare class CommunityListener extends ViewListener.ViewListener { + onUpdateOfflineMode(callback: (offlineMode: boolean) => void): void; + onSetPlayerData(callback: (data: CommunityPanelPlayerData) => void): void; + onSetPlayerNotificationData(callback: (data: CommunityPanelPlayerNotificationsData) => void): void; + onSetLocalPlayersData(callback: (data: CommunityPanelFriendsData) => void): void; + onSetPlayerFriendData(callback: (data: CommunityPanelFriendsData) => void): void; + onSetPlayerGroupsData(callback: (data: CommunityPanelFriendsData) => void): void; + onSetServerList(callback: (data: ServerInfoData[], currentServer: string, offline: boolean) => void): void; + onAvatarUpdate(callback: () => void): void; + setNotificationAsSeen(sId: string): void; + deleteNotification(sId: string): void; + changePlayerStatus(status: PlayerStatus): void; + selectPlayerServer(server: string): void; + onPushNotification(callback: (notification: CommunityPanelPlayerNotificationData) => void): void; + onUpdateNotification(callback: (notification: CommunityPanelPlayerNotificationData) => void): void; + onDeleteNotification(callback: (sId: string) => void): void; + createFriendRequestBySearch(nametag: string): void; + askAddFriend(data: CommunityPanelFriendData): void; + askRemoveFriend(data: CommunityPanelFriendData): void; + blockPlayer(sPlayerId: string, bBlock: boolean): void; + onCreateFriendRequestBySearchResultSuccess(callback: () => void): void; + onCreateFriendRequestBySearchResultError(callback: (message: string) => void): void; + createFriendRequestByID(id: string): void; + onCreateFriend(callback: (friend: CommunityPanelFriendData) => void): void; + onUpdateFriend(callback: (friend: CommunityPanelFriendData) => void): void; + onDestroyFriend(callback: (sID: string) => void): void; + onCreateGroupFriend(callback: (friend: CommunityPanelFriendData) => void): void; + onUpdateGroupFriend(callback: (friend: CommunityPanelFriendData) => void): void; + onDestroyGroupFriend(callback: (sID: string) => void): void; + onDisplayNote(callback: (note: CommunityPanelNoteData) => void): void; + sendMessage(sIdReceiver: string, content: string): void; + getReportTopicList(): void; + onReportTopicList(callback: (data: DataValue[]) => void): void; + onForceCloseAll(callback: () => void): void; + inviteFriendToGroup(sPlayerId: string): void; + inviteFriendToGameMode(sPlayerId: string, bAccept: boolean): void; + removeFriendFromGroup(sPlayerId: string): void; + cancelInvitationToGroup(sPlayerId: string): void; + leaveGroup(): void; + onPendingQueueUpdate(callback: (queue: number) => void): void; + viewGamercard(sXuid: string): void; +} +declare function RegisterCommunityListener(callback?: any): CommunityListener; diff --git a/src/msfstypes/js/services/contentmanager.d.ts b/src/msfstypes/js/services/contentmanager.d.ts new file mode 100644 index 000000000..0e94635ae --- /dev/null +++ b/src/msfstypes/js/services/contentmanager.d.ts @@ -0,0 +1,60 @@ +interface SPackageInfo { + sPackageID: string; + sPackageFriendlyID: string; + multiSelectState: CheckboxData; + sImagePath: string; + sTitle: string; + sSubtitle: string; + sAuthor: string; + sStatus: string; + sLocalVersion: string; + sServerVersion: string; + sDownloadState: string; + sDownloadSubstate: string; + fDownloadProgress: number; + currentSize: DataValue; + downloadSize: DataValue; + additionalSize: DataValue; + bHidden: boolean; + bCommunity: boolean; + bThirdParty: boolean; + bIsExpansion: boolean; + bIsPartOfExpansion: boolean; + bIsStandard: boolean; + sBundleName: boolean; + bIsRetailable: boolean; +} +declare class ContentManagerListener extends ViewListener.ViewListener { + constructor(name: string); + onSetDownloadSize(callback: any): void; + onSetDeleteSize(callback: any): void; + onSetGlobalDownloadProgress(callback: any): void; + onSetDownloadablePackages(callback: any): void; + onUpdatePackage(callback: any): void; + onSetPackageDownloadProgress(callback: any): void; + onSetTotalInstallationSize(callback: any): void; + onSetError(callback: any): void; + onShowStorageBtn(callback: any): void; + onBeginDownload(callback: any): void; + onHideDownload(callback: any): void; + onShowDelete(callback: any): void; + onShowCancel(callback: any): void; + onSetDownloadMode(callback: any): void; + onSetToggleState(callback: any): void; + onSetNbItemSelected(callback: any): void; + onSetFocusedItem(callback: any): void; + onSetLoading(callback: any): void; + onSetBrowserFiltersData(callback: (data: MarketBrowserFiltersData) => void): void; + toggleFilter(id: string): void; + sortBy(id: number): void; + onSetViewMode(callback: any): void; + onSetOfflineMode(callback: any): void; + onHideFilters(callback: any): void; + onSetBtnText(callback: any): void; +} +declare function RegisterContentManagerListener(callback?: any): ContentManagerListener; +declare class PackageEvent extends Event { + sEventType: string; + sPackageId: string; + constructor(_eventType: string, _sPackageId: string); +} diff --git a/src/msfstypes/js/services/controls.d.ts b/src/msfstypes/js/services/controls.d.ts new file mode 100644 index 000000000..0193ff97f --- /dev/null +++ b/src/msfstypes/js/services/controls.d.ts @@ -0,0 +1,182 @@ +declare class BindingCombo { + sKeys: string; + daKeys: number[]; + sHTML: string; + physicalKey?: PhysicalKey; + keyState?: HardwareKeyState; +} +declare class KeyBinding { + iUId: number; + sName: string; + sCategory: string; + sSubCategory: string; + sNameTT: string; + sCategoryTT: string; + sSubCategoryTT: string; + sContext: string; + sDescription: string; + primary: BindingCombo; + secondary: BindingCombo; + sTags: string; + bIsReversed: boolean; + bIsAxis: boolean; + bCanMapOnRelease: boolean; + bMapOnRelease: boolean; + bHidden: boolean; +} +declare class ScannedKey { + combo: BindingCombo; + bHasConflicts: boolean; + daConflicts: string[]; + sError: string; +} +declare class PhysicalKey { + iUId: number; + iIndex: number; + nType: string; + sDisplayName: string; + sDisplayNameShort: string; + sHTML: string; + fAxisSensitivityMinus: number; + fAxisSensitivityPlus: number; + daSensitivityCurve: Array; + fAxisDeadZone: number; + fAxisNeutral: number; + fReactivity: number; + fExtremityDeadZone: number; + daPOVNames: Array; + bShowSensitivity: boolean; +} +declare class BindingData { + deviceName: string; + bSimpleSensitivity: boolean; + keys: PhysicalKey[]; + keyBindings: KeyBinding[]; + type: string; + canHaveVibrations: boolean; + vibrations: boolean; + hasAxes: boolean; +} +declare class HardwareKeyState { + iUId: number; + fValue: number; + fRawValue: number; +} +declare class DevicePresetData { + deviceName: string; + sFriendlyName: string; + sFileName: string; + bLocked: boolean; +} +declare class ControllerData { + iDeviceId: number; + sTranslatedName: string; + sLayout: string; + sTextureFolder: string; +} +declare class SelectActionData { + actionId: number; + showAxis: boolean; + showButtons: boolean; + constructor(json?: string); + static toJSON(data: SelectActionData): string; +} +declare class DeviceCalibrationData { + deviceId: number; +} +declare function RegisterControlsListener(callback?: any): ControlsViewListener; +declare class ControlsViewListener extends ViewListener.ViewListener { + requestUserInputProfileList(): void; + askSwitchCurrentProfile(deviceId: string, filename: string): void; + askRenameCurrentPreset(): void; + askDeleteCurrentPreset(): void; + createUserPreset(): void; + duplicateCurrentPreset(): void; + askRenameCurrentProfile(): void; + askDeleteCurrentProfile(): void; + createUserProfile(): void; + duplicateCurrentProfile(): void; + setCurrentGlobalProfile(id: string): void; + requestCurrentMapping(): void; + requestCurrentKeyState(): void; + initKeyBindings(_deviceId: string): void; + initGlobal(id: string): void; + onSetCurrentBindings(callback: (data: BindingData, _resetDisplay: boolean) => void): void; + onKeyScanned(callback: (_scan: ScannedKey) => void): void; + onKeySelected(callback: (_scan: ScannedKey) => void): void; + onScanFinished(callback: () => void): void; + onHardwareKeysChanged(callback: (_keyStates: Array, _axisStates: Array, _axisButtonStates: Array) => void): void; + onEnableImportButton(callback: (_isEnable: boolean) => void): void; + onDevicePresetListChange(callback: (deviceId: number, presets: DevicePresetData[], currentFilename: string) => void): void; + onGlobalProfilesListChange(callback: (profiles: DataValue[], currentId: string) => void): void; + onInitListControllers(callback: (data: ControllerData[], currentDeviceId: number) => void): void; + onSetCurrentController(callback: (_deviceId: string) => void): void; + onAddUserInput(callback: (deviceId: number, data: DevicePresetData) => void): void; + onLoadingStateChange(callback: (loading: boolean) => void): void; + onActiveUserInput(callback: (deviceId: number, userInputFilename: string, isReadOnly: boolean) => void): void; + onShowSensibility(callback: () => void): void; + onUpdateSensitivityCurve(callback: (_key: PhysicalKey) => void): void; +} +declare enum EFilterType { + ALL = 0, + ESSENTIALS = 1, + ASSIGNED = 2, + NEW = 3 +} +declare class ControlsScreenBase extends TemplateElement { + protected m_canImportFSX: boolean; + get templateID(): string; + protected m_ControlsListener: ControlsViewListener; + private SN_Axis; + protected m_lastDevice: string; + protected m_KeyMapperElem: KeyMapper; + protected m_JoyMapperElem: JoyMapper; + protected tabListElem: NewListButtonElement; + protected filterElem: ControlsFilterElement; + protected m_ControllerDataList: ControllerData[]; + constructor(); + connectedCallback(): void; + onListenerRegistered: () => void; + disconnectedCallback(): void; + protected OnLoadingStateChange: (loading: boolean) => void; + private get eCurrentFilter(); + private set eCurrentFilter(value); + private onAllActionsAdded; + OnFilterListSelected: () => void; + private InitTabElem; + private _textSearchTimeout; + OnSearchByTextChanged: () => void; + OnSearchByInputChanged: () => void; + private OnSetCurrentBindings; + SetCurrentBindings(data: BindingData, _resetDisplay: boolean): void; + protected updateDescription(e: CustomEvent): void; + SetKeyBindings(data: BindingData, _resetDisplay: boolean): void; + SetJoyBindings(data: BindingData, _resetDisplay: boolean): void; + OnKeyScanned: (_scan: ScannedKey) => void; + OnScanFinished: () => void; + OnHardwareKeysChanged: (_keyStates: Array, _axis: Array, _axisButton: Array) => void; + OnControllerButtonChanged: (e: Event) => void; + imageFound: () => void; + imageNotFound: () => void; + private m_initTimeout; + RefreshControllerPage(_deviceId: string): void; + EnableImportButton: (_isEnable: boolean) => void; + ShowHeader(_visible: boolean): void; + ShowGlobal(id: string): void; + RefreshSubPage(_deviceId: string): void; + InitListControllers: (data: ControllerData[], _defaultDeviceId: number) => void; + SetCurrentController: (_deviceId: string) => void; + onProfileSelected: (deviceId: string, filename: string) => void; + AddUserInput: (deviceId: number, data: DevicePresetData) => void; + ActiveUserInput: (deviceId: number, userInputFilename: string, isReadOnly: boolean) => void; + ShowInputEditPage(): void; + protected showSensibility: () => void; + private onSensitivityPopUpClosed; + protected setGlobalProfileId: (profileId: string) => void; + protected onDevicePresetListChange: (deviceId: number, presets: DevicePresetData[], currentFilename: string) => void; + protected onGlobalProfilesListChange: (list: DataValue[], currentId: string) => void; + OnCalibrateSelected(): void; + OnCalibrateClose(): void; + OnImportNewProfile: () => void; + OnExportCurrentProfile: () => void; +} diff --git a/src/msfstypes/js/services/fuelpayload.d.ts b/src/msfstypes/js/services/fuelpayload.d.ts new file mode 100644 index 000000000..af7490e0c --- /dev/null +++ b/src/msfstypes/js/services/fuelpayload.d.ts @@ -0,0 +1,56 @@ +declare class PayloadValue extends RangeDataValue { + __Type: string; + pos: Vec3; +} +declare class ContactPoint { + pos: Vec3; + type: number; +} +declare class FuelPayloadData { + planeManufacturer: string; + planeModel: string; + planeImage: string; + stations: PayloadValue[]; + totalPayload: RangeDataValue; + fuelTanks: PayloadValue[]; + totalFuelVolume: RangeDataValue; + totalFuelWeight: RangeDataValue; + emptyWeight: RangeDataValue; + totalWeight: RangeDataValue; + displayFuelAsWeight: boolean; + volumeUnit: string; + weightUnit: string; + consumptionInfos: DataValue[]; + static getFakeData(nbFuelTanks: number, nbPayloadStations: number): FuelPayloadData; +} +declare class BalanceData { + balancePercent: RangeDataValue; + balancePosition: Vec3; + balance: RangeDataValue; + LEMAC: number; + TEMAC: number; + image: string; + emptyCGPosition: RangeDataValue; +} +declare class ShapeData { + planeImage: string; + datumPosition: Vec3; + contactPoints: ContactPoint[]; + fuselage_length: number; + fuselage_diameter_max: number; + fuselage_height_max: number; + fuselage_forebody_length: number; + fuselage_afterbody_length: number; + fuselage_midbody_length: number; + fuelPayload: FuelPayloadData; + balance: BalanceData; +} +declare class FuelPayloadListener extends ViewListener.ViewListener { + constructor(name: string); + onFuelPayloadDataUpdated(callback: any): void; + onBalanceDataUpdated(callback: any): void; + onShapeDataUpdated(callback: any): void; + setEmptyCOG(value: any): void; + resetFuelPayload(): void; +} +declare function RegisterFuelPayloadListener(callback?: any): FuelPayloadListener; diff --git a/src/msfstypes/js/services/gamenavlog.d.ts b/src/msfstypes/js/services/gamenavlog.d.ts new file mode 100644 index 000000000..67a2476f3 --- /dev/null +++ b/src/msfstypes/js/services/gamenavlog.d.ts @@ -0,0 +1,54 @@ +interface LegacyGameNavlogLeg { + __Type: string; + AbsoluteSubLegIndex: number; + Comments: string; + Distance: string; + Ete: string; + Heading: string; + IsDescriptionActive: boolean; + IsImageActive: boolean; + LegIndex: number; + NextLegAvaiable: boolean; + NextSubLegAvailable: boolean; + PrevLegAvaiable: boolean; + PrevSubLegAvailable: boolean; + SubLegImagePath: string; + SubLegIndex: number; + Winds: string; + nextLegName: string; + nextSubLegName: string; + prevLegName: string; + prevSubLegName: string; +} +interface GameNavlogLeg { + index: number; + name: string; + distance: string; + ete: string; + nextLegName: string; + subLegs: GameNavlogSubLeg[]; +} +interface GameNavlogSubLeg { + index: number; + name: string; + icao: string; + absoluteIndex: number; + comments: string; + distance: string; + ete: string; + heading: string; + winds: string; + imagePath: string; + isLast: boolean; + nextSubLegName: string; +} +declare class GameNavlogListener extends ViewListener.ViewListener { + constructor(name: string); + onUpdateDisplayedLeg(callback: (leg: LegacyGameNavlogLeg) => void): void; + onUpdateLeg(callback: (leg: GameNavlogLeg) => void): void; + onUpdateTime(callback: (data: TimeData) => void): void; + onUpdateWatchTime(callback: (data: DataValue, isRunning: boolean) => void): void; + toggleStopWatch(value: boolean): void; + resetStopWatch(): void; +} +declare function RegisterGameNavlogListener(callback?: any): GameNavlogListener; diff --git a/src/msfstypes/js/services/genericpanelmanager.d.ts b/src/msfstypes/js/services/genericpanelmanager.d.ts new file mode 100644 index 000000000..443e65025 --- /dev/null +++ b/src/msfstypes/js/services/genericpanelmanager.d.ts @@ -0,0 +1,8 @@ +declare class GenericPanelListener extends ViewListener.ViewListener { + onSetupPanelInfos(callback: any): void; + onSetupPanelForm(callback: any): void; + onSetupCustomComponent(callback: any): void; + on(str: any, arg: any): void; + trigger(str: any, ...args: any[]): void; +} +declare function RegisterGenericPanelListener(callback?: () => void): GenericPanelListener; diff --git a/src/msfstypes/js/services/ingamepanelcontrolsviewlistener.d.ts b/src/msfstypes/js/services/ingamepanelcontrolsviewlistener.d.ts new file mode 100644 index 000000000..7bbad1738 --- /dev/null +++ b/src/msfstypes/js/services/ingamepanelcontrolsviewlistener.d.ts @@ -0,0 +1,5 @@ +declare class IngamePanelControlsViewListener extends ViewListener.ViewListener { + onInGamePanelControlsUpdated(callback: any): void; + requestDeviceList(): void; +} +declare function RegisterIngamePanelControlsViewListener(callback?: any): IngamePanelControlsViewListener; diff --git a/src/msfstypes/js/services/installationmanager.d.ts b/src/msfstypes/js/services/installationmanager.d.ts new file mode 100644 index 000000000..d72333603 --- /dev/null +++ b/src/msfstypes/js/services/installationmanager.d.ts @@ -0,0 +1,22 @@ +declare class InstallationManagerListener extends ViewListener.ViewListener { + constructor(name: string); + onUpdateLoadingFinished(callback: any): void; + onShowUpdateManager(callback: any): void; + onShowContentManager(callback: any): void; + onInitInstallPath(callback: any): void; + onStartDownload(callback: any): void; + onPauseDownload(callback: any): void; + onResumeDownload(callback: any): void; + onShowContinue(callback: any): void; + onSetDownloadSize(callback: any): void; + onSetAvailableSpace(callback: any): void; + onDisableDownloadBtn(callback: any): void; + onSetGlobalDownloadProgress(callback: any): void; + onClearWorldUpdateInfo(callback: any): void; + onShowWorldUpdates(callback: any): void; + onSetBtnText(callback: any): void; + onSetOfflineMode(callback: any): void; + onSetDebugUpdateText(callback: any): void; + onShowStorageBtn(callback: any): void; +} +declare function RegisterInstallationManagerListener(callback?: any): InstallationManagerListener; diff --git a/src/msfstypes/js/services/market.d.ts b/src/msfstypes/js/services/market.d.ts new file mode 100644 index 000000000..7b5bef4c0 --- /dev/null +++ b/src/msfstypes/js/services/market.d.ts @@ -0,0 +1,282 @@ +declare enum MarketBrowserFiltersItemElementIconMap { + all = "ICON_ALL", + cat_wishlist = "ICON_WISHLIST", + cat_wishlist_full = "ICON_WISHLIST_FULL", + cat_master = "ICON_CATEGORY_MASTER", + cat_sub = "ICON_CATEGORY_SUB", + cat_hide_owned = "ICON_HIDE_OWNED", + cat_msfs = "ICON_EXPANSION", + car_sale = "ICON_SALE", + cat_platform = "ICON_PLATEFORME", + cat_rating = "ICON_RATINGS", + cat_creators = "ICON_CREATORS", + cat_greateorequal = "ICON_GREATEREQUAL" +} +declare enum MarketDisplayViewFilter { + NONE = 0, + PAID = 1, + FREE = 2, + WORLD_UPDATE = 4, + ALL = 7 +} +interface MarketTags { + id: number; + label: string; + icon: string; +} +interface MarketCategory { + id: string; + label: string; + icon: string; +} +interface MarketItemDetailsData { + type: string; + htmlTag: string; + url: string; + JSONData: string; +} +interface MarketItemImage { + thumbnail: string; + fullres: string; + videoPath: string; +} +declare class MarketItem { + id: string; + storeId: string; + name: string; + category: string; + tags: string[]; + icon: string; + author: string; + description: string; + rate: MarketItemRateData; + availablePlatformList: string[]; + isAvailableOnCurrentPlatform: boolean; + isInitComplete: boolean; + isNew: boolean; + isVisited: boolean; + isUpdated: boolean; + isOwned: boolean; + isPartialyOwned: boolean; + isPreview: boolean; + isFavorite: boolean; + isBundle: boolean; + isHardBundle: boolean; + isDynamicBundle: boolean; + isInstalled: boolean; + isPartialyInstalled: boolean; + isDownloading: boolean; + hasRightToBeDownloaded: boolean; + hasRightToBeDownloadedErr: string; + warns: MarketItemWarnData[]; + downloadData: MarketItemDownloadData; + purchaseData: MarketItemPurchaseData; + realPrice: DataValue; + discountedRealPrice: DataValue; + discountedRealPricePercentage: number; + virtualPrice: DataValue; + discountedVirtualPrice: DataValue; + discountedVirtualPricePercentage: number; + discountRemainingTime: DataValue; + coinsRedeemSentence: string; + image: MarketItemImage; + image_main: MarketItemImage; + image_secondary: MarketItemImage; + medias: MarketItemImage[]; + detailData: MarketItemDetailsData[]; +} +declare class MarketItemRateData { + show: boolean; + pending: boolean; + disabled: boolean; + recent: DataValue[]; + global: DataValue[]; + user: DataValue; +} +declare enum eMarketItemWarnType { + INFO = 0, + WARNING = 1, + DANGER = 2 +} +interface MarketItemWarnData { + messages: string[]; + lockDownload: boolean; + lockBuy: boolean; + type: eMarketItemWarnType; + buttons: NewPushButtonData[]; +} +interface MarketItemDownloadData { + isPaused: boolean; + progress: number; + downloadStatus: string; + downloadSpeed: DataValue; + downloadSize: DataValue; + downloadedSize: DataValue; +} +interface MarketItemPurchaseData { + isPurchasing: boolean; + isPipeLock: boolean; + status: string; +} +declare class MarketBundleData { + title: string; + items: MarketItem[]; + purchaseData: DataValue[]; + setJSON(json: string): void; +} +interface MarketItemSpecsData { + values: DataValue[]; +} +interface MarketItemTextData { + title: string; + text: string; + media: MediaContentData; + mediaPosition: string; +} +interface MarketItemMediaSliderData { + title: string; + medias: MediaContentData[]; +} +interface MarketItemMediaScrollerData { + title: string; + medias: MediaContentData[]; +} +interface MarketItemLiveriesItemData { + name: string; + media: MediaContentData; + primaryHexaColor: string; + secondaryHexaColor: string; +} +interface MarketItemLiveriesData { + title: string; + liveries: MarketItemLiveriesItemData[]; +} +interface MarketItemSupportContactData { + label: string; + url: string; +} +interface MarketItemSupportData { + title: string; + contact: MarketItemSupportContactData; + contacts: MarketItemSupportContactData[]; +} +interface MarketItemListData { + title: string; + messageType: string | "success" | "warning" | "error"; + message: string; + buttonTitle: string; + buttonEvent: string; + items: MarketItem[]; +} +interface MarketBrowserMetaData { + title: string; + displayViewFilter: MarketDisplayViewFilter; + viewFilterButtons: MarketBrowserMetaViewFilterButton[]; +} +interface MarketBrowserMetaViewFilterButton { + title: string; + filter: MarketDisplayViewFilter; + hasNewContent: boolean; +} +interface MarketBrowserData { + count: number; + items: MarketItem[]; +} +interface MarketBrowserFiltersData { + search: string; + orderBy: number; + orders: DataValue[]; + filtersCount: number; + filters: MarketBrowserFilterData[]; +} +interface MarketBrowserFilterData { + id: string; + label: string; + icon: string; + numberResults: number; + checked: boolean; + disabled: boolean; + template: MarketBrowserFilterTemplate; + hasSeparator: boolean; + isExclusive: boolean; + isVisible: boolean; + filters: MarketBrowserFilterData[]; +} +declare enum MarketBrowserFilterTemplate { + TOGGLE = 0, + TOGGLE_PUSH = 1, + LIST = 2 +} +declare class MarketBundleBuyConfirmParams { + id: string; + download: boolean; + dependencies: DataValue[]; + hasRightToBeDownloaded: boolean; + hasRightToBeDownloadedErr: string; + constructor(json: string); +} +declare class MarketBrowserFilterSelectEvent extends Event { + filter_id: string; + constructor(filter_id: string); +} +declare class MarketBrowserItemSelectEvent extends Event { + marketItemId: string; + storeId: string; + constructor(marketItemId: string, storeId: string); +} +declare class MarketItemFavoriteEvent extends Event { + marketItemId: string; + marketItemStoreId: string; + constructor(marketItemId: string, marketItemStoreId?: string); +} +declare class MarketItemFloaterButtonSelectEvent extends Event { + marketItemId: string; + constructor(marketItemId: string); +} +declare abstract class MarketListener extends ViewListener.ViewListener { + protected fetch(triggerEvent: string, onEvent: string): Promise; +} +declare class MarketBrowserListener extends MarketListener { + askBrowserData(storeId?: string, itemId?: string): void; + askBrowserMetaData(): void; + askBrowserFilterData(): void; + askBrowserCompleteData(id: string): void; + onSetBrowserData(callback: (data: MarketBrowserData) => void): void; + onSetBrowserItemData(callback: (data: MarketItem) => void): void; + onSetBrowserItemDiscountRemainingTimeData(callback: (marketItemId: string, value: DataValue) => void): void; + onSetBrowserMetaData(callback: (data: MarketBrowserMetaData) => void): void; + onSetBrowserSearch(callback: (search: string) => void): void; + onSetBrowserFiltersData(callback: (data: MarketBrowserFiltersData) => void): void; + sortBy(id: number): void; + updateSearch(search: string): void; + updateViewFilter(filter: MarketDisplayViewFilter): void; + toggleFilter(id: string): void; + clearFilters(): void; + openMarketBrowser(search?: string): void; + openMarketItem(id: string, storeId?: string): void; + toggleFavoriteMarketItem(id: string, storeid?: string): void; +} +declare function RegisterMarketListener(callback?: any): MarketBrowserListener; +declare class MarketItemListener extends MarketListener { + onSetData(callback: (data: MarketItem) => void): void; + onSetBaseData(callback: (data: MarketItem) => void): void; + onSetBundleData(callback: (bundleData: MarketItemDetailsData) => void): void; + onSetDownloadData(callback: (bIsDownloading: boolean, data: MarketItemDownloadData) => void): void; + onSetPurchasedata(callback: (data: MarketItemPurchaseData) => void): void; + onConfirmBuy(callback: (data: MarketBundleBuyConfirmParams) => void): void; + onPurchasePipeInProgress(callback: () => void): void; + onPurchasePipeFinished(callback: (success: boolean, errorCode: string) => void): void; + onPurchasePipelockError(callback: (data: string) => void): void; + buy(bundleMarketId: string, download: boolean): void; + confirmBuy(bundleMarketId: string, download: boolean): void; + openMarketItem(marketItemId: string, storeId?: string): void; + onConfirmBuyButtonClick(callback: (data: string) => void): void; + openContentMgr(marketItemId: string): void; + downloadMarketItem(marketItemId: string): void; + pauseDownloading(marketItemId: string): void; + cancelDownloading(marketItemId: string): void; + rateItem(marketItemId: string, value: number): void; + openRateDetails(): void; + toggleFavoriteMarketItem(id: string, storeId: string): void; +} +declare function RegisterMarketItemListener(callback?: any): MarketItemListener; diff --git a/src/msfstypes/js/services/notifications.d.ts b/src/msfstypes/js/services/notifications.d.ts new file mode 100644 index 000000000..e4691662f --- /dev/null +++ b/src/msfstypes/js/services/notifications.d.ts @@ -0,0 +1,59 @@ +declare type NotificationType = "POPUP" | "MESSAGE" | "STACKABLE" | "OVERLAY"; +declare type NotificationTheme = "INFO" | "SUCCESS" | "WARNING" | "SYSTEM" | "TIPS" | "GAMEPLAY" | "SCORE"; +declare class NotificationData { + __Type: string; + id: number; + type: NotificationType; + theme: NotificationTheme; + title: string; + description: string; + image: string; + style: string; + buttons: NotificationButton[]; + hasGauge: boolean; + priority: number; + params: PopUp.NotiticationParams; + sound: string; +} +declare class NotificationsListener extends ViewListener.ViewListener { + constructor(name: string); + onCloseAllNotifications(callback: any): void; + onSendNewNotification(callback: any): void; + onUpdateNotificationText(callback: any): void; + onUpdateNotificationData(callback: any): void; + onUpdateNotificationGauge(callback: any): void; + onSetupObjectiveSteps(callback: any): void; + onHideNotification(callback: any): void; + onSetSubtitles(callback: any): void; + onHideSubtitles(callback: any): void; + onEnterPause(callback: any): void; + onLeavePause(callback: any): void; + PlayNotificationSound(id: number): void; +} +declare function RegisterNotificationsListener(callback?: any): NotificationsListener; +declare class NotificationElement extends TemplateElement { + get templateID(): string; + _data: NotificationData; + protected _theme: string; + private _hideMotive?; + protected m_clearTimeout: number; + constructor(); + connectedCallback(): void; + SetUpNotif(_oData: NotificationData): void; + UpdateTexts(_oData: NotificationData): void; + setTitle(newTitle: string): void; + setDesc(newDesc: string): void; + UpdateGauge(id: number, gaugePercent: number): void; + onPause(): void; + afterPause(): void; + protected OnClick(): void; + IsDisappearing(): boolean; + Hide(): void; + RemoveNotification(id: number, hideMotive?: string): void; + Close(hideMotive?: string): void; + OnFinishedCB: () => void; + OnFinished(): void; + get theme(): string; + set theme(theme: string); + CleanUp(): void; +} diff --git a/src/msfstypes/js/services/objective.d.ts b/src/msfstypes/js/services/objective.d.ts new file mode 100644 index 000000000..47f7aaf8c --- /dev/null +++ b/src/msfstypes/js/services/objective.d.ts @@ -0,0 +1,19 @@ +interface ObjectiveData { + objectiveId: number; + text: string; + status: string; + activated: boolean; +} +interface StepData { + stepId: number; + objectiveId: number; + text: string; + status: string; + activated: boolean; +} +declare class ObjectiveListener extends ViewListener.ViewListener { + onObjectiveUpdate(callback: (data: ObjectiveData) => void): void; + onStepUpdate(callback: (data: StepData) => void): void; + onObjectiveReset(callback: () => void): void; +} +declare function RegisterObjectiveListener(callback?: any): ObjectiveListener; diff --git a/src/msfstypes/js/services/profile.d.ts b/src/msfstypes/js/services/profile.d.ts new file mode 100644 index 000000000..e6aa22374 --- /dev/null +++ b/src/msfstypes/js/services/profile.d.ts @@ -0,0 +1,111 @@ +declare class ProfileMetaGaugesData { + constructor(); + metaGauges: TreeDataValue[]; + selectedIndex: number; + static getDebugValue(): ProfileMetaGaugesData; +} +declare class FlightData { + iLogVersion: number; + entryID: number; + iCreationTimeInSeconds: number; + iStartDay: number; + iStartMonth: number; + iStartYear: number; + iStartTimeInSeconds: number; + distance: DataValue; + fTotalHours: number; + fNightHours: number; + fDayHours: number; + fIFRHours: number; + fVFRHours: number; + iDayLandingCount: number; + iDayTakeOffCount: number; + iNightLandingCount: number; + iNightTakeOffCount: number; + sStartingAirport: string; + sEndingAirport: string; + bFullFlight: boolean; + bAllowFlyAgain: boolean; + sAircraftCategory: string; + sAircraftId: string; + sAircraftName: string; + sActivityName: string; + daNotes: string[]; +} +declare class TimelineEntry { + iDay: number; + iMonth: number; + iYear: number; + sDate: number; + daFlights: FlightData[]; +} +declare class ProfileAircraftData { + name: string; + image: string; + engineType: string; + stats: DataValue[]; + static getDebugValue(): ProfileAircraftData; +} +declare class LogbookData { + entries: TimelineEntry[]; + total: FlightData; + remarks: string; + favoriteAircraft: ProfileAircraftData; + favoriteAirport: string; + favoriteAircraftType: ProfileAircraftData; + favoriteFlight: string; + static getDebugValue(): LogbookData; +} +declare class ProfileReward { + id: string; + name: string; + image: string; + unlocked: boolean; + description: string; + category: string; + progress: number; + unlockProgress: number; + unlockedDate: string; +} +declare class SlottedProfileReward extends ProfileReward { + slotId: number; +} +declare class ProfileRank { + name: string; + image: string; + nextValue: DataValue; + unlockProgress: number; +} +interface MissionStat { + name: string; + value: number; + total: number; +} +declare class ProfileData { + sProfileName: string; + hasOverview: boolean; + avatarImage: string; + levelImage: string; + fTotalHours: number; + iLandingCount: number; + iAirportCount: number; + missionStats: MissionStat[]; + statsData: DataValue[]; + logbook: LogbookData; + metaStats: ProfileMetaGaugesData; + badges: ProfileReward[]; + achievements: ProfileReward[]; + favoriteBadges: ProfileReward[]; + rank: ProfileRank; + static getDebugValue(): ProfileData; +} +declare class ProfileListener extends ViewListener.ViewListener { + onProfileUpdated(callback: (data: ProfileData) => void): void; + onProfileFavoriteRewardsUpdated(callback: (data: ProfileReward[]) => void): void; + fillDebugValues(): ProfileData; + setFavoriteReward(data: ProfileReward, index: number): void; + createNote(entryID: number, content: string): void; + tooggleFavoriteEntry(entryID: number): void; + reflyEntry(entryID: number): void; +} +declare function RegisterProfileListener(callback?: any): ProfileListener; diff --git a/src/msfstypes/js/services/raceleaderboard.d.ts b/src/msfstypes/js/services/raceleaderboard.d.ts new file mode 100644 index 000000000..7aba7960e --- /dev/null +++ b/src/msfstypes/js/services/raceleaderboard.d.ts @@ -0,0 +1,9 @@ +declare class RaceLeaderboardListener extends ViewListener.ViewListener { + onRaceStatsUpdated(callback: (data: RaceStatistics) => void): void; + onStatsRankUpdated(callback: (rank: number, type: any) => void): void; + displayOverview(): void; + getLeaderboard(category: string, type: string): void; + onQuickMatchLeaderboardUpdated(callback: (table: LeaderboardTable, leaderboardType: LeaderboardType) => void): void; + onTimeTrialLeaderboardUpdated(callback: (table: LeaderboardTableWithAdditionalDataFields, leaderboardType: LeaderboardType, category: RenoLeaderboardType) => void): void; +} +declare function RegisterRaceLeaderboardListener(callback?: any): RaceLeaderboardListener; diff --git a/src/msfstypes/js/services/replay.d.ts b/src/msfstypes/js/services/replay.d.ts new file mode 100644 index 000000000..80bb2364b --- /dev/null +++ b/src/msfstypes/js/services/replay.d.ts @@ -0,0 +1,114 @@ +declare const ReplayPlayerSpeedMapping: { + 0: string; + 1: string; + 2: string; + 3: string; + 4: string; +}; +interface ReplayRecordCameraData { +} +interface ReplayRecordKeyframeData { + id: number; + configuration: ReplayRecordCameraData; +} +interface ReplayRecordData { + totalTime: DataValue; +} +interface ReplayPlayerData { + isLive: boolean; + isRecording: boolean; + selectedKeyframeId: number; + isCameraRerecording: boolean; + isPlaying: boolean; + isRewinding: boolean; + isForwarding: boolean; + playbackSpeed: number; + saveName: string; + time: DataValue; + reversedTime: DataValue; + record: ReplayRecordData; + cameraKeys: DataValue[]; +} +interface TrackSwitchEvent { + fTimestamp: number; + iTrackDestId: number; +} +interface EnvSwitchEvent { + fTimestamp: number; + sPresetFilename: string; + dZuluTime: number; +} +interface FlightReplayData { + iVersion: number; + sName: string; + fRecordedTime: number; + dLatitudeOrigin: number; + dLongitudeOrigin: number; + iCameraCount: number; + iCurrentCamera: number; + trackSwitchEvents: TrackSwitchEvent[]; + envSwitchEvents: EnvSwitchEvent[]; +} +interface ReplayPlayerNewData { + sFileName: string; + bIsPlaying: boolean; + bIsRecording: boolean; + fTimer: number; + bPaused: boolean; + bIsMultiplayer: boolean; + bUseStartPosition: boolean; + iReplayCount: number; + iCurrentFlightReplay: number; + replaysData: FlightReplayData[]; +} +declare class ReplayListener extends ViewListener.ViewListener { + onUpdate(callback: (data: ReplayPlayerNewData) => void): void; + loadReplay(): void; + saveReplay(): void; + saveReplayAs(): void; + startReplay(): void; + pauseReplay(): void; + toggleReplayReplay(replayReplay: boolean): void; + stopReplay(): void; + startRecord(): void; + startRecordCamera(): void; + stopRecordCamera(): void; + cancelRecordCamera(): void; + stopRecord(): void; + setStartPosition(): void; + resetStartPosition(): void; + loadFile(): void; + saveFile(): void; + incrementSaveFile(): void; + replayName(index: number, name: string): void; + deleteReplay(index: number): void; + selectFlight(index: number): void; + selectCamera(index: number): void; + seek(percent: number): void; + setSelectedTrackSwitch(timestamp: number): void; + setSelectedEnvSwitch(timestamp: number): void; + createMultiplayers(): void; + stopMultiplayers(): void; + loadMultiplayers(): void; + createMission(): void; + loadMission(): void; + askAllAircrafts(): void; + changePlane(): void; + startRecordPlaneMission(): void; + stopRecordPlaneMission(): void; + playMission(): void; + pauseMission(): void; + resetMission(): void; + stopPlayMission(): void; + receiveAircraft(): void; + startRecordCameraMission(): void; + stopRecordCameraMission(): void; + toggleGUI(bHideGUI: boolean): void; + addTrackSwitch(): void; + addEnvSwitch(): void; + deleteKeyframe(): void; + deleteCamera(): void; + setFirstCameraPosition(): void; + setSecondCameraPosition(): void; +} +declare function RegisterReplayListener(callback?: any): ReplayListener; diff --git a/src/msfstypes/js/services/rewardscreenmanager.d.ts b/src/msfstypes/js/services/rewardscreenmanager.d.ts new file mode 100644 index 000000000..e4656494e --- /dev/null +++ b/src/msfstypes/js/services/rewardscreenmanager.d.ts @@ -0,0 +1,107 @@ +declare const enum MissionState { + MISSION_NONE = 0, + MISSION_INCOMPLETE = 1, + MISSION_FAILED = 2, + MISSION_CRASHED = 3, + MISSION_PROHIBITED = 4, + MISSION_OUT_OF_BOUNDS = 5, + MISSION_SUCCEEDED = 6, + MISSION_ABORTED = 7 +} +declare const enum GoalState { + GOAL_NONE = -1, + GOAL_PENDING = 0, + GOAL_COMPLETED = 1, + GOAL_FAILED = 2, + GOAL_ABORTED = 3 +} +declare const enum StepState { + STEP_PENDING = 0, + STEP_FAILED = 1, + STEP_COMPLETED = 2, + STEP_ABORTED = 3 +} +declare class MissionStep { + State: StepState; + Description: string; + Text: string; + Image: string; + Score: EOMScore; +} +declare class MissionObjective { + index?: number; + State: GoalState; + Description: string; + Text: string; + Image: string; + Score: EOMScore; + Steps: MissionStep[]; +} +declare class RewardElementData { + type: string; + state: "default" | "hide" | "disable"; + tag: string; + path: string; + external: boolean; +} +declare class RewardPage { + id: string; + title: string; + tabs?: string[]; + elements: RewardElementData[]; + buttons: InputBar.InputBarButtonParams[]; + forceNoButtons: boolean; +} +declare class EOMData_Base { + MissionState: MissionState; + MissionType: string; + MissionName: string; + MissionEndingMessage: string; + MissionEndingTitle: string; + Description: string; + ActivitiesMenuTitle: string; + NextActivityButtonTitle: string; + Image: string; + CompletionTime: string; + AllowContinue: boolean; + AllowContinueBushTrip: boolean; + AllowRestart: boolean; + AllowRaceRestart: boolean; + AllowBackRaceMenu: boolean; + AllowRaceNew: boolean; + AllowActivityMenu: boolean; + AllowBackMainMenu: boolean; + NextFlight: Flight; + Objectives: MissionObjective[]; + pages: RewardPage[]; +} +declare abstract class RewardScreenElement extends TemplateElement { + abstract elementPosition(): "external" | "inTabs"; + showPage(val: boolean, transition: boolean): void; + setData(eomData: EOMData_Base, pageData: RewardElementData): void; + setPageElementData(pageData: RewardElementData): void; +} +declare function EndScreenSetData(data: EOMData_Base): void; +declare class EOMScore extends RewardElementData { + constructor(); + ScoreName: string; + IconFilename: string; + Description: string; + Score: ScoreParam; + Tracked: ScoreParam; + Reference: ScoreParam; + MinScore: ScoreParam; + MaxScore: ScoreParam; + Ranks: EOMRank[]; + SubScores: EOMScore[]; + currentRank?: EOMRank; + static applyRankToScore(score: EOMScore): void; + static getDebugValue(): EOMScore; +} +declare class RewardScreenListener extends ViewListener.ViewListener { + requestEndOfMissionData(): void; + onUpdateEndOfMissionData(callback: (data: EOMData_Base) => void): void; + onUpdatePageData(callback: (data: RewardPage) => void): void; + onUpdatePageElementData(callback: (data: RewardElementData, pageId: string) => void): void; +} +declare function RegisterRewardScreenListener(callback?: () => void): RewardScreenListener; diff --git a/src/msfstypes/js/services/toolbarpanels.d.ts b/src/msfstypes/js/services/toolbarpanels.d.ts new file mode 100644 index 000000000..44561f713 --- /dev/null +++ b/src/msfstypes/js/services/toolbarpanels.d.ts @@ -0,0 +1,76 @@ +interface ToolBarButtonData { + __Type: "ToolBarButtonData"; + icon: string; + childDetached: boolean; + buttonVisible: boolean; + disabled: boolean; + childActive: boolean; + nbNotifications: number; + newNotification: boolean; + name: string; + ID: string; + shortcut: string; + managedByToolbar: boolean; +} +declare class ToolBarButtonAction { + ID: string; + x: number; + childActive?: boolean; + childVisible?: boolean; + y: number; + childDetached?: boolean; +} +declare class ToolBarPanelData { + __Type: "ToolBarPanelData"; + visible: boolean; + action: string; + x: number; + y: number; +} +declare class ToolBarListener extends ViewListener.ViewListener { + onSetToolBarElements(callback: (data: ToolBarButtonData[], isFirstFlight: boolean) => void): void; + onToolBarButtonFocusChange(callback: (id: string, focused: boolean) => void): void; + onUpdateToolBarElement(callback: (data: ToolBarButtonData) => void): void; + onPanelActiveChange(callback: (panelID: string, visible: boolean, minimized: boolean) => void): void; + onSetToolBarCustomizationList(callback: (data: ToolBarButtonData[]) => void): void; + onInGamePanelMouseOut(callback: (panelID: string) => void): void; + setButtonChildActive(ID: string, active: boolean): void; + setButtonChildDetach(ID: string, detach: boolean): void; + setButtonChildExtern(ID: string, extern: boolean): void; + setButtonEnabled(ID: string, enabled: boolean): void; + setMinimized(ID: string, minimized: boolean): void; + setActivePause(paused: boolean): void; + onActivePauseUpdate(callback: (paused: boolean) => void): void; + setFirstFlightInteracted(): void; + getFirstFlightInteracted(): boolean; + resetAllPanelsPosition(): void; + onPanelVisible(ID: string): void; + onToolbarMode(callback: (on: boolean) => void): void; + pushPanelMouseOver(ID: string): void; + onInGamePanelMouseOver(callback: (panelID: string) => void): void; + pushPanelMouseOut(ID: string): void; + pushLocalPanelVisibility(panelID: string, visible: boolean): void; + onLocalPanelVisibility(callback: (panelID: string, visible: boolean) => void): void; + pushPanelAttachedPosition(data: ToolBarButtonAction): void; + onInGamePanelToggleMinimize(callback: (panelID: string, minimized: boolean) => void): void; + pushInGamePanelToggleMinimize(panelID: string, minimized: boolean): void; + onUpdatePanelPosition(callback: (data: ToolBarButtonAction) => void): void; + onRefreshPanelPosition(callback: (panelID: string) => void): void; + pushRefreshPanelPosition(panelID: string): void; + onUpdatePanelAttachment(callback: (panelID: string, detached: boolean) => void): void; + onUpdatePanelExtern(callback: (panelID: string, extern: boolean) => void): void; + onSetupPanelInfos(callback: (infos: PanelInfos) => void): void; + onSetupPanelOptions(callback: (data: PanelOptionData[]) => void): void; + onTogglePanelOptionVisibility(callback: (updateList: { + optionID: string; + visible: boolean; + }[]) => void): void; + onTogglePanelOptionDisable(callback: (updateList: { + optionID: string; + disabled: boolean; + }[]) => void): void; + onUpdatePanelOptions(callback: (data: PanelOptionData[]) => void): void; + pushUpdatePanelOption(optionID: string, dataList: DataValue[]): void; + onSetHeaderVisibility(callback: (data: boolean) => void): void; +} +declare function RegisterToolBarListener(callback?: any): ToolBarListener; diff --git a/src/msfstypes/js/services/tooltipsmanager.d.ts b/src/msfstypes/js/services/tooltipsmanager.d.ts new file mode 100644 index 000000000..86f605d90 --- /dev/null +++ b/src/msfstypes/js/services/tooltipsmanager.d.ts @@ -0,0 +1,23 @@ +declare class TooltipData { + __Type: string; + text: string; + posX: number; + posY: number; + maxWidth: number; + sideMargin: number; +} +declare class ActionTooltipData { + __Type: string; + tree: TreeDataValue; + posX: number; + posY: number; + maxWidth: number; + sideMargin: number; +} +declare class TooltipsListener extends ViewListener.ViewListener { + onSetTooltip(callback: (data: TooltipData) => void): void; + onHideTooltip(callback: () => void): void; + onSetActionsTooltips(callback: (data: ActionTooltipData) => void): void; + onHideActionsTooltip(callback: (tooltipId: number) => void): void; +} +declare function RegisterTooltipsListener(callback?: any): TooltipsListener; diff --git a/src/msfstypes/js/services/weather.d.ts b/src/msfstypes/js/services/weather.d.ts new file mode 100644 index 000000000..39bcdceb0 --- /dev/null +++ b/src/msfstypes/js/services/weather.d.ts @@ -0,0 +1,133 @@ +declare class UIWeatherData { + index: number; + name: string; + icon: string; + weatherImage: string; + weatherImageLayered: string; + visibility: string; + live: boolean; + locked: boolean; + wind: string; + displayed: boolean; +} +declare let UIWeatherConfig: UIWeatherConfigData; +declare abstract class UIWeatherConfigData { + I_NUM_RULERS_FT: number; + I_NUM_RULERS_M: number; + I_MIN_CLOUD_HEIGHT_M: number; + I_MIN_CLOUD_HEIGHT_FT: number; + I_NAME_MAX_CHAR: number; + I_ALTITUDE_LINE_CHUNK_ALTITUDE: number; + I_MIN_WIND_LAYERS: number; + I_MAX_WIND_LAYERS: number; + F_MAX_WIND_SPEED: number; + I_MIN_CLOUD_LAYERS: number; + I_MAX_CLOUD_LAYERS: number; + F_GUST_GRAPH_POINT_INTERVAL: number; + F_GUST_GRAPH_MAX_SPEED: number; + F_GUST_GRAPH_MAX_DISPLAYED_TIME: number; + F_GUST_GRAPH_MAX_TOTAL_TIME: number; + F_MIN_PRECIPITATION: number; + F_MAX_PRECIPITATION: number; + F_STEP_PRECIPITATION: number; + F_MIN_LIGHTNING: number; + F_MAX_LIGHTNING: number; + F_STEP_LIGHTNING: number; + F_MIN_GROUND_TEMP: number; + F_MAX_GROUND_TEMP: number; + F_STEP_GROUND_TEMP: number; + F_MIN_GROUND_PRESS: number; + F_MAX_GROUND_PRESS: number; + F_STEP_GROUND_PRESS: number; + F_MIN_ISA: number; + F_MAX_ISA: number; + F_STEP_ISA: number; + F_MIN_AEROSOL_DENSITY: number; + F_MAX_AEROSOL_DENSITY: number; + F_STEP_AEROSOL_DENSITY: number; + F_MIN_GROUND_SNOW: number; + F_MAX_GROUND_SNOW: number; + F_STEP_GROUND_SNOW: number; +} +declare let configJson: any; +declare class WeatherPresetData { + __Type: string; + index: number; + sPresetName: string; + bIsValid: boolean; + bIsRemovable: boolean; + tCloudLayers: CloudLayer[]; + tWindLayers: WindLayer[]; + oSettings: WeatherPresetSettingData; + oConfig: WeatherPresetConfigData; +} +declare class WeatherPresetSettingData { + bIsAltitudeAMGL: boolean; + bIsInMeters: boolean; + dvMSLPressure: RangeDataValue; + dvMSLGLTemperature: RangeDataValue; + dvPrecipitation: RangeDataValue; + dvSnowCover: RangeDataValue; + dvPollution: RangeDataValue; + dvHumidityMultiplier: RangeDataValue; + dvThunderstormRatio: RangeDataValue; +} +declare class WeatherPresetConfigData { + dvMinAltitude: DataValue; + dvMaxAltitude: DataValue; + dvAltitudeLineChunk: DataValue; + dvMinCloudHeight: DataValue; + dvMaxWindSpeed: DataValue; + fMaxGustSpeedRatio: number; + fMinGustSpeedRatio: number; +} +declare class CloudLayer { + __Type: string; + dvDensityMultiplier: RangeDataValue; + dvCoverageRatio: RangeDataValue; + dvCloudScatteringRatio: RangeDataValue; + dvAltitudeBot: RangeDataValue; + dvAltitudeTop: RangeDataValue; +} +declare class WindLayer { + __Type: string; + dvAltitude: RangeDataValue; + dvAngleRad: RangeDataValue; + dvSpeed: RangeDataValue; + gustWaveData: GustWave; +} +declare class GustWave { + __Type: string; + dvAngleRad: RangeDataValue; + dvIntervalS: RangeDataValue; + dvSpeedMultiplier: RangeDataValue; +} +declare class WeatherListener extends ViewListener.ViewListener { + constructor(name: any); + setZuluTime(timeSec: number): void; + setLocalTime(timeSec: number): void; + increaseZuluTime(): void; + decreaseZuluTime(): void; + increaseLocalTime(): void; + decreaseLocalTime(): void; + setForcedTime(value: boolean): void; + timeLocalToSystemTime(): void; + setDate(data: TimeData): void; + onTimeUpdated(callback: (time: TimeData, locked: boolean) => void): void; + onFlightTimeChanged(callback: (timeData: TimeData) => void): void; + onToggleReadOnlyPanel(callback: (canEditWeather: boolean, canEditCustom: boolean) => void): void; + updateGroundSnow(value: number): void; + onUpdatedGroundSnow(callback: (value: number) => void): void; + getWeatherPresetList(): void; + setWeatherPresetList(callback: (m_w_preset_list: UIWeatherData[]) => void): void; + setWeatherPreset(id: number): void; + addPreset(name: string, successCallback: any, errorCallback: any): void; + savePreset(preset: WeatherPresetData, successCallback: any, errorCallback: any): void; + updatePreset(callback: (data: any) => void): void; + updateTempWeatherPreset(preset: WeatherPresetData, successCallback: (data: WeatherPresetData) => void, errorCallback: any): void; + removePreset(successCallback: any, errorCallback: any): void; + onUpdateGustSpeedGraphData(callback: (data: number[]) => void): void; + setUISelectedWindLayerIndex(value: number): void; + onAllowEditGameflightFlag(callback: (value: boolean) => void): void; +} +declare function RegisterWeatherListener(callback?: any): WeatherListener; diff --git a/src/msfstypes/js/simplane.d.ts b/src/msfstypes/js/simplane.d.ts new file mode 100644 index 000000000..7a0488cdb --- /dev/null +++ b/src/msfstypes/js/simplane.d.ts @@ -0,0 +1,588 @@ +declare class RangeDisplay { + constructor(_type?: string); + __Type: string; + Initialized: boolean; + min: number; + max: number; + lowLimit: number; + highLimit: number; +} +declare class ColorRangeDisplay extends RangeDisplay { + constructor(_type?: string); + greenStart: number; + greenEnd: number; +} +declare class ColorRangeDisplay2 extends ColorRangeDisplay { + constructor(_type?: string); + yellowStart: number; + yellowEnd: number; + redStart: number; + redEnd: number; +} +declare class ColorRangeDisplay3 extends ColorRangeDisplay2 { + constructor(_type?: string); + lowRedStart: number; + lowRedEnd: number; + lowYellowStart: number; + lowYellowEnd: number; +} +declare class ColorRangeDisplay4 extends ColorRangeDisplay2 { + constructor(_type?: string); + whiteStart: number; + whiteEnd: number; +} +declare class FlapsRangeDisplay extends RangeDisplay { + constructor(_type?: string); + takeOffValue: number; +} +declare class ThrottleLevelsInfo { + __Type: string; + initialised: boolean; + minValues: Array; + names: Array; +} +declare class FlapsLevelsInfo { + __Type: string; + initialised: boolean; + slatsAngle: Array; + flapsAngle: Array; +} +declare class TakeOffSpeedsInfo { + __Type: string; + initialised: boolean; + minVal: number; + minWeight: number; + maxVal: number; + maxWeight: number; +} +declare class GlassCockpitMisc { + __Type: string; + initialised: boolean; + hasGMeter: boolean; + vCockpitHud: boolean; + highAltitudeHud: boolean; + hudAirspeedColorFromLVar: boolean; + hudShowFuel: boolean; + hudShowAOA: boolean; +} +declare class GlassCockpitSettings { + FuelFlow: ColorRangeDisplay; + FuelQuantity: ColorRangeDisplay2; + FuelTemperature: ColorRangeDisplay3; + FuelPressure: ColorRangeDisplay3; + OilPressure: ColorRangeDisplay3; + OilTemperature: ColorRangeDisplay3; + EGTTemperature: ColorRangeDisplay2; + CHTTemperature: ColorRangeDisplay2; + Vacuum: ColorRangeDisplay; + ManifoldPressure: ColorRangeDisplay; + AirSpeed: ColorRangeDisplay4; + Torque: ColorRangeDisplay2; + RPM: ColorRangeDisplay2; + TurbineNg: ColorRangeDisplay2; + TurbineN1: ColorRangeDisplay2; + TurbineN2: ColorRangeDisplay2; + ITTEngineOff: ColorRangeDisplay3; + ITTEngineOn: ColorRangeDisplay3; + MainBusVoltage: ColorRangeDisplay3; + HotBatteryBusVoltage: ColorRangeDisplay3; + BatteryBusAmps: ColorRangeDisplay2; + GenAltBusAmps: ColorRangeDisplay2; + CoolantLevel: RangeDisplay; + CoolantTemperature: ColorRangeDisplay3; + GearOilTemperature: ColorRangeDisplay2; + CabinAltitude: ColorRangeDisplay; + CabinAltitudeChangeRate: RangeDisplay; + CabinPressureDiff: ColorRangeDisplay; + ThrottleLevels: ThrottleLevelsInfo; + FlapsLevels: FlapsLevelsInfo; + TakeOffSpeeds: TakeOffSpeedsInfo; + Misc: GlassCockpitMisc; +} +declare class FuelLevels { + fuel_tank_selector: number[]; + Center: number; + Center2: number; + Center3: number; + LeftMain: number; + RightMain: number; + LeftAux: number; + RightAux: number; + LeftTip: number; + RightTip: number; + External1: number; + External2: number; +} +declare class DesignSpeeds { + VS0: number; + VS1: number; + VFe: number; + VNe: number; + VNo: number; + VMin: number; + VMax: number; + Vr: number; + Vx: number; + Vy: number; + Vapp: number; + BestGlide: number; + Vyse: number; + Vmc: number; +} +declare enum EngineType { + ENGINE_TYPE_PISTON = 0, + ENGINE_TYPE_JET = 1, + ENGINE_TYPE_NONE = 2, + ENGINE_TYPE_HELO_TURBINE = 3, + ENGINE_TYPE_ROCKET = 4, + ENGINE_TYPE_TURBOPROP = 5 +} +declare enum PropellerType { + PROPELLER_TYPE_CONSTANT_SPEED = 0, + PROPELLER_TYPE_FIXED_PITCH = 1 +} +declare enum Aircraft { + CJ4 = 0, + A320_NEO = 1, + B747_8 = 2, + AS01B = 3, + AS02A = 4, + AS03D = 5 +} +declare enum ThrottleMode { + UNKNOWN = 0, + REVERSE = 1, + IDLE = 2, + AUTO = 3, + CLIMB = 4, + FLEX_MCT = 5, + TOGA = 6, + HOLD = 7 +} +declare enum AutopilotMode { + MANAGED = 0, + SELECTED = 1, + HOLD = 2 +} +declare enum MinimumReferenceMode { + RADIO = 0, + BARO = 1 +} +declare enum FlightState { + FLIGHT_STATE_BRIEFING = 0, + FLIGHT_STATE_INTRO_PLANE = 1, + FLIGHT_STATE_INTRO = 2, + FLIGHT_STATE_PREFLIGHT_GATE = 3, + FLIGHT_STATE_PREFLIGHT_PUSHBACK = 4, + FLIGHT_STATE_PREFLIGHT_TAXI = 5, + FLIGHT_STATE_PREFLIGHT_HOLDSHORT = 6, + FLIGHT_STATE_FLIGHT_RUNWAY = 7, + FLIGHT_STATE_FLIGHT_INITIAL_CLIMB = 8, + FLIGHT_STATE_FLIGHT_CLIMB = 9, + FLIGHT_STATE_FLIGHT_CRUISE = 10, + FLIGHT_STATE_FLIGHT_DESCENT = 11, + FLIGHT_STATE_JOINPLANE = 12, + FLIGHT_STATE_LANDING_APPROACH = 13, + FLIGHT_STATE_LANDING_FINAL = 14, + FLIGHT_STATE_LANDING_TOUCHDOWN = 15, + FLIGHT_STATE_LANDING_GROUNDROLL = 16, + FLIGHT_STATE_LANDING_TAXI = 17, + FLIGHT_STATE_LANDING_GATE = 18, + FLIGHT_STATE_LANDING_REST = 19, + FLIGHT_STATE_OUTRO = 20, + FLIGHT_STATE_WAITING = 21, + FLIGHT_STATE_TELEPORTTOSTATE = 22, + FLIGHT_STATE_FREEFLIGHT = 23, + FLIGHT_STATE_LANDINGCHALLENGE = 24, + FLIGHT_STATE_BUSHTRIP = 25 +} +declare enum FlightPhase { + FLIGHT_PHASE_PREFLIGHT = 0, + FLIGHT_PHASE_TAXI = 1, + FLIGHT_PHASE_TAKEOFF = 2, + FLIGHT_PHASE_CLIMB = 3, + FLIGHT_PHASE_CRUISE = 4, + FLIGHT_PHASE_DESCENT = 5, + FLIGHT_PHASE_APPROACH = 6, + FLIGHT_PHASE_GOAROUND = 7 +} +declare enum ApproachType { + APPROACH_TYPE_UNKNOWN = 0, + APPROACH_TYPE_GPS = 1, + APPROACH_TYPE_VOR = 2, + APPROACH_TYPE_NDB = 3, + APPROACH_TYPE_ILS = 4, + APPROACH_TYPE_LOCALIZER = 5, + APPROACH_TYPE_SDF = 6, + APPROACH_TYPE_LDA = 7, + APPROACH_TYPE_VORDME = 8, + APPROACH_TYPE_NDBDME = 9, + APPROACH_TYPE_RNAV = 10, + APPROACH_TYPE_LOCALIZER_BACK_COURSE = 11 +} +declare enum RunwayDesignator { + RUNWAY_DESIGNATOR_NONE = 0, + RUNWAY_DESIGNATOR_LEFT = 1, + RUNWAY_DESIGNATOR_RIGHT = 2, + RUNWAY_DESIGNATOR_CENTER = 3, + RUNWAY_DESIGNATOR_WATER = 4, + RUNWAY_DESIGNATOR_A = 5, + RUNWAY_DESIGNATOR_B = 6 +} +declare enum WorldRegion { + NORTH_AMERICA = 0, + AUSTRALIA = 1, + HAWAII = 2, + OTHER = 3 +} +declare enum NAV_AID_STATE { + OFF = 0, + ADF = 1, + VOR = 2 +} +declare enum NAV_AID_MODE { + NONE = 0, + MANUAL = 1, + REMOTE = 2 +} +declare namespace Simplane { + function getDSVNO(): number; + function getMGSP(): number; + function LowVaccum(): boolean; + function getStructuralDeiceSwitch(): boolean; + function getDesignSpeeds(): DesignSpeeds; + function getBTNWXActive(): boolean; + function setBTNWXActive(val: boolean): void; + function getBTNTerrOnNdActive(): boolean; + function setBTNTerrOnNdActive(val: boolean): void; + function get747MFDNavMode(): number; + function set747MFDNavMode(val: number): void; + function get747MFDRange(): number; + function getTrueSpeed(): number; + function getIndicatedSpeed(): number; + function getVerticalSpeed(): number; + function getGroundSpeed(): number; + function getTrackAngle(): number; + function getMachSpeed(): number; + function getFlightPathAngleY(): number; + function getV1AirspeedR(): number; + function getV1AirspeedP(phase: number): number; + function getVRAirspeedP(phase: number): number; + function getV1Airspeed(): number; + function getVRAirspeed(): number; + function getV2Airspeed(): number; + function getV2AirspeedP(phase: number): number; + function getDecisionHeight(): number; + function getREFAirspeed(): number; + function getVXAirspeed(): number; + function getFMCGreenDotSpeed(): number; + function getFMCApprGreenDotSpeed(): number; + function getGreenDotSpeed(): number; + function getCruiseMach(): number; + function getCrossoverSpeed(): number; + function getCrossoverSpeedFactor(_cas: number, _mach: number): number; + function getKiasToMach(_kias: number): number; + function getMachToKias(_kias: number): number; + function getFlapsSpeedLim(index: number): number; + function getFlapsLimitSpeed(_aircraft: Aircraft, _flapIndex: number): number; + function getFlapsHandleIndex(forceSimVarCall?: boolean): number; + function getFlapsExtendSpeed(_aircraft: Aircraft, forceSimVarCall?: boolean): number; + function getNextFlapsExtendSpeed(_aircraft: Aircraft, forceSimVarCall?: boolean): number; + function getMaxSpeed(_aircraft: Aircraft): number; + function getLowestSelectableSpeed(): number; + function getStallProtectionMinSpeed(): number; + function getStallProtectionMaxSpeed(): number; + function getStallSpeed(): number; + function getStallSpeedPredicted(index: number): number; + function getWindDirection(): number; + function getWindStrength(): number; + function getAPRadioNavSource(): number; + function setAPRadioNavSource(val: number): void; + function getAPLNAVActive(): number; + function setAPLNAVActive(val: number): void; + function getAPLNAVArmed(): number; + function setAPLNAVArmed(val: number): void; + function getAPFLCHActive(): number; + function setAPFLCHActive(val: number): void; + function getAPAltHoldActive(): number; + function setAPAltHoldActive(val: number): void; + function getAPVNAVActive(): number; + function setAPVNAVActive(val: number): void; + function getAPVNAVArmed(): number; + function setAPVNAVArmed(val: number): void; + function getFMCFlightPlanIsTemp(): number; + function getAutoPilotAvailable(): number; + function setAutoPilotSelectedNav(_index: number): Promise; + function getAutoPilotNavSelected(): number; + function getAutoPilotNavSelectedTMP(): number; + function getAutoPilotSelectedNav(): number; + function getAutoPilotActive(_apIndex?: number): boolean; + function getAutoPilotAirspeedSlotIndex(): number; + function getAutoPilotAirspeedManaged(): boolean; + function getAutoPilotAirspeedSelected(): boolean; + function getAutoPilotAirspeedHold2(): boolean; + function getAutoPilotAirspeedHold1(): boolean; + function getAutoPilotAirspeedHold(): boolean; + function getAutoPilotAirspeedHoldActive(isManaged?: boolean): boolean; + function getAutoPilotAirspeedHoldValue(): number; + function getAutoPilotSelectedAirspeedHoldValue(): number; + function getAutoPilotManagedAirspeedHoldValue(): number; + function getAutoPilotMachModeActive(): boolean; + function setAutoPilotMachModeActive(val: boolean): void; + function getAS1000WarIndex(): number; + function setAS1000WarIndex(val: number): void; + function getAS1000WarMasterSet(): number; + function setAS1000WarMasterSet(val: number): void; + function getAutoPilotManSpdIsMachOn(): number; + function setAutoPilotManSpdIsMachOn(val: number): void; + function getECAMCurPage(): number; + function setECAMCurPage(val: number): void; + function getAutoPilotPanMachHold(): number; + function setAutoPilotPanMachHold(val: number): void; + function getAutoPilotManSpdIsMachOff(): number; + function setAutoPilotManSpdIsMachOff(val: number): void; + function getAutoPilotFMCForceNextUpdate(): number; + function setAutoPilotFMCForceNextUpdate(val: number): void; + function getAutoPilotMachHold(): boolean; + function getAutoPilotMachHoldValue(): number; + function getAutoPilotSelectedMachHoldValue(): number; + function getAutoPilotManagedMachHoldValue(): number; + function getAutoPilotHeadingSlotIndex(): number; + function getAutoPilotHeadingManaged(): boolean; + function getAutoPilotHeadingSelected(): boolean; + function getAutoPilotHeadingLockActive(): boolean; + function getAutoPilotHeadingLockValueRadians(): number; + function getAutoPilotHeadingLockValueDegrees(): number; + function getAutoPilotHeadingLockValue(_radians?: boolean): number; + function getAutoPilotSelectedHeadingLockValueRadians(): number; + function getAutoPilotSelectedHeadingLockValueDegrees(): number; + function getAutoPilotSelectedHeadingLockValue(_radians?: boolean): number; + function getAutoPilotManagedHeadingLockValueRadians(): number; + function getAutoPilotManagedHeadingLockValueDegrees(): number; + function getAutoPilotManagedHeadingValue(_radians?: boolean): number; + function getAutoPilotDisplayedHeadingLockValueRadians(): number; + function getAutoPilotDisplayedHeadingLockValueDegrees(): number; + function getAutoPilotDisplayedHeadingValue(_radians?: boolean): number; + function getAutoPilotAltitudeSlotIndex(): number; + function getAutoPilotAltitudeManaged(): boolean; + function getAutoPilotAltitudeSelected(): boolean; + function getAutoPilotAltitudeArm(): boolean; + function getAutoPilotAltitudeArmed(): boolean; + function getAutoPilotAltitudeLockActive(): boolean; + function getAutoPilotFLCActive(): boolean; + function getAutoPilotAltitudeLockValueFeet(): number; + function getAutoPilotAltitudeLockValue(_units?: string): number; + function getAutoPilotSelectedAltitudeLockValueFeet(): number; + function getAutoPilotSelectedAltitudeLockValue(_units?: string): number; + function getAutoPilotDisplayedAltitudeLockValueFeet(): number; + function getAutoPilotDisplayedAltitudeLockValue(_units?: string): number; + function getAutoPilotAltitudeLockUnits(): string; + function getAutoPilotVerticalSpeedHoldActive(): boolean; + function getAutoPilotVerticalSpeedHoldValue(): number; + function getAutoPilotSelectedVerticalSpeedHoldValue(): number; + function getAutoPilotDisplayedVerticalSpeedHoldValue(): number; + function getAutoPilotLateralModeActive(): boolean; + function getAutoPilotNavHasLoc(_fdIndex: number): boolean; + function getAutoPilotFlightDirectorActive(_fdIndex: number): boolean; + function getAutoPilotFlightDirectorBankValue(): number; + function getAutoPilotFlightDirectorPitchValue(): number; + function getAutopilotGPSDriven(): boolean; + function getAutopilotGPSActive(): boolean; + function getAutoPilotTrackAngle(): number; + function getAutoPilotFlightPathAngle(): number; + function getAutoPilotThrottleArmedA(): boolean; + function getAutoPilotThrottleArmedB(_fdIndex: number): boolean; + function getAutoPilotThrottleArmed(_index?: number): boolean; + function getAutoPilotThrottleLocked(): boolean; + function getAutoPilotThrottleActiveA(): boolean; + function getAutoPilotThrottleActiveB(_fdIndex: number): boolean; + function getAutoPilotThrottleActive(_index?: number): boolean; + function getAutoPilotTOGAActive(): boolean; + function getAutoPilotAPPRIsLocalizer(): boolean; + function getAutoPilotAPPRCaptured(): boolean; + function getAutoPilotAPPRAct(): boolean; + function getAutoPilotAPPRActive(): boolean; + function getAutoPilotAPPRAr(): boolean; + function getAutoPilotAPPRArm(): boolean; + function getAutoPilotAPPRHold(): boolean; + function getAutoPilotTRKFPAModeActive(): boolean; + function getAutoPilotTRKModeActive(): boolean; + function getAutoPilotFPAModeActive(): boolean; + function getAutoPilotGlideslopeActive(): boolean; + function getAutoPilotGlideslopeArm(): boolean; + function getAutoPilotGlideslopeHold(): boolean; + function getAutoPilotApproachType(): ApproachType; + function getGPSWpNextID(): string; + function getAutoPilotApproachLoaded(): boolean; + function getAutoPilotNavAidStateL(_Index: number): number; + function getAutoPilotNavAidStateR(_Index: number): number; + function getAutoPilotNavAidState(_aircraft: Aircraft, _user: number, _switch: number): NAV_AID_STATE; + function getAutoPilotIsHeadingAligned(): boolean; + function getNextWaypointName(): string; + function getNextWaypointTrack(): number; + function getNextWaypointDistance(): number; + function getNextWaypointCrossTrk(): number; + function getNextWaypointETA(): number; + function getFlightTime(): number; + function getCurrentUTC(): number; + function getCurrentLocalTime(): number; + function getCurrentTimeDeviation(): number; + function getTurbEng1IsIgn(): boolean; + function getEngStarAc1(): boolean; + function getEngineCount(): number; + function getEngineEGT(_engineIndex: number): number; + function getEngineAntiIce(_engineIndex: number): boolean; + function getEngineActive(_engineIndex: number): boolean; + function getEngineThrottle(_engineIndex: number): number; + function getEngineThrottleMode(_engineIndex: number): ThrottleMode; + function getEngineCommandedN1(_engineIndex: number): number; + function getN2Value(_engineIndex: number): number; + function getFuelValveOpen(_engineIndex: number): boolean; + function getEngineThrottleCommandedN1(_engineIndex: number, inverseIfReverseMode?: boolean): number; + function getTurbEngineReverseNozzlePercent(_engineIndex: number): number; + function getEngineThrottleMaxThrust(_engineIndex: number): number; + function getEngineThrustTakeOffMode(_engineIndex: number): number; + function getEngineThrustClimbMode(_engineIndex: number): number; + function getAutopilotThrottle(_engineIndex: number): number; + function getAutopilotCommandedN1(_engineIndex: number): number; + function getEngineType(): number; + function getEngineUsePropRPM(): boolean; + function getEngineRPMJet(_engineIndex: number): number; + function getEngineRPMJetPC(_engineIndex: number): number; + function getEngineRPMProp(_engineIndex: number): number; + function getEngineRPMGen(_engineIndex: number): number; + function getEngineRPM(_engineIndex: number): number; + function getEngineMaxHP(): number; + function getEngineTurbTorque(_engineIndex: number): number; + function getEngineJetTorque(_engineIndex: number): number; + function getEngineTorque(_engineIndex: number): number; + function getEnginePistonTorque(_engineIndex: number): number; + function getEnginePower(_engineIndex: number): number; + function getMinCruiseRPM(): number; + function getMaxCruiseRPM(): number; + function getMaxIndicatedRPM(): number; + function getMaxRatedRPM(): number; + function getPropellerType(): PropellerType; + function getNbPropellers(): number; + function getInclinometer(): number; + function getAngleOfAttack(_unit?: string): number; + function getOrientationAxis(): XYZ; + function getAltitude(): number; + function getGroundReference(): number; + function getTurnRate(): number; + function getHeadingMagnetic(): number; + function getHeadingTrue(): number; + function getHeadingTrueRadians(): number; + function getPitch(): number; + function getBank(): number; + function getFlightDirectorPitch(): number; + function getFlightDirectorBank(): number; + function getIsGrounded(): boolean; + function getAltitudeAboveGround_(): number; + function getAltitudeAboveGround(forceSimVarCall?: boolean): number; + function getCrossoverAltitude(_cas: number, _mach: number): number; + function getThrustReductionAltitude(): number; + function getMinimumReferenceMode(): MinimumReferenceMode; + function getComActFreq(Index: number): number; + function getComActFreq1(): number; + function getComSbyFreq(Index: number): number; + function getComSbyFreq1(): number; + function getNavHasNav(Index: number): boolean; + function getNavActFreq(Index: number): number; + function getNavActFreq1(): number; + function getNavSbyFreq1(): number; + function getFlapsNbHandles(): number; + function getFlapsHandlePercent(): number; + function getFlapsHandleAngle(_flapIndex: number): number; + function getFlapsAngle(): number; + function getFlapsPercent(): number; + function getSlatsAngle(): number; + function getSlatsPercent(): number; + function hasTrim(): boolean; + function getTrimPos(): number; + function getRudTrimPos(): number; + function getTrim(): number; + function getTrimIndicator(): number; + function getTrimNeutral(): number; + function setTransponderToRegion(_index?: number): void; + function getXPnderCode(): number; + function setXPnderCode(val: number): void; + function setTransponderToZero(): void; + function getTransponderCode1(): number; + function getTotalAirTemperature(): number; + function getAmbientTemperature(): number; + function getFlexTemperature(): number; + function getElecMainBusVolt(): number; + function getElecMasterBatt(): boolean; + function getElecBatBusAmp(): number; + function getEngGenSw1(): boolean; + function getExitOpen(): number; + function getParkBrake(): boolean; + function getStallWarning(): boolean; + function getEngOilTemp1(): number; + function getEngOilTemp(Index: number): number; + function getWOilPressure(): boolean; + function getEngOilQuant(Index: number): number; + function getEngVibration(Index: number): number; + function getEngOilPressure(Index: number): number; + function getEngOilPressure1(): number; + function getEngITT(): number; + function getFuelWPG(): number; + function getEngFuelPressure(Index: number): number; + function getEngFuelPressure0(): number; + function getEngFuelFlow(Index: number): number; + function getEngFuelFlow1(): number; + function getEngFuelLineFlow(index: number): number; + function getEngFuelValveSwitch(index: number): boolean; + function getEngFuelValveOpen(index: number): number; + function getEngFuelPumpActive(index: number): boolean; + function getEngFuelPumpSwitch(index: number): boolean; + function getEngFuelTankQuantity(index: number): number; + function getEngFuelPump1(): boolean; + function getFuelPress(): number; + function getTankSelector(): number; + function getFuelQuantityR(): number; + function getFuelQuantityL(): number; + function getFuelMQuantityL(): number; + function getFuelMQuantityR(): number; + function getFuelCapacity(): number; + function getFuelcQuantity(): number; + function getFuelPercent(): number; + function getFuelQuantity(): number; + function getTotalFuel(): number; + function getFuelUsed(_engineIndex: number): number; + function getCompassAngle(): number; + function getPressureValue(_units?: string): number; + function getBaroSele(): boolean; + function getPressureSelectedUnits(): string; + function getBaroMode(): number; + function getBaroFStd(): boolean; + function getPressureSelectedMode(_aircraft: Aircraft): string; + function getHasGlassCockpit(): boolean; + function getPressurisationCabinAltitude(): number; + function getPressurisationCabinAltitudeGoal(): number; + function getPressurisationCabinAltitudeRate(): number; + function getPressurisationDifferential(): number; + function getBleedAirSourceCont(): number; + function getPartpanVacu(): number; + function getWeight(): number; + function getMaxWeight(): number; + function getGForce(): number; + function getIsGearRetractable(): boolean; + function getGearHandlePosition(): boolean; + function getGearPosition(): number; + function getUnitIsMetric(): boolean; + function getLatSpeed(): number; + function getGroundVelocity(): number; + function convertTrackToHeading(track: number, trueGroundSpeed?: number, lateralVelocity?: number): number; + function convertFPAToVS(fpa: number, trueAirspeed?: number): number; + function getRadioNavAct(): boolean; + function setRadioNavAct(val: boolean): void; + function getCurrentPage(): number; + function setCurrentPage(val: number): void; + function getCurrentFlightPhase(forceSimVarCall?: boolean): number; + function setCurrentFlightPhase(val: number): void; + function getCurrentLat(): number; + function getCurrentLon(): number; + function getWorldRegion(): WorldRegion; +} diff --git a/src/msfstypes/js/simvar.d.ts b/src/msfstypes/js/simvar.d.ts new file mode 100644 index 000000000..615972f0a --- /dev/null +++ b/src/msfstypes/js/simvar.d.ts @@ -0,0 +1,46 @@ +declare namespace SimVar { + var g_bUseWatcher: boolean; + type SimVarUnit = "" | "amp" | "ampere" | "amperes" | "amps" | "angl16" | "angl32" | "atm" | "atmosphere" | "atmospheres" | "bar" | "bars" | "Bco16" | "bel" | "bels" | "Bool" | "Boolean" | "boost cmHg" | "boost inHg" | "boost psi" | "celsius fs7 egt" | "celsius fs7 oil temp" | "celsius scaler 1/256" | "celsius scaler 16k" | "celsius scaler 256" | "celsius" | "centimeter of mercury" | "centimeter" | "centimeters of mercury" | "centimeters" | "cm" | "cm2" | "cm3" | "cmHg" | "cu cm" | "cu ft" | "cu in" | "cu km" | "cu m" | "cu mm" | "cu yd" | "cubic centimeter" | "cubic centimeters" | "cubic feet" | "cubic foot" | "cubic inch" | "cubic inches" | "cubic kilometer" | "cubic kilometers" | "cubic meter" | "cubic meters" | "cubic mile" | "cubic miles" | "cubic millimeter" | "cubic millimeters" | "cubic yard" | "cubic yards" | "day" | "days" | "decibel" | "decibels" | "decimile" | "decimiles" | "decinmile" | "decinmiles" | "degree angl16" | "degree angl32" | "degree latitude" | "degree longitude" | "degree per second ang16" | "degree per second" | "degree" | "degrees angl16" | "degrees angl32" | "degrees latitude" | "degrees longitude" | "degrees per second ang16" | "degrees per second" | "Degrees" | "degrees" | "Enum" | "fahrenheit" | "farenheit" | "feet per minute" | "feet per second squared" | "feet per second" | "feet" | "feet/minute" | "feet/second" | "flags" | "foot per second squared" | "foot pound" | "foot pounds" | "foot" | "foot-pound" | "foot-pounds" | "FractionalLatLonDigits" | "Frequency ADF BCD32" | "Frequency BCD16" | "Frequency BCD32" | "fs7 charging amps" | "fs7 oil quantity" | "ft lb per second" | "ft" | "ft-lbs" | "ft/min" | "ft2" | "ft3" | "G Force 624 scaled" | "G Force" | "gallon per hour" | "gallon" | "gallons per hour" | "gallons" | "geepound" | "geepounds" | "GForce" | "GLOBALP->delta_heading_rate" | "GLOBALP->eng1.manifold_pressure" | "GLOBALP->eng1.oil_prs" | "GLOBALP->eng1.oil_tmp" | "GLOBALP->vertical_speed" | "gph" | "grad" | "grads" | "half" | "halfs" | "hectopascal" | "hectopascals" | "Hertz" | "hour over 10" | "hour" | "hours over 10" | "hours" | "Hz" | "in" | "in2" | "in3" | "inch of mercury" | "inch" | "inches of mercury" | "inches" | "inHg 64 over 64k" | "inHg" | "kelvin" | "keyframe" | "keyframes" | "kg" | "kgf meter" | "kgf meters" | "KgFSqCm" | "KHz" | "kilogram force per square centimeter" | "kilogram meter squared" | "kilogram meter" | "kilogram meters" | "kilogram per cubic meter" | "kilogram per second" | "kilogram" | "kilograms meter squared" | "kilograms per cubic meter" | "kilograms per second" | "kilograms" | "Kilohertz" | "kilometer per hour" | "kilometer" | "kilometer/hour" | "kilometers per hour" | "kilometers" | "kilometers/hour" | "kilopascal" | "km" | "km2" | "km3" | "knot scaler 128" | "knot" | "knots scaler 128" | "knots" | "kPa" | "kph" | "LatLonFormat" | "lbf-feet" | "lbs" | "liter per hour" | "liter" | "liters per hour" | "liters" | "m/s" | "m2" | "m3" | "mach 3d2 over 64k" | "mach" | "machs" | "mask" | "mbar" | "mbars" | "Megahertz" | "meter cubed per second" | "meter cubed" | "meter latitude" | "meter per minute" | "meter per second scaler 256" | "meter per second squared" | "meter per second" | "meter scaler 256" | "meter" | "meter/second" | "meters cubed per second" | "meters cubed" | "meters latitude" | "meters per minute" | "meters per second scaler 256" | "meters per second squared" | "meters per second" | "meters scaler 256" | "meters" | "meters/second" | "MHz" | "mile per hour" | "mile" | "miles per hour" | "miles" | "millibar scaler 16" | "millibar" | "millibars scaler 16" | "millibars" | "millimeter of mercury" | "millimeter of water" | "millimeter" | "millimeters of mercury" | "millimeters of water" | "millimeters" | "minute per round" | "minute" | "minutes per round" | "minutes" | "mm2" | "mm3" | "mmHg" | "more_than_a_half" | "mph" | "nautical mile" | "nautical miles" | "newton meter" | "newton meters" | "newton per square meter" | "newtons per square meter" | "nice minute per round" | "nice minutes per round" | "Nm" | "nmile" | "nmiles" | "number" | "number_number" | "numbers" | "Pa" | "part" | "pascal" | "pascals" | "per degree" | "per hour" | "per minute" | "per radian" | "per second" | "percent over 100" | "percent scaler 16k" | "percent scaler 2pow23" | "percent scaler 32k" | "percent" | "percentage" | "position 128" | "position 16k" | "position 32k" | "position" | "pound per hour" | "pound scaler 256" | "pound" | "pound-force per square foot" | "pound-force per square inch" | "poundal feet" | "pounds per hour" | "pounds scaler 256" | "pounds" | "pph" | "psf scaler 16k" | "psf" | "psi 4 over 16k" | "psi fs7 oil pressure" | "psi scaler 16k" | "psi" | "quart" | "quarts" | "radian per second" | "radian" | "radians per second" | "radians" | "rankine" | "ratio" | "revolution per minute" | "revolutions per minute" | "round" | "rounds" | "rpm 1 over 16k" | "rpm" | "rpms" | "scaler" | "second" | "Seconds" | "seconds" | "slug feet squared" | "Slug per cubic feet" | "Slug per cubic foot" | "slug" | "Slug/ft3" | "slugs feet squared" | "Slugs per cubic feet" | "Slugs per cubic foot" | "slugs" | "sq cm" | "sq ft" | "sq in" | "sq km" | "sq m" | "sq mm" | "sq yd" | "square centimeter" | "square centimeters" | "square feet" | "square foot" | "square inch" | "square inches" | "square kilometer" | "square kilometers" | "square meter" | "square meters" | "square mile" | "square miles" | "square millimeter" | "square millimeters" | "square yard" | "square yards" | "third" | "thirds" | "times" | "volt" | "volts" | "Watt" | "Watts" | "yard" | "yards" | "yd2" | "yd3" | "year" | "years" | "string" | "latlonaltpbh" | "latlonalt" | "Millibars" | "PBH" | "XYZ" | "PID_STRUCT" | "POIList" | "GlassCockpitSettings" | "FuelLevels" | string; + type SimVarType = number | LatLongAlt | LatLongAltPBH | string | PID_STRUCT | XYZ | PitchBankHeading | boolean; + class SimVarValue { + __type: string; + name: string; + type: SimVarType; + unit: SimVarUnit; + value: any; + constructor(_name?: string, _unit?: SimVarUnit, _type?: SimVarType); + } + function IsReady(): boolean; + function LogSimVarValueHistory(): void; + function LogSimVarValueHistoryByTimePerFrame(): void; + function GetRegisteredId(name: any, unit: any, dataSource: any): number; + function GetSimVarValue(name: string, unit: SimVarUnit, dataSource?: string): any; + function GetSimVarValueFast(name: string, unit: SimVarUnit, dataSource?: string): any; + function GetSimVarValueFastReg(registeredID: number): any; + function GetSimVarValueFastRegString(registeredID: number): any; + class SimVarBatch { + __Type: string; + private simVarCount; + private simVarIndex; + private wantedNames; + private wantedUnits; + private wantedTypes; + requestID: number; + instrumentID: string; + constructor(_simVarCount: string, _simVarIndex: string); + add(_name: string, _unit: string, _type?: string): void; + getCount(): string; + getIndex(): string; + getNames(): string[]; + getUnits(): string[]; + getTypes(): string[]; + } + function GetSimVarArrayValues(simvars: SimVarBatch, callback: SingleArgumentCallback, dataSource?: string): void; + function SetSimVarValue(name: string, unit: SimVarUnit, value: any, dataSource?: string): Promise; + function GetGlobalVarValue(name: string, unit: SimVarUnit): any; + function GetRegisteredGameVarId(name: any, unit: any, dataSource: any): number; + function GetGameVarValue(name: string, unit: SimVarUnit, param1?: Number, param2?: Number): any; + function GetGameVarValueFast(name: string, unit: SimVarUnit, param1?: Number, param2?: Number): any; + function GetGameVarValueFastReg(regId: number, param1?: Number, param2?: Number): any; + function SetGameVarValue(name: string, unit: SimVarUnit, value: any): Promise; +} diff --git a/src/msfstypes/js/slider.d.ts b/src/msfstypes/js/slider.d.ts new file mode 100644 index 000000000..d2edfc0f1 --- /dev/null +++ b/src/msfstypes/js/slider.d.ts @@ -0,0 +1,51 @@ +interface Element { + moveIntoView(props: any): any; +} +declare function MoveIntoView(target: any, options: any): any; +declare function _move(dir: any, aspect: any): any; +declare function _position(aspectX: any, aspectY: any): { + x: number; + y: number; +}; +declare function _parentsOf(target: any, isParent: any): { + parent: any; + wrapper: any; +}; +interface SliderElementCreateFn { + (childIndex: number, globalIndex: number): HTMLElement; +} +interface SliderElementUpdatepageFn { + (start: number, end: number, nbTotal: number): void; +} +declare class SliderConfig { + parentElement: Element; + querySelector: string; + leftElement: ButtonElement; + rightElement: ButtonElement; + NbElementPerPage: number; + NbElement: number; + CurrentElement: number; + SelectedElement: number; + CarrouselLoop: boolean; + CreateFn: SliderElementCreateFn; + UpdatePageFn: SliderElementUpdatepageFn; +} +declare class slider { + config: SliderConfig; + itemsElement: NodeListOf; + NbElement: number; + NbPage: number; + CurrentPage: number; + private m_startindex; + constructor(); + init(config: SliderConfig): void; + updateItems(nbElements?: number): void; + private scroll; + private CreateCurrentView; + scrollLeft(): void; + scrollRight(): void; + setActive(CurrentElement: any): void; + setSelected(index: any): void; + movePage(): void; + moveToActive(): void; +} diff --git a/src/msfstypes/js/sortedlist.d.ts b/src/msfstypes/js/sortedlist.d.ts new file mode 100644 index 000000000..08f7d7513 --- /dev/null +++ b/src/msfstypes/js/sortedlist.d.ts @@ -0,0 +1,11 @@ +interface IComparable { + compare(a: IComparable): number; + clone(): IComparable; +} +declare class SortedList { + private _list; + get length(): number; + clear(): void; + add(e: T, from?: number, to?: number): T; + get(i: number): T; +} diff --git a/src/msfstypes/js/testsimvar.d.ts b/src/msfstypes/js/testsimvar.d.ts new file mode 100644 index 000000000..89b568a89 --- /dev/null +++ b/src/msfstypes/js/testsimvar.d.ts @@ -0,0 +1,10 @@ +declare class SimVarTest { + name: string; + unit: SimVar.SimVarUnit; + value: SimVar.SimVarType; +} +declare var simVars: SimVarTest[]; +declare function updateSimVarValue(name: any, unit: any, input: HTMLInputElement): void; +declare function addSimVar(inputName: HTMLInputElement, inputType: HTMLInputElement): void; +declare function OnValueArray(values: any[]): void; +declare function testSimVars(bCreate?: boolean): void; diff --git a/src/msfstypes/js/types.d.ts b/src/msfstypes/js/types.d.ts new file mode 100644 index 000000000..3a12d7337 --- /dev/null +++ b/src/msfstypes/js/types.d.ts @@ -0,0 +1,108 @@ +declare class LatLong { + lat: number; + long: number; + __Type: string; + constructor(data?: any); + constructor(data?: any, long?: number); + set(lat: number, long: number): void; + toStringFloat(): string; + toString(): string; + static fromStringFloat(_str: string): LatLong | LatLongAlt; + latToDegreeString(): string; + longToDegreeString(): string; + toDegreeString(): string; + toShortDegreeString(): string; +} +declare class LatLongAlt { + lat: number; + long: number; + alt: number; + __Type: string; + constructor(data?: any); + constructor(lat: number, long: number, alt?: number); + toLatLong(): LatLong; + toStringFloat(): string; + toString(): string; + latToDegreeString(): string; + longToDegreeString(): string; + toDegreeString(): string; +} +declare function wrapLatLong(_latLong: LatLong | LatLongAlt): void; +declare class PitchBankHeading { + pitchDegree: number; + bankDegree: number; + headingDegree: number; + __Type: string; + constructor(data?: any); + toString(): string; +} +declare class LatLongAltPBH { + lla: LatLongAlt; + pbh: PitchBankHeading; + __Type: string; + constructor(data?: any); + toString(): string; +} +declare class PID_STRUCT { + pid_p: number; + pid_i: number; + pid_i2: number; + pid_d: number; + i_boundary: number; + i2_boundary: number; + d_boundary: number; + constructor(data?: any); + toString(): string; +} +declare class XYZ { + __Type: string; + lon: number; + alt: number; + lat: number; + x: number; + y: number; + z: number; + pitch: number; + heading: number; + bank: number; + constructor(data?: any); + toString(): string; +} +declare class DataDictionaryEntry { + key: number; + data: number; + __Type: string; + constructor(data?: any); + toString(): string; +} +declare class POIInfo { + distance: number; + angle: number; + isSelected: boolean; + __Type: string; + constructor(data?: any); + toString(): string; +} +declare class KeyActionParams { + iUId: number; + sName: string; + key1: BindingCombo; + key2: BindingCombo; + bReversed: boolean; + bMapOnRelease: boolean; + bPrimary: boolean; + inputList: DataValue[]; + bCanMapOnRelease: boolean; + constructor(json?: string); + static sKeyDelimiter: string; +} +declare class Simvar { + __Type: string; + name: string; + unit: string; +} +declare class Attribute { + __Type: string; + name: string; + value: string; +} diff --git a/src/msfstypes/js/uiresourceelement.d.ts b/src/msfstypes/js/uiresourceelement.d.ts new file mode 100644 index 000000000..f1224f747 --- /dev/null +++ b/src/msfstypes/js/uiresourceelement.d.ts @@ -0,0 +1,136 @@ +declare const MAPPINGS: { + FLEX: { + ALIGN: { + VERTICAL: { + PARALLEL: { + top: string; + middle: string; + bottom: string; + stretch: string; + }; + ORTHOGONAL: { + top: string; + middle: string; + bottom: string; + stretch: string; + }; + }; + HORIZONTAL: { + PARALLEL: { + left: string; + center: string; + right: string; + stretch: string; + }; + ORTHOGONAL: { + left: string; + center: string; + right: string; + stretch: string; + }; + }; + }; + }; + SVG: { + ASPECT_RATIO: { + contain: string; + cover: string; + fill: string; + }; + POSITION: { + X: { + left: string; + center: string; + right: string; + }; + Y: { + top: string; + middle: string; + bottom: string; + }; + }; + }; +}; +interface ElementWithOverrides extends HTMLElement { + overrides?: { + [attributeKey: string]: boolean; + }; + transformChain?: string; +} +interface ExposedAttributeData { + value: any; + appliedTo: string; + property: string; +} +interface ComponentStateData { + timeline: UITimeline; + name: string; + animationMapping: { + [s: string]: AnimationOptions; + }; +} +interface AttributeChangesData { + styleChanges: { + [P in keyof CSSStyleDeclaration]?: string; + }; + attributeChanges: { + [s: string]: string; + }; +} +interface StateOptions { + loops?: number; + playAnimation?: boolean; + startAnimationAt?: number; +} +declare class UIResourceElement extends UIElement implements ElementWithOverrides { + private static m_dummyXMLDocument; + private xmlDefinition; + private m_exposedChildren; + private m_exposedAttributes; + private m_states; + private m_activeState; + private m_activeStateOptions; + useUnscaledSizes: boolean; + private resourcesPath?; + private xmlPath?; + getResourcesPath(): string; + setResourcesPath(path: string): void; + isTransparent(): boolean; + get created(): boolean; + set created(created: boolean); + overrides: { + [attributeKey: string]: boolean; + }; + get componentName(): string; + get componentGroup(): string; + get componentPath(): string; + connectedCallback(): void; + Load(): Promise; + private applyBaseStyles; + private parseXMLTree; + private parseStyleValue; + private parseDataValue; + private getBlockName; + private parseAsHTMLElement; + private parseXMLAttributeData; + private mapAttributeToElement; + private applyTransform; + private applyAttributeToElement; + private parseStateData; + private resolveResourceUrl; + private applyLayoutToElement; + protected applyDimension(attribute: Attr, element: ElementWithOverrides, styleChanges: {}): void; + getStateNames(): string[]; + getState(): ComponentStateData; + setState(newState: StateUnionType, options?: StateOptions): void; + private updatePaths; + protected getExposedChild(id: ExposedChildrenNameUnionType): HTMLElement; + hasExposedAttribute(id: ExposedAttributesUnionType): boolean; + private findExposedAttribute; + getExposedAttribute(id: ExposedAttributesUnionType): string; + getExposedAttributeNames(): string[]; + setExposedAttribute(id: ExposedAttributesUnionType, value: string): void; + static addElementTo(path: string, element: HTMLElement, jsPath?: string): Promise; + static loadComponent(path: string, jsPath?: string): Promise; + static call(obj: UIResourceElement, fnc: Function, ...args: any[]): void; +} diff --git a/src/msfstypes/js/wasmsimcanvas.d.ts b/src/msfstypes/js/wasmsimcanvas.d.ts new file mode 100644 index 000000000..d27b7eaa3 --- /dev/null +++ b/src/msfstypes/js/wasmsimcanvas.d.ts @@ -0,0 +1,24 @@ +declare class WasmSimCanvas extends HTMLElement { + constructor(); + connectedCallback(): void; + disconnectedCallback(): void; + private onListenerRegistered; + private onWasmModuleLoaded; + onClick(_e: MouseEvent): void; + onDblClick(_e: MouseEvent): void; + onMouseMove(_e: MouseEvent): void; + OnMouseDown(_e: MouseEvent): void; + OnMouseUp(_e: MouseEvent): void; + OnMouseEnter(_e: MouseEvent): void; + OnMouseLeave(_e: MouseEvent): void; + OnMouseOver(_e: MouseEvent): void; + onMouseWheel(_e: WheelEvent): void; + m_wasmModuleName: string; + m_wasmGaugeName: string; + m_wasmInstrumentGUid: string; + private m_imgElement; + private m_listener; + private m_buttonState; + private m_mouseX; + private m_mouseY; +} diff --git a/src/msfstypes/js/widgetscontainer.d.ts b/src/msfstypes/js/widgetscontainer.d.ts new file mode 100644 index 000000000..4cb71f8a1 --- /dev/null +++ b/src/msfstypes/js/widgetscontainer.d.ts @@ -0,0 +1,52 @@ +declare class WidgetsContainer extends UIElement { + private m_WidgetsListener; + private get iCurrentPage(); + private m_Header; + private m_Header_Componenent; + private m_Container; + private m_WidgetOpened; + private virtualScroll; + private layout; + private CleanWidgets; + private getWidgetButtonFromID; + private ShowWidgetButtons; + private ShowWidgetButtonsForPage; + private HideWidgetButtons; + private HideAllWidgetButtons; + private OpenPopUp; + private ClosePopUp; + private BackPopUp; + private OnButtonSelected; + private ShowAllWidgets; + private SetIsPaused; + private HideAllWidgets; + isTransparent(): boolean; + widgetsCreated: boolean; + connectedCallback(): void; + registerWidgetsListener: () => void; + unregisterWidgetsListener: () => void; + disconnectedCallback(): void; + LoadWidgets(src: string): void; + createHeader: (tag: string, url: string, data: string) => boolean; + CreateWidgets: (page: WidgetPage) => void; + onListenerRegistered: () => void; + private ShowWidgetPage; + private upateWidgetsState; + private _AddWidget; + AddWidget(widgetInfo: Widget): void; + private AddHeaderCB; + private RemoveHeaderCB; + private AddWidgetCB; + private getPageFootprintLines; + private getPageFootprintColumns; + private RecomputeLayout; + get currentButtonNumber(): number; + get buttonsCount(): number; + getKeyNavigationDirection(): KeyNavigationDirection; + private UpdateWidgetDataCB; + private UpdateWidgetTagsCB; + TestWidgets(): void; + PreviousPage(): Boolean; + NextPage(): boolean; + ShowPage: (index: number) => void; +} diff --git a/src/msfstypes/package.json b/src/msfstypes/package.json new file mode 100644 index 000000000..82173e5f0 --- /dev/null +++ b/src/msfstypes/package.json @@ -0,0 +1,21 @@ +{ + "name": "@microsoft/msfs-types", + "version": "1.14.6", + "description": "Base MSFS TS Types", + "main": "index.js", + "scripts": { + "build:gulp": "esbuild Gulpfile.ts --bundle --outfile=gulpfile.js --platform=node --target=node16 --packages=external", + "build:lib": "gulp", + "clean": "gulp clean" + }, + "typings": "index.d.ts", + "repository": { + "type": "git", + "url": "https://workingtitlesim@dev.azure.com/workingtitlesim/KittyHawk/_git/ProjectGolf" + }, + "author": "Asobo Studio", + "license": "ISC", + "devDependencies": { + "@types/glob": "^8.0.0" + } +} \ No newline at end of file diff --git a/src/msfstypes/pages/vcockpit/core/vcockpit.d.ts b/src/msfstypes/pages/vcockpit/core/vcockpit.d.ts new file mode 100644 index 000000000..80033231d --- /dev/null +++ b/src/msfstypes/pages/vcockpit/core/vcockpit.d.ts @@ -0,0 +1,42 @@ +declare class VCockpitInstrumentData { + iGUId: number; + sContainer: string; + sUrl: string; + vPosAndSize: any; + templateName: string; + templateClass: Function; +} +declare class VCockpitPanelData { + sName: string; + vLogicalSize: IVec2; + vDisplaySize: IVec2; + daAttributes: Array; + daInstruments: Array; + sConfigFile: string; +} +declare var globalPanelData: VCockpitPanelData; +declare var globalInstrumentListener: ViewListener.ViewListener; +declare class VCockpitPanel extends HTMLElement { + private data; + private curInstrumentIndex; + private curAttributes; + private virtualMouse; + private vignettage; + private vignettageNeeded; + private vignettageHandler; + static instrumentRoot: string; + connectedCallback(): void; + disconnectedCallback(): void; + load(_data: VCockpitPanelData): void; + hasData(): boolean; + setAttributes(_attributes: Array): void; + showVirtualMouse(_target: string, _show: boolean): void; + registerInstrument(_instrumentName: string, _instrumentClass: CustomElementConstructor): void; + createInstrument(_instrumentName: string, _instrumentClass: Function): void; + private loadNextInstrument; + private setupInstrument; + private urlAlreadyImported; + private showVignettage; + private hideVignettage; +} +declare function registerInstrument(_instrumentName: string, _instrumentClass: CustomElementConstructor): void; diff --git a/src/msfstypes/pages/vcockpit/core/vcockpitlogic.d.ts b/src/msfstypes/pages/vcockpit/core/vcockpitlogic.d.ts new file mode 100644 index 000000000..b74f999e7 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/core/vcockpitlogic.d.ts @@ -0,0 +1,39 @@ +declare class VCockpitLogicInputInstrument { + nName: Name_Z; +} +declare class VCockpitLogicInputPanel { + iGUId: number; + daInstruments: Array; + daOriginalMaterials: Array; +} +declare class VCockpitLogicInput { + sConfigFile: string; + daPanels: Array; +} +declare class VCockpitLogicOutputPanel { + __Type: string; + iGUId: number; + daAttributes: Array; + daTargetMaterials: Array; +} +declare class VCockpitLogicOutput { + __Type: string; + daPanels: Array; +} +declare var globalLogicData: VCockpitLogicInput; +declare var globalInstrumentListener: ViewListener.ViewListener; +declare class VCockpitLogic extends HTMLElement { + private data; + private connected; + private xmlConfig; + private systemsHandlers; + static systemsRoot: string; + connectedCallback(): void; + disconnectedCallback(): void; + load(_data: VCockpitLogicInput): void; + hasData(): boolean; + private loadXMLConfig; + private onScriptReady; + private createMainLoop; + private killMainLoop; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/baseinstrument.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/baseinstrument.d.ts new file mode 100644 index 000000000..01a8f59a1 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/baseinstrument.d.ts @@ -0,0 +1,149 @@ +declare enum ScreenState { + OFF = 0, + INIT = 1, + WAITING_VALIDATION = 2, + ON = 3, + REVERSIONARY = 4 +} +declare class BaseInstrument extends TemplateElement { + static allInstrumentsLoaded: boolean; + static useSvgImages: boolean; + dataMetaManager: DataReadMetaManager; + urlConfig: URLConfig; + xmlConfig: Document; + instrumentXmlConfig: Element; + protected startTime: number; + private _frameCount; + protected electricity: HTMLElement; + protected electricalLogic: CompositeLogicXMLElement; + protected electricityAvailable: boolean; + protected initDuration: number; + protected hasBeenOff: boolean; + protected isStarted: boolean; + protected needValidationAfterInit: boolean; + protected initAcknowledged: boolean; + protected screenState: ScreenState; + protected reversionaryMode: boolean; + protected highlightSvg: HTMLElement; + protected highlightList: Array; + protected backgroundList: Array; + private _instrumentId; + private _lastTime; + private _deltaTime; + private _frameLastTime; + private _frameDeltaTime; + private _isConnected; + private _isInitialized; + private _xmlConfigFile; + private _quality; + private _gameState; + private _alwaysUpdate; + private _alwaysUpdateList; + private _pendingCalls; + private _pendingCallUId; + private _facilityLoader; + private _mainLoopFuncInstance; + constructor(); + get initialized(): boolean; + get instrumentIdentifier(): string; + get instrumentIndex(): number; + get isInteractive(): boolean; + get IsGlassCockpit(): boolean; + get isPrimary(): boolean; + get deltaTime(): number; + get frameCount(): number; + get flightPlanManager(): FlightPlanManager; + get facilityLoader(): FacilityLoader; + connectedCallback(): void; + disconnectedCallback(): void; + protected Init(): void; + setInstrumentIdentifier(_identifier: string): void; + setConfigFile(_file: string): void; + getChildById(_selector: String): any; + getChildrenById(_selector: String): any; + getChildrenByClassName(_selector: string): any; + startHighlight(_id: string): void; + stopHighlight(_id: string): void; + clearHighlights(): void; + updateHighlightElements(): void; + onInteractionEvent(_args: Array): void; + onSoundEnd(_event: Name_Z): void; + getQuality(): Quality; + getGameState(): GameState; + protected reboot(): void; + protected onFlightStart(): void; + protected onQualityChanged(_quality: Quality): void; + protected onGameStateChanged(_oldState: GameState, _newState: GameState): void; + private loadDocumentAttributes; + protected parseXMLConfig(): void; + protected parseURLAttributes(): void; + private beforeUpdate; + protected Update(): void; + private afterUpdate; + doUpdate(): void; + private CanUpdate; + private canUpdate; + protected updateElectricity(): void; + protected isElectricityAvailable(): boolean; + onShutDown(): void; + onPowerOn(): void; + protected isBootProcedureComplete(): boolean; + acknowledgeInit(): void; + isInReversionaryMode(): boolean; + wasTurnedOff(): boolean; + playInstrumentSound(soundId: string): boolean; + private createMainLoop; + private mainLoop; + private killMainLoop; + private loadXMLConfig; + private loadURLAttributes; + getTimeSinceStart(): number; + getAspectRatio(): number; + isComputingAspectRatio(): boolean; + isAspectRatioForced(): boolean; + getForcedScreenRatio(): number; + getForcedAspectRatio(): number; + protected updateHighlight(): void; + highlightGetState(_valueMin: number, _valueMax: number, _period: number): number; + private initTransponder; + requestCall(_func: Function, _timeout?: number): number; + removeCall(_uid: number): void; + protected updatePendingCalls(): void; + protected clearPendingCalls(): void; + alwaysUpdate(_element: Updatable, _val: boolean): void; + protected updateAlwaysList(): void; + protected clearAlwaysList(): void; +} +declare class URLConfig { + style: string; + index: number; + wasmModule: string; + wasmGauge: string; +} +declare class PendingCall { + func: Function; + timeout: number; + uid: number; +} +declare enum Quality { + "ultra" = 0, + "high" = 1, + "medium" = 2, + "low" = 3, + "hidden" = 4, + "disabled" = 5 +} +declare enum GameState { + "mainmenu" = 0, + "loading" = 1, + "briefing" = 2, + "ingame" = 3 +} +declare class HighlightedElement { + elem: Element; + style: any; + lastRect: DOMRect; +} +declare abstract class Updatable { + abstract onUpdate(_deltaTime: number): any; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/approach.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/approach.d.ts new file mode 100644 index 000000000..27f7bd682 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/approach.d.ts @@ -0,0 +1,19 @@ +declare class Approach { + name: string; + runway: string; + wayPoints: Array; + transitions: Transition[]; + vorFrequency: number; + vorIdent: string; + constructor(); + isLocalizer(): boolean; +} +declare class ApproachWayPoint extends WayPoint { + segmentType: number; +} +declare class Transition { + name: string; + latitude: number; + longitude: number; + waypoints: WayPoint[]; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplan.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplan.d.ts new file mode 100644 index 000000000..f3aac1448 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplan.d.ts @@ -0,0 +1,36 @@ +declare class FlightPlan implements AsynchroneDataGetter { + static readManager: InstrumentDataReadManager; + manager: FlightPlanManager; + instrument: BaseInstrument; + name: string; + wayPoints: Array; + activeWayPoint: number; + approach: Approach; + nbElementToDisplay: number; + isDirectTo: boolean; + private endLoadingCallback; + private beginGeoCalc; + private loadState; + private waypointsBatch; + private approachBatch; + constructor(_instrument: BaseInstrument, _manager: FlightPlanManager); + updateActiveWaypoint(): void; + LoadData(): void; + IsUpToDate(): boolean; + EndLoad(): void; + FillWithCurrentFP(_Callback?: Function): void; + GetAirportList(): Array; + FillHTMLElement(_element: HTMLElement, _nbElemMax: number, _startIndex: number): void; +} +declare class FlightPlanAlternate { + instrument: BaseInstrument; + activeWaypoint: number; + waypoints: WayPoint[]; + origin: WayPoint; + routeWaypoints: WayPoint[]; + dest: WayPoint; + updating: boolean; + activeBearing(): number; + constructor(instrument: BaseInstrument); + update(): Promise; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplanmanager.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplanmanager.d.ts new file mode 100644 index 000000000..d9aafae77 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/flightplanmanager.d.ts @@ -0,0 +1,187 @@ +declare class FlightPlanManager { + static DEBUG_INSTANCE: FlightPlanManager; + private _runwayIndex; + private _departureRunwayIndex; + private _departureProcIndex; + private _departureEnRouteTransitionIndex; + private _departureDiscontinuity; + private _arrivalRunwayIndex; + private _arrivalProcIndex; + private _arrivalTransitionIndex; + private _arrivalDiscontinuity; + private _approachIndex; + private _approachTransitionIndex; + private _waypoints; + private _approachWaypoints; + private _departureWaypointSize; + private _arrivalWaypointSize; + private _atcTimeClimbLLA; + private _atcTimeClimbExist; + private _atcTimeApproachLLA; + private _atcTimeApproachExist; + private _activeWaypointIndex; + private _approach; + private _onFlightPlanUpdateCallbacks; + private _isDirectTo; + private _directToTarget; + private _directToOrigin; + private _cruisingAltitude; + onCruisingAltitudeChanged: () => void; + private _lastIndexBeforeApproach; + decelWaypoint: WayPoint; + decelPrevIndex: number; + instrument: BaseInstrument; + addHardCodedConstraints(wp: WayPoint): void; + constructor(_instrument: BaseInstrument); + private _activeWaypointHasChanged; + private _lastDistanceToPreviousActiveWaypoint; + private _isGoingTowardPreviousActiveWaypoint; + private _planeCoordinates; + get planeCoordinates(): LatLong; + update(_deltaTime: number): void; + private _isRegistered; + private _isRegisteredAndLoaded; + private _onCurrentGameFlightLoaded; + onCurrentGameFlightLoaded(_callback: Function): void; + private registerListener; + hasFlightPlan(): boolean; + private _loadWaypoints; + updateWaypointIndex(): void; + private _updateFlightPlanCallback; + updateFlightPlanByIndex(callback: () => void, index: number, log?: boolean): void; + asyncUpdateFlightPlanByIndex(index: number, log?: boolean): Promise; + updateFlightPlan(callback?: () => void, log?: boolean): void; + asyncUpdateFlightPlan(log?: boolean): Promise; + updateCurrentApproach(callback?: () => void, log?: boolean): void; + get cruisingAltitude(): number; + private _currentFlightPlanIndex; + getCurrentFlightPlanIndex(): number; + updateCurrentFlightPlanIndex(callback?: () => void): void; + asyncUpdateCurrentFlightPlanIndex(): Promise; + setCurrentFlightPlanIndex(index: number, thenSetActive?: boolean, callback?: (result: boolean) => void): void; + asyncSetCurrentFlightPlanIndex(index: number, thenSetActive?: boolean): Promise; + activeFlightPlanByIndex(index: number, callback?: () => void): void; + asyncActiveFlightPlanByIndex(index: number): Promise; + createNewFlightPlan(callback?: () => void): void; + createNewFlightPlansUntilIndex(index: number, callback?: () => void): void; + asyncCreateNewFlightPlansUntilIndex(index: number): Promise; + copyCurrentFlightPlanInto(index: number, callback?: () => void): void; + asyncCopyCurrentFlightPlanInto(index: number): Promise; + copyFlightPlanIntoCurrent(index: number, callback?: () => void): void; + clearFlightPlan(callback?: () => void): void; + asyncClearFlightPlan(): Promise; + clearAllFlightPlans(callback?: () => void): void; + getOrigin(_addedAsOriginOnly?: boolean): WayPoint; + setOrigin(icao: string, callback?: () => void, useLocalVars?: boolean): void; + private _gpsActiveWaypointIdent; + getActiveWaypointIdent(): string; + private _gpsActiveWaypointIndex; + getActiveWaypointIndex(useCorrection?: boolean): number; + private computeActiveWaypointIndex; + setActiveWaypointIndex(index: number, callback?: () => void): void; + recomputeActiveWaypointIndex(callback?: () => void): void; + getPreviousActiveWaypoint(): WayPoint; + getActiveWaypoint(useCorrection?: boolean): WayPoint; + getNextActiveWaypoint(): WayPoint; + getDistanceToActiveWaypoint(): number; + getDistanceToDirectToTarget(): number; + getDistanceToWaypoint(waypoint: WayPoint): number; + getBearingToActiveWaypoint(_magnetic: boolean): number; + getBearingToWaypoint(waypoint: WayPoint, _magnetic: boolean): number; + getETEToActiveWaypoint(): number; + getETEToWaypoint(waypoint: WayPoint): number; + getDestination(_addedAsDestinationOnly?: boolean): WayPoint; + getDeparture(): IDeparture; + getArrival(): IArrival; + getAirportApproach(): Approach; + getDepartureWaypoints(): WayPoint[]; + getDepartureWaypointsMap(): WayPoint[]; + getEnRouteWaypoints(outFPIndex?: number[], useLocalVarForExtremity?: boolean): WayPoint[]; + getEnRouteWaypointsLastIndex(): number; + getArrivalWaypoints(): WayPoint[]; + getArrivalWaypointsMap(): WayPoint[]; + getWaypointsWithAltitudeConstraints(): WayPoint[]; + setDestination(icao: string, callback?: () => void, useLocalVars?: boolean): void; + addWaypoint(icao: string, index?: number, callback?: () => void, setActive?: boolean): void; + asyncAddWaypoint(icao: string, index?: number, setActive?: boolean): Promise; + addCustomWaypoint(ident: string, index: number, latitude: number, longitude: number, setActive?: boolean, callback?: () => void): void; + asyncAddCustomWaypoint(ident: string, index: number, latitude: number, longitude: number, setActive?: boolean): Promise; + setWaypointLatLon(index: number, latitude: number, longitude: number, setActive?: boolean, callback?: () => void): void; + setWaypointLatLonAlt(index: number, latitude: number, longitude: number, altitude: number, setActive?: boolean, callback?: () => void): void; + asyncSetWaypointLatLonAlt(index: number, latitude: number, longitude: number, altitude: number, setActive?: boolean): Promise; + setWaypointAltitude(altitude: number, index: number, callback?: () => void): void; + asyncSetWaypointAltitude(altitude: number, index: number): Promise; + setWaypointAdditionalData(index: number, key: string, value: string, callback?: () => void): void; + getWaypointAdditionalData(index: number, key: Name_Z, callback?: (value: string) => void): void; + invertActiveFlightPlan(callback?: () => void): void; + getApproachIfIcao(callback?: (value: string) => void): void; + addFlightPlanUpdateCallback(_callback: Function): void; + asyncAddWaypointByIdent(ident: string, index?: number): Promise; + addWaypointByIdent(ident: string, index?: number, callback?: () => void): void; + removeWaypoint(index: number, thenSetActive?: boolean, callback?: () => void): void; + asyncRemoveWaypoint(index: number, thenSetActive?: boolean): Promise; + removeWaypointFromTo(indexFrom: number, indexTo: number, thenSetActive?: boolean, callback?: () => void): void; + indexOfWaypoint(waypoint: WayPoint): number; + getWaypointsCount(flightPlanIndex?: number): number; + getDepartureWaypointsCount(): number; + getArrivalWaypointsCount(): number; + getWaypoint(i: number, flightPlanIndex?: number, considerApproachWaypoints?: boolean): WayPoint; + getWaypoints(flightPlanIndex?: number): WayPoint[]; + getDepartureRunwayIndex(): number; + getDepartureRunway(): Runway; + getDetectedCurrentRunway(): Runway; + getDepartureProcIndex(): number; + setDepartureProcIndex(index: number, callback?: () => void): void; + setDepartureRunwayIndex(index: number, callback?: () => void): void; + setOriginRunwayIndex(index: number, callback?: () => void): void; + getAtcTimeClimbLLA(): LatLongAlt; + getAtcTimeApproachLLA(): LatLongAlt; + getDepartureEnRouteTransitionIndex(): number; + setDepartureEnRouteTransitionIndex(index: number, callback?: () => void): void; + getDepartureDiscontinuity(): boolean; + clearDepartureDiscontinuity(callback?: () => void): void; + removeDeparture(callback?: () => void): void; + getArrivalProcIndex(): number; + getArrivalTransitionIndex(): number; + setArrivalProcIndex(index: number, callback?: () => void): void; + getArrivalDiscontinuity(): boolean; + clearArrivalDiscontinuity(callback?: () => void): void; + setArrivalEnRouteTransitionIndex(index: number, callback?: () => void): void; + getArrivalRunwayIndex(): number; + setArrivalRunwayIndex(index: number, callback?: () => void): void; + getApproachIndex(): number; + setApproachIndex(index: number, callback?: () => void, transition?: number): void; + private _isLoadedApproach; + private _isLoadedApproachTimeLastSimVarCall; + isLoadedApproach(forceSimVarCall?: boolean): boolean; + private _isActiveApproach; + private _isActiveApproachTimeLastSimVarCall; + isActiveApproach(forceSimVarCall?: boolean): boolean; + activateApproach(callback?: () => void): void; + deactivateApproach(): void; + tryAutoActivateApproach(): void; + getApproachActiveWaypointIndex(): number; + getApproach(): Approach; + getApproachNavFrequency(): number; + getApproachTransitionIndex(): number; + getLastIndexBeforeApproach(): number; + getApproachRunway(): Runway; + getApproachWaypoints(): WayPoint[]; + setApproachTransitionIndex(index: number, callback?: () => void): void; + removeArrival(callback?: () => void): void; + activateDirectTo(icao: string, callback?: () => void): void; + activateDirectToFromLatLonAlt(latitude: number, longitude: number, altitude: number, callback?: () => void): void; + asyncActivateDirectToFromLatLonAlt(latitude: number, longitude: number, altitude: number): Promise; + cancelDirectTo(callback?: () => void): void; + getIsDirectTo(): boolean; + getDirectToTarget(): WayPoint; + getDirecToOrigin(): LatLongAlt; + getCoordinatesHeadingAtDistanceAlongFlightPlan(distance: number): { + lla: LatLong; + heading: number; + }; + getCoordinatesAtNMFromDestinationAlongFlightPlan(distance: number): { + lla: LatLong; + prevIndex: number; + }; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/geocalc.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/geocalc.d.ts new file mode 100644 index 000000000..240b330f9 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/geocalc.d.ts @@ -0,0 +1,18 @@ +declare class GeoCalcInfo { + instrument: BaseInstrument; + private lat1; + private lat2; + private lon1; + private lon2; + private useMagVar; + private loadState; + private endCallBack; + bearing: number; + distance: number; + constructor(_instrument: BaseInstrument); + SetParams(_lat1: number, _lon1: number, _lat2: number, _lon2: number, _useMagVar?: boolean): void; + Compute(_callback?: Function): void; + private LoadData; + IsUpToDate(): boolean; + IsIdle(): boolean; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/nearestwaypoint.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/nearestwaypoint.d.ts new file mode 100644 index 000000000..d6ef7b787 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/nearestwaypoint.d.ts @@ -0,0 +1,192 @@ +declare class FullDataAirport extends WayPoint { + toDelete: boolean; + distance: number; + bearing: number; + bestApproach: string; + frequencyName: string; + frequencyMHz: number; + frequencyBCD16: number; + longestRunwayLength: number; + longestRunwayDirection: number; + airportClass: number; + constructor(_instrument: BaseInstrument); +} +declare class NearestWaypoint extends WayPoint { + toDelete: boolean; + distance: number; + bearing: number; + lastDistance: number; + lastBearing: number; + coordinates: LatLongAlt; + routes: NearestWaypointRoute[]; +} +declare enum AirportSize { + Small = 0, + Medium = 1, + Large = 2 +} +declare class NearestAirport extends NearestWaypoint { + name: string; + bestApproach: string; + frequencyName: string; + frequencyMHz: number; + frequencyBCD16: number; + longestRunwayLength: number; + longestRunwayDirection: number; + type: string; + airportClass: number; + fuel1: string; + fuel2: string; + towered: boolean; + hasAirportInfosLoaded: boolean; + private _svgMapElement; + get svgMapElement(): SvgNearestAirportElement; + imageFileName(): string; + getSize(): AirportSize; +} +declare class FullDataNearestAirportList { + instrument: BaseInstrument; + airports: FullDataAirport[]; + private loadState; + private nbMax; + private milesDistance; + private batch; + private _referentialLatLong; + private _currentLatLong; + constructor(_instrument: BaseInstrument); + Update(_nbMax?: number, _milesDistance?: number): void; + private LoadData; + private IsUpToDate; + private IsIdle; +} +declare class NearestAirportList { + static DEBUG_INSTANCE: NearestAirportList; + instrument: BaseInstrument; + airports: Array; + private loadState; + private nbMax; + private milesDistance; + private _timer; + private airportLineBatch; + private airportSelectedBatch; + private _referentialLatLong; + private _currentLatLong; + constructor(_instrument: BaseInstrument); + Update(_nbMax?: number, _milesDistance?: number): void; + private LoadData; + private IsUpToDate; + private IsIdle; +} +declare class NearestWaypointRoute { + nearestIntersection: NearestWaypoint; + name: string; + prevIcao: string; + prevCoordinates: LatLong; + prevWaypoint: WayPoint; + nextIcao: string; + nextCoordinates: LatLong; + nextWaypoint: WayPoint; + constructor(nearestIntersection: NearestWaypoint); +} +declare class NearestIntersection extends NearestWaypoint { + airwaysDrawn: boolean; + private _svgMapElement; + get svgMapElement(): SvgNearestIntersectionElement; + constructor(_instrumentName: any); + imageFileName(): string; +} +declare class NearestIntersectionList { + instrument: BaseInstrument; + intersections: Array; + private loadState; + private nbMax; + private milesDistance; + private _timer; + private batch; + private _referentialLatLong; + private _currentLatLong; + constructor(_instrument: BaseInstrument); + Update(_nbMax?: number, _milesDistance?: number): void; + private LoadData; + private IsUpToDate; + private IsIdle; +} +declare class NearestNDB extends NearestWaypoint { + private _svgMapElement; + get svgMapElement(): SvgNearestNDBElement; + ndbType: number; + frequencyMHz: number; + name: string; + imageFileName(): string; +} +declare class NearestNDBList { + instrument: BaseInstrument; + ndbs: Array; + private loadState; + private nbMax; + private milesDistance; + private _timer; + private ndbLinesBatch; + private ndbSelectedBatch; + private _referentialLatLong; + private _currentLatLong; + constructor(_instrument: BaseInstrument); + Update(_nbMax?: number, _milesDistance?: number): void; + private LoadData; + private IsUpToDate; + private IsIdle; +} +declare class NearestVOR extends NearestWaypoint { + private _svgMapElement; + get svgMapElement(): SvgNearestVORElement; + name: string; + vorType: number; + frequencyMHz: number; + frequencyBCD16: number; + imageFileName(): string; +} +declare class NearestVORList { + instrument: BaseInstrument; + vors: Array; + private loadState; + private nbMax; + private milesDistance; + private _timer; + private vorLinesBatch; + private vorSelectedBatch; + private _referentialLatLong; + private _currentLatLong; + constructor(_instrument: BaseInstrument); + Update(_nbMax?: number, _milesDistance?: number): void; + private LoadData; + private IsUpToDate; + private IsIdle; +} +declare class NearestAirspace { + static I: number; + ident: string; + name: string; + type: number; + status: number; + nearDistance: number; + aheadTime: number; + segments: LatLong[]; + svgMapElement: SvgAirspaceElement; + constructor(); + GetStatus(): string; +} +declare class NearestAirspaceList { + instrument: BaseInstrument; + airspaces: Array; + private loadState; + private nbMax; + private milesDistance; + private batch; + private _referentialLatLong; + private _currentLatLong; + constructor(_instrument: BaseInstrument); + Update(_nbMax?: number, _milesDistance?: number): void; + private LoadData; + private IsUpToDate; + private IsIdle; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/runway.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/runway.d.ts new file mode 100644 index 000000000..a06d754d8 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/runway.d.ts @@ -0,0 +1,21 @@ +declare class Runway { + latitude: number; + longitude: number; + elevation: number; + direction: number; + designation: string; + designatorCharPrimary: number; + designatorCharSecondary: number; + length: number; + width: number; + surface: number; + lighting: number; + beginningCoordinates: LatLongAlt; + endCoordinates: LatLongAlt; + primaryILSFrequency: Frequency; + secondaryILSFrequency: Frequency; + cosDirection: number; + sinDirection: number; + splitIfTwoWays(): Runway[]; + getSurfaceString(): string; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypoint.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypoint.d.ts new file mode 100644 index 000000000..4287eac34 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypoint.d.ts @@ -0,0 +1,205 @@ +declare class Airway { + name: string; + type: number; + icaos: string[]; + SetFromIAirwayData(data: IAirwayData): void; +} +declare class WayPoint { + instrument: BaseInstrument; + ident: string; + icao: string; + private _icaoNoSpace; + get icaoNoSpace(): string; + infos: WayPointInfo; + latitudeFP: number; + longitudeFP: number; + altitudeinFP: number; + altitudeModeinFP: string; + bearingInFP: number; + distanceInFP: number; + estimatedTimeOfArrivalFP: number; + estimatedTimeEnRouteFP: number; + cumulativeEstimatedTimeEnRouteFP: number; + cumulativeDistanceInFP: number; + originalIndexInFP: number; + type: string; + isInFlightPlan: boolean; + isActiveInFlightPlan: boolean; + timeWasReached: number; + altitudeWasReached: number; + fuelWasReached: number; + getFuelWasReached(useLbs?: boolean): number; + directFrom: WayPoint; + legAltitudeDescription: number; + legAltitude1: number; + getLegAltitude1Text(): string; + legAltitude2: number; + getLegAltitude2Text(): string; + speedConstraint: number; + transitionLLas: LatLongAlt[]; + magvar: number; + getSvgElement(index: number): SvgWaypointElement; + constructor(_instrument: BaseInstrument); + SetTypeFromEnum(_enum: number): void; + UpdateInfos(_CallBack?: Function, _LoadApproaches?: boolean): void; + UpdateApproaches(): void; + GetInfos(): WayPointInfo; + SetICAO(_ICAO: string, _endLoadCallback?: Function, _LoadApproaches?: boolean): void; + SetIdent(_Ident: string): void; + SetFromIFacility(data: IFacilityData, callback?: () => void): void; + imageFileName(): string; +} +declare class WayPointInfo { + icao: string; + ident: string; + region: string; + name: string; + city: string; + routes: IRoute[]; + timeInFP: number; + totalTimeInFP: number; + etaInFP: number; + totalDistInFP: number; + fuelConsInFP: number; + totalFuelConsInFP: number; + airwayIdentInFP: string; + coordinates: LatLongAlt; + get lat(): number; + set lat(l: number); + get long(): number; + set long(l: number); + instrument: BaseInstrument; + loaded: boolean; + protected endLoadCallback: Function; + airways: Airway[]; + constructor(_instrument: BaseInstrument); + id(): string; + protected _svgElements: SvgWaypointElement[]; + getSvgElement(index: number): SvgWaypointElement; + CopyBaseInfosFrom(_WP: WayPointInfo): void; + UpdateInfos(_CallBack?: Function): void; + GetSymbol(): string; + imageFileName(): string; + getWaypointType(): string; + setEndCallbackIfUnset(_Callback: Function): void; + SetFromIFacilityWaypoint(data: IFacilityData): void; + UpdateAirways(): Promise; +} +declare class AirportInfo extends WayPointInfo { + frequencies: Array; + privateType: number; + radarCoverage: number; + fuel: string; + bestApproach: string; + airspaceType: string; + departures: IDeparture[]; + approaches: Array; + arrivals: IArrival[]; + runways: Array; + oneWayRunways: Array; + unsortedOneWayRunways: Array; + longestRunwayDirection: number; + airportClass: number; + towered: boolean; + transitionAltitude: number; + private needReload; + private reloadCallback; + private loadApproaches; + private approachLoadIndex; + constructor(_instrument: BaseInstrument); + getWaypointType(): string; + getSvgElement(index: number): SvgWaypointElement; + UpdateInfos(_CallBack?: Function, _LoadApproaches?: boolean): void; + GetSymbolFileName(): string; + imageFileName(): string; + GetSize(): Vec2; + getClassSize(): AirportSize; + IsUpToDate(): boolean; + SetFromIFacilityAirport(data: IFacilityAirportData, loadApproachesData?: boolean, callback?: () => void): Promise; +} +declare class VORInfo extends WayPointInfo { + static readManager: InstrumentDataReadManager; + frequencyMHz: number; + frequencyBcd16: number; + weatherBroadcast: number; + magneticVariation: number; + type: number; + vorClass: number; + constructor(_instrument: BaseInstrument); + getWaypointType(): string; + getSvgElement(index: number): SvgWaypointElement; + IsUpToDate(): boolean; + GetSymbol(): string; + imageFileName(): string; + UpdateInfos(_CallBack?: Function): void; + getClassName(): string; + SetFromIFacilityVOR(data: IFacilityVORData, callback?: () => void): void; +} +declare class NDBInfo extends WayPointInfo { + static readManager: InstrumentDataReadManager; + frequencyMHz: number; + weatherBroadcast: number; + type: number; + constructor(_instrument: BaseInstrument); + getSvgElement(index: number): SvgWaypointElement; + getWaypointType(): string; + GetSymbol(): "GPS/Marker.png" | "GPS/Ndb.png"; + imageFileName(): string; + IsUpToDate(): boolean; + UpdateInfos(_CallBack?: Function): void; + getTypeString(): "Unknown" | "H" | "Compass Point" | "MH" | "HH"; + SetFromIFacilityNDB(data: IFacilityNDBData, callback?: () => void): void; +} +declare class IntersectionInfo extends WayPointInfo { + static readManager: InstrumentDataReadManager; + nearestVORICAO: string; + nearestVORIdent: string; + nearestVORTrueRadial: number; + nearestVORMagneticRadial: number; + nearestVORDistance: number; + nearestVORFrequencyBCD16: number; + nearestVORFrequencyMHz: number; + nearestVORType: number; + constructor(_instrument: BaseInstrument); + getWaypointType(): string; + IsUpToDate(): boolean; + GetSymbol(): string; + imageFileName(): string; + vorImageFileNameSync(): string; + UpdateInfos(_CallBack?: Function): void; + GetRouteToIdent(ident: string): IRoute; + GetIcaoViaRouteByIdent(ident: string): string; + GetRouteToIcao(icao: string): IRoute; + GetNextIcaoVia(routeName: string): string; + GetNextWayPointVia(routeName: string): Promise; + static longestAirway: number; + SetFromIFacilityIntersection(data: IFacilityIntersectionData, callback?: () => void): void; + UpdateAirways(): Promise; + static GetCommonAirway(wp1: WayPoint, wp2: WayPoint): Airway; +} +declare enum EFrequencyType { + NONE = 0, + ATIS = 1, + MULTICOM = 2, + UNICOM = 3, + CTAF = 4, + GROUND = 5, + TOWER = 6, + CLEARANCE = 7, + APPROACH = 8, + DEPARTURE = 9, + CENTER = 10, + FSS = 11, + AWOS = 12, + ASOS = 13, + CPT = 14, + GCO = 15 +} +declare class Frequency { + name: string; + mhValue: number; + bcd16Value: number; + type: EFrequencyType; + constructor(_name: string, _mhValue: number, _bcd16Value: number, _type?: EFrequencyType); + getTypeName(): string; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypointloader.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypointloader.d.ts new file mode 100644 index 000000000..2fcae4939 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/flightelements/waypointloader.d.ts @@ -0,0 +1,242 @@ +interface IFrequency { + name: string; + freqMHz: number; + freqBCD16: number; + type: number; +} +interface IRunway { + latitude: number; + longitude: number; + elevation: number; + direction: number; + designation: string; + length: number; + width: number; + surface: number; + lighting: number; + designatorCharPrimary: number; + designatorCharSecondary: number; +} +interface IRoute { + name: string; + type: number; + prevIcao: string; + nextIcao: string; +} +interface IAirwayData { + name: string; + type: number; + icaos: string[]; +} +interface ILeg { + fixIcao: string; + originIcao: string; + course: number; + distance: number; + altDesc: number; + altitude1: number; + altitude2: number; +} +interface IRunwayTransition { + name: string; + runwayNumber: number; + runwayDesignation: number; + legs: ILeg[]; +} +interface IEnRouteTransition { + name: string; + legs: ILeg[]; +} +interface IApproachTransition { + name: string; + legs: ILeg[]; +} +interface IDeparture { + name: string; + commonLegs: ILeg[]; + enRouteTransitions: IEnRouteTransition[]; + runwayTransitions: IRunwayTransition[]; +} +interface IApproach { + name: string; + runway: string; + icaos: string[]; + transitions: IApproachTransition[]; + finalLegs: ILeg[]; + missedLegs: ILeg[]; +} +interface IArrival { + name: string; + commonLegs: ILeg[]; + enRouteTransitions: IEnRouteTransition[]; + runwayTransitions: IRunwayTransition[]; +} +interface IFacilityData { + icao: string; + icaoTrimed: string; + name: string; + lat: number; + lon: number; + region: string; + city: string; + altitudeMode: string; + magvar: number; +} +interface IFacilityAirportData extends IFacilityData { + airportPrivateType: number; + fuel1: string; + fuel2: string; + bestApproach: string; + radarCoverage: number; + airspaceType: number; + airportClass: number; + towered: boolean; + frequencies: IFrequency[]; + runways: IRunway[]; + departures: IDeparture[]; + approaches: IApproach[]; + arrivals: IArrival[]; +} +interface IFacilityIntersectionData extends IFacilityData { + routes: IRoute[]; + nearestVorICAO: string; + nearestVorType: number; + nearestVorFrequencyBCD16: number; + nearestVorFrequencyMHz: number; + nearestVorTrueRadial: number; + nearestVorMagneticRadial: number; + nearestVorDistance: number; +} +interface IFacilityVORData extends IFacilityData { + freqMHz: number; + freqBCD16: number; + weatherBroadcast: number; + magneticVariation: number; + type: number; + vorClass: number; +} +interface IFacilityNDBData extends IFacilityData { + freqMHz: number; + weatherBroadcast: number; + type: number; +} +declare class NearestAirspacesLoader { + lla: LatLongAlt; + nearestAirspaces: NearestAirspace[]; + onNewAirspaceAddedCallback: (airspace: NearestAirspace) => void; + private _lastlla; + private _updating; + private instrument; + constructor(_instrument: BaseInstrument); + update(): void; +} +declare class FacilityLoader { + private instrument; + constructor(_instrument: BaseInstrument); + pendingRequests: any[]; + loadingFacilities: string[]; + loadedFacilities: IFacilityData[]; + loadedAirwayDatas: Map; + private _isRegistered; + private _isCompletelyRegistered; + registerListener(): void; + private _maxSimultaneousCoherentCalls; + private _pendingGetFacilityCoherentCall; + update(): void; + private addFacility; + getFacilityCB(icao: string, callback: (waypoint: WayPoint) => void): void; + waitRegistration(): Promise; + getFacility(icao: string): Promise; + getFacilityDataCB(icao: string, callback: (data: IFacilityData) => void): void; + getFacilityData(icao: string): Promise; + getAirport(icao: string): Promise; + getAirportDataCB(icao: string, callback: (data: IFacilityAirportData) => void): void; + getAirportData(icao: string): Promise; + getAirports(icaos: string[]): Promise; + getAirportsData(icaos: string[]): Promise; + getIntersectionDataCB(icao: string, callback: (data: IFacilityData) => void): void; + getIntersectionData(icao: string): Promise; + getIntersections(icaos: string[]): Promise; + getIntersectionsData(icaos: string[]): Promise; + getNdbDataCB(icao: string, callback: (data: IFacilityData) => void): void; + getNdbWaypointDataCB(icao: string, callback: (data: IFacilityIntersectionData) => void): void; + getNdbData(icao: string): Promise; + getNdbs(icaos: string[]): Promise; + getNdbsData(icaos: string[]): Promise; + getVorDataCB(icao: string, callback: (data: IFacilityData) => void): void; + getVorWaypointDataCB(icao: string, callback: (data: IFacilityIntersectionData) => void): void; + getVorData(icao: string): Promise; + getVors(icaos: string[]): Promise; + getVorsData(icaos: string[]): Promise; + getAllAirways(intersection: WayPoint | WayPointInfo, maxLength?: number): Promise; + getAllAirwaysData(intersectionInfo: WayPointInfo, maxLength?: number): Promise; + getAirwayData(intersectionInfo: WayPointInfo, name?: string, maxLength?: number): Promise; +} +declare abstract class WaypointLoader { + static DEPRECATION_DELAY_MAX: number; + static DEPRECATION_DELAY_MIN: number; + deprecationDelay: number; + slowDown(): void; + speedUp(): void; + protected waypointsCountLimit: number; + waypoints: WayPoint[]; + private _locked; + private _lastMaxItemsSearchCountSyncDate; + private _maxItemsSearchCountNeedUpdate; + private _maxItemsSearchCount; + get maxItemsSearchCount(): number; + set maxItemsSearchCount(v: number); + private _lastSearchRangeSyncDate; + private _searchRangeNeedUpdate; + private _searchRange; + get searchRange(): number; + get searchRangeInMeters(): number; + set searchRange(v: number); + private _lastSearchOriginSyncDate; + private _lastSearchOriginLat; + private _lastSearchOriginLong; + private _searchOrigin; + get searchLat(): number; + set searchLat(v: number); + get searchLong(): number; + set searchLong(v: number); + private _itemsCountNeedUpdate; + private _itemsNeedUpdate; + private _isLoadingItems; + private _hasUpdatedItems; + private _lastItemCountUpdateDate; + private _itemsCount; + private _itemIterator; + private batch; + protected SET_ORIGIN_LATITUDE: string; + protected SET_ORIGIN_LONGITUDE: string; + protected SET_SEARCH_RANGE: string; + protected GET_SEARCH_RANGE: string; + protected SET_MAX_ITEMS: string; + protected GET_MAX_ITEMS: string; + protected GET_ITEMS_COUNT: string; + protected SET_ITEM_INDEX: string; + protected GET_ITEM_ICAO: string; + protected GET_ITEM_IDENT: string; + protected createCallback: (icao: string) => Promise; + protected createWaypointCallback: (icao: string) => Promise; + protected createWaypointsCallback: (icaos: string[]) => Promise; + loaderName: string; + currentMapAngularWidth: number; + currentMapAngularHeight: number; + instrument: BaseInstrument; + constructor(_instrument: BaseInstrument); + update(): void; +} +declare class NDBLoader extends WaypointLoader { + constructor(_instrument: BaseInstrument); +} +declare class VORLoader extends WaypointLoader { + constructor(_instrument: BaseInstrument); +} +declare class IntersectionLoader extends WaypointLoader { + constructor(_instrument: BaseInstrument); +} +declare class AirportLoader extends WaypointLoader { + constructor(_instrument: BaseInstrument); +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/utils/datareadmanager.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/utils/datareadmanager.d.ts new file mode 100644 index 000000000..622c77f59 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/utils/datareadmanager.d.ts @@ -0,0 +1,24 @@ +declare class DataReadMetaManager { + private managerList; + constructor(); + UpdateAll(): void; + RegisterManager(_Manager: DataReadManager): void; +} +interface AsynchroneDataGetter { + LoadData(): any; + IsUpToDate(): boolean; + EndLoad(): any; +} +declare class DataReadManager { + waitingForUpdate: Array; + registered: boolean; + metaManager: DataReadMetaManager; + constructor(_metaManager: DataReadMetaManager); + Update(): void; + AddToQueue(_Getter: AsynchroneDataGetter): boolean; + protected Register(): void; +} +declare class InstrumentDataReadManager { + private array; + AddToQueue(_instrument: BaseInstrument, _Getter: AsynchroneDataGetter): boolean; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/utils/radionav.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/utils/radionav.d.ts new file mode 100644 index 000000000..460f96f3a --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/utils/radionav.d.ts @@ -0,0 +1,103 @@ +declare class RadioNav { + private navMode; + private navBeacon; + init(_navMode: NavMode): void; + get mode(): NavMode; + setRADIONAVActive(_index: number, _value: boolean): void; + getRADIONAVActive(_index: number): boolean; + getRADIONAVSource(): NavSource; + setRADIONAVSource(_source: NavSource): void; + swapVORFrequencies(_index: number): Promise; + setVORActiveFrequency(_index: number, _value: number): Promise; + getVORActiveFrequency(_index: number): number; + setVORActiveIdent(_index: number, _value: string): Promise; + getVORActiveIdent(_index: number): string; + setVORStandbyFrequency(_index: number, _value: number): Promise; + getVORStandbyFrequency(_index: number): number; + setVORObs(_index: number, _value: number): Promise; + getVORObs(_index: number): number; + getVORBeacon(_index: number): NavBeacon; + getBestVORBeacon(_useNavSource?: UseNavSource): NavBeacon; + private _getVORBeacon; + swapILSFrequencies(_index: number): Promise; + setILSActiveFrequency(_index: number, _value: number): Promise; + getILSActiveFrequency(_index: number): number; + setILSActiveIdent(_index: number, _value: string): Promise; + getILSActiveIdent(_index: number): string; + setILSStandbyFrequency(_index: number, _value: number): Promise; + getILSStandbyFrequency(_index: number): number; + setILSObs(_index: number, _value: number): Promise; + getILSObs(_index: number): number; + getILSBeacon(_index: number): NavBeacon; + private _getILSBeacon; + getBestILSBeacon(_useNavSource?: UseNavSource): NavBeacon; + getClosestILSBeacon(): NavBeacon; + tuneClosestILS(_tune: boolean): Promise; + getADFActiveFrequency(_index: number): number; + getADFStandbyFrequency(_index: number): number; + setADFActiveFrequency(_index: number, _value: number): Promise; + setADFStandbyFrequency(_index: number, _value: number): Promise; + swapADFFrequencies(_index: number, _vhfIndex: number): Promise; + getTransponderCode(_index: number): number; + setTransponderCode(_index: number, _value: number): void; + getTransponderState(_index: number): TRANSPONDER_STATE; + setTransponderState(_index: number, _state: TRANSPONDER_STATE): void; + swapVHFFrequencies(_userIndex: number, _vhfIndex: number): Promise; + setVHFActiveFrequency(_userIndex: number, _vhfIndex: number, _value: number): Promise; + getVHFActiveFrequency(_userIndex: number, _vhfIndex: number): number; + setVHFStandbyFrequency(_userIndex: number, _vhfIndex: number, _value: number): Promise; + getVHFStandbyFrequency(_userIndex: number, _vhfIndex: number): number; + setVHF1ActiveFrequency(_index: number, _value: number): void; + getVHF1ActiveFrequency(_index: number): number; + setVHF1StandbyFrequency(_index: number, _value: number): void; + getVHF1StandbyFrequency(_index: number): number; + setVHF2ActiveFrequency(_index: number, _value: number): void; + getVHF2ActiveFrequency(_index: number): number; + setVHF2StandbyFrequency(_index: number, _value: number): void; + getVHF2StandbyFrequency(_index: number): number; + setVHF3ActiveFrequency(_index: any, _value: number): void; + getVHF3ActiveFrequency(_index: number): number; + setVHF3StandbyFrequency(_index: number, _value: number): void; + getVHF3StandbyFrequency(_index: number): number; + getRadioDecisionHeight(): number; + private static Hz833Spacing; + static isHz833Compliant(_MHz: number): boolean; + static isHz25Compliant(_MHz: number): boolean; + static isHz50Compliant(_MHz: number): boolean; + static isXPDRCompliant(_code: number): boolean; +} +declare enum NavMode { + TWO_SLOTS = 0, + FOUR_SLOTS = 1 +} +declare enum UseNavSource { + NO = 0, + YES_ONLY = 1, + YES_FALLBACK = 2 +} +declare enum NavSource { + AUTO = 0, + GPS = 1, + VOR1 = 2, + VOR2 = 3, + ILS1 = 4, + ILS2 = 5 +} +declare enum TRANSPONDER_STATE { + OFF = 0, + STBY = 1, + TEST = 2, + ON = 3, + ALT = 4, + GND = 5 +} +declare class NavBeacon { + id: number; + freq: number; + course: number; + radial: number; + name: string; + ident: string; + isILS: boolean; + reset(): void; +} diff --git a/src/msfstypes/pages/vcockpit/instruments/shared/utils/xmllogic.d.ts b/src/msfstypes/pages/vcockpit/instruments/shared/utils/xmllogic.d.ts new file mode 100644 index 000000000..29cad9d4e --- /dev/null +++ b/src/msfstypes/pages/vcockpit/instruments/shared/utils/xmllogic.d.ts @@ -0,0 +1,209 @@ +declare class LogicXMLContext { + functions: Array; + currentParameters: Array; + update(): void; + addFunction(_func: LogicXMLFunction): void; + executeFunction(_name: string, _uniqueCall?: boolean): number | string; +} +declare class LogicXMLFunction { + callback: CompositeLogicXMLElement; + name: string; + hasBeenCalled: boolean; + lastValue: number | string; + context: any; + getValue(uniqueCall?: boolean, args?: Array): number | string; +} +declare abstract class LogicXMLElement { + gps: BaseInstrument; + element: Element; + constructor(_gps: BaseInstrument, _element: Element); + abstract getValue(_context?: LogicXMLContext): number | string; + getValueAsNumber(_context?: LogicXMLContext): number; + getValueAsString(_context?: LogicXMLContext): string; + reset(): void; +} +declare class CompositeLogicXMLElement extends LogicXMLElement { + childrens: Array; + constructor(_gps: BaseInstrument, _element: Element); + protected createChildrens(): void; + getValue(_context?: LogicXMLContext): number | string; + reset(): void; +} +declare class AndLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class OrLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class NotLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class MultiplyLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class DivideLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class AddLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): string | number; +} +declare class SubstractLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class MaxLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class MinLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class ClampLogicXMLElement extends CompositeLogicXMLElement { + private min; + private max; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): number; +} +declare class LowerLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class LowerEqualLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class GreaterLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class GreaterEqualLogicXMLElement extends CompositeLogicXMLElement { + getValue(_context?: LogicXMLContext): number; +} +declare class EqualLogicXMLElement extends CompositeLogicXMLElement { + private tolerance; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): number; +} +declare class DifferentLogicXMLElement extends CompositeLogicXMLElement { + private tolerance; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): number; +} +declare class TimerLogicXMLElement extends CompositeLogicXMLElement { + private wasTrue; + private timerBegin; + private time; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): number; + reset(): void; +} +declare class SimvarLogicXMLElement extends LogicXMLElement { + private simvar; + private unit; + constructor(_gps: BaseInstrument, _element: Element); + getValue(): string | number; +} +declare class GamevarLogicXMLElement extends LogicXMLElement { + private gamevar; + private unit; + constructor(_gps: BaseInstrument, _element: Element); + getValue(): string | number; +} +declare class ConstantLogicXMLElement extends LogicXMLElement { + private value; + constructor(_gps: BaseInstrument, _element: Element); + getValue(): string | number; +} +declare class TimeSinceStartLogicXMLElement extends LogicXMLElement { + getValue(): number; +} +declare class InstrumentWasOffLogicXMLElement extends LogicXMLElement { + getValue(): number; +} +declare class LinearMultiPointLogicXMLElement extends LogicXMLElement { + private referencePoints; + private minimums; + private maximums; + private param1; + private param2; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): number; + reset(): void; +} +declare class MultiDimensionsTableInput { + references: Array; + param: CompositeLogicXMLElement; + private _factor; + get factor(): number; + private _previousIndex; + get previousIndex(): number; + private _nextIndex; + get nextIndex(): number; + update(_context?: LogicXMLContext): void; +} +declare class MultiDimensionsTableLogicXMLElement extends LogicXMLElement { + private inputs; + private outputTable; + constructor(_gps: BaseInstrument, _element: Element); + private constructOutputTable; + private initializeOutputTable; + private getTableValue; + private setTableValue; + private fillUndefinedValues; + private interpolate; + getValue(_context?: LogicXMLContext): number; +} +declare class StateTransitionLogicXML { + toId: Name_Z; + conditions: CompositeLogicXMLElement; +} +declare class StateLogicXML { + id: Name_Z; + value: number; + transitions: Array; +} +declare class StateMachineLogicXMLElement extends LogicXMLElement { + private currentState; + private states; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): number; + makeTransitions(_context?: LogicXMLContext): void; + reset(): void; +} +declare class ToFixedLogicXMLElement extends CompositeLogicXMLElement { + private precision; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): string; +} +declare class IfLogicXMLElement extends LogicXMLElement { + private precision; + private condition; + private then; + private else; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): string | number; + reset(): void; +} +declare class FunctionXMLElement extends LogicXMLElement { + private functionName; + private uniqueCall; + constructor(_gps: BaseInstrument, _element: Element); + getValue(_context?: LogicXMLContext): string | number; +} +declare class MaxSinceStartXMLElement extends CompositeLogicXMLElement { + maxValue: number; + getValue(_context?: LogicXMLContext): number | string; +} +declare class MinSinceStartXMLElement extends CompositeLogicXMLElement { + minValue: number; + getValue(_context?: LogicXMLContext): number | string; +} +declare class DistanceFromOriginXMLElement extends LogicXMLElement { + originPosition: LatLong; + getValue(_context?: LogicXMLContext): number | string; +} +declare class DistanceToDestinationXMLElement extends LogicXMLElement { + destinationPosition: LatLong; + getValue(_context?: LogicXMLContext): number | string; +} +declare class HeadingChangeFromDepartureXMLElement extends LogicXMLElement { + headingAtTakeOff: number; + wasOnGround: boolean; + maxHeadingChange: number; + getValue(_context?: LogicXMLContext): number | string; +} diff --git a/src/msfstypes/pages/vcockpit/systems/systems.d.ts b/src/msfstypes/pages/vcockpit/systems/systems.d.ts new file mode 100644 index 000000000..2742a8bbf --- /dev/null +++ b/src/msfstypes/pages/vcockpit/systems/systems.d.ts @@ -0,0 +1,16 @@ +declare class InstrumentConfig { + name: string; + electrics: Array; +} +declare class Systems { + protected xmlConfig: Document; + protected inputData: VCockpitLogicInput; + protected allInstruments: Array; + init(_xmlConfig: Document, _inputData: VCockpitLogicInput): void; + protected parseXML(): void; + update(): void; + protected updateLogic(_data: VCockpitLogicOutput): void; + protected addAttribute(_panel: VCockpitLogicOutputPanel, _name: string, _value: string): void; + protected addMaterial(_panel: VCockpitLogicOutputPanel, _name: Name_Z): void; + protected addMaterials(_panel: VCockpitLogicOutputPanel, _names: Array): void; +} diff --git a/src/msfstypes/pages/vcockpit/systems/systems_as1000.d.ts b/src/msfstypes/pages/vcockpit/systems/systems_as1000.d.ts new file mode 100644 index 000000000..e35823e00 --- /dev/null +++ b/src/msfstypes/pages/vcockpit/systems/systems_as1000.d.ts @@ -0,0 +1,22 @@ +declare class Systems_AS1000 extends Systems { + private PFDName; + private MFDName; + private PFDPanel; + private MFDPanel; + private PFDOutput; + private MFDOutput; + private FinalOutput; + private bPFDTurnedOn; + private bMFDTurnedOn; + private bPFDFailure; + private bMFDFailure; + private bReversionary; + private bSwapScreens; + init(_xmlConfig: Document, _logicData: VCockpitLogicInput): void; + protected parseXML(): void; + update(): void; + protected isInstrumentTurnedOn(_name: string): boolean; + protected isScreenFailure(_name: string): boolean; + protected isReversionaryMode(): boolean; + protected doSwapScreens(): boolean; +} diff --git a/src/sdk/autopilot/APConfig.ts b/src/sdk/autopilot/APConfig.ts index d71ba61ab..707afcd81 100644 --- a/src/sdk/autopilot/APConfig.ts +++ b/src/sdk/autopilot/APConfig.ts @@ -17,7 +17,8 @@ export enum APVerticalModes { TO, GA, FPA, - FLARE + FLARE, + LEVEL } export enum APLateralModes { @@ -198,6 +199,13 @@ export interface APConfig { */ createWingLevelerDirector?(apValues: APValues): PlaneDirector | undefined; + /** + * Creates the autopilot's pitch level mode director. + * @param apValues The autopilot's state values. + * @returns The autopilot's pitch level mode director. + */ + createPitchLevelerDirector?(apValues: APValues): PlaneDirector | undefined; + /** * Creates the autopilot's GPS LNAV mode director. * @param apValues The autopilot's state values. @@ -339,8 +347,11 @@ export interface APConfig { /** The autopilot's default vertical mode. */ defaultVerticalMode: APVerticalModes | (() => APVerticalModes); - /** The default maximum bank angle the autopilot may command in degrees. */ - defaultMaxBankAngle: number; + /** + * The default maximum bank angle the autopilot may command in degrees. + * If not defined, then the maximum bank angle will be sourced from the AUTOPILOT MAX BANK SimVar + **/ + defaultMaxBankAngle?: number; /** The altitude hold slot index to use. Defaults to 1 */ altitudeHoldSlotIndex?: 1 | 2 | 3; @@ -362,6 +373,11 @@ export interface APConfig { */ autoEngageFd?: boolean; + /** + * Whether to have independent flight directors that can be switched on/off separately. Defaults to false. + */ + independentFds?: boolean; + /** * When true, will initialize the state manager when the flight plan is next synced. * This is a work around to delay initialization of autopilot, diff --git a/src/sdk/autopilot/Autopilot.ts b/src/sdk/autopilot/Autopilot.ts index f69a1e666..4848edc98 100644 --- a/src/sdk/autopilot/Autopilot.ts +++ b/src/sdk/autopilot/Autopilot.ts @@ -43,6 +43,9 @@ export type APDirectors = { /** The autopilot's wings level mode director. */ readonly wingLevelerDirector?: PlaneDirector; + /** The autopilot's pitch level mode director. */ + readonly pitchLevelerDirector?: PlaneDirector; + /** The autopilot's GPS LNAV mode director. */ readonly gpssDirector?: PlaneDirector; @@ -110,7 +113,7 @@ export type APDirectors = { /** * An Autopilot. */ -export class Autopilot { +export class Autopilot { /** This autopilot's plane directors. */ public readonly directors: APDirectors; @@ -183,10 +186,14 @@ export class Autopilot { constructor( protected readonly bus: EventBus, protected readonly flightPlanner: FlightPlanner, - protected readonly config: APConfig, + protected readonly config: Config, public readonly stateManager: APStateManager ) { - this.apValues.maxBankAngle.set(config.defaultMaxBankAngle); + + if (config.defaultMaxBankAngle !== undefined) { + this.apValues.maxBankAngle.set(config.defaultMaxBankAngle); + } + this.directors = this.createDirectors(config); this.vnavManager = config.createVNavManager?.(this.apValues); this.navToNavManager = config.createNavToNavManager?.(this.apValues); @@ -239,6 +246,7 @@ export class Autopilot { trackHoldDirector: config.createTrackHoldDirector?.(this.apValues), rollDirector: config.createRollDirector?.(this.apValues), wingLevelerDirector: config.createWingLevelerDirector?.(this.apValues), + pitchLevelerDirector: config.createPitchLevelerDirector?.(this.apValues), gpssDirector: config.createGpssDirector?.(this.apValues), vorDirector: config.createVorDirector?.(this.apValues), locDirector: config.createLocDirector?.(this.apValues), @@ -314,9 +322,9 @@ export class Autopilot { } } if (set === undefined || set === true) { - if (this.config.autoEngageFd !== false && !this.stateManager.isFlightDirectorOn.get()) { + if (this.config.autoEngageFd !== false && !this.stateManager.isAnyFlightDirectorOn.get()) { this.stateManager.setFlightDirector(true); - } else if (this.config.autoEngageFd === false && !this.stateManager.isFlightDirectorOn.get() && !this.stateManager.apMasterOn.get()) { + } else if (this.config.autoEngageFd === false && !this.stateManager.isAnyFlightDirectorOn.get() && !this.stateManager.apMasterOn.get()) { return; } switch (mode) { @@ -361,9 +369,9 @@ export class Autopilot { } } if (set === undefined || set === true) { - if (this.config.autoEngageFd !== false && !this.stateManager.isFlightDirectorOn.get()) { + if (this.config.autoEngageFd !== false && !this.stateManager.isAnyFlightDirectorOn.get()) { this.stateManager.setFlightDirector(true); - } else if (this.config.autoEngageFd === false && !this.stateManager.isFlightDirectorOn.get() && !this.stateManager.apMasterOn.get()) { + } else if (this.config.autoEngageFd === false && !this.stateManager.isAnyFlightDirectorOn.get() && !this.stateManager.apMasterOn.get()) { return; } switch (mode) { @@ -380,6 +388,7 @@ export class Autopilot { case APVerticalModes.VS: case APVerticalModes.FPA: case APVerticalModes.FLC: + case APVerticalModes.LEVEL: if (this.vnavManager?.state === VNavState.Enabled_Active && !this.vnavManager.canVerticalModeActivate(mode)) { // If the VNav Manager is active, don't activate the mode until VNav Approves. this.verticalModes.get(mode)?.arm(); @@ -629,7 +638,7 @@ export class Autopilot { * Callback to set the vertical armed mode. * @param mode is the mode being set. */ - private setVerticalArmed(mode: APVerticalModes): void { + protected setVerticalArmed(mode: APVerticalModes): void { const { verticalArmed } = this.apValues; if (mode !== verticalArmed.get()) { const currentMode = this.verticalModes.get(verticalArmed.get()); @@ -644,7 +653,7 @@ export class Autopilot { * Callback to set the vertical approach armed mode. * @param mode is the mode being set. */ - private setVerticalApproachArmed(mode: APVerticalModes): void { + protected setVerticalApproachArmed(mode: APVerticalModes): void { const currentMode = this.verticalModes.get(this.verticalApproachArmed); currentMode?.deactivate(); this.verticalApproachArmed = mode; @@ -664,7 +673,7 @@ export class Autopilot { /** * Initializes the Autopilot with the available lateral modes from the config. */ - private initLateralModes(): void { + protected initLateralModes(): void { if (this.directors.rollDirector) { this.lateralModes.set(APLateralModes.ROLL, this.directors.rollDirector); @@ -827,7 +836,7 @@ export class Autopilot { /** * Initializes the Autopilot with the available vertical modes from the config. */ - private initVerticalModes(): void { + protected initVerticalModes(): void { if (this.directors.pitchDirector) { this.verticalModes.set(APVerticalModes.PITCH, this.directors.pitchDirector); @@ -929,6 +938,14 @@ export class Autopilot { this.setVerticalApproachArmed(APVerticalModes.NONE); }; } + if (this.directors.pitchLevelerDirector) { + this.verticalModes.set(APVerticalModes.LEVEL, this.directors.pitchLevelerDirector); + this.directors.pitchLevelerDirector.onActivate = () => { + this.setVerticalActive(APVerticalModes.LEVEL); + this.setVerticalArmed(APVerticalModes.NONE); + this.setVerticalApproachArmed(APVerticalModes.NONE); + }; + } if (this.directors.toVerticalDirector) { this.verticalModes.set(APVerticalModes.TO, this.directors.toVerticalDirector); this.directors.toVerticalDirector.onActivate = (): void => { @@ -956,12 +973,12 @@ export class Autopilot { * Checks if all the active and armed modes are still in their proper state * and takes corrective action if not. */ - private checkModes(): void { + protected checkModes(): void { if (this.lateralModeFailed) { this.lateralModeFailed = false; } - if (!this.stateManager.apMasterOn.get() && !this.stateManager.isFlightDirectorOn.get()) { + if (!this.stateManager.apMasterOn.get() && !this.stateManager.isAnyFlightDirectorOn.get()) { return; } @@ -993,7 +1010,7 @@ export class Autopilot { /** * Runs update on each of the active and armed modes. */ - private updateModes(): void { + protected updateModes(): void { const { lateralActive, lateralArmed, verticalActive, verticalArmed } = this.apValues; if (lateralActive.get() !== APLateralModes.NONE && lateralActive.get() !== APLateralModes.GPSS && this.lateralModes.has(lateralActive.get())) { @@ -1160,7 +1177,7 @@ export class Autopilot { this.handleApFdStateChange(); } }); - this.stateManager.isFlightDirectorOn.sub(() => { + this.stateManager.isAnyFlightDirectorOn.sub(() => { if (this.autopilotInitialized) { this.handleApFdStateChange(); } @@ -1169,6 +1186,12 @@ export class Autopilot { this.bus.getSubscriber().on('approach_available').handle(available => { this.apValues.approachIsActive.set(available); }); + + if (this.config.defaultMaxBankAngle === undefined) { + ap.on('ap_max_bank_value').handle(value => { + this.apValues.maxBankAngle.set(value); + }); + } } /** @@ -1199,7 +1222,7 @@ export class Autopilot { */ protected handleApFdStateChange(): void { const ap = this.stateManager.apMasterOn.get(); - const fd = this.stateManager.isFlightDirectorOn.get(); + const fd = this.stateManager.isAnyFlightDirectorOn.get(); if (ap && !fd && this.config.autoEngageFd !== false) { this.stateManager.setFlightDirector(true); } else if (!ap && !fd) { diff --git a/src/sdk/autopilot/directors/APFLCDirector.ts b/src/sdk/autopilot/directors/APFLCDirector.ts index 148c40f18..e6f4e9fd4 100644 --- a/src/sdk/autopilot/directors/APFLCDirector.ts +++ b/src/sdk/autopilot/directors/APFLCDirector.ts @@ -45,6 +45,12 @@ export type APFLCDirectorOptions = { * speed target should be in mach. Any undefined commands will leave the current settings unchanged. */ setSpeedOnActivation: (currentIas: number, currentMach: number, isSelectedSpeedInMach: boolean, command: APFLCDirectorSetSpeedCommand) => void; + + /** + * Whether the director should use mach number calculated from the impact pressure derived from indicated airspeed + * and ambient pressure instead of the true mach number. Defaults to `false`. + */ + useIndicatedMach?: boolean; }; /** @@ -75,6 +81,8 @@ export class APFLCDirector implements PlaneDirector { private readonly maxPitchDownAngleFunc: () => number; private readonly setSpeedOnActivationFunc: (currentIas: number, currentMach: number, isSelectedSpeedInMach: boolean, command: APFLCDirectorSetSpeedCommand) => void; + private readonly useIndicatedMach: boolean; + /** * Creates a new instance of APFLCDirector. * @param apValues Autopilot values from this director's parent autopilot. @@ -111,6 +119,8 @@ export class APFLCDirector implements PlaneDirector { this.setSpeedOnActivationFunc = options?.setSpeedOnActivation ?? APFLCDirector.defaultSetSpeedOnActivation; + this.useIndicatedMach = options?.useIndicatedMach ?? false; + this.state = DirectorState.Inactive; this.flcComputer = new GenericFlcComputer({ kP: 2, kI: 0, kD: 0, maxOut: 90, minOut: -90 }); } @@ -128,9 +138,17 @@ export class APFLCDirector implements PlaneDirector { this.setSpeedCommand.mach = undefined; this.setSpeedCommand.isSelectedSpeedInMach = undefined; + const ias = SimVar.GetSimVarValue('AIRSPEED INDICATED:1', SimVarValueType.Knots); + let mach: number; + if (this.useIndicatedMach) { + mach = AeroMath.casToMach(UnitType.KNOT.convertTo(ias, UnitType.MPS), SimVar.GetSimVarValue('AMBIENT PRESSURE', SimVarValueType.HPA)); + } else { + mach = SimVar.GetSimVarValue('AIRSPEED MACH', SimVarValueType.Number); + } + this.setSpeedOnActivationFunc( - SimVar.GetSimVarValue('AIRSPEED INDICATED:1', SimVarValueType.Knots), - SimVar.GetSimVarValue('AIRSPEED MACH', SimVarValueType.Number), + ias, + mach, this.apValues.isSelectedSpeedInMach.get(), this.setSpeedCommand ); @@ -185,11 +203,18 @@ export class APFLCDirector implements PlaneDirector { if (this.apValues.isSelectedSpeedInMach.get()) { const mach = this.apValues.selectedMach.get(); - let ias = Simplane.getMachToKias(mach); - if (!isFinite(ias)) { - // Sometimes getMachToKias returns a NaN value. If so, fall back to doing the conversion ourselves. + + let ias: number; + if (this.useIndicatedMach) { ias = UnitType.KNOT.convertFrom(AeroMath.machToCas(mach, SimVar.GetSimVarValue('AMBIENT PRESSURE', SimVarValueType.HPA)), UnitType.MPS); + } else { + ias = Simplane.getMachToKias(mach); + if (!isFinite(ias)) { + // Sometimes getMachToKias returns a NaN value. If so, fall back to doing the conversion ourselves. + ias = UnitType.KNOT.convertFrom(AeroMath.machToCas(mach, SimVar.GetSimVarValue('AMBIENT PRESSURE', SimVarValueType.HPA)), UnitType.MPS); + } } + this.flcComputer.setTargetSpeed(ias); } else { this.flcComputer.setTargetSpeed(this.apValues.selectedIas.get()); diff --git a/src/sdk/autopilot/directors/APPitchLvlDirector.ts b/src/sdk/autopilot/directors/APPitchLvlDirector.ts new file mode 100644 index 000000000..2027de8e5 --- /dev/null +++ b/src/sdk/autopilot/directors/APPitchLvlDirector.ts @@ -0,0 +1,66 @@ +/// + +import { APValues } from '../APConfig'; +import { DirectorState, PlaneDirector } from './PlaneDirector'; + +/** + * A pitch level autopilot director. + */ +export class APPitchLvlDirector implements PlaneDirector { + + public state: DirectorState; + + /** @inheritdoc */ + public onActivate?: () => void; + + /** @inheritdoc */ + public onArm?: () => void; + + /** @inheritdoc */ + public drivePitch?: (pitch: number, adjustForAoa?: boolean, adjustForVerticalWind?: boolean) => void; + + + /** + * Creates an instance of the APPitchLvlDirector. + * @param apValues are the ap selected values for the autopilot. + */ + constructor(protected readonly apValues: APValues) { + this.state = DirectorState.Inactive; + } + + /** + * Activates this director. + */ + public activate(): void { + this.state = DirectorState.Active; + if (this.onActivate !== undefined) { + this.onActivate(); + } + } + + /** + * Arms this director. + * This director has no armed mode, so it activates immediately. + */ + public arm(): void { + if (this.state == DirectorState.Inactive) { + this.activate(); + } + } + + /** + * Deactivates this director. + */ + public deactivate(): void { + this.state = DirectorState.Inactive; + } + + /** + * Updates this director. + */ + public update(): void { + if (this.state === DirectorState.Active) { + this.drivePitch && this.drivePitch(0, true, true); + } + } +} \ No newline at end of file diff --git a/src/sdk/autopilot/directors/APVSDirector.ts b/src/sdk/autopilot/directors/APVSDirector.ts index eafb0f076..c04f49e46 100644 --- a/src/sdk/autopilot/directors/APVSDirector.ts +++ b/src/sdk/autopilot/directors/APVSDirector.ts @@ -30,7 +30,7 @@ export class APVSDirector implements PlaneDirector { * Upon activation, the actual vs will be rounded using this increment. * If undefined, the value will not be rounded before passed to the sim. Defaults to undefined. */ - constructor(private readonly apValues: APValues, private readonly vsIncrement: number | undefined = undefined) { + constructor(protected readonly apValues: APValues, protected readonly vsIncrement: number | undefined = undefined) { this.state = DirectorState.Inactive; } @@ -80,7 +80,7 @@ export class APVSDirector implements PlaneDirector { * Gets a desired pitch from the selected vs value. * @returns The desired pitch angle. */ - private getDesiredPitch(): number { + protected getDesiredPitch(): number { const tas = SimVar.GetSimVarValue('AIRSPEED TRUE', SimVarValueType.Knots); const desiredPitch = this.getFpa(UnitType.NMILE.convertTo(tas / 60, UnitType.FOOT), this.apValues.selectedVerticalSpeed.get()); return -MathUtils.clamp(isNaN(desiredPitch) ? 0 : desiredPitch, -15, 15); diff --git a/src/sdk/autopilot/directors/index.ts b/src/sdk/autopilot/directors/index.ts index d3375c4b9..50673f5e5 100644 --- a/src/sdk/autopilot/directors/index.ts +++ b/src/sdk/autopilot/directors/index.ts @@ -9,6 +9,7 @@ export * from './APHdgHoldDirector'; export * from './APNavDirector'; export * from './APNoneDirectors'; export * from './APPitchDirector'; +export * from './APPitchLvlDirector'; export * from './APRollDirector'; export * from './APTrkDirector'; export * from './APTrkHoldDirector'; diff --git a/src/sdk/autopilot/index.ts b/src/sdk/autopilot/index.ts index 00b7fff17..6d07da6f5 100644 --- a/src/sdk/autopilot/index.ts +++ b/src/sdk/autopilot/index.ts @@ -1,6 +1,7 @@ export * from './APConfig'; export * from './APStates'; export * from './Autopilot'; +export * from './AutopilotDriver'; export * from './VerticalNavigation'; export * from './GpsSynchronizer'; export * from './LNavUtils'; diff --git a/src/sdk/autopilot/managers/APStateManager.ts b/src/sdk/autopilot/managers/APStateManager.ts index ee28d8fb6..69af9af5a 100644 --- a/src/sdk/autopilot/managers/APStateManager.ts +++ b/src/sdk/autopilot/managers/APStateManager.ts @@ -1,7 +1,7 @@ import { EventBus, KeyEventData, KeyEvents, KeyEventManager, SimVarValueType } from '../../data'; import { APEvents, APLockType } from '../../instruments'; import { MSFSAPStates } from '../../navigation'; -import { SubEventInterface, SubEvent, Subject, Subscribable } from '../../sub'; +import { SubEventInterface, SubEvent, Subject, Subscribable, MappedSubject } from '../../sub'; import { APConfig, APLateralModes, APVerticalModes } from '../APConfig'; /** AP Mode Types */ @@ -42,6 +42,15 @@ export abstract class APStateManager { public isFlightDirectorOn = this._isFlightDirectorOn as Subscribable; protected _isFlightDirectorCoPilotOn = Subject.create(false); public isFlightDirectorCoPilotOn = this._isFlightDirectorCoPilotOn as Subscribable; + /** + * Whether any of the flight directors are switched on. + * Only looks at FD1/pilot unless the {@link APConfig.independentFds} option is enabled. + */ + public readonly isAnyFlightDirectorOn = MappedSubject.create( + ([isFlightDirectorOn, isFlightDirectorCoPilotOn]) => isFlightDirectorOn || (this.apConfig.independentFds && isFlightDirectorCoPilotOn), + this._isFlightDirectorOn, + this._isFlightDirectorCoPilotOn, + ); /** * Creates an instance of the APStateManager. @@ -84,12 +93,16 @@ export abstract class APStateManager { ap.on('flight_director_is_active_1').whenChanged().handle((fd) => { this._isFlightDirectorOn.set(fd); - this.setFlightDirector(fd); + if (!this.apConfig.independentFds) { + this.setFlightDirector(fd); + } }); ap.on('flight_director_is_active_2').whenChanged().handle((fd) => { this._isFlightDirectorCoPilotOn.set(fd); - this.setFlightDirector(fd); + if (!this.apConfig.independentFds) { + this.setFlightDirector(fd); + } }); } diff --git a/src/sdk/autopilot/managers/AltitudeSelectManager.ts b/src/sdk/autopilot/managers/AltitudeSelectManager.ts index 4042df4b4..ec9166306 100644 --- a/src/sdk/autopilot/managers/AltitudeSelectManager.ts +++ b/src/sdk/autopilot/managers/AltitudeSelectManager.ts @@ -1,6 +1,6 @@ import { EventBus, KeyEventData, KeyEvents, KeyEventManager, SimVarValueType } from '../../data'; import { APEvents } from '../../instruments'; -import { MathUtils, NumberUnitInterface, Unit, UnitFamily, UnitType } from '../../math'; +import { BitFlags, MathUtils, NumberUnitInterface, Unit, UnitFamily, UnitType } from '../../math'; import { UserSetting, UserSettingManager } from '../../settings'; import { SubscribableSet, SubscribableSetEventType } from '../../sub/SubscribableSet'; import { SortedArray } from '../../utils/datastructures/SortedArray'; @@ -28,7 +28,27 @@ export type MetricAltitudeSelectSetting = { export type MetricAltitudeSettingsManager = UserSettingManager; /** - * Configuration options for AltitudeSelectManager. + * Bitflags used to filter input events eligible to trigger input acceleration for {@link AltitudeSelectManager}. + */ +export enum AltitudeSelectManagerAccelFilter { + /** No events. */ + None = 0, + + /** INC/DEC events with a value of zero. */ + ZeroIncDec = 1 << 0, + + /** INC/DEC events with a non-zero value. */ + NonZeroIncDec = 1 << 1, + + /** SET events that are transformed to an INC/DEC event. */ + TransformedSet = 1 << 2, + + /** All events. */ + All = ~0 +} + +/** + * Configuration options for {@link AltitudeSelectManager}. */ export type AltitudeSelectManagerOptions = { /** The altitude hold slot index to use. Defaults to 1. */ @@ -91,6 +111,18 @@ export type AltitudeSelectManagerOptions = { */ lockAltToStepOnIncrMetric?: boolean; + /** + * Whether to lock the selected altitude setting to multiples of the small increment on a SET event. Defaults to + * `false`. + */ + lockAltToStepOnSet?: boolean; + + /** + * Whether to lock the selected altitude setting to multiples of the small increment in metric mode on a SET event. + * If undefined, it will be set equal to the lock flag in non-metric mode. + */ + lockAltToStepOnSetMetric?: boolean; + /** * The required number of consecutive small-increment inputs received to trigger input acceleration. While * acceleration is active, small-increment inputs will be converted to large increments. A threshold less than or @@ -101,6 +133,12 @@ export type AltitudeSelectManagerOptions = { /** Whether to reset input acceleration if the direction of increment changes. Defaults to `false`. */ accelResetOnDirectionChange?: boolean; + /** + * Bitflags to use to filter input events for input acceleration. Only events that pass the filter are eligible to + * trigger input acceleration. Defaults to `AltitudeSelectManagerAccelFilter.All`. + */ + accelFilter?: number; + /** * Whether to initialize the selected altitude setting only on the first detected input. If `false`, the selected * altitude will be initialized as soon as the manager is fully initialized. Defaults to `false`. @@ -145,9 +183,12 @@ export class AltitudeSelectManager { private readonly lockAltToStepOnIncr: boolean; private readonly lockAltToStepOnIncrMetric: boolean; + private readonly lockAltToStepOnSet: boolean; + private readonly lockAltToStepOnSetMetric: boolean; private readonly accelInputCountThreshold: number; private readonly accelResetOnDirectionChange: boolean; + private readonly accelFilter: number; private readonly initToIndicatedAlt: boolean; @@ -178,7 +219,7 @@ export class AltitudeSelectManager { }; /** - * Constructor. + * Creates a new instance of AltitudeSelectManager. * @param bus The event bus. * @param settingsManager The user settings manager controlling metric altitude preselector setting. Required to * support metric mode. @@ -186,10 +227,10 @@ export class AltitudeSelectManager { * @param stops Additional altitude stops, in feet, to respect when the selected altitude is incremented or * decremented. */ - constructor( + public constructor( private readonly bus: EventBus, settingsManager: MetricAltitudeSettingsManager | undefined, - options: AltitudeSelectManagerOptions, + options: Readonly, stops?: Iterable | SubscribableSet ) { this.altitudeHoldSlotIndex = options.altitudeHoldSlotIndex ?? 1; @@ -209,8 +250,12 @@ export class AltitudeSelectManager { this.lockAltToStepOnIncr = options.lockAltToStepOnIncr ?? true; this.lockAltToStepOnIncrMetric = options.lockAltToStepOnIncrMetric ?? this.lockAltToStepOnIncr; + this.lockAltToStepOnSet = options.lockAltToStepOnSet ?? false; + this.lockAltToStepOnSetMetric = options.lockAltToStepOnSetMetric ?? this.lockAltToStepOnSet; + this.accelInputCountThreshold = options.accelInputCountThreshold ?? 0; this.accelResetOnDirectionChange = options.accelResetOnDirectionChange ?? false; + this.accelFilter = options.accelFilter ?? AltitudeSelectManagerAccelFilter.All; this.initToIndicatedAlt = options.initToIndicatedAlt ?? false; @@ -351,15 +396,26 @@ export class AltitudeSelectManager { let direction: 0 | 1 | -1 = 0; let useLargeIncrement = false; let setAltitude: number | undefined = undefined; + let accelFilterChallenge = 0; switch (key) { case 'AP_ALT_VAR_INC': direction = 1; useLargeIncrement = value !== undefined && value > this.inputIncrLargeThreshold; + if (value === undefined || value === 0) { + accelFilterChallenge = AltitudeSelectManagerAccelFilter.ZeroIncDec; + } else { + accelFilterChallenge = AltitudeSelectManagerAccelFilter.NonZeroIncDec; + } break; case 'AP_ALT_VAR_DEC': direction = -1; useLargeIncrement = value !== undefined && value > this.inputIncrLargeThreshold; + if (value === undefined || value === 0) { + accelFilterChallenge = AltitudeSelectManagerAccelFilter.ZeroIncDec; + } else { + accelFilterChallenge = AltitudeSelectManagerAccelFilter.NonZeroIncDec; + } break; case 'AP_ALT_VAR_SET_ENGLISH': case 'AP_ALT_VAR_SET_METRIC': { @@ -368,6 +424,7 @@ export class AltitudeSelectManager { const delta = value - currentValue; direction = delta < 0 ? -1 : 1; useLargeIncrement = Math.abs(delta) > this.inputIncrLargeThreshold; + accelFilterChallenge = AltitudeSelectManagerAccelFilter.TransformedSet; } else { setAltitude = value; } @@ -387,8 +444,11 @@ export class AltitudeSelectManager { let isAccelActive = this.consecIncrSmallCount >= this.accelInputCountThreshold; + const didPassFilter = BitFlags.isAny(accelFilterChallenge, this.accelFilter); + if ( useLargeIncrement + || !didPassFilter || direction === 0 || (this.consecIncrSmallCount > 0 && time - this.lastIncrSmallInputTime > AltitudeSelectManager.CONSECUTIVE_INPUT_PERIOD) || ((isAccelActive ? this.accelResetOnDirectionChange : this.consecIncrSmallCount > 0) && this.lastIncrSmallDirection !== direction) @@ -396,7 +456,7 @@ export class AltitudeSelectManager { this.consecIncrSmallCount = 0; } - if (!useLargeIncrement) { + if (!useLargeIncrement && didPassFilter) { this.consecIncrSmallCount++; this.lastIncrSmallDirection = direction; this.lastIncrSmallInputTime = time; @@ -420,22 +480,34 @@ export class AltitudeSelectManager { */ private setSelectedAltitude(altitudeFeet: number): void { const isMetric = this.altimeterMetricSetting?.value ?? false; + let lockIncr: number; let min: number, max: number, unit: Unit; if (isMetric) { min = this.minValueMetric; max = this.maxValueMetric; unit = UnitType.METER; + lockIncr = this.lockAltToStepOnSetMetric ? this.incrSmallMetric : 0; } else { min = this.minValue; max = this.maxValue; unit = UnitType.FOOT; + lockIncr = this.lockAltToStepOnSet ? this.incrSmall : 0; } - const valueToSet = UnitType.FOOT.convertFrom( - MathUtils.clamp(UnitType.FOOT.convertTo(altitudeFeet, unit), min, max), - unit - ); + let altitudeInUnits = UnitType.FOOT.convertTo(altitudeFeet, unit); + + if (lockIncr > 0) { + altitudeInUnits = MathUtils.clamp( + MathUtils.round(altitudeInUnits, lockIncr), + MathUtils.ceil(min, lockIncr), + MathUtils.floor(max, lockIncr) + ); + } else { + altitudeInUnits = MathUtils.clamp(altitudeInUnits, min, max); + } + + const valueToSet = UnitType.FOOT.convertFrom(altitudeInUnits, unit); if (valueToSet !== SimVar.GetSimVarValue(this.altitudeHoldSlotSimVar, SimVarValueType.Feet)) { SimVar.SetSimVarValue(this.altitudeHoldSlotSimVar, SimVarValueType.Feet, valueToSet); @@ -475,7 +547,7 @@ export class AltitudeSelectManager { const startValueConverted = Math.round(UnitType.FOOT.convertTo(startValue, units)); useLargeIncrement &&= !lockAlt || (startValueConverted % incrSmall === 0); let valueToSet = UnitType.FOOT.convertFrom( - Utils.Clamp((lockAlt ? roundFunc(startValueConverted / incrSmall) * incrSmall : startValueConverted) + direction * (useLargeIncrement ? incrLarge : incrSmall), min, max), + MathUtils.clamp((lockAlt ? roundFunc(startValueConverted / incrSmall) * incrSmall : startValueConverted) + direction * (useLargeIncrement ? incrLarge : incrSmall), min, max), units ); diff --git a/src/sdk/autothrottle/AbstractAutothrottle.ts b/src/sdk/autothrottle/AbstractAutothrottle.ts index f7d3d5b2e..fb64e0f76 100644 --- a/src/sdk/autothrottle/AbstractAutothrottle.ts +++ b/src/sdk/autothrottle/AbstractAutothrottle.ts @@ -6,9 +6,11 @@ import { KeyEventManager } from '../data/KeyEventManager'; import { SimVarValueType } from '../data/SimVars'; import { ThrottleLeverManager, VirtualThrottleLeverEvents } from '../fadec/ThrottleLeverManager'; import { ClockEvents } from '../instruments/Clock'; +import { AeroMath } from '../math/AeroMath'; import { ExpSmoother } from '../math/ExpSmoother'; import { MathUtils } from '../math/MathUtils'; import { MultiExpSmoother } from '../math/MultiExpSmoother'; +import { UnitType } from '../math/NumberUnit'; import { Subject } from '../sub/Subject'; import { Subscribable } from '../sub/Subscribable'; import { SubscribableUtils } from '../sub/SubscribableUtils'; @@ -62,6 +64,12 @@ export type AutothrottlePidParams = { * Options used to initialize an autothrottle. */ export type AutothrottleOptions = { + /** + * Whether the autothrottle should use mach number calculated from the impact pressure derived from indicated + * airspeed and ambient pressure instead of the true mach number. Defaults to `false`. + */ + useIndicatedMach?: boolean; + /** * The rate at which the autothrottle's servos moves throttle levers, in units of normalized position per second. * One normalized throttle position is equal to the distance traversed by the throttle from the idle position to @@ -315,6 +323,8 @@ export abstract class AbstractAutothrottle { protected readonly publisher = this.bus.getPublisher(); + protected readonly useIndicatedMach: boolean; + protected readonly airspeedIndex: Subscribable; protected airspeedSimVar!: string; @@ -425,6 +435,8 @@ export abstract class AbstractAutothrottle { options: AutothrottleOptions, throttleLeverManager?: ThrottleLeverManager ) { + this.useIndicatedMach = options.useIndicatedMach ?? false; + this.airspeedIndex = SubscribableUtils.toSubscribable(airspeedIndex, true); this.airspeedIndex.sub(index => { this.airspeedSimVar = `AIRSPEED INDICATED:${index}`; }, true); @@ -877,9 +889,22 @@ export abstract class AbstractAutothrottle { out.isOverspeed = false; out.isUnderspeed = false; + const pressure = SimVar.GetSimVarValue('AMBIENT PRESSURE', SimVarValueType.HPA); const ias = SimVar.GetSimVarValue(this.airspeedSimVar, SimVarValueType.Knots); - const mach = SimVar.GetSimVarValue('AIRSPEED MACH', SimVarValueType.Number); - const currentMachToKias = ias > 1 && mach > 0 ? ias / mach : Simplane.getMachToKias(1); + + let currentMachToKias: number; + if (this.useIndicatedMach) { + if (ias > 1) { + const iasMps = UnitType.KNOT.convertTo(ias, UnitType.MPS); + currentMachToKias = ias / AeroMath.casToMach(iasMps, pressure); + } else { + currentMachToKias = 1 / AeroMath.casToMach(1, pressure); + } + } else { + const mach = SimVar.GetSimVarValue('AIRSPEED MACH', SimVarValueType.Number); + currentMachToKias = ias > 1 && mach > 0 ? ias / mach : 1 / AeroMath.casToMach(1, pressure); + } + const machToKias = this.machToKiasSmoother.next(isFinite(currentMachToKias) ? currentMachToKias : 1, dt); const lookahead = Math.max(0, this.iasLookahead.get()); diff --git a/src/sdk/cas/CasSystem.ts b/src/sdk/cas/CasSystem.ts index 73fa60c83..bba450cbf 100644 --- a/src/sdk/cas/CasSystem.ts +++ b/src/sdk/cas/CasSystem.ts @@ -100,7 +100,7 @@ export interface CasEvents { 'cas_set_initial_acknowledge': boolean; /** Broadcast a master acknowledge event. */ - 'cas_master_acknowledge': AnnunciationType.Caution | AnnunciationType.Warning; + 'cas_master_acknowledge': AnnunciationType; /** Enable a CAS inhibit state. */ 'cas_activate_inhibit_state': string; @@ -260,10 +260,10 @@ export class CasSystem { (keyData: KeyEventData) => { switch (keyData.key) { case 'MASTER_CAUTION_ACKNOWLEDGE': - this.handleAcknowledgement(AnnunciationType.Caution); + this.casPublisher.pub('cas_master_acknowledge', AnnunciationType.Caution, true, false); break; case 'MASTER_WARNING_ACKNOWLEDGE': - this.handleAcknowledgement(AnnunciationType.Warning); + this.casPublisher.pub('cas_master_acknowledge', AnnunciationType.Warning, true, false); break; } } @@ -297,12 +297,9 @@ export class CasSystem { this.initialAcknowledge = v; }); - // If we're not primary we need to handle master ack events published by the primary. - if (!this.isPrimary) { - this.casSubscriber.on('cas_master_acknowledge').handle(ackType => { - this.handleAcknowledgement(ackType); - }); - } + this.casSubscriber.on('cas_master_acknowledge').handle(ackType => { + this.handleAcknowledgement(ackType); + }); // Requests the CAS system to suppress all annunciations with the provided priority. this.casSubscriber.on('cas_suppress_priority').handle(priority => { @@ -568,10 +565,6 @@ export class CasSystem { * @param type The type of alert to acknowledge. */ protected handleAcknowledgement(type: AnnunciationType): void { - if (this.isPrimary && [AnnunciationType.Caution, AnnunciationType.Warning].includes(type)) { - this.casPublisher.pub('cas_master_acknowledge', type as AnnunciationType.Caution | AnnunciationType.Warning, true); - } - this.setMasterStatus(type, false); const messagesAtPriority = this.allMessages.get(type); diff --git a/src/sdk/components/FSComponent.ts b/src/sdk/components/FSComponent.ts index a06d2b70b..3a4ed935b 100644 --- a/src/sdk/components/FSComponent.ts +++ b/src/sdk/components/FSComponent.ts @@ -321,7 +321,8 @@ export namespace FSComponent { 'rect': true, 'stop': true, 'svg': true, - 'text': true + 'text': true, + 'tspan': true, }; /** @@ -1490,4 +1491,4 @@ export function registerPlugin(plugin: new (binder: T) => AvionicsPlugin): } const Fragment = FSComponent.Fragment; -export { Fragment }; \ No newline at end of file +export { Fragment }; diff --git a/src/sdk/components/XMLGauges/GaugeDefinitions/BaseGauge.ts b/src/sdk/components/XMLGauges/GaugeDefinitions/BaseGauge.ts index 43eca1715..1a606d683 100644 --- a/src/sdk/components/XMLGauges/GaugeDefinitions/BaseGauge.ts +++ b/src/sdk/components/XMLGauges/GaugeDefinitions/BaseGauge.ts @@ -56,7 +56,7 @@ export interface XMLGaugeProps extends ComponentProps { */ export interface XMLHostedLogicGauge { /** The logic host. */ - logicHost: CompositeLogicXMLHost + logicHost: CompositeLogicXMLHost; } /** An XML gauge style definition. */ diff --git a/src/sdk/components/XMLGauges/XMLGaugeAdapter.ts b/src/sdk/components/XMLGauges/XMLGaugeAdapter.ts index bd55ff974..365f4ebaa 100644 --- a/src/sdk/components/XMLGauges/XMLGaugeAdapter.ts +++ b/src/sdk/components/XMLGauges/XMLGaugeAdapter.ts @@ -178,38 +178,38 @@ export class XMLGaugeConfigFactory { } break; case 'Text': - { - const textProps: XMLTextElementProps = {}; - const className = gauge.getAttribute('id'); - if (className !== null) { - textProps.class = className; - } - - const leftElem = gauge.getElementsByTagName('Left'); - if (leftElem.length > 0) { - textProps.left = this.makeTextColumn(leftElem[0]); - } - - const centerElem = gauge.getElementsByTagName('Center'); - if (centerElem.length > 0) { - textProps.center = this.makeTextColumn(centerElem[0]); - } - - const rightElem = gauge.getElementsByTagName('Right'); - if (rightElem.length > 0) { - textProps.right = this.makeTextColumn(rightElem[0]); - } - - const style = XMLGaugeConfigFactory.parseStyleDefinition(gauge.getElementsByTagName('Style')); - if (style !== undefined) { - textProps.style = style; - } - - gaugeSpecs.push({ - gaugeType: XMLGaugeType.Text, - configuration: textProps - }); + { + const textProps: XMLTextElementProps = {}; + const className = gauge.getAttribute('id'); + if (className !== null) { + textProps.class = className; } + + const leftElem = gauge.getElementsByTagName('Left'); + if (leftElem.length > 0) { + textProps.left = this.makeTextColumn(leftElem[0]); + } + + const centerElem = gauge.getElementsByTagName('Center'); + if (centerElem.length > 0) { + textProps.center = this.makeTextColumn(centerElem[0]); + } + + const rightElem = gauge.getElementsByTagName('Right'); + if (rightElem.length > 0) { + textProps.right = this.makeTextColumn(rightElem[0]); + } + + const style = XMLGaugeConfigFactory.parseStyleDefinition(gauge.getElementsByTagName('Style')); + if (style !== undefined) { + textProps.style = style; + } + + gaugeSpecs.push({ + gaugeType: XMLGaugeType.Text, + configuration: textProps + }); + } break; case 'ColumnGroup': gaugeSpecs.push({ diff --git a/src/sdk/components/bing/BingComponent.tsx b/src/sdk/components/bing/BingComponent.tsx index 196bc1b13..8b4f6b8a7 100644 --- a/src/sdk/components/bing/BingComponent.tsx +++ b/src/sdk/components/bing/BingComponent.tsx @@ -233,7 +233,7 @@ export class BingComponent extends DisplayComponent { private readonly positionRadiusInhibitTimer = new DebounceTimer(); private readonly processPendingPositionRadius = (): void => { if (this.isPositionRadiusPending) { - Coherent.call('SET_MAP_PARAMS', this.uid, this.pos, this.radius, 1); + Coherent.call('SET_MAP_PARAMS', this.uid, this.pos, this.radius); } if (--this.positionRadiusInhibitFramesRemaining > 0) { @@ -358,7 +358,7 @@ export class BingComponent extends DisplayComponent { // Only when not SVT, send in initial map params (even if we are asleep), because a bing instance that doesn't // have params initialized causes GPU perf issues. if (this.modeFlags !== 4) { - Coherent.call('SET_MAP_PARAMS', this.uid, this.pos, this.radius, 1); + Coherent.call('SET_MAP_PARAMS', this.uid, this.pos, this.radius); } this.props.onBoundCallback && this.props.onBoundCallback(this); @@ -452,7 +452,7 @@ export class BingComponent extends DisplayComponent { if (this.positionRadiusInhibitFramesRemaining > 0) { this.isPositionRadiusPending = true; } else { - Coherent.call('SET_MAP_PARAMS', this.uid, this.pos, this.radius, 1); + Coherent.call('SET_MAP_PARAMS', this.uid, this.pos, this.radius); } } } diff --git a/src/sdk/components/common/DigitScroller.tsx b/src/sdk/components/common/DigitScroller.tsx index d1915d97a..b39779bed 100644 --- a/src/sdk/components/common/DigitScroller.tsx +++ b/src/sdk/components/common/DigitScroller.tsx @@ -46,11 +46,11 @@ export interface DigitScrollerProps extends ComponentProps { * A scrolling digit display. The display supports number bases greater than or equal to 3. The display renders a * one digit for each of the following values: * ``` - * -(base + 2), -(base + 1), -(base), ... , -1, 0, 1, ... , base, base + 1, base + 2` + * -(base + 2), -(base + 1), -(base), ... , -1, 0, 1, ... , base, base + 1, base + 2` * ``` * The total number of rendered digits equals `(base + 2) * 2 + 1`. The display will scroll between the rendered * digits based on a bound value. - * + * * When styling the scroller with CSS, select the `digit-scroller-digit` class to style all rendered digits. Each * individual digit can also be selected with the `digit-scroller-digit-[index]` classes, where `[index]` is replaced * with `0, 1, 2, ...`, starting with the lowest-valued digit. Select the `digit-scroller-nan` class to style the text diff --git a/src/sdk/components/controls/HardwareUiControl.tsx b/src/sdk/components/controls/HardwareUiControl.tsx index 8e30de95f..503ece825 100644 --- a/src/sdk/components/controls/HardwareUiControl.tsx +++ b/src/sdk/components/controls/HardwareUiControl.tsx @@ -367,8 +367,8 @@ export abstract class HardwareUiControl = Record, args: any[]): boolean { - const handler = this[`on${event}` as keyof this] as unknown as UiControlEventHandler, any> | undefined; - const propHandler = this.props[`on${event}` as keyof P] as unknown as UiControlEventHandler, any> | undefined; + const handler = this[`on${String(event)}` as keyof this] as unknown as UiControlEventHandler, any> | undefined; + const propHandler = this.props[`on${String(event)}` as keyof P] as unknown as UiControlEventHandler, any> | undefined; // Class-defined handlers get priority over prop-defined handlers // Prop-defined handlers are not called if a class-defined handler exists -> this is to allow subclasses to diff --git a/src/sdk/components/controls/HardwareUiControlList.tsx b/src/sdk/components/controls/HardwareUiControlList.tsx index 5cf9193e6..7a0e4f791 100644 --- a/src/sdk/components/controls/HardwareUiControlList.tsx +++ b/src/sdk/components/controls/HardwareUiControlList.tsx @@ -29,6 +29,9 @@ export interface HardwareControlListProps extends HardwareUiControlProps { /** Whether or not to hide the list scrollbar. */ hideScrollbar?: boolean; + /** Scroll to the index of the most recently added item. */ + scrollToMostRecentlyAdded?: boolean; + /** The CSS class to apply to this list container. */ class?: string; @@ -152,6 +155,8 @@ export abstract class HardwareUiControlList, dataItem, element); } + + this.props.scrollToMostRecentlyAdded && this.scrollToIndex(indexToAdd); } /** diff --git a/src/sdk/components/map/DefaultMapLabeledRingLabel.tsx b/src/sdk/components/map/DefaultMapLabeledRingLabel.tsx new file mode 100644 index 000000000..076f9a72f --- /dev/null +++ b/src/sdk/components/map/DefaultMapLabeledRingLabel.tsx @@ -0,0 +1,138 @@ +import { CssTransformBuilder, CssTransformSubject } from '../../graphics/css/CssTransform'; +import { ReadonlyFloat64Array, Vec2Math } from '../../math/VecMath'; +import { Subject } from '../../sub/Subject'; +import { ComponentProps, DisplayComponent, FSComponent, VNode } from '../FSComponent'; +import { MapLabeledRingLabel, MapLabeledRingLabelContent } from './MapLabeledRingLabel'; + +/** + * A default implementation of {@link MapLabeledRingLabel}. + */ +export class DefaultMapLabeledRingLabel extends DisplayComponent + implements MapLabeledRingLabel { + + private static readonly tempVec2_1 = new Float64Array(2); + + private readonly translate = CssTransformSubject.create(CssTransformBuilder.translate('%')); + private readonly left = Subject.create(''); + private readonly top = Subject.create(''); + + private thisNode?: VNode; + private _content?: T | null; + + /** @inheritdoc */ + public get content(): T { + if (this._content === undefined || this._content === null) { + throw new Error('DefaultMapLabeledRingLabel: unable to access content'); + } + + return this._content; + } + + private readonly center = new Float64Array(2); + private radius = 0; + private readonly anchor = new Float64Array(2); + private radialAngle = 0; + private radialOffset = 0; + + /** @inheritdoc */ + public onAfterRender(thisNode: VNode): void { + this.thisNode = thisNode; + this._content = thisNode.children?.[0].instance as T | null; + } + + /** @inheritdoc */ + public getAnchor(): ReadonlyFloat64Array { + return this.anchor; + } + + /** @inheritdoc */ + public getRadialAngle(): number { + return this.radialAngle; + } + + /** @inheritdoc */ + public getRadialOffset(): number { + return this.radialOffset; + } + + /** @inheritdoc */ + public setAnchor(anchor: ReadonlyFloat64Array): void { + this.anchor.set(anchor); + + this.translate.transform.set(-anchor[0] * 100, -anchor[1] * 100); + this.translate.resolve(); + } + + /** @inheritdoc */ + public setRadialAngle(angle: number): void { + if (this.radialAngle === angle) { + return; + } + + this.radialAngle = angle; + + this.updatePosition(); + } + + /** @inheritdoc */ + public setRadialOffset(offset: number): void { + if (this.radialOffset === offset) { + return; + } + + this.radialOffset = offset; + + this.updatePosition(); + } + + /** + * Updates this label with the center and radius of its parent ring. + * @param center The center of the ring, in pixels. + * @param radius The radius of the ring, in pixels. + */ + public setRingPosition(center: ReadonlyFloat64Array, radius: number): void { + if (Vec2Math.equals(this.center, center) && radius === this.radius) { + return; + } + + this.center.set(center); + this.radius = radius; + + this.updatePosition(); + } + + /** + * Updates this label's position. + */ + private updatePosition(): void { + const pos = DefaultMapLabeledRingLabel.tempVec2_1; + Vec2Math.setFromPolar(this.radius + this.radialOffset, this.radialAngle, pos); + Vec2Math.add(this.center, pos, pos); + + this.left.set(`${pos[0]}px`); + this.top.set(`${pos[1]}px`); + } + + /** @inheritdoc */ + public render(): VNode { + return ( +

+ {this.props.children} +
+ ); + } + + /** @inheritdoc */ + public destroy(): void { + this.thisNode && FSComponent.shallowDestroy(this.thisNode); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/sdk/components/map/MapLabeledRingLabel.ts b/src/sdk/components/map/MapLabeledRingLabel.ts new file mode 100644 index 000000000..bc669681d --- /dev/null +++ b/src/sdk/components/map/MapLabeledRingLabel.ts @@ -0,0 +1,57 @@ +import { ReadonlyFloat64Array } from '../../math/VecMath'; +import { DisplayComponent } from '../FSComponent'; + +/** + * Valid content types for map ring labels. + */ +export type MapLabeledRingLabelContent = string | number | HTMLElement | DisplayComponent | SVGElement; + +/** + * A map ring label. + */ +export interface MapLabeledRingLabel { + /** The content of this label. */ + readonly content: T; + + /** + * Gets this label's anchor point. The anchor point is expressed relative to the label's width and height, such that + * (0, 0) is located at the top-left corner and (1, 1) is located at the bottom-right corner. + * @returns this label's anchor point. + */ + getAnchor(): ReadonlyFloat64Array; + + /** + * Gets the angle of the radial on which this label is positioned, in radians. Radial 0 is in the positive x + * direction. + * @returns the angle of the radial on which this label is positioned. + */ + getRadialAngle(): number; + + /** + * Gets the radial offset of this label from its parent ring, in pixels. Positive values denote displacement away + * from the center of the ring. + * @returns the radial offset of this label from its parent ring, in pixels. + */ + getRadialOffset(): number; + + /** + * Sets this label's anchor point. The anchor point is expressed relative to the label's width and height, such that + * (0, 0) is located at the top-left corner and (1, 1) is located at the bottom-right corner. + * @param anchor The new anchor point. + */ + setAnchor(anchor: ReadonlyFloat64Array): void; + + /** + * Sets the angle of the radial on which this label is positioned, in radians. Radial 0 is in the positive x + * direction. + * @param angle The new radial angle. + */ + setRadialAngle(angle: number): void; + + /** + * Sets the radial offset of this label from its parent ring, in pixels. Positive values denote displacement away + * from the center of the ring. + * @param offset The new radial offset. + */ + setRadialOffset(offset: number): void; +} \ No newline at end of file diff --git a/src/sdk/components/map/MapMultiLineAirspaceRenderer.ts b/src/sdk/components/map/MapMultiLineAirspaceRenderer.ts index 0da446090..7ad6326df 100644 --- a/src/sdk/components/map/MapMultiLineAirspaceRenderer.ts +++ b/src/sdk/components/map/MapMultiLineAirspaceRenderer.ts @@ -695,7 +695,7 @@ class Shape implements MapMultiLineAirspaceShape { } else { const lastIndex = this.length - 1; const result = this.calculateOffsetVertex(lastIndex, offset, startPoint); - if (!result || Shape.isPointInSegmentBounds(this.segments[lastIndex], this.segments[lastIndex - 1].end, result)) { + if (!result || !Shape.isPointInSegmentBounds(this.segments[lastIndex], this.segments[lastIndex - 1].end, result)) { this.calculateOffsetEndPoint(lastIndex, offset, startPoint); } } diff --git a/src/sdk/components/map/index.ts b/src/sdk/components/map/index.ts index 41e96d5e3..028c79ab1 100644 --- a/src/sdk/components/map/index.ts +++ b/src/sdk/components/map/index.ts @@ -1,46 +1,51 @@ -export * from './MapComponent'; -export * from './MapLayer'; -export * from './MapModel'; -export * from './MapProjection'; -export * from './MapTextLabel'; -export * from './MapCullableTextLabel'; -export * from './MapWaypoint'; -export * from './MapWaypointIcon'; -export * from './MapWaypointRenderer'; -export * from './GeoProjectionPathStreamStack'; -export * from './GeoCirclePathRenderer'; -export * from './GeoCircleLineRenderer'; -export * from './GeoCirclePatternRenderer'; -export * from './AbstractFlightPathPlanRenderer'; export * from './AbstractFlightPathLegRenderer'; +export * from './AbstractFlightPathPlanRenderer'; export * from './CustomFlightPathLegRenderer'; +export * from './DefaultMapLabeledRingLabel'; export * from './FlightPathLegLineRenderer'; export * from './FlightPathLegPatternRenderer'; export * from './FlightPathVectorLineRenderer'; export * from './FlightPathVectorPatternRenderer'; -export * from './MapAirspaceRenderer'; -export * from './MapSingleLineAirspaceRenderer'; -export * from './MapMultiLineAirspaceRenderer'; +export * from './GeoCircleLineRenderer'; +export * from './GeoCirclePathRenderer'; +export * from './GeoCirclePatternRenderer'; +export * from './GeoProjectionPathStreamStack'; export * from './MapAirspaceRenderManager'; +export * from './MapAirspaceRenderer'; +export * from './MapComponent'; +export * from './MapCullableTextLabel'; export * from './MapFieldOfViewCalculator'; +export * from './MapLabeledRingLabel'; +export * from './MapLayer'; +export * from './MapModel'; +export * from './MapMultiLineAirspaceRenderer'; +export * from './MapProjection'; +export * from './MapSingleLineAirspaceRenderer'; +export * from './MapTextLabel'; +export * from './MapWaypoint'; +export * from './MapWaypointIcon'; +export * from './MapWaypointRenderer'; +export * from './modules/MapAirspaceModule'; +export * from './modules/MapAutopilotPropsModule'; +export * from './modules/MapDataIntegrityModule'; +export * from './modules/MapIndexedRangeModule'; export * from './modules/MapOwnAirplaneIconModule'; export * from './modules/MapOwnAirplanePropsModule'; -export * from './modules/MapAutopilotPropsModule'; export * from './modules/MapRangeModule'; -export * from './modules/MapIndexedRangeModule'; -export * from './modules/MapAirspaceModule'; -export * from './modules/MapDataIntegrityModule'; +export * from './layers/GenericMapSharedCanvasSubLayer'; +export * from './layers/MapAirspaceLayer'; export * from './layers/MapAltitudeArcLayer'; export * from './layers/MapBingLayer'; -export * from './layers/MapCanvasLayer'; -export * from './layers/MapSyncedCanvasLayer'; export * from './layers/MapCachedCanvasLayer'; -export * from './layers/MapLabeledRingLayer'; -export * from './layers/MapOwnAirplaneLayer'; +export * from './layers/MapCanvasLayer'; export * from './layers/MapCullableTextLayer'; -export * from './layers/MapAirspaceLayer'; -export * from './layers/MapNearestWaypointsLayer'; +export * from './layers/MapGenericLayer'; +export * from './layers/MapLabeledRingCanvasSubLayer'; +export * from './layers/MapLabeledRingLayer'; export * from './layers/MapLineLayer'; -export * from './layers/MapGenericLayer'; \ No newline at end of file +export * from './layers/MapNearestWaypointsLayer'; +export * from './layers/MapOwnAirplaneLayer'; +export * from './layers/MapSharedCanvasLayer'; +export * from './layers/MapSyncedCanvasLayer'; diff --git a/src/sdk/components/map/layers/GenericMapSharedCanvasSubLayer.ts b/src/sdk/components/map/layers/GenericMapSharedCanvasSubLayer.ts new file mode 100644 index 000000000..43142ae2c --- /dev/null +++ b/src/sdk/components/map/layers/GenericMapSharedCanvasSubLayer.ts @@ -0,0 +1,77 @@ +import { MapProjection } from '../MapProjection'; +import { MapSharedCanvasInstance, MapSharedCanvasSubLayer, MapSharedCanvasSubLayerProps } from './MapSharedCanvasLayer'; + +/** + * Component props for GenericMapSharedCanvasSubLayer. + */ +export interface GenericMapSharedCanvasSubLayerProps extends MapSharedCanvasSubLayerProps { + /** A function which will be called when the sublayer's visibility changes. */ + onVisibilityChanged?: (isVisible: boolean) => void; + + /** A function which will be called when the sublayer is attached to its parent layer. */ + onAttached?: (projection: MapProjection, display: MapSharedCanvasInstance) => void; + + /** A function which will be called when the sublayer is awakened. */ + onWake?: (projection: MapProjection, display: MapSharedCanvasInstance) => void; + + /** A function which will be called when the sublayer is put to sleep. */ + onSleep?: (projection: MapProjection, display: MapSharedCanvasInstance) => void; + + /** + * A function which will be called at the beginning of every update cycle to check whether the sublayer's shared + * canvas instance should be invalidated. If the canvas is already invalidated, then this function will not be + * called. + */ + shouldInvalidate?: (projection: MapProjection, display: MapSharedCanvasInstance, time: number, elapsed: number) => boolean; + + /** + * A function which will be called once every update cycle after the sublayer's shared canvas instance has had a + * chance to be invalidated. + */ + onUpdated?: (projection: MapProjection, display: MapSharedCanvasInstance, time: number, elapsed: number) => void; + + /** A function which will be called when the sublayer is destroyed. */ + onDestroyed?: () => void; +} + +/** + * A generic implementation of {@link MapSharedCanvasSubLayer} that delegates behavior to props. + */ +export class GenericMapSharedCanvasSubLayer

> extends MapSharedCanvasSubLayer

{ + /** @inheritdoc */ + public onVisibilityChanged(isVisible: boolean): void { + this.props.onVisibilityChanged && this.props.onVisibilityChanged(isVisible); + } + + /** @inheritdoc */ + public onAttached(): void { + this.props.onAttached && this.props.onAttached(this.projection, this.display); + } + + /** @inheritdoc */ + public onWake(): void { + this.props.onWake && this.props.onWake(this.projection, this.display); + } + + /** @inheritdoc */ + public onSleep(): void { + this.props.onSleep && this.props.onSleep(this.projection, this.display); + } + + /** @inheritdoc */ + public shouldInvalidate(time: number, elapsed: number): boolean { + return this.props.shouldInvalidate ? this.props.shouldInvalidate(this.projection, this.display, time, elapsed) : false; + } + + /** @inheritdoc */ + public onUpdated(time: number, elapsed: number): void { + this.props.onUpdated && this.props.onUpdated(this.projection, this.display, time, elapsed); + } + + /** @inheritdoc */ + public destroy(): void { + this.props.onDestroyed && this.props.onDestroyed(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/sdk/components/map/layers/MapLabeledRingCanvasSubLayer.tsx b/src/sdk/components/map/layers/MapLabeledRingCanvasSubLayer.tsx new file mode 100644 index 000000000..292bd1181 --- /dev/null +++ b/src/sdk/components/map/layers/MapLabeledRingCanvasSubLayer.tsx @@ -0,0 +1,238 @@ +import { ReadonlyFloat64Array, Vec2Math } from '../../../math/VecMath'; +import { DisplayComponent, FSComponent, VNode } from '../../FSComponent'; +import { DefaultMapLabeledRingLabel } from '../DefaultMapLabeledRingLabel'; +import { MapLabeledRingLabel } from '../MapLabeledRingLabel'; +import { MapSharedCanvasSubLayer, MapSharedCanvasSubLayerProps } from './MapSharedCanvasLayer'; + +/** + * A map shared canvas sublayer that displays a ring (circle) with one or more labels. + */ +export class MapLabeledRingCanvasSubLayer> extends MapSharedCanvasSubLayer { + private readonly labelContainerRef = FSComponent.createRef(); + + private readonly center = new Float64Array(2); + private radius = 0; + + private strokeWidth = 0; + private strokeStyle: string | CanvasGradient | CanvasPattern = ''; + private strokeDash: readonly number[] = []; + private outlineWidth = 0; + private outlineStyle: string | CanvasGradient | CanvasPattern = ''; + private outlineDash: readonly number[] = []; + + private readonly labels: DefaultMapLabeledRingLabel[] = []; + + private needInvalidate = false; + + /** + * Gets the center position of this sublayer's ring, in pixels. + * @returns the center position of this sublayer's ring. + */ + public getRingCenter(): ReadonlyFloat64Array { + return this.center; + } + + /** + * Gets the radius of this sublayer's ring, in pixels. + * @returns the radius of this sublayer's ring. + */ + public getRingRadius(): number { + return this.radius; + } + + /** + * Sets the center and radius of this sublayer's ring. + * @param center The new center, in pixels. + * @param radius The new radius, in pixels. + */ + public setRingPosition(center: ReadonlyFloat64Array, radius: number): void { + if (Vec2Math.equals(this.center, center) && radius === this.radius) { + return; + } + + this.center.set(center); + this.radius = radius; + + this.needInvalidate = true; + } + + /** + * Sets the styling for this sublayer's ring stroke. Any style that is not explicitly defined will be left unchanged. + * @param width The new stroke width. + * @param style The new stroke style. + * @param dash The new stroke dash. + */ + public setRingStrokeStyles(width?: number, style?: string | CanvasGradient | CanvasPattern, dash?: readonly number[]): void { + this.strokeWidth = width ?? this.strokeWidth; + this.strokeStyle = style ?? this.strokeStyle; + this.strokeDash = dash ?? this.strokeDash; + + this.needInvalidate = true; + } + + /** + * Sets the styling for this sublayer's ring outline. Any style that is not explicitly defined will be left unchanged. + * @param width The new outline width. + * @param style The new outline style. + * @param dash The new outline dash. + */ + public setRingOutlineStyles(width?: number, style?: string | CanvasGradient | CanvasPattern, dash?: readonly number[]): void { + this.outlineWidth = width ?? this.outlineWidth; + this.outlineStyle = style ?? this.outlineStyle; + this.outlineDash = dash ?? this.outlineDash; + + this.needInvalidate = true; + } + + /** + * Creates a ring label. Labels can only be created after this sublayer has been rendered. + * @param content The content of the new label. + * @returns The newly created ring label, or `null` if a label could not be created. + */ + public createLabel | SVGElement> + (content: VNode): MapLabeledRingLabel | null { + + if (!this.labelContainerRef.instance) { + return null; + } + + const node = ( + + {content} + + ); + + FSComponent.render(node, this.labelContainerRef.instance); + const label = node.instance as DefaultMapLabeledRingLabel; + label.setRingPosition(this.center, this.radius); + this.labels.push(label); + return label; + } + + /** @inheritdoc */ + public onVisibilityChanged(isVisible: boolean): void { + this.needInvalidate = true; + + this.labelContainerRef.instance.style.display = isVisible ? 'block' : 'none'; + } + + /** @inheritdoc */ + public onAttached(): void { + this.needInvalidate = true; + } + + /** @inheritdoc */ + public shouldInvalidate(): boolean { + return this.needInvalidate; + } + + /** @inheritdoc */ + public onUpdated(): void { + if (this.display.isInvalidated) { + this.needInvalidate = false; + + if (!this.isVisible()) { + return; + } + + this.drawRing(); + this.updateLabelPositions(); + } + } + + /** + * Draws this layer's ring. + */ + private drawRing(): void { + if (!this.isRingInView()) { + return; + } + + this.display.context.beginPath(); + this.display.context.arc(this.center[0], this.center[1], this.radius, 0, Math.PI * 2); + if (this.outlineWidth > 0) { + this.applyStrokeToContext(this.display.context, this.strokeWidth + this.outlineWidth * 2, this.outlineStyle, this.outlineDash); + } + if (this.strokeWidth > 0) { + this.applyStrokeToContext(this.display.context, this.strokeWidth, this.strokeStyle, this.strokeDash); + } + } + + /** + * Checks whether this sublayer's ring is in view. + * @returns whether this sublayer's ring is in view. + */ + private isRingInView(): boolean { + const centerX = this.center[0]; + const centerY = this.center[1]; + + const innerHalfLength = this.radius / Math.SQRT2; + const innerLeft = centerX - innerHalfLength; + const innerRight = centerX + innerHalfLength; + const innerTop = centerY - innerHalfLength; + const innerBottom = centerY + innerHalfLength; + + const outerLeft = centerX - this.radius; + const outerRight = centerX + this.radius; + const outerTop = centerY - this.radius; + const outerBottom = centerY + this.radius; + + const width = this.projection.getProjectedSize()[0]; + const height = this.projection.getProjectedSize()[1]; + + if (innerLeft < 0 && innerRight > width && innerTop < 0 && innerBottom > height) { + return false; + } + + if (outerLeft > width || outerRight < 0 || outerTop > height || outerBottom < 0) { + return false; + } + + return true; + } + + /** + * Applies a stroke to a canvas rendering context. + * @param context The canvas to which to apply a stroke. + * @param lineWidth The stroke width. + * @param strokeStyle The stroke style. + * @param dash The stroke dash. + */ + private applyStrokeToContext( + context: CanvasRenderingContext2D, + lineWidth: number, + strokeStyle: string | CanvasGradient | CanvasPattern, + dash: readonly number[] + ): void { + context.lineWidth = lineWidth; + context.strokeStyle = strokeStyle; + context.setLineDash(dash); + context.stroke(); + } + + /** + * Updates the position of this sublayer's labels based on the position of the ring. + */ + private updateLabelPositions(): void { + const len = this.labels.length; + for (let i = 0; i < len; i++) { + this.labels[i].setRingPosition(this.center, this.radius); + } + } + + /** @inheritdoc */ + public render(): VNode { + return ( +

+ ); + } + + /** @inheritdoc */ + public destroy(): void { + for (const label of this.labels) { + label.destroy(); + } + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/sdk/components/map/layers/MapLabeledRingLayer.tsx b/src/sdk/components/map/layers/MapLabeledRingLayer.tsx index 40fd29d03..989bfe859 100644 --- a/src/sdk/components/map/layers/MapLabeledRingLayer.tsx +++ b/src/sdk/components/map/layers/MapLabeledRingLayer.tsx @@ -1,63 +1,15 @@ import { BitFlags } from '../../../math/BitFlags'; import { ReadonlyFloat64Array, Vec2Math } from '../../../math/VecMath'; import { DisplayComponent, FSComponent, VNode } from '../../FSComponent'; +import { DefaultMapLabeledRingLabel } from '../DefaultMapLabeledRingLabel'; +import { MapLabeledRingLabel } from '../MapLabeledRingLabel'; import { MapLayer, MapLayerProps } from '../MapLayer'; import { MapProjection, MapProjectionChangeType } from '../MapProjection'; import { MapCanvasLayerCanvasInstance } from './MapCanvasLayer'; import { MapSyncedCanvasLayer } from './MapSyncedCanvasLayer'; /** - * A ring label. - */ -export interface MapLabeledRingLabel { - /** The content of this label. */ - readonly content: T; - - /** - * Gets this label's anchor point. The anchor point is expressed relative to the label's width and height, such that - * (0, 0) is located at the top-left corner and (1, 1) is located at the bottom-right corner. - * @returns this label's anchor point. - */ - getAnchor(): ReadonlyFloat64Array; - - /** - * Gets the angle of the radial on which this label is positioned, in radians. Radial 0 is in the positive x - * direction. - * @returns the angle of the radial on which this label is positioned. - */ - getRadialAngle(): number; - - /** - * Gets the radial offset of this label from its parent ring, in pixels. Positive values denote displacement away - * from the center of the ring. - * @returns the radial offset of this label from its parent ring, in pixels. - */ - getRadialOffset(): number; - - /** - * Sets this label's anchor point. The anchor point is expressed relative to the label's width and height, such that - * (0, 0) is located at the top-left corner and (1, 1) is located at the bottom-right corner. - * @param anchor The new anchor point. - */ - setAnchor(anchor: ReadonlyFloat64Array): void; - - /** - * Sets the angle of the radial on which this label is positioned, in radians. Radial 0 is in the positive x - * direction. - * @param angle The new radial angle. - */ - setRadialAngle(angle: number): void; - - /** - * Sets the radial offset of this label from its parent ring, in pixels. Positive values denote displacement away - * from the center of the ring. - * @param offset The new radial offset. - */ - setRadialOffset(offset: number): void; -} - -/** - * A map layer which displays a ring (circle) with one or more labels. + * A map layer that displays a ring (circle) with one or more labels. */ export class MapLabeledRingLayer> extends MapLayer { protected readonly labelContainerRef = FSComponent.createRef(); @@ -74,7 +26,7 @@ export class MapLabeledRingLayer> extends MapLayer< private needUpdateRingPosition = false; protected isInit = false; - private readonly labels: MapLabeledRingLabelClass[] = []; + private readonly labels: DefaultMapLabeledRingLabel[] = []; /** * Gets the center position of this layer's ring, in pixels. @@ -148,9 +100,14 @@ export class MapLabeledRingLayer> extends MapLayer< return null; } - const wrapperRef = FSComponent.createRef(); - FSComponent.render(
{content}
, this.labelContainerRef.instance); - const label = new MapLabeledRingLabelClass(content.instance as L, wrapperRef.instance); + const node = ( + + {content} + + ); + + FSComponent.render(node, this.labelContainerRef.instance); + const label = node.instance as DefaultMapLabeledRingLabel; label.setRingPosition(this.center, this.radius); this.labels.push(label); return label; @@ -303,97 +260,15 @@ export class MapLabeledRingLayer> extends MapLayer< ); } -} - -/** - * An implementation of {@link MapLabeledRingLabel}. - */ -class MapLabeledRingLabelClass implements MapLabeledRingLabel { - private static readonly tempVec2_1 = new Float64Array(2); - - private readonly center = new Float64Array(2); - private radius = 0; - private readonly anchor = new Float64Array(2); - private radialAngle = 0; - private radialOffset = 0; - - /** - * Constructor. - * @param content The content of this label. - * @param wrapper The wrapper for this label. - */ - constructor(public readonly content: T, private readonly wrapper: HTMLDivElement) { - } /** @inheritdoc */ - public getAnchor(): ReadonlyFloat64Array { - return this.anchor; - } + public destroy(): void { + this.canvasLayerRef.getOrDefault()?.destroy(); - /** @inheritdoc */ - public getRadialAngle(): number { - return this.radialAngle; - } - - /** @inheritdoc */ - public getRadialOffset(): number { - return this.radialOffset; - } - - /** @inheritdoc */ - public setAnchor(anchor: ReadonlyFloat64Array): void { - this.anchor.set(anchor); - - this.wrapper.style.transform = `translate(${-anchor[0] * 100}%, ${-anchor[1] * 100}%)`; - } - - /** @inheritdoc */ - public setRadialAngle(angle: number): void { - if (this.radialAngle === angle) { - return; + for (const label of this.labels) { + label.destroy(); } - this.radialAngle = angle; - - this.updatePosition(); - } - - /** @inheritdoc */ - public setRadialOffset(offset: number): void { - if (this.radialOffset === offset) { - return; - } - - this.radialOffset = offset; - - this.updatePosition(); - } - - /** - * Updates this label with the center and radius of its parent ring. - * @param center The center of the ring, in pixels. - * @param radius The radius of the ring, in pixels. - */ - public setRingPosition(center: ReadonlyFloat64Array, radius: number): void { - if (Vec2Math.equals(this.center, center) && radius === this.radius) { - return; - } - - this.center.set(center); - this.radius = radius; - - this.updatePosition(); - } - - /** - * Updates this label's position. - */ - private updatePosition(): void { - const pos = MapLabeledRingLabelClass.tempVec2_1; - Vec2Math.setFromPolar(this.radius + this.radialOffset, this.radialAngle, pos); - Vec2Math.add(this.center, pos, pos); - - this.wrapper.style.left = `${pos[0]}px`; - this.wrapper.style.top = `${pos[1]}px`; + super.destroy(); } } \ No newline at end of file diff --git a/src/sdk/components/map/layers/MapSharedCanvasLayer.tsx b/src/sdk/components/map/layers/MapSharedCanvasLayer.tsx new file mode 100644 index 000000000..ac99f820a --- /dev/null +++ b/src/sdk/components/map/layers/MapSharedCanvasLayer.tsx @@ -0,0 +1,357 @@ +/* eslint-disable @typescript-eslint/no-non-null-assertion */ + +import { BitFlags } from '../../../math/BitFlags'; +import { ComponentProps, DisplayComponent, FSComponent, VNode } from '../../FSComponent'; +import { MapLayer } from '../MapLayer'; +import { MapModel } from '../MapModel'; +import { MapProjection, MapProjectionChangeType } from '../MapProjection'; +import { MapCanvasLayerCanvasInstance, MapCanvasLayerProps } from './MapCanvasLayer'; +import { MapSyncedCanvasLayer } from './MapSyncedCanvasLayer'; + +/** + * An instance of a shared canvas used by {@link MapSharedCanvasLayer}. + */ +export interface MapSharedCanvasInstance { + /** This instance's canvas element. */ + readonly canvas: HTMLCanvasElement; + + /** This instance's canvas 2D rendering context. */ + readonly context: CanvasRenderingContext2D; + + /** Whether this canvas has been invalidated. */ + readonly isInvalidated: boolean; +} + +/** + * A map layer containing a single canvas synced to the map's projected size that can be shared amongst multiple + * sublayers for rendering. + * + * All of the layer's children are rendered on top of the shared canvas element. All children that extend + * {@link MapSharedCanvasSubLayer} are treated as sublayers and can render to the shared canvas element. + */ +export class MapSharedCanvasLayer extends MapLayer> { + private thisNode?: VNode; + + private readonly canvasLayerRef = FSComponent.createRef(); + + private readonly sublayers: MapSharedCanvasSubLayer[] = []; + + private sharedCanvasInstance?: MapSharedCanvasInstanceClass; + + private isInit = false; + + /** @inheritdoc */ + public onVisibilityChanged(isVisible: boolean): void { + if (!this.isInit) { + return; + } + + this.canvasLayerRef.instance.setVisible(isVisible); + + for (let i = 0; i < this.sublayers.length; i++) { + this.sublayers[i].setVisible(isVisible); + } + } + + /** @inheritdoc */ + public onAfterRender(thisNode: VNode): void { + this.thisNode = thisNode; + + // Enumerate sublayers + FSComponent.visitNodes(thisNode, node => { + if (node !== thisNode && node.instance instanceof DisplayComponent) { + if (node.instance instanceof MapSharedCanvasSubLayer) { + this.sublayers.push(node.instance); + } + + return true; + } + + return false; + }); + } + + /** @inheritdoc */ + public onAttached(): void { + super.onAttached(); + + this.canvasLayerRef.instance.onAttached(); + + this.sharedCanvasInstance = new MapSharedCanvasInstanceClass(this.canvasLayerRef.instance.display); + + this.isInit = true; + + if (!this.isVisible()) { + this.onVisibilityChanged(false); + } + + for (let i = 0; i < this.sublayers.length; i++) { + this.sublayers[i].attach(this.props.mapProjection, this.sharedCanvasInstance); + } + } + + /** @inheritdoc */ + public onWake(): void { + for (let i = 0; i < this.sublayers.length; i++) { + this.sublayers[i].onWake(); + } + } + + /** @inheritdoc */ + public onSleep(): void { + for (let i = 0; i < this.sublayers.length; i++) { + this.sublayers[i].onSleep(); + } + } + + /** @inheritdoc */ + public onMapProjectionChanged(projection: MapProjection, changeFlags: number): void { + this.canvasLayerRef.instance.onMapProjectionChanged(projection, changeFlags); + + if (BitFlags.isAll(changeFlags, MapProjectionChangeType.ProjectedSize)) { + this.sharedCanvasInstance!.invalidate(); + } + + for (let i = 0; i < this.sublayers.length; i++) { + this.sublayers[i].onMapProjectionChanged(projection, changeFlags); + } + } + + /** @inheritdoc */ + public onUpdated(time: number, elapsed: number): void { + let invalidate = false; + for (let i = 0; !invalidate && i < this.sublayers.length; i++) { + invalidate = this.sublayers[i].shouldInvalidate(time, elapsed); + } + + if (invalidate) { + this.sharedCanvasInstance!.invalidate(); + } + + for (let i = 0; i < this.sublayers.length; i++) { + this.sublayers[i].onUpdated(time, elapsed); + } + + this.sharedCanvasInstance!.revalidate(); + } + + /** @inheritdoc */ + public render(): VNode { + return ( + <> + + {this.props.children} + + ); + } + + /** @inheritdoc */ + public destroy(): void { + this.thisNode && FSComponent.shallowDestroy(this.thisNode); + + super.destroy(); + } +} + +/** + * Component props for MapSharedCanvasSubLayer. + */ +export interface MapSharedCanvasSubLayerProps extends ComponentProps { + /** A map model. */ + model: MapModel; +} + +/** + * A sublayer of {@link MapSharedCanvasLayer}. + */ +export class MapSharedCanvasSubLayer

> extends DisplayComponent

{ + private _isAttached = false; + private _isVisible = true; + + private _projection?: MapProjection; + private _display?: MapSharedCanvasInstance; + + // eslint-disable-next-line jsdoc/require-returns + /** + * This sublayer's map projection. + * @throws Error if this sublayer is not attached. + */ + protected get projection(): MapProjection { + if (this._projection) { + return this._projection; + } + + throw new Error('MapSharedCanvasSubLayer: attempted to access projection before sublayer was attached'); + } + + // eslint-disable-next-line jsdoc/require-returns + /** + * This sublayer's shared canvas instance. + * @throws Error if this sublayer is not attached. + */ + protected get display(): MapSharedCanvasInstance { + if (this._display) { + return this._display; + } + + throw new Error('MapSharedCanvasSubLayer: attempted to access display canvas before sublayer was attached'); + } + + /** + * Checks whether this sublayer is attached to a parent layer. + * @returns Whether this sublayer is attached to a parent layer. + */ + protected isAttached(): boolean { + return this._isAttached; + } + + /** + * Checks whether this sublayer is visible. + * @returns Whether this sublayer is visible. + */ + protected isVisible(): boolean { + return this._isVisible; + } + + /** + * Attaches this sublayer to a parent layer. + * @param projection The map projection used by this sublayer. + * @param display The canvas instance shared by this sublayer. + */ + public attach(projection: MapProjection, display: MapSharedCanvasInstance): void { + this._projection = projection; + this._display = display; + + this._isAttached = true; + if (!this._isVisible) { + this.onVisibilityChanged(this._isVisible); + } + this.onAttached(); + } + + /** + * Sets this sublayer's visibility. + * @param val Whether this sublayer should be visible. + */ + public setVisible(val: boolean): void { + if (this._isVisible === val) { + return; + } + + this._isVisible = val; + if (this._isAttached) { + this.onVisibilityChanged(val); + } + } + + /** + * This method is called when this layer's visibility changes. + * @param isVisible Whether the layer is now visible. + */ + // eslint-disable-next-line @typescript-eslint/no-unused-vars + protected onVisibilityChanged(isVisible: boolean): void { + // noop + } + + /** + * This method is called when this sublayer is attached to its parent layer. + */ + public onAttached(): void { + // noop + } + + /** + * This method is called when this sublayer's parent layer is awakened. + */ + public onWake(): void { + // noop + } + + /** + * This method is called when this sublayer's parent layer is put to sleep. + */ + public onSleep(): void { + // noop + } + + /** + * This method is called when this sublayer's map projection changes. + * @param projection This sublayer's map projection. + * @param changeFlags The types of changes made to the projection. + */ + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public onMapProjectionChanged(projection: MapProjection, changeFlags: number): void { + // noop + } + + /** + * This method is called at the beginning of every update cycle to check whether this sublayer's shared canvas + * instance should be invalidated. If the canvas is already invalidated, then this method will not be called. + * @param time The current time as a UNIX timestamp in milliseconds. + * @param elapsed The elapsed time, in milliseconds, since the last update. + * @returns Whether this sublayer's shared canvas instance should be invalidated. + */ + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public shouldInvalidate(time: number, elapsed: number): boolean { + return false; + } + + /** + * This method is called once every update cycle after this sublayer's shared canvas instance has had a chance to be + * invalidated. + * @param time The current time as a UNIX timestamp in milliseconds. + * @param elapsed The elapsed time, in milliseconds, since the last update. + */ + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public onUpdated(time: number, elapsed: number): void { + // noop + } + + /** @inheritdoc */ + public render(): VNode | null { + return null; + } +} + +/** + * An implementation of {@link MapSharedCanvasInstance} which is backed by a + * {@link MapCanvasLayerCanvasInstance}. + */ +class MapSharedCanvasInstanceClass implements MapSharedCanvasInstance { + /** @inheritdoc */ + public readonly canvas = this.instance.canvas; + + /** @inheritdoc */ + readonly context = this.instance.context; + + private _isInvalidated = false; + // eslint-disable-next-line jsdoc/require-returns + /** Whether this canvas has been invalidated. */ + public get isInvalidated(): boolean { + return this._isInvalidated; + } + + /** + * Creates a new instance of MapSharedCanvasInstanceClass. + * @param instance This instance's backing canvas instance. + */ + public constructor(private readonly instance: MapCanvasLayerCanvasInstance) { + } + + /** + * Invalidates and clears this canvas. + */ + public invalidate(): void { + this._isInvalidated = true; + this.instance.clear(); + } + + /** @inheritdoc */ + public revalidate(): void { + this._isInvalidated = false; + } +} \ No newline at end of file diff --git a/src/sdk/components/mapsystem/MapSystemBuilder.tsx b/src/sdk/components/mapsystem/MapSystemBuilder.tsx index 46d34e41a..fa845c543 100644 --- a/src/sdk/components/mapsystem/MapSystemBuilder.tsx +++ b/src/sdk/components/mapsystem/MapSystemBuilder.tsx @@ -213,6 +213,7 @@ export class MapSystemBuilder< protected readonly controllerFactories = new Map(); protected readonly contextFactories = new Map(); protected readonly initCallbacks = new Map) => void>(); + protected readonly destroyCallbacks = new Map) => void>(); protected projectedSize: Subscribable = Subject.create(Vec2Math.create(100, 100)); protected deadZone?: Subscribable; @@ -435,6 +436,33 @@ export class MapSystemBuilder< return this; } + /** + * Configures this builder to execute a callback function after a built map is destroyed. If an existing callback has + * been added to this builder with the same key, it will be replaced. + * @param key The key of the callback. + * @param callback The callback function to add. + * @returns This builder, after the callback has been added. + */ + public withDestroy< + UseModules extends ModuleRecord = any, + UseLayers extends LayerRecord = any, + UseControllers extends ControllerRecord = any, + UseContext extends ContextRecord = any + >( + key: string, + callback: ( + context: MapSystemContext< + DefaultIfAny, + DefaultIfAny, + DefaultIfAny, + DefaultIfAny + > + ) => void + ): this { + this.destroyCallbacks.set(key, callback); + return this; + } + /** * Assigns an order value to a layer. Layers with a lower assigned order will be attached before and appear below * layers with greater assigned order values. @@ -1397,6 +1425,17 @@ export class MapSystemBuilder< } } } + + for (const callback of this.destroyCallbacks.values()) { + try { + callback(context); + } catch (e) { + console.error(`MapSystem: error in destroy callback: ${e}`); + if (e instanceof Error) { + console.error(e.stack); + } + } + } }; const map = ( @@ -1434,7 +1473,14 @@ export class MapSystemBuilder< controllers.push(...controllerEntries.map(([, controller]) => controller)); for (const callback of this.initCallbacks.values()) { - callback(context); + try { + callback(context); + } catch (e) { + console.error(`MapSystem: error in init callback: ${e}`); + if (e instanceof Error) { + console.error(e.stack); + } + } } return { context, map, ref }; diff --git a/src/sdk/components/mapsystem/MapSystemUtils.ts b/src/sdk/components/mapsystem/MapSystemUtils.ts index 326680f58..4efb95990 100644 --- a/src/sdk/components/mapsystem/MapSystemUtils.ts +++ b/src/sdk/components/mapsystem/MapSystemUtils.ts @@ -31,11 +31,11 @@ export class MapSystemUtils { } /** - * Converts nominal relative projected coordinates to a true relative projected coordinates. Nominal relative + * Converts nominal relative projected coordinates to true relative projected coordinates. Nominal relative * coordinates are expressed relative to the map's projected width and height, *excluding* dead zones. True relative * coordinates are expressed relative to the map's projected width and height, *including* dead zones. * @param nominal Nominal relative projected coordinates. - * @param size The size of the map's projected window, in pixels. + * @param size The size of the map's projected window, as `[width, height]` in pixels. * @param deadZone The map's dead zone, as `[left, top, right, bottom]` in pixels. * @param out The vector to which to write the result. * @returns The true relative projected coordinates that are equivalent to the specified nominal coordinates. @@ -52,4 +52,53 @@ export class MapSystemUtils { out ); } + + /** + * Converts a true relative projected x coordinate to a nominal relative projected x coordinate. Nominal relative + * coordinates are expressed relative to the map's projected width and height, *excluding* dead zones. True relative + * coordinates are expressed relative to the map's projected width and height, *including* dead zones. + * @param trueRelX A true relative projected x coordinate. + * @param width The width of the map's projected window, in pixels. + * @param deadZone The map's dead zone, as `[left, top, right, bottom]` in pixels. + * @returns The nominal relative projected x coordinate that is equivalent to the specified true coordinate. + */ + public static trueToNominalRelativeX(trueRelX: number, width: number, deadZone: ReadonlyFloat64Array): number { + return (trueRelX * width - deadZone[0]) / (width - deadZone[0] - deadZone[2]); + } + + /** + * Converts a true relative projected y coordinate to a nominal relative projected y coordinate. Nominal relative + * coordinates are expressed relative to the map's projected width and height, *excluding* dead zones. True relative + * coordinates are expressed relative to the map's projected width and height, *including* dead zones. + * @param trueRelY A true relative projected y coordinate. + * @param height The height of the map's projected window, in pixels. + * @param deadZone The map's dead zone, as `[left, top, right, bottom]` in pixels. + * @returns The nominal relative projected y coordinate that is equivalent to the specified true coordinate. + */ + public static trueToNominalRelativeY(trueRelY: number, height: number, deadZone: ReadonlyFloat64Array): number { + return (trueRelY * height - deadZone[1]) / (height - deadZone[1] - deadZone[3]); + } + + /** + * Converts true relative projected coordinates to nominal relative projected coordinates. Nominal relative + * coordinates are expressed relative to the map's projected width and height, *excluding* dead zones. True relative + * coordinates are expressed relative to the map's projected width and height, *including* dead zones. + * @param nominal True relative projected coordinates. + * @param size The size of the map's projected window, as `[width, height]` in pixels. + * @param deadZone The map's dead zone, as `[left, top, right, bottom]` in pixels. + * @param out The vector to which to write the result. + * @returns The nominal relative projected coordinates that are equivalent to the specified true coordinates. + */ + public static trueToNominalRelativeXY( + nominal: ReadonlyFloat64Array, + size: ReadonlyFloat64Array, + deadZone: ReadonlyFloat64Array, + out: Float64Array + ): Float64Array { + return Vec2Math.set( + MapSystemUtils.trueToNominalRelativeX(nominal[0], size[0], deadZone), + MapSystemUtils.trueToNominalRelativeY(nominal[1], size[1], deadZone), + out + ); + } } \ No newline at end of file diff --git a/src/sdk/components/mapsystem/controllers/MapRotationController.ts b/src/sdk/components/mapsystem/controllers/MapRotationController.ts index 0b3c4fff6..8c51f0240 100644 --- a/src/sdk/components/mapsystem/controllers/MapRotationController.ts +++ b/src/sdk/components/mapsystem/controllers/MapRotationController.ts @@ -71,7 +71,7 @@ export class MapRotationController extends MapSystemController 0 // TODO + [MapRotation.DtkUp]: (): number => -this.rotationModule.dtk.get() * Avionics.Utils.DEG2RAD }; private rotationFunc?: () => number; diff --git a/src/sdk/components/mapsystem/modules/MapRotationModule.ts b/src/sdk/components/mapsystem/modules/MapRotationModule.ts index 5b2c47542..07e3c75a9 100644 --- a/src/sdk/components/mapsystem/modules/MapRotationModule.ts +++ b/src/sdk/components/mapsystem/modules/MapRotationModule.ts @@ -16,7 +16,7 @@ export enum MapRotation { /** Map up position points towards the current airplane heading. */ HeadingUp = 'HeadingUp', - /** Map up position points towards the current nav desired track. */ + /** Map up position points towards the current desired track. */ DtkUp = 'DtkUp' } @@ -26,4 +26,7 @@ export enum MapRotation { export class MapRotationModule { /** The type of map rotation to use. */ public readonly rotationType = Subject.create(MapRotation.HeadingUp); + + /** The desired track, in degrees true. */ + public readonly dtk = Subject.create(0); } \ No newline at end of file diff --git a/src/sdk/data/Consumer.ts b/src/sdk/data/Consumer.ts index 4c41cf805..9e3a950c0 100644 --- a/src/sdk/data/Consumer.ts +++ b/src/sdk/data/Consumer.ts @@ -56,7 +56,7 @@ export interface Consumer { /** * Filters events by time such that events will not be consumed until a minimum duration * has passed since the previous event. - * @param deltaTime The minimum delta time between events. + * @param deltaTime The minimum delta time between events in milliseconds. * @returns A new consumer with the applied change threshold filter. */ onlyAfter(deltaTime: number): Consumer; diff --git a/src/sdk/data/ConsumerSubject.ts b/src/sdk/data/ConsumerSubject.ts index 323f49e12..a043fdf45 100644 --- a/src/sdk/data/ConsumerSubject.ts +++ b/src/sdk/data/ConsumerSubject.ts @@ -5,12 +5,25 @@ import { Consumer } from './Consumer'; /** * A subscribable subject which derives its value from an event consumer. */ -export class ConsumerSubject extends AbstractSubscribable { +export class ConsumerSubject extends AbstractSubscribable implements Subscription { + /** @inheritdoc */ + public readonly canInitialNotify = true; + private readonly consumerHandler = this.onEventConsumed.bind(this); private value: T; private consumerSub?: Subscription; + private _isAlive = true; + // eslint-disable-next-line jsdoc/require-returns + /** + * Whether this subject is alive. While alive, this subject will update its value from its event consumer unless it + * is paused. Once dead, this subject will no longer update its value and cannot be resumed again. + */ + public get isAlive(): boolean { + return this._isAlive; + } + private _isPaused = false; // eslint-disable-next-line jsdoc/require-returns /** @@ -21,8 +34,6 @@ export class ConsumerSubject extends AbstractSubscribable { return this._isPaused; } - private isDestroyed = false; - /** * Constructor. * @param consumer The event consumer from which this subject obtains its value. If null, this subject's value will @@ -103,7 +114,7 @@ export class ConsumerSubject extends AbstractSubscribable { * @returns This subject, after its consumer has been set. */ public setConsumer(consumer: Consumer | null): this { - if (this.isDestroyed) { + if (!this._isAlive) { return this; } @@ -130,7 +141,10 @@ export class ConsumerSubject extends AbstractSubscribable { /** * Resumes consuming events for this subject. Once resumed, this subject's value will be updated from consumed - * events. + * events. When this subject is resumed, it immediately updates its value from its event consumer, if one exists. + * + * Any `initialNotify` argument passed to this method is ignored. This subject is always immediately notified of its + * event consumer's value when resumed. * @returns This subject, after it has been resumed. */ public resume(): this { @@ -153,7 +167,7 @@ export class ConsumerSubject extends AbstractSubscribable { * Destroys this subject. Once destroyed, it will no longer consume events to update its value. */ public destroy(): void { + this._isAlive = false; this.consumerSub?.destroy(); - this.isDestroyed = true; } } \ No newline at end of file diff --git a/src/sdk/data/ConsumerValue.ts b/src/sdk/data/ConsumerValue.ts index 6fe8020c6..04afe489b 100644 --- a/src/sdk/data/ConsumerValue.ts +++ b/src/sdk/data/ConsumerValue.ts @@ -9,12 +9,25 @@ export type ReadonlyConsumerValue = Pick, 'get' | 'isPaused' /** * Captures the state of a value from a consumer. */ -export class ConsumerValue { +export class ConsumerValue implements Subscription { + /** @inheritdoc */ + public readonly canInitialNotify = true; + private readonly consumerHandler = (v: T): void => { this.value = v; }; private value: T; private sub?: Subscription; + private _isAlive = true; + // eslint-disable-next-line jsdoc/require-returns + /** + * Whether this object is alive. While alive, this object will update its value from its event consumer unless it + * is paused. Once dead, this object will no longer update its value and cannot be resumed again. + */ + public get isAlive(): boolean { + return this._isAlive; + } + private _isPaused = false; // eslint-disable-next-line jsdoc/require-returns /** @@ -24,8 +37,6 @@ export class ConsumerValue { return this._isPaused; } - private isDestroyed = false; - /** * Creates an instance of a ConsumerValue. * @param consumer The consumer to track. @@ -51,7 +62,7 @@ export class ConsumerValue { * @returns This object, after its consumer has been set. */ public setConsumer(consumer: Consumer | null): this { - if (this.isDestroyed) { + if (!this._isAlive) { return this; } @@ -79,6 +90,9 @@ export class ConsumerValue { /** * Resumes consuming events for this object. Once resumed, this object's value will be updated from consumed * events. + * + * Any `initialNotify` argument passed to this method is ignored. This object is always immediately notified of its + * event consumer's value when resumed. * @returns This object, after it has been resumed. */ public resume(): this { @@ -96,7 +110,7 @@ export class ConsumerValue { * Destroys this object. Once destroyed, it will no longer consume events to update its value. */ public destroy(): void { - this.isDestroyed = true; + this._isAlive = false; this.sub?.destroy(); } diff --git a/src/sdk/data/SimVars.ts b/src/sdk/data/SimVars.ts index 6ddd0824b..0294b7383 100644 --- a/src/sdk/data/SimVars.ts +++ b/src/sdk/data/SimVars.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ /** * Valid type arguments for Set/GetSimVarValue */ @@ -6,6 +7,7 @@ export enum SimVarValueType { Bool = 'bool', Celsius = 'celsius', Degree = 'degrees', + DegreesPerSecond = 'degrees per second', Enum = 'enum', Farenheit = 'farenheit', Feet = 'feet', @@ -34,12 +36,14 @@ export enum SimVarValueType { PPH = 'Pounds per hour', PSI = 'psi', Radians = 'radians', + RadiansPerSecond = 'radians per second', Rankine = 'rankine', RPM = 'Rpm', Seconds = 'seconds', SlugsPerCubicFoot = 'slug per cubic foot', String = 'string', Volts = 'Volts', + FtLb = 'Foot pounds', } /** @@ -66,6 +70,7 @@ const boolRegex = new RegExp(/boolean|bool/i); const numberRegex = new RegExp(/number/i); const defaultSource = ''; +// @ts-ignore SimVar.GetSimVarValue = (name: string, unit: string, dataSource = defaultSource): any => { try { if (simvar) { @@ -101,6 +106,7 @@ SimVar.GetSimVarValue = (name: string, unit: string, dataSource = defaultSource) return null; }; +// @ts-ignore SimVar.SetSimVarValue = (name: string, unit: string, value: any, dataSource = defaultSource): Promise => { if (value == undefined) { console.warn(name + ' : Trying to set a null value'); @@ -138,3 +144,11 @@ SimVar.SetSimVarValue = (name: string, unit: string, value: any, dataSource = de return Promise.resolve(); }; + +// @ts-ignore +const SimOvrd = { + GetSimVarValue: SimVar.GetSimVarValue, + SetSimVarValue: SimVar.SetSimVarValue, +}; + +export { SimOvrd }; diff --git a/src/sdk/fmc/AbstractFmcPage.ts b/src/sdk/fmc/AbstractFmcPage.ts index 3187f4fb8..c974cc926 100644 --- a/src/sdk/fmc/AbstractFmcPage.ts +++ b/src/sdk/fmc/AbstractFmcPage.ts @@ -41,7 +41,7 @@ export abstract class AbstractFmcPage { */ abstract readonly renderCallback: FmcRenderCallback; - protected readonly memorizedComponents: [FmcComponent | null, FmcComponent | null, FmcComponent | null][] = []; + public readonly memorizedComponents: [FmcComponent | null, FmcComponent | null, FmcComponent | null][] = []; private readonly bindings: (Subscription | ConsumerSubject)[] = []; @@ -210,13 +210,13 @@ export abstract class AbstractFmcPage { render[i + k] = []; } - render[i + k][l] = componentRenderRow[l] as string; + (componentRenderRow[l] !== '') && (render[i + k][l] = componentRenderRow[l] as string); } } - } else { - renderRow[row.indexOf(col)] = componentRender as string; + } else if (componentRender !== '' || renderRow[j] === undefined) { + renderRow[j] = componentRender as string; } - } else { + } else if (col !== '' && renderRow[j] === undefined) { renderRow[j] = col; } } diff --git a/src/sdk/fmc/FmcFormat.ts b/src/sdk/fmc/FmcFormat.ts index 29d646ecd..a4dd8072e 100644 --- a/src/sdk/fmc/FmcFormat.ts +++ b/src/sdk/fmc/FmcFormat.ts @@ -1,3 +1,5 @@ +import { FmcRenderTemplate } from './FmcRenderer'; + /** * Validates an input string into a value of a type */ @@ -18,26 +20,36 @@ export const RawValidator: Validator = { }; /** - * Formats a value of a type + * Represents the possible output of a formatting function + */ +export type FmcFormatterOutput = string | FmcRenderTemplate; + +/** + * Formats a non-nullable value of a type `T` into a value of a type `U`, with the ability to specify a null value */ -export interface Formatter { +export interface Formatter { /** * The string to show when a value is `null` */ - nullValueString?: string, + nullValueString?: U, /** * Formats a value of a type into a string * * @param value the value to format */ - format: (value: NonNullable) => string, + format: (value: NonNullable) => U, } +/** + * A formatter for use in the FMC Framework + */ +export type FmcFormatter = Formatter + /** * Formats a value of a type */ -export type FieldFormatter = Formatter | ((type: T) => string) +export type FmcComponentFormatter = FmcFormatter | ((type: T) => FmcFormatterOutput) /** * {@link Formatter} for displaying raw string values diff --git a/src/sdk/fmc/FmcScreen.ts b/src/sdk/fmc/FmcScreen.ts index a93a9be56..2bd3e53e7 100644 --- a/src/sdk/fmc/FmcScreen.ts +++ b/src/sdk/fmc/FmcScreen.ts @@ -240,8 +240,8 @@ export class FmcScreen

{ - return this.bus.getSubscriber().on(`${this.options.eventPrefix}${event}` as keyof E & string); + public onPrefixedEvent(event: k): Consumer { + return this.bus.getSubscriber().on(`${this.options.eventPrefix}${event}` as k); } /** @@ -252,10 +252,17 @@ export class FmcScreen

(page: U): P { - return this.pageFactory.createPage(page, this.bus, this as FmcScreen

, this.acceptPageOutput.bind(this)); + return this.pageFactory.createPage(page, this.bus, this, this.acceptPageOutput.bind(this)); } - // eslint-disable-next-line jsdoc/require-jsdoc + + /** + * Method called when a page is rendered to the screen. This can be overridden to intercept the page data and act upon it. + * + * @param output the output template, displayed on the screen + * @param template the render template, rendered by the page + * @param atRowIndex the row index at which the render occurred + */ protected acceptPageOutput(output: FmcOutputTemplate, template: FmcRenderTemplate, atRowIndex: number): void { const rows = [...output]; diff --git a/src/sdk/fmc/SimpleFmcRenderer.ts b/src/sdk/fmc/SimpleFmcRenderer.ts index 4f1df0f7d..faf559cc7 100644 --- a/src/sdk/fmc/SimpleFmcRenderer.ts +++ b/src/sdk/fmc/SimpleFmcRenderer.ts @@ -145,7 +145,7 @@ export class SimpleFmcRenderer implements FmcRenderer { private buildRowInfo(template: FmcOutputRow, rowIndex: number): void { // only content if (rowIndex < this.options.screenCellHeight && template) { - if (template[0] !== '') { + if (template[0] && template[0] !== '') { // LEFT this.buildColumnInformation(template[0], rowIndex, 'left'); } diff --git a/src/sdk/fmc/components/DisplayField.ts b/src/sdk/fmc/components/DisplayField.ts index 66d6d69cc..1bec8397f 100644 --- a/src/sdk/fmc/components/DisplayField.ts +++ b/src/sdk/fmc/components/DisplayField.ts @@ -1,4 +1,4 @@ -import { FieldFormatter } from '../FmcFormat'; +import { FmcComponentFormatter, FmcFormatterOutput } from '../FmcFormat'; import { AbstractFmcPage } from '../AbstractFmcPage'; import { FmcComponent, FmcComponentOptions } from './FmcComponent'; import { Subscribable } from '../../sub'; @@ -11,7 +11,7 @@ export interface DisplayFieldOptions extends FmcComponentOptions { /** * Formatter object */ - formatter: FieldFormatter, + formatter: FmcComponentFormatter, /** @inheritDoc */ style?: string | ((value: T | null) => string), @@ -71,16 +71,24 @@ export class DisplayField extends FmcComponent> { } /** @inheritDoc */ - public render(): string { - let renderStr: string; + public render(): FmcFormatterOutput { + let renderOutput: FmcFormatterOutput; if (typeof this.options.formatter === 'object') { - renderStr = (this.value !== null) ? this.options.formatter.format(this.value as NonNullable) : (this.options.formatter.nullValueString ?? ''); + if (this.value !== null) { + renderOutput = this.options.formatter.format(this.value as NonNullable); + } else { + renderOutput = this.options.formatter.nullValueString ?? ''; + } } else { - renderStr = this.options.formatter(this.value as T); + renderOutput = this.options.formatter(this.value as T); + } + + if (typeof renderOutput !== 'string') { + return renderOutput; } const styleStr = (typeof this.options.style === 'function') ? this.options.style(this.value) : this.options.style; - return `${this.options.prefix ?? ''}${renderStr}${this.options.suffix ?? ''}${styleStr ?? ''}`; + return `${this.options.prefix ?? ''}${renderOutput}${this.options.suffix ?? ''}${styleStr ?? ''}`; } } diff --git a/src/sdk/fmc/components/TextInputField.ts b/src/sdk/fmc/components/TextInputField.ts index aeb2535d0..475cda564 100644 --- a/src/sdk/fmc/components/TextInputField.ts +++ b/src/sdk/fmc/components/TextInputField.ts @@ -1,5 +1,5 @@ import { AbstractFmcPage } from '../AbstractFmcPage'; -import { Formatter, RawFormatter, RawValidator, Validator } from '../FmcFormat'; +import { FmcFormatter, Validator } from '../FmcFormat'; import { LineSelectKeyEvent } from '../FmcInteractionEvents'; import { EditableField, EditableFieldOptions } from './EditableField'; @@ -10,7 +10,7 @@ export interface TextInputFieldOptions extends EditableFieldOptions { /** * Validator object */ - formatter: Formatter & Validator, + formatter: FmcFormatter & Validator, /** * Whether CLR DEL lsk events push a null value @@ -83,20 +83,17 @@ export class TextInputField extends EditableField { } /** - * Creates an {@link TextInputField} that uses a {@link RawValidator} and {@link RawFormatter} - * @param page the parent {@link FmcPage} - * @returns the {@link TextInputField} - * @deprecated (0.5.X) use constructor instead + * Allows text input to be programmatically sent to the field. + * + * @param input the text input */ - public static createRawTextInput(page: AbstractFmcPage): TextInputField { - return new TextInputField(page, { - formatter: { ...RawFormatter, ...RawValidator }, - }); + public async takeTextInput(input: string): Promise { + return this.handleTextInputInternal(input); } /** @inheritDoc */ protected async onHandleSelectKey(event: LineSelectKeyEvent): Promise { - if (event.isDelete === true) { + if (event.isDelete) { if (this.options.deleteAllowed ?? true) { this.valueChanged.notify(this, null as unknown as V); // We cannot check at runtime if the field can take null, so we kinda have to do that @@ -109,7 +106,16 @@ export class TextInputField extends EditableField { } } - const parsedValue = await this.options.formatter.parse(event.scratchpadContents); + return this.handleTextInputInternal(event.scratchpadContents); + } + + /** + * Internal handling of text input + * + * @param text the input text + */ + private async handleTextInputInternal(text: string): Promise { + const parsedValue = await this.options.formatter.parse(text); if (parsedValue !== null) { // Process an `onModified` hook if we have one @@ -151,5 +157,4 @@ export class TextInputField extends EditableField { return Promise.reject(this.page.screen.options.textInputFieldParseFailThrowValue); } } - } diff --git a/src/sdk/graphics/color/ColorUtils.ts b/src/sdk/graphics/color/ColorUtils.ts index 29f385665..ed821982d 100644 --- a/src/sdk/graphics/color/ColorUtils.ts +++ b/src/sdk/graphics/color/ColorUtils.ts @@ -67,7 +67,7 @@ export class ColorUtils { hex = ColorUtils.reverseHexNumber(hex); } - return (hex & ColorUtils.MASK_24).toString(16); + return (hex & ColorUtils.MASK_24).toString(16).padStart(6, '0'); } /** @@ -357,4 +357,151 @@ export class ColorUtils { return ColorUtils.rgbToHex(ColorUtils.hslToRgb(arg1, ColorUtils.rgbCache), arg2 as boolean | undefined); } } + + /** + * Linearly interpolates between two hex colors in the RGB colorspace. + * @param color1 The first color to interpolate between. + * @param color2 The second color to interpolate between. + * @param fraction The position between the two colors at which to generate the interpolated color, as a number in + * the range `[0, 1]`. A value of `0` is equivalent to the first color, and a value of `1` is equivalent to the + * second color. + * @returns The color that is the result of interpolating between the two specified colors at the specified position. + */ + public static interpolateHex(color1: T, color2: T, fraction: number): T; + /** + * Linearly interpolates between two hex colors in the RGB colorspace. + * @param color1 The first color to interpolate between. + * @param color2 The second color to interpolate between. + * @param fraction An array of positions between the two colors at which to generate interpolated colors. Each + * position is a number in the range `[0, 1]`. A value of `0` is equivalent to the first color, and a value of `1` is + * equivalent to the second color. + * @param out The array to which to write the interpolated colors. + * @returns An array of colors that are the result of interpolating between the two specified colors at the positions + * specified by `fraction`. The index of each color in the array matches the index of the position used to generate + * it in `fraction`. + */ + public static interpolateHex(color1: T, color2: T, fraction: readonly number[], out?: T[]): T[]; + // eslint-disable-next-line jsdoc/require-jsdoc + public static interpolateHex(color1: T, color2: T, fraction: number | readonly number[], out?: T[]): T | T[] { + const useString = typeof color1 === 'string'; + + const color1Number = useString ? ColorUtils.hexStringToNumber(color1 as unknown as string) : color1 as unknown as number; + const color2Number = useString ? ColorUtils.hexStringToNumber(color2 as unknown as string) : color2 as unknown as number; + + const interp = typeof fraction === 'object' + ? ColorUtils.interpolateRgbSpace(color1Number, color2Number, fraction, out as number[] | undefined) + : ColorUtils.interpolateRgbSpace(color1Number, color2Number, fraction); + + if (useString) { + if (Array.isArray(interp)) { + for (let i = 0; i < interp.length; i++) { + (interp as unknown as string[])[i] = ColorUtils.hexNumberToString(interp[i]); + } + return interp as unknown as T; + } else { + return ColorUtils.hexNumberToString(interp as number) as unknown as T; + } + } else { + return interp as unknown as T; + } + } + + /** + * Linearly interpolates between two numeric hex colors in the RGB colorspace. + * @param color1 The first color to interpolate between. + * @param color2 The second color to interpolate between. + * @param fraction The position between the two colors at which to generate the interpolated color, as a number in + * the range `[0, 1]`. A value of `0` is equivalent to the first color, and a value of `1` is equivalent to the + * second color. + * @returns The color that is the result of interpolating between the two specified colors at the specified position. + */ + private static interpolateRgbSpace(color1: number, color2: number, fraction: number): number; + /** + * Linearly interpolates between two numeric hex colors in the RGB colorspace. + * @param color1 The first color to interpolate between. + * @param color2 The second color to interpolate between. + * @param fraction An array of positions between the two colors at which to generate interpolated colors. Each + * position is a number in the range `[0, 1]`. A value of `0` is equivalent to the first color, and a value of `1` is + * equivalent to the second color. + * @param out The array to which to write the interpolated colors. + * @returns An array of colors that are the result of interpolating between the two specified colors at the positions + * specified by `fraction`. The index of each color in the array matches the index of the position used to generate + * it in `fraction`. + */ + private static interpolateRgbSpace(color1: number, color2: number, fraction: readonly number[], out?: number[]): number[] + // eslint-disable-next-line jsdoc/require-jsdoc + private static interpolateRgbSpace(color1: number, color2: number, fraction: number | readonly number[], out?: number[]): number | number[] { + const r1 = (color1 & ColorUtils.BYTE_2_MASK) >> 16; + const g1 = (color1 & ColorUtils.BYTE_1_MASK) >> 8; + const b1 = (color1 & ColorUtils.BYTE_0_MASK); + + const r2 = (color2 & ColorUtils.BYTE_2_MASK) >> 16; + const g2 = (color2 & ColorUtils.BYTE_1_MASK) >> 8; + const b2 = (color2 & ColorUtils.BYTE_0_MASK); + + if (typeof fraction === 'number') { + const r = Math.round(MathUtils.lerp(fraction, 0, 1, r1, r2, true, true)); + const g = Math.round(MathUtils.lerp(fraction, 0, 1, g1, g2, true, true)); + const b = Math.round(MathUtils.lerp(fraction, 0, 1, b1, b2, true, true)); + return (r << 16) | (g << 8) | b; + } else { + out ??= []; + + for (let i = 0; i < fraction.length; i++) { + const r = Math.round(MathUtils.lerp(fraction[i], 0, 1, r1, r2, true, true)); + const g = Math.round(MathUtils.lerp(fraction[i], 0, 1, g1, g2, true, true)); + const b = Math.round(MathUtils.lerp(fraction[i], 0, 1, b1, b2, true, true)); + out[i] = (r << 16) | (g << 8) | b; + } + + out.length = fraction.length; + + return out; + } + } + + /** + * Creates a function that linearly interpolates between two colors in the RGB colorspace. + * @param color1 The first color to interpolate between. + * @param color2 The second color to interpolate between. + * @returns A function that linearly interpolates between the two specified colors in the RGB colorspace. + */ + public static gradientHex(color1: T, color2: T): (fraction: number) => T { + const useString = typeof color1 === 'string'; + + const color1Number = useString ? ColorUtils.hexStringToNumber(color1 as unknown as string) : color1 as unknown as number; + const color2Number = useString ? ColorUtils.hexStringToNumber(color2 as unknown as string) : color2 as unknown as number; + + if (useString) { + const interpFunc = ColorUtils.gradientRgbSpace(color1Number, color2Number); + return ((fraction: number): string => { + return ColorUtils.hexNumberToString(interpFunc(fraction)); + }) as unknown as (fraction: number) => T; + } else { + return ColorUtils.gradientRgbSpace(color1Number, color2Number) as unknown as (fraction: number) => T; + } + } + + /** + * Creates a function that linearly interpolates between two numeric hex colors in the RGB colorspace. + * @param color1 The first color to interpolate between. + * @param color2 The second color to interpolate between. + * @returns A function that linearly interpolates between the two specified colors in the RGB colorspace. + */ + private static gradientRgbSpace(color1: number, color2: number): (fraction: number) => number { + const r1 = (color1 & ColorUtils.BYTE_2_MASK) >> 16; + const g1 = (color1 & ColorUtils.BYTE_1_MASK) >> 8; + const b1 = (color1 & ColorUtils.BYTE_0_MASK); + + const r2 = (color2 & ColorUtils.BYTE_2_MASK) >> 16; + const g2 = (color2 & ColorUtils.BYTE_1_MASK) >> 8; + const b2 = (color2 & ColorUtils.BYTE_0_MASK); + + return (fraction: number): number => { + const r = Math.round(MathUtils.lerp(fraction, 0, 1, r1, r2, true, true)); + const g = Math.round(MathUtils.lerp(fraction, 0, 1, g1, g2, true, true)); + const b = Math.round(MathUtils.lerp(fraction, 0, 1, b1, b2, true, true)); + return (r << 16) | (g << 8) | b; + }; + } } \ No newline at end of file diff --git a/src/sdk/graphics/text/NumberFormatter.ts b/src/sdk/graphics/text/NumberFormatter.ts index 837dfe193..3502dcf5b 100644 --- a/src/sdk/graphics/text/NumberFormatter.ts +++ b/src/sdk/graphics/text/NumberFormatter.ts @@ -2,51 +2,55 @@ * Options for creating a number formatter. */ export type NumberFormatterOptions = { - /** The precision to which to round the number. A value of 0 denotes no rounding. */ - precision: number; + /** The precision to which to round the number. A value of 0 denotes no rounding. Defaults to `0`. */ + precision?: number; - /** Rounding behavior. Always round down = `-1`. Always round up = `+1`. Normal rounding = `0`. */ - round: -1 | 0 | 1; + /** Rounding behavior. Always round down = `-1`. Always round up = `+1`. Normal rounding = `0`. Defaults to `0`. */ + round?: -1 | 0 | 1; /** * The maximum number of digits to enforce. Digits to the _right_ of the decimal point will be omitted (with proper * rounding behavior) as necessary until the total number of digits in the output is less than or equal to the value * of this option or until there are no more digits to omit. Digits to the _left_ of the decimal point are always - * preserved, even if it means the number of digits in the output will exceed the value of this option. + * preserved, even if it means the number of digits in the output will exceed the value of this option. Defaults to + * `Infinity`. */ - maxDigits: number; + maxDigits?: number; /** * Whether to force trailing zeroes to the right of the decimal point. The number of trailing zeroes is determined * by the `precision` option. Specifically, trailing zeroes are added to the least significant decimal place required * to represent the value of `precision` (and therefore, any possible output rounded to `precision`) with no - * rounding. + * rounding. Defaults to `true`. */ - forceDecimalZeroes: boolean; + forceDecimalZeroes?: boolean; - /** The number of digits to which to pad with zeroes to the left of the decimal point. */ - pad: number; + /** The number of digits to which to pad with zeroes to the left of the decimal point. Defaults to `1`. */ + pad?: number; - /** Whether to show commas. */ - showCommas: boolean; + /** Whether to show commas. Defaults to `false`. */ + showCommas?: boolean; - /** Whether to use a minus sign (`−`) in place of a dash (`-`) in front of negative numbers. */ - useMinusSign: boolean; + /** Whether to use a minus sign (`−`) in place of a dash (`-`) in front of negative numbers. Defaults to `false`. */ + useMinusSign?: boolean; - /** Whether to force the display of a positive sign. */ - forceSign: boolean; + /** Whether to force the display of a positive sign. Ignored if `hideSign` is `true`. Defaults to `false`. */ + forceSign?: boolean; - /** The string to output for an input of NaN. */ - nanString: string; + /** Whether to hide the display of the positive/negative sign. Overrides `forceSign`. Defaults to `false`. */ + hideSign?: boolean; - /** Whether to cache and reuse the previously generated string when possible. */ - cache: boolean; + /** The string to output for an input of NaN. Defaults to `'NaN'`. */ + nanString?: string; + + /** Whether to cache and reuse the previously generated string when possible. Defaults to `false`. */ + cache?: boolean; }; /** * Options used for formatting numbers, for internal use. */ -type NumberFormatterOptionsInternal = NumberFormatterOptions & { +type NumberFormatterOptionsInternal = Required & { /** The function to use to round the number before formatting. */ roundFunc: (value: number) => number; @@ -65,7 +69,7 @@ type NumberFormatterOptionsInternal = NumberFormatterOptions & { * documentation for more information on each individual option. */ export class NumberFormatter { - public static readonly DEFAULT_OPTIONS: Readonly = { + public static readonly DEFAULT_OPTIONS: Readonly> = { precision: 0, round: 0, maxDigits: Infinity, @@ -74,6 +78,7 @@ export class NumberFormatter { showCommas: false, useMinusSign: false, forceSign: false, + hideSign: false, nanString: 'NaN', cache: false }; @@ -111,6 +116,7 @@ export class NumberFormatter { showCommas, useMinusSign, forceSign, + hideSign, cache } = opts; @@ -179,7 +185,9 @@ export class NumberFormatter { formatted = parts.join('.'); } - formatted = ((forceSign || signText !== '+') ? signText : '') + formatted; + if (!hideSign && (forceSign || signText !== '+')) { + formatted = signText + formatted; + } if (cache) { opts.cachedString = formatted; @@ -188,27 +196,34 @@ export class NumberFormatter { return formatted; } + /** + * Resolves an internal options object from a partial options object. Any option not explicitly defined by the + * partial options object will revert to its default value. + * @param options A partial options object. + * @returns A new internal options object containing the full set of options resolved from the specified partial + * options object. + */ + private static resolveOptions(options?: Readonly): NumberFormatterOptionsInternal { + const resolved = Object.assign({}, options) as NumberFormatterOptionsInternal; + + for (const key in NumberFormatter.DEFAULT_OPTIONS) { + (resolved as any)[key] ??= NumberFormatter.DEFAULT_OPTIONS[key as keyof NumberFormatterOptions]; + } + + resolved.roundFunc = NumberFormatter.roundFuncs[resolved.round]; + + return resolved; + } + /** * Creates a function which formats numeric values to strings. The formatting behavior of the function can be * customized using a number of options. Please refer to the {@link NumberFormatterOptions} type documentation for * more information on each individual option. - * @param options Options to customize the formatter. Options not explicitly defined will be set to the following - * default values: - * * `precision = 0` - * * `round = 0` - * * `maxDigits = Infinity` - * * `forceDecimalZeroes = true` - * * `pad = 1` - * * `showCommas = false` - * * `useMinusSign = false` - * * `forceSign = false` - * * `nanString = 'NaN'` - * * `cache = false` + * @param options Options with which to customize the formatter. * @returns A function which formats numeric values to strings. */ - public static create(options: Partial): (number: number) => string { - const optsToUse = Object.assign({}, NumberFormatter.DEFAULT_OPTIONS, options) as unknown as NumberFormatterOptionsInternal; - optsToUse.roundFunc = NumberFormatter.roundFuncs[optsToUse.round]; + public static create(options?: NumberFormatterOptions): (number: number) => string { + const optsToUse = NumberFormatter.resolveOptions(options); return (number: number): string => { return NumberFormatter.formatNumber(number, optsToUse); diff --git a/src/sdk/instruments/ADC.ts b/src/sdk/instruments/ADC.ts index e33326248..0a767e3ef 100644 --- a/src/sdk/instruments/ADC.ts +++ b/src/sdk/instruments/ADC.ts @@ -15,6 +15,18 @@ export interface BaseAdcEvents { /** The airplane's indicated airspeed, in knots. */ ias: number; + /** + * The airplane's mach number, as calculated from the impact pressure derived from the current indicated airspeed and + * ambient pressure. + */ + indicated_mach_number: number; + + /** + * The airplane's true airspeed, in knots, as calculated from the impact pressure derived from the current indicated + * airspeed, ambient pressure, and ambient temperature. + */ + indicated_tas: number; + /** The airplane's true airspeed, in knots. */ tas: number; @@ -51,7 +63,7 @@ export interface BaseAdcEvents { /** The ambient air density, in slugs per cubic foot */ ambient_density: number; - /** The ambient temperature, in degrees Celsius. */ + /** The ambient temperature, in degrees Celsius. Same as OAT (Outside Air Temperature). */ ambient_temp_c: number; /** The ambient pressure, in inches of mercury. */ @@ -60,7 +72,7 @@ export interface BaseAdcEvents { /** The current ISA temperature, in degrees Celsius. */ isa_temp_c: number; - /** The current ram air temperature, in degrees Celsius. */ + /** The current ram air temperature, in degrees Celsius. Same as TAT (Total Air Temperature). */ ram_air_temp_c: number; /** The ambient wind velocity, in knots. */ @@ -89,12 +101,27 @@ export interface BaseAdcEvents { * words, the speed of sound in knots indicated airspeed. */ mach_to_kias_factor: number; + + /** The conversion factor from true airspeed to indicated airspeed in the airplane's current environment. */ + tas_to_ias_factor: number; + + /** + * The conversion factor from indicated mach to knots indicated airspeed in the airplane's current environment. + */ + indicated_mach_to_kias_factor: number; + + /** The conversion factor from indicated true airspeed to indicated airspeed in the airplane's current environment. */ + indicated_tas_to_ias_factor: number; + + /** The density altitude, in feet */ + density_alt: number; } /** * Topics indexed by airspeed indicator. */ -type AdcAirspeedIndexedTopics = 'ias' | 'tas' | 'mach_to_kias_factor'; +type AdcAirspeedIndexedTopics = 'ias' | 'tas' | 'indicated_tas' | 'indicated_mach_number' | 'mach_to_kias_factor' | 'tas_to_ias_factor' + | 'indicated_mach_to_kias_factor' | 'indicated_tas_to_ias_factor'; /** Topics indexed by altimeter. */ type AdcAltimeterIndexedTopics = 'indicated_alt' | 'altimeter_baro_setting_inhg' | 'altimeter_baro_setting_mb' @@ -118,13 +145,91 @@ type AdcIndexedEvents = { export interface AdcEvents extends BaseAdcEvents, AdcIndexedEvents { } +/** + * An entry describing indicated airspeed-related topics to publish for a single airspeed indicator index. + */ +type IasTopicEntry = { + /** The name of the SimVar from which to retrieve indicated airspeed. */ + iasSimVar: string; + + /** The name of the SimVar from which to retrieve indicated airspeed. */ + tasSimVar: string; + + /** The most recently retrieved indicated airspeed value, in knots. */ + kias: number; + + /** The most recently retrieved indicated airspeed value, in meters per second. */ + iasMps: number; + + /** The most recently retrieved true airspeed value, in knots. */ + ktas: number; + + /** The most recently retrieved indicated mach number. */ + indicatedMach: number; + + /** The most recently retrieved indicated true airspeed, in knots. */ + indicatedTas: number; + + /** The topic to which to publish indicated airspeed. */ + iasTopic?: 'ias' | `ias_${number}`; + + /** The topic to which to publish true airspeed. */ + tasTopic?: 'tas' | `tas_${number}`; + + /** The topic to which to publish indicated mach number. */ + indicatedMachTopic?: 'indicated_mach_number' | `indicated_mach_number_${number}`; + + /** The topic to which to publish indicated true airspeed. */ + indicatedTasTopic?: 'indicated_tas' | `indicated_tas_${number}`; + + /** The topic to which to publish the conversion factor from mach number to knots indicated airspeed. */ + machToKiasTopic?: 'mach_to_kias_factor' | `mach_to_kias_factor_${number}`; + + /** The topic to which to publish the conversion factor from true airspeed to indicated airspeed. */ + tasToIasTopic?: 'tas_to_ias_factor' | `tas_to_ias_factor_${number}`; + + /** The topic to which to publish the conversion factor from indicated mach number to knots indicated airspeed. */ + indicatedMachToKiasTopic?: 'indicated_mach_to_kias_factor' | `indicated_mach_to_kias_factor_${number}`; + + /** The topic to which to publish the conversion factor from indicated true airspeed to indicated airspeed. */ + indicatedTasToIasTopic?: 'indicated_tas_to_ias_factor' | `indicated_tas_to_ias_factor_${number}`; +}; + /** * A publisher for air data computer information. */ export class AdcPublisher extends SimVarPublisher { - private mach: number; + private static readonly TOPIC_REGEXES = { + 'ias': /^ias(?:_(0|(?:[1-9])\d*))?$/, + 'tas': /^tas(?:_(0|(?:[1-9])\d*))?$/, + 'indicated_mach_number': /^indicated_mach_number(?:_(0|(?:[1-9])\d*))?$/, + 'indicated_tas': /^indicated_tas(?:_(0|(?:[1-9])\d*))?$/, + 'mach_to_kias_factor': /^mach_to_kias_factor(?:_(0|(?:[1-9])\d*))?$/, + 'tas_to_ias_factor': /^tas_to_ias_factor(?:_(0|(?:[1-9])\d*))?$/, + 'indicated_mach_to_kias_factor': /^indicated_mach_to_kias_factor(?:_(0|(?:[1-9])\d*))?$/, + 'indicated_tas_to_ias_factor': /^indicated_tas_to_ias_factor(?:_(0|(?:[1-9])\d*))?$/ + }; + + private needRetrievePressure: boolean; + private needRetrieveTemperature: boolean; + private needRetrieveMach: boolean; + + private needPublish!: Readonly<{ + /** Whether `mach_number` needs to be published. */ + 'mach_number': boolean; + + /** Whether `ambient_pressure_inhg` needs to be published. */ + 'ambient_pressure_inhg': boolean; + + /** Whether `ambient_temp_c` needs to be published. */ + 'ambient_temp_c': boolean; + }>; + + private needPublishIasTopics!: Map; + private pressure: number; - private needUpdateMachToKiasData: boolean; + private temperature: number; + private mach: number; /** * Creates an AdcPublisher. @@ -133,21 +238,6 @@ export class AdcPublisher extends SimVarPublisher { */ public constructor(bus: EventBus, pacer?: PublishPacer) { const simvars = new Map>([ - ['ias', { name: 'AIRSPEED INDICATED:#index#', type: SimVarValueType.Knots, indexed: true }], - ['tas', { name: 'AIRSPEED TRUE:#index#', type: SimVarValueType.Knots, indexed: true }], - [ - 'mach_to_kias_factor', - { - name: 'AIRSPEED INDICATED:#index#', - type: SimVarValueType.Knots, - map: (kias: number): number => { - const factor = kias < 1 || this.mach === 0 ? AeroMath.machToCas(1, this.pressure) : kias / this.mach; - return isFinite(factor) ? factor : 1; - }, - indexed: true - } - ], - ['indicated_alt', { name: 'INDICATED ALTITUDE:#index#', type: SimVarValueType.Feet, indexed: true }], ['altimeter_baro_setting_inhg', { name: 'KOHLSMAN SETTING HG:#index#', type: SimVarValueType.InHG, indexed: true }], ['altimeter_baro_setting_mb', { name: 'KOHLSMAN SETTING MB:#index#', type: SimVarValueType.MB, indexed: true }], @@ -160,8 +250,6 @@ export class AdcPublisher extends SimVarPublisher { ['pressure_alt', { name: 'PRESSURE ALTITUDE', type: SimVarValueType.Feet }], ['vertical_speed', { name: 'VERTICAL SPEED', type: SimVarValueType.FPM }], ['ambient_density', { name: 'AMBIENT DENSITY', type: SimVarValueType.SlugsPerCubicFoot }], - ['ambient_temp_c', { name: 'AMBIENT TEMPERATURE', type: SimVarValueType.Celsius }], - ['ambient_pressure_inhg', { name: 'AMBIENT PRESSURE', type: SimVarValueType.InHG }], ['isa_temp_c', { name: 'STANDARD ATM TEMPERATURE', type: SimVarValueType.Celsius }], ['ram_air_temp_c', { name: 'TOTAL AIR TEMPERATURE', type: SimVarValueType.Celsius }], ['ambient_wind_velocity', { name: 'AMBIENT WIND VELOCITY', type: SimVarValueType.Knots }], @@ -170,35 +258,394 @@ export class AdcPublisher extends SimVarPublisher { ['aoa', { name: 'INCIDENCE ALPHA', type: SimVarValueType.Degree }], ['stall_aoa', { name: 'STALL ALPHA', type: SimVarValueType.Degree }], ['zero_lift_aoa', { name: 'ZERO LIFT ALPHA', type: SimVarValueType.Degree }], - ['mach_number', { name: 'AIRSPEED MACH', type: SimVarValueType.Mach }], + ['density_alt', { name: 'DENSITY ALTITUDE', type: SimVarValueType.Feet }], ]); super(simvars, bus, pacer); - this.mach = 0; - this.pressure = 1013.25; - this.needUpdateMachToKiasData ??= false; + this.needPublish ??= { + 'mach_number': false, + 'ambient_pressure_inhg': false, + 'ambient_temp_c': false + }; + this.needPublishIasTopics ??= new Map(); + + this.needRetrievePressure ??= false; + this.needRetrieveTemperature ??= false; + this.needRetrieveMach ??= false; + + this.pressure ??= 1013.25; + this.temperature ??= 0; + this.mach ??= 0; } - /** @inheritdoc */ + /** @inheritDoc */ + protected handleSubscribedTopic(topic: string): void { + this.needPublish ??= { + 'mach_number': false, + 'ambient_pressure_inhg': false, + 'ambient_temp_c': false + }; + this.needPublishIasTopics ??= new Map(); + + if ( + this.resolvedSimVars.has(topic as any) + || topic in this.needPublish + || AdcPublisher.TOPIC_REGEXES['ias'].test(topic) + || AdcPublisher.TOPIC_REGEXES['tas'].test(topic) + || AdcPublisher.TOPIC_REGEXES['indicated_mach_number'].test(topic) + || AdcPublisher.TOPIC_REGEXES['indicated_tas'].test(topic) + || AdcPublisher.TOPIC_REGEXES['mach_to_kias_factor'].test(topic) + || AdcPublisher.TOPIC_REGEXES['tas_to_ias_factor'].test(topic) + || AdcPublisher.TOPIC_REGEXES['indicated_mach_to_kias_factor'].test(topic) + || AdcPublisher.TOPIC_REGEXES['indicated_tas_to_ias_factor'].test(topic) + ) { + // If topic matches an already resolved topic -> start publishing. + this.onTopicSubscribed(topic as keyof AdcEvents); + } else { + // Check if topic matches indexed topic. + this.tryMatchIndexedSubscribedTopic(topic); + } + } + + /** @inheritDoc */ protected onTopicSubscribed(topic: keyof AdcEvents): void { - super.onTopicSubscribed(topic); + if (topic in this.needPublish) { + (this.needPublish as any)[topic] = true; + + switch (topic) { + case 'ambient_pressure_inhg': + this.needRetrievePressure = true; + if (this.publishActive) { + this.retrieveAmbientPressure(true); + } + break; + case 'ambient_temp_c': + this.needRetrieveTemperature = true; + if (this.publishActive) { + this.retrieveAmbientTemperature(true); + } + break; + case 'mach_number': + this.needRetrieveMach = true; + if (this.publishActive) { + this.retrieveMach(true); + } + break; + } + } else if (AdcPublisher.TOPIC_REGEXES['ias'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['ias']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.iasTopic = index < 0 ? 'ias' : `ias_${index}`; + + if (this.publishActive) { + this.retrieveIas(entry, true); + } + } else if (AdcPublisher.TOPIC_REGEXES['tas'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['tas']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.tasTopic = index < 0 ? 'tas' : `tas_${index}`; + + if (this.publishActive) { + this.retrieveTas(entry, true); + } + } else if (AdcPublisher.TOPIC_REGEXES['indicated_mach_number'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['indicated_mach_number']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + this.needRetrievePressure = true; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.indicatedMachTopic = index < 0 ? 'indicated_mach_number' : `indicated_mach_number_${index}`; + + if (this.publishActive) { + this.retrieveAmbientPressure(false); + this.retrieveIas(entry, false); + this.retrieveIndicatedMach(entry, true); + } + } else if (AdcPublisher.TOPIC_REGEXES['indicated_tas'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['indicated_tas']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + this.needRetrievePressure = true; + this.needRetrieveTemperature = true; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.indicatedTasTopic = index < 0 ? 'indicated_tas' : `indicated_tas_${index}`; + + if (this.publishActive) { + this.retrieveAmbientPressure(false); + this.retrieveAmbientTemperature(false); + this.retrieveIas(entry, false); + this.retrieveIndicatedTas(entry, true); + } + } else if (AdcPublisher.TOPIC_REGEXES['mach_to_kias_factor'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['mach_to_kias_factor']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + this.needRetrievePressure = true; + this.needRetrieveMach = true; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.machToKiasTopic = index < 0 ? 'mach_to_kias_factor' : `mach_to_kias_factor_${index}`; + + if (this.publishActive) { + this.retrieveAmbientPressure(false); + this.retrieveMach(false); + this.retrieveIas(entry, false); + this.publishMachToKias(entry); + } + } else if (AdcPublisher.TOPIC_REGEXES['tas_to_ias_factor'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['tas_to_ias_factor']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + this.needRetrievePressure = true; + this.needRetrieveTemperature = true; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.tasToIasTopic = index < 0 ? 'tas_to_ias_factor' : `tas_to_ias_factor_${index}`; + + if (this.publishActive) { + this.retrieveAmbientPressure(false); + this.retrieveAmbientTemperature(false); + this.retrieveIas(entry, false); + this.retrieveTas(entry, false); + this.publishTasToIas(entry); + } + } else if (AdcPublisher.TOPIC_REGEXES['indicated_mach_to_kias_factor'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['indicated_mach_to_kias_factor']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + this.needRetrievePressure = true; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.indicatedMachToKiasTopic = index < 0 ? 'indicated_mach_to_kias_factor' : `indicated_mach_to_kias_factor_${index}`; + + if (this.publishActive) { + this.retrieveAmbientPressure(false); + this.retrieveIas(entry, false); + this.retrieveIndicatedMach(entry, false); + this.publishIndicatedMachToKias(entry); + } + } else if (AdcPublisher.TOPIC_REGEXES['indicated_tas_to_ias_factor'].test(topic)) { + const indexMatch = (topic.match(AdcPublisher.TOPIC_REGEXES['indicated_tas_to_ias_factor']) as RegExpMatchArray)[1]; + const index = indexMatch ? parseInt(indexMatch) : -1; + + this.needRetrievePressure = true; + this.needRetrieveTemperature = true; + + const entry = this.getOrCreateIasTopicEntry(index); + entry.indicatedTasToIasTopic = index < 0 ? 'indicated_tas_to_ias_factor' : `indicated_tas_to_ias_factor_${index}`; + + if (this.publishActive) { + this.retrieveAmbientPressure(false); + this.retrieveAmbientTemperature(false); + this.retrieveIas(entry, false); + this.retrieveIndicatedTas(entry, false); + this.publishIndicatedTasToIas(entry); + } + } else { + super.onTopicSubscribed(topic); + } + } - if (topic.startsWith('mach_to_kias_factor')) { - this.needUpdateMachToKiasData = true; + /** + * Gets the entry describing indicated airspeed-related topics to publish for a given airspeed indicator index, or + * creates a new one if it does not exist. + * @param index The airspeed indicator index for which to get an entry, or `-1` for the un-indexed airspeed + * indicator. + * @returns An entry describing indicated airspeed-related topics to publish for the specified airspeed indicator + * index. + */ + private getOrCreateIasTopicEntry(index: number): IasTopicEntry { + let entry = this.needPublishIasTopics.get(index); + if (!entry) { + entry = { + iasSimVar: index < 0 ? 'AIRSPEED INDICATED:1' : `AIRSPEED INDICATED:${index}`, + tasSimVar: index < 0 ? 'AIRSPEED TRUE:1' : `AIRSPEED TRUE:${index}`, + kias: 0, + iasMps: 0, + ktas: 0, + indicatedMach: 0, + indicatedTas: 0 + }; + this.needPublishIasTopics.set(index, entry); } + return entry; } - /** @inheritdoc */ + /** @inheritDoc */ public onUpdate(): void { const isSlewing = SimVar.GetSimVarValue('IS SLEW ACTIVE', 'bool'); if (!isSlewing) { - if (this.needUpdateMachToKiasData) { - this.mach = SimVar.GetSimVarValue('AIRSPEED MACH', SimVarValueType.Number); - this.pressure = SimVar.GetSimVarValue('AMBIENT PRESSURE', SimVarValueType.HPA); + if (this.needRetrievePressure) { + this.retrieveAmbientPressure(this.needPublish['ambient_pressure_inhg']); + } + if (this.needRetrieveTemperature) { + this.retrieveAmbientTemperature(this.needPublish['ambient_temp_c']); + } + if (this.needRetrieveMach) { + this.retrieveMach(this.needPublish['mach_number']); + } + + for (const entry of this.needPublishIasTopics.values()) { + this.retrieveIas(entry, true); + if (entry.tasTopic || entry.tasToIasTopic) { + this.retrieveTas(entry, true); + } + if (entry.indicatedMachTopic || entry.indicatedMachToKiasTopic) { + this.retrieveIndicatedMach(entry, true); + } + if (entry.indicatedTasTopic || entry.indicatedTasToIasTopic) { + this.retrieveIndicatedTas(entry, true); + } + this.publishMachToKias(entry); + this.publishTasToIas(entry); + this.publishIndicatedMachToKias(entry); + this.publishIndicatedTasToIas(entry); } super.onUpdate(); } } + + /** + * Retrieves and optionally publishes the current ambient pressure. + * @param publish Whether to publish the value. + */ + private retrieveAmbientPressure(publish: boolean): void { + const pressureInHg = SimVar.GetSimVarValue('AMBIENT PRESSURE', SimVarValueType.InHG); + this.pressure = UnitType.IN_HG.convertTo(pressureInHg, UnitType.HPA); + publish && this.publish('ambient_pressure_inhg', pressureInHg); + } + + /** + * Retrieves and optionally publishes the current ambient temperature. + * @param publish Whether to publish the value. + */ + private retrieveAmbientTemperature(publish: boolean): void { + this.temperature = SimVar.GetSimVarValue('AMBIENT TEMPERATURE', SimVarValueType.Celsius); + publish && this.publish('ambient_temp_c', this.temperature); + } + + /** + * Retrieves and optionally publishes the airplane's current mach number. + * @param publish Whether to publish the value. + */ + private retrieveMach(publish: boolean): void { + this.mach = SimVar.GetSimVarValue('AIRSPEED MACH', SimVarValueType.Mach); + publish && this.publish('mach_number', this.mach); + } + + /** + * Retrieves and optionally publishes the current indicated airspeed for an airspeed indicator index. + * @param entry The entry for the airspeed indicator index for which to retrieve the value. + * @param publish Whether to publish the value. + */ + private retrieveIas(entry: IasTopicEntry, publish: boolean): void { + entry.kias = SimVar.GetSimVarValue(entry.iasSimVar, SimVarValueType.Knots); + entry.iasMps = UnitType.KNOT.convertTo(entry.kias, UnitType.MPS); + publish && entry.iasTopic && this.publish(entry.iasTopic, entry.kias); + } + + /** + * Retrieves and optionally publishes the current true airspeed for an airspeed indicator index. + * @param entry The entry for the airspeed indicator index for which to retrieve the value. + * @param publish Whether to publish the value. + */ + private retrieveTas(entry: IasTopicEntry, publish: boolean): void { + entry.ktas = SimVar.GetSimVarValue(entry.tasSimVar, SimVarValueType.Knots); + publish && entry.tasTopic && this.publish(entry.tasTopic, entry.ktas); + } + + /** + * Retrieves and optionally publishes the current indicated mach number for an airspeed indicator index. + * @param entry The entry for the airspeed indicator index for which to retrieve the value. + * @param publish Whether to publish the value. + */ + private retrieveIndicatedMach(entry: IasTopicEntry, publish: boolean): void { + entry.indicatedMach = AeroMath.casToMach(entry.iasMps, this.pressure); + publish && entry.indicatedMachTopic && this.publish(entry.indicatedMachTopic, entry.indicatedMach); + } + + /** + * Retrieves and optionally publishes the current indicated true airspeed for an airspeed indicator index. + * @param entry The entry for the airspeed indicator index for which to retrieve the value. + * @param publish Whether to publish the value. + */ + private retrieveIndicatedTas(entry: IasTopicEntry, publish: boolean): void { + entry.indicatedTas = UnitType.MPS.convertTo(AeroMath.casToTas(entry.iasMps, this.pressure, this.temperature), UnitType.KNOT); + publish && entry.indicatedTasTopic && this.publish(entry.indicatedTasTopic, entry.indicatedTas); + } + + /** + * Publishes the current conversion factor from mach number to knots indicated airspeed for an airspeed indicator + * index. + * @param entry The entry for the airspeed indicator index for which to publish the value. + */ + private publishMachToKias(entry: IasTopicEntry): void { + if (!entry.machToKiasTopic) { + return; + } + + const factor = entry.kias < 1 || this.mach === 0 + ? 1 / AeroMath.casToMach(1, this.pressure) + : entry.kias / this.mach; + + this.publish(entry.machToKiasTopic, isFinite(factor) ? factor : 1); + } + + /** + * Publishes the current conversion factor from true airspeed to indicated airspeed for an airspeed indicator index. + * @param entry The entry for the airspeed indicator index for which to publish the value. + */ + private publishTasToIas(entry: IasTopicEntry): void { + if (!entry.tasToIasTopic) { + return; + } + + const factor = entry.kias < 1 || entry.ktas === 0 + ? 1 / AeroMath.casToTas(1, this.pressure, this.temperature) + : entry.kias / entry.ktas; + + this.publish(entry.tasToIasTopic, isFinite(factor) ? factor : 1); + } + + /** + * Publishes the current conversion factor from indicated mach number to knots indicated airspeed for an airspeed + * indicator index. + * @param entry The entry for the airspeed indicator index for which to publish the value. + */ + private publishIndicatedMachToKias(entry: IasTopicEntry): void { + if (!entry.indicatedMachToKiasTopic) { + return; + } + + const factor = entry.kias < 1 || entry.indicatedMach === 0 + ? 1 / AeroMath.casToMach(1, this.pressure) + : entry.kias / entry.indicatedMach; + + this.publish(entry.indicatedMachToKiasTopic, isFinite(factor) ? factor : 1); + } + + /** + * Publishes the current conversion factor from indicated true airspeed to indicated airspeed for an airspeed + * indicator index. + * @param entry The entry for the airspeed indicator index for which to publish the value. + */ + private publishIndicatedTasToIas(entry: IasTopicEntry): void { + if (!entry.indicatedTasToIasTopic) { + return; + } + + const factor = entry.kias < 1 || entry.indicatedTas === 0 + ? 1 / AeroMath.casToTas(1, this.pressure, this.temperature) + : entry.kias / entry.indicatedTas; + + this.publish(entry.indicatedTasToIasTopic, isFinite(factor) ? factor : 1); + } } diff --git a/src/sdk/instruments/Accelerometer.ts b/src/sdk/instruments/Accelerometer.ts new file mode 100644 index 000000000..3e8ba09ca --- /dev/null +++ b/src/sdk/instruments/Accelerometer.ts @@ -0,0 +1,35 @@ +import { PublishPacer, SimVarValueType } from '../data'; +import { EventBus } from '../data/EventBus'; +import { SimVarPublisher, SimVarPublisherEntry } from './BasePublishers'; + +/** + * Events related to acceleration of the airplane. + */ +export interface AccelerometerEvents { + /** The current value from the G-Meter */ + g_force: number + /** Maximum G force attained */ + max_g_force: number + /** Minimum G force attained */ + min_g_force: number +} + +/** + * A publisher for Accelerometer information. + */ +export class AccelerometerPublisher extends SimVarPublisher { + /** + * Creates an AccelerometerPublisher. + * @param bus The event bus to which to publish. + * @param pacer An optional pacer to use to control the rate of publishing. + */ + public constructor(bus: EventBus, pacer?: PublishPacer) { + const simvars = new Map>([ + ['g_force', { name: 'G FORCE', type: SimVarValueType.Number }], + ['max_g_force', { name: 'MAX G FORCE', type: SimVarValueType.Number }], + ['min_g_force', { name: 'MIN G FORCE', type: SimVarValueType.Number }], + ]); + + super(simvars, bus, pacer); + } +} \ No newline at end of file diff --git a/src/sdk/instruments/AircraftInertialPublisher.ts b/src/sdk/instruments/AircraftInertialPublisher.ts new file mode 100644 index 000000000..9acd1586a --- /dev/null +++ b/src/sdk/instruments/AircraftInertialPublisher.ts @@ -0,0 +1,55 @@ +/// + +import { EventBus } from '../data/EventBus'; +import { PublishPacer } from '../data/EventBusPacer'; +import { SimVarValueType } from '../data/SimVars'; +import { SimVarPublisher, SimVarPublisherEntry } from './BasePublishers'; + +/** + * An interface that describes the possible aircraft inertial motion events. + */ +export interface AircraftInertialEvents { + /** Lateral acceleration relative to aircraft X axis, in east/west direction in metres/sec^2, +ve to the right. */ + acceleration_body_x: number, + /** Vertical acceleration relative to aircraft Y axis, in vertical direction in metres/sec^2, +ve upwards. */ + acceleration_body_y: number, + /** Longitudinal acceleration relative to aircraft Z axis, in fore/aft direction in metres/sec^2, +ve forwards. */ + acceleration_body_z: number, + /** Pitch rotation velocity relative to aircraft X axis in °/sec, +ve downwards. */ + rotation_velocity_body_x: number, + /** Yaw rotation velocity relative to aircraft Y axis in °/sec, +ve right. */ + rotation_velocity_body_y: number, + /** Roll rotation velocity relative to aircraft Z axis in °/sec +ve to the left. */ + rotation_velocity_body_z: number, +} + +/** + * A publisher for Aircraft information. + */ +export class AircraftInertialPublisher extends SimVarPublisher { + + /** + * Create a AircraftSimvarPublisher. + * @param bus The EventBus to publish to + * @param pacer An optional pacer to use to control the rate of publishing + */ + public constructor(bus: EventBus, pacer: PublishPacer | undefined = undefined) { + + const simvars = new Map>([ + ['acceleration_body_x', { name: 'ACCELERATION BODY X', type: SimVarValueType.MetersPerSecondSquared }], + ['acceleration_body_y', { name: 'ACCELERATION BODY Y', type: SimVarValueType.MetersPerSecondSquared }], + ['acceleration_body_z', { name: 'ACCELERATION BODY Z', type: SimVarValueType.MetersPerSecondSquared }], + ['rotation_velocity_body_x', { name: 'ROTATION VELOCITY BODY X', type: SimVarValueType.DegreesPerSecond }], + ['rotation_velocity_body_y', { name: 'ROTATION VELOCITY BODY Y', type: SimVarValueType.DegreesPerSecond }], + ['rotation_velocity_body_z', { name: 'ROTATION VELOCITY BODY Z', type: SimVarValueType.DegreesPerSecond }], + ]); + + super(simvars, bus, pacer); + + } + + /** @inheritdoc */ + public onUpdate(): void { + super.onUpdate(); + } +} diff --git a/src/sdk/instruments/BasePublishers.ts b/src/sdk/instruments/BasePublishers.ts index e3a13c5b4..91877ac87 100644 --- a/src/sdk/instruments/BasePublishers.ts +++ b/src/sdk/instruments/BasePublishers.ts @@ -177,15 +177,7 @@ export class SimVarPublisher, IndexedEventRoo } } - const handleSubscribedTopic = (topic: string): void => { - if (this.resolvedSimVars.has(topic)) { - // If topic matches an already resolved topic -> start publishing. - this.onTopicSubscribed(topic); - } else { - // Check if topic matches indexed topic. - this.tryMatchIndexedSubscribedTopic(topic); - } - }; + const handleSubscribedTopic = this.handleSubscribedTopic.bind(this); // Iterate over each subscribed topic on the bus to see if it matches any of our topics. If so, start publishing. this.bus.forEachSubscribedTopic(handleSubscribedTopic); @@ -194,6 +186,20 @@ export class SimVarPublisher, IndexedEventRoo this.bus.getSubscriber().on('event_bus_topic_first_sub').handle(handleSubscribedTopic); } + /** + * Handles when an event bus topic is subscribed to for the first time. + * @param topic The subscribed topic. + */ + protected handleSubscribedTopic(topic: string): void { + if (this.resolvedSimVars.has(topic)) { + // If topic matches an already resolved topic -> start publishing. + this.onTopicSubscribed(topic); + } else { + // Check if topic matches indexed topic. + this.tryMatchIndexedSubscribedTopic(topic); + } + } + /** * Checks if a subscribed topic matches one of this publisher's indexed topics, and if so resolves and starts * publishing the indexed topic. diff --git a/src/sdk/instruments/Clock.ts b/src/sdk/instruments/Clock.ts index 279587e81..875401c38 100644 --- a/src/sdk/instruments/Clock.ts +++ b/src/sdk/instruments/Clock.ts @@ -22,13 +22,19 @@ export interface ClockEvents { /** * A Javascript timestamp corresponding to the simulation time, fired every sim frame instead of on each Coherent * animation frame. The timestamp uses the UNIX epoch (00:00 UTC January 1, 1970) and has units of milliseconds. - * + * * USE THIS EVENT SPARINGLY, as it will impact performance and ignores the user set glass cockpit refresh setting. */ simTimeHiFreq: number; /** The simulation rate factor. */ simRate: number; + + /** The seconds since midnight (zulu time) until sunrise at the aircraft's location. */ + zulu_sunrise: number; + + /** The seconds since midnight (zulu time) until sunset at the aircraft's location. */ + zulu_sunset: number; } /** @@ -51,7 +57,9 @@ export class ClockPublisher extends BasePublisher { this.simVarPublisher = new SimVarPublisher(new Map>([ ['simTime', { name: 'E:ABSOLUTE TIME', type: SimVarValueType.Seconds, map: ClockPublisher.absoluteTimeToUNIXTime }], - ['simRate', { name: 'E:SIMULATION RATE', type: SimVarValueType.Number }] + ['simRate', { name: 'E:SIMULATION RATE', type: SimVarValueType.Number }], + ['zulu_sunrise', { name: 'E:ZULU SUNRISE TIME', type: SimVarValueType.Seconds }], + ['zulu_sunset', { name: 'E:ZULU SUNSET TIME', type: SimVarValueType.Seconds }], ]), bus, pacer); if (this.bus.getTopicSubscriberCount('realTime') > 0) { @@ -137,4 +145,4 @@ export class Clock { public onUpdate(): void { this.publisher.onUpdate(); } -} \ No newline at end of file +} diff --git a/src/sdk/instruments/ControlSurfaces.ts b/src/sdk/instruments/ControlSurfaces.ts index ae114b40f..7a46992c2 100644 --- a/src/sdk/instruments/ControlSurfaces.ts +++ b/src/sdk/instruments/ControlSurfaces.ts @@ -74,6 +74,9 @@ export interface BaseControlSurfacesEvents { /** The percent of elevator deflection */ elevator_percent: number; + /** The percent of elevator position within the maximum deflection limits */ + elevator_position: number; + /** The percent of rudder deflection */ rudder_percent: number; @@ -142,6 +145,7 @@ export class ControlSurfacesPublisher extends SimVarPublisher { const isUsingAdvancedFuelSystem = SimVar.GetSimVarValue('NEW FUEL SYSTEM', SimVarValueType.Bool) !== 0; const totalUnusableFuelGal = SimVar.GetSimVarValue('UNUSABLE FUEL TOTAL QUANTITY', SimVarValueType.GAL); - const totalUnusableFuelLb = SimVar.GetSimVarValue('UNUSABLE FUEL TOTAL QUANTITY', SimVarValueType.LBS); + const totalUnusableFuelLb = UnitType.GALLON_FUEL.convertTo(totalUnusableFuelGal, UnitType.POUND); const nonIndexedSimVars: [keyof BaseEngineEvents, SimVarPublisherEntry][] = [ ['vac', { name: 'SUCTION PRESSURE', type: SimVarValueType.InHG }], @@ -158,6 +171,7 @@ export class EISPublisher extends SimVarPublisher { ['apu_pct_starter', { name: 'APU PCT STARTER', type: SimVarValueType.Percent }], ['apu_switch', { name: 'APU SWITCH', type: SimVarValueType.Bool }], ['eng_starter_active', { name: 'GENERAL ENG STARTER ACTIVE:#index#', type: SimVarValueType.Bool, indexed: true }], + ['throttle_lower_limit', { name: 'THROTTLE LOWER LIMIT', type: SimVarValueType.Number }], ]; const engineIndexedSimVars: [keyof EngineIndexedTopics, SimVarPublisherEntry][] = [ @@ -183,6 +197,11 @@ export class EISPublisher extends SimVarPublisher { ['eng_fuel_pump_switch_state', { name: 'GENERAL ENG FUEL PUMP SWITCH EX1', type: SimVarValueType.Number }], ['eng_vibration', { name: 'ENG VIBRATION', type: SimVarValueType.Number }], ['fuel_flow_pph', { name: 'ENG FUEL FLOW PPH', type: SimVarValueType.PPH }], + ['torque_moment', { name: 'ENG TORQUE', type: SimVarValueType.FtLb }], + ['eng_manifold_pressure', { name: 'ENG MANIFOLD PRESSURE', type: SimVarValueType.PSI }], + ['reverse_thrust_engaged', { name: 'GENERAL ENG REVERSE THRUST ENGAGED', type: SimVarValueType.Bool }], + ['cylinder_head_temp_avg', { name: 'ENG CYLINDER HEAD TEMPERATURE', type: SimVarValueType.Farenheit }], + ['recip_turbine_inlet_temp_avg', { name: 'RECIP ENG TURBINE INLET TEMPERATURE', type: SimVarValueType.Farenheit }], ]; const simvars = new Map>(nonIndexedSimVars); diff --git a/src/sdk/instruments/GNSS.ts b/src/sdk/instruments/GNSS.ts index 121b5c8c5..29e8ad09c 100644 --- a/src/sdk/instruments/GNSS.ts +++ b/src/sdk/instruments/GNSS.ts @@ -36,6 +36,9 @@ export interface GNSSEvents { */ magvar: number; + /** The plane's height above the ground, in feet. */ + above_ground_height: number; + /** The airplane's inertial speed, in meters per second. */ inertial_speed: number; @@ -67,6 +70,7 @@ export class GNSSPublisher extends BasePublisher { ['zulu_time', { name: 'E:ZULU TIME', type: SimVarValueType.Seconds }], ['time_of_day', { name: 'E:TIME OF DAY', type: SimVarValueType.Number }], ['ground_speed', { name: 'GROUND VELOCITY', type: SimVarValueType.Knots }], + ['above_ground_height', { name: 'PLANE ALT ABOVE GROUND', type: SimVarValueType.Feet }], ['inertial_vertical_speed', { name: 'VELOCITY WORLD Y', type: SimVarValueType.FPM }] ]), this.bus, diff --git a/src/sdk/instruments/GPSSat.ts b/src/sdk/instruments/GPSSat.ts index 0e4e98806..82ff4305b 100644 --- a/src/sdk/instruments/GPSSat.ts +++ b/src/sdk/instruments/GPSSat.ts @@ -1,12 +1,17 @@ import { EventBus, IndexedEventType } from '../data/EventBus'; +import { SimVarValueType } from '../data/SimVars'; +import { LatLonInterface } from '../geo/GeoInterfaces'; import { GeoPoint } from '../geo/GeoPoint'; +import { MathUtils } from '../math/MathUtils'; import { UnitType } from '../math/NumberUnit'; -import { ReadonlyFloat64Array, Vec2Math, Vec3Math } from '../math/VecMath'; +import { ReadonlyFloat64Array, Vec2Math, Vec3Math, VecNMath } from '../math/VecMath'; import { Vec2Subject, Vec3Subject } from '../math/VectorSubject'; import { SetSubject } from '../sub/SetSubject'; import { Subject } from '../sub/Subject'; +import { Subscribable } from '../sub/Subscribable'; import { SubscribableSet } from '../sub/SubscribableSet'; -import { ResourceHeap } from '../utils/resource/ResourceHeap'; +import { SubscribableUtils } from '../sub/SubscribableUtils'; +import { ArrayUtils } from '../utils/datastructures/ArrayUtils'; import { Instrument } from './Backplane'; import { ClockEvents } from './Clock'; import { GNSSEvents } from './GNSS'; @@ -53,6 +58,74 @@ interface SBASGroupDefinition { constellation: SBASSatelliteDefinition[]; } +/** + * Possible state on GPS satellites. + */ +export enum GPSSatelliteState { + /** There is no current valid state. */ + None = 'None', + + /** The satellite is out of view and cannot be reached. */ + Unreachable = 'Unreachable', + + /** The satellite has been found and data is being downloaded. */ + Acquired = 'Acquired', + + /** The satellite is faulty. */ + Faulty = 'Faulty', + + /** The satellite has been found, data is downloaded, but is not presently used in the GPS solution. */ + DataCollected = 'DataCollected', + + /** The satellite is being active used in the GPS solution. */ + InUse = 'InUse', + + /** The satellite is being active used in the GPS solution and SBAS differential corrections are being applied. */ + InUseDiffApplied = 'InUseDiffApplied' +} + +/** + * Possible {@link GPSSatComputer} states. + */ +export enum GPSSystemState { + /** The GPS receiver is searching for any visible satellites to acquire. */ + Searching = 'Searching', + + /** The GPS receiver is in the process of acquiring satellites. */ + Acquiring = 'Acquiring', + + /** A 3D solution has been acquired. */ + SolutionAcquired = 'SolutionAcquired', + + /** A 3D solution using differential computations has been acquired. */ + DiffSolutionAcquired = 'DiffSolutionAcquired' +} + +/** + * Possible SBAS connection states. + */ +export enum GPSSystemSBASState { + /** SBAS is disabled. */ + Disabled = 'Disabled', + + /** SBAS is enabled but not receiving differential corrections. */ + Inactive = 'Inactive', + + /** SBAS is enabled and is receiving differential corrections. */ + Active = 'Active' +} + +/** + * Data used to sync receiver channel state from primary to replica GPS satellite systems. + */ +type GPSChannelStateSyncData = { + /** The index of the channel. */ + index: number; + + /** The PRN of the satellite assigned to the channel, or `null` if no satellite is assigned to the channel. */ + prn: number | null; +} + /** * Data used to sync satellite state from primary to replica GPS satellite systems. */ @@ -64,10 +137,24 @@ type GPSSatStateSyncData = { state: GPSSatelliteState; } +/** + * Data used to sync the entire {@link GPSSatComputer} state from primary to replica GPS satellite systems. + */ +type GPSStateSyncData = { + /** The states of the computer's receiver channels. */ + channels: readonly Readonly[]; + + /** The states of the satellites. */ + satStates: readonly Readonly[]; +}; + /** * Events used to sync state between GPSSatComputer instances. */ interface GPSSatComputerSyncEvents { + /** A primary GPS satellite system has recalculated the positions of its satellites. */ + [gps_system_sync_channel_state_changed: IndexedEventType<'gps_system_sync_channel_state_changed'>]: Readonly; + /** A primary GPS satellite system has recalculated the positions of its satellites. */ [gps_system_sync_sat_calc: IndexedEventType<'gps_system_sync_sat_calc'>]: void; @@ -78,10 +165,10 @@ interface GPSSatComputerSyncEvents { [gps_system_sync_reset: IndexedEventType<'gps_system_sync_reset'>]: void; /** A full satellite state record has been requested from a replica GPS satellite system. */ - [gps_system_sync_sat_state_request: IndexedEventType<'gps_system_sync_sat_state_request'>]: void; + [gps_system_sync_state_request: IndexedEventType<'gps_system_sync_state_request'>]: void; /** A response by a primary GPS satellite system to a full satellite state record request. */ - [gps_system_sync_sat_state_response: IndexedEventType<'gps_system_sync_sat_state_response'>]: readonly Readonly[]; + [gps_system_sync_state_response: IndexedEventType<'gps_system_sync_state_response'>]: Readonly; } /** @@ -119,6 +206,128 @@ export interface GPSSatComputerEvents { [gps_system_vdop: IndexedEventType<'gps_system_vdop'>]: number; } +/** + * Options describing the timings of {@link GPSSatellite} state changes. + */ +export type GPSSatelliteTimingOptions = { + /** + * The amount of elapsed time (bidirectional) required for a downloaded almanac to expire, in milliseconds. Defaults + * to `7776000000` (90 days). + */ + almanacExpireTime?: number; + + /** + * The amount of elapsed time (bidirectional) required for ephemeris data to expire, in milliseconds. Defaults to + * `7200000` (2 hours). + */ + ephemerisExpireTime?: number; + + /** + * The amount of time spent searching for a satellite signal, in milliseconds, before the satellite is declared + * unreachable. Defaults to `60000`. + */ + acquisitionTimeout?: number; + + /** + * The average time required to acquire a satellite signal without valid ephemeris data, in milliseconds. Defaults to + * `30000`. + */ + acquisitionTime?: number; + + /** + * The difference between the maximum and minimum time required to acquire a satellite signal without valid ephemeris + * data, in milliseconds. The range is centered on the average (`acquisitionTime`). Defaults to `15000`. + */ + acquisitionTimeRange?: number; + + /** + * The average time required to acquire a satellite signal with valid ephemeris data, in milliseconds. Defaults to + * `15000`. + */ + acquisitionTimeWithEphemeris?: number; + + /** + * The difference between the maximum and minimum time required to acquire a satellite signal with valid ephemeris + * data, in milliseconds. The range is centered on the average (`acquisitionTimeWithEphemeris`). Defaults to `5000`. + */ + acquisitionTimeRangeWithEphemeris?: number; + + /** + * The amount of elapsed time (bidirectional), in milliseconds, required for a satellite that was previously declared + * unreachable to be considered eligible for tracking again. Defaults to `3600000` (1 hour). + */ + unreachableExpireTime?: number; + + /** The time required to download ephemeris data from a non-SBAS satellite, in milliseconds. Defaults to `30000`. */ + ephemerisDownloadTime?: number; + + /** + * The time required to download a complete almanac from a non-SBAS satellite, in milliseconds. Defaults to `750000` + * (12.5 minutes). + */ + almanacDownloadTime?: number; + + /** + * The average time required to download ephemeris data from an SBAS satellite, in milliseconds. Defaults to + * `60500`. + */ + sbasEphemerisDownloadTime?: number; + + /** + * The difference between the maximum and minimum time required to download ephemeris data from an SBAS satellite, + * in milliseconds. The range is centered on the average (`sbasEphemerisDownloadTime`). Defaults to `59500`. + */ + sbasEphemerisDownloadTimeRange?: number; + + /** + * The average time required to download differential correction data from an SBAS satellite, in milliseconds. + * Defaults to `150500`. + */ + sbasCorrectionDownloadTime?: number; + + /** + * The difference between the maximum and minimum time required to download differential correction data from an SBAS + * satellite, in milliseconds. The range is centered on the average (`sbasCorrectionDownloadTime`). Defaults to + * `149500`. + */ + sbasCorrectionDownloadTimeRange?: number; +}; + +/** + * Options for {@link GPSSatComputer}. + */ +export type GPSSatComputerOptions = { + /** + * The number of receiver channels supported by the computer. The computer can acquire and track one satellite per + * channel. Must be greater than or equal to `4`. Defaults to the total number of satellites. + */ + channelCount?: number; + + /** + * The maximum number of satellites to use for position solution calculations. Must be greater than or equal to `4`. + * Defaults to `Infinity`. + */ + satInUseMaxCount?: number | Subscribable; + + /** + * The maximum PDOP to target when selecting satellites to use for position solution calculations. Additional + * satellites will be selected while PDOP is greater than the target or the number of selected satellites is less + * than the optimum count (`satInUseOptimumCount`). Values less than or equal to zero will cause all possible + * satellites to be selected up to the maximum count (`satInUseMaxCount`). Defaults to `-1`. + */ + satInUsePdopTarget?: number | Subscribable; + + /** + * The optimum number of satellites to use for position solution calculations when targeting a maximum PDOP value. + * Must be greater than or equal to `4`. Additional satellites will be selected while PDOP is greater than the target + * (`satInUsePdopTarget`) or the number of selected satellites is less than the optimum count. Defaults to `4`. + */ + satInUseOptimumCount?: number | Subscribable; + + /** Options with which to configure the timings of satellite state changes. */ + timingOptions?: Readonly; +}; + /** * An instrument that computes GPS satellite information. */ @@ -136,28 +345,34 @@ export class GPSSatComputer implements Instrument { private readonly hdopTopic = `gps_system_hdop_${this.index}` as const; private readonly vdopTopic = `gps_system_vdop_${this.index}` as const; + private readonly channelStateSyncTopic = `gps_system_sync_channel_state_changed_${this.index}` as const; private readonly satCalcSyncTopic = `gps_system_sync_sat_calc_${this.index}` as const; private readonly satStateSyncTopic = `gps_system_sync_sat_state_changed_${this.index}` as const; private readonly resetSyncTopic = `gps_system_sync_reset_${this.index}` as const; - private readonly satStateRequestSyncTopic = `gps_system_sync_sat_state_request_${this.index}` as const; - private readonly satStateResponseSyncTopic = `gps_system_sync_sat_state_response_${this.index}` as const; + private readonly stateRequestSyncTopic = `gps_system_sync_state_request_${this.index}` as const; + private readonly stateResponseSyncTopic = `gps_system_sync_state_response_${this.index}` as const; private ephemerisData: GPSEphemerisRecords = {}; private sbasData: SBASGroupDefinition[] = []; private readonly sbasServiceAreas = new Map(); - private readonly currentSbasGroupsInView = new Set(); + private readonly currentAvailableSbasGroups = new Set(); private readonly satellites: GPSSatellite[] = []; + private readonly publishedSatStates: GPSSatelliteState[] = []; + + private readonly channels: (GPSSatellite | null)[] = []; private readonly ppos = new GeoPoint(0, 0); private readonly pposVec = new Float64Array(2); - private readonly vecHeap = new ResourceHeap(() => Vec3Math.create(), () => { }); + private readonly lastKnownPosition = new GeoPoint(NaN, NaN); + private distanceFromLastKnownPos = 0; private altitude = 0; - private previousSimTime = 0; - private previousUpdate = 0; private simTime = 0; + private previousSimTime = 0; + private lastUpdateTime = 0; + private _state = GPSSystemState.Searching; private _sbasState = GPSSystemSBASState.Disabled; @@ -172,8 +387,28 @@ export class GPSSatComputer implements Instrument { private needAcquireAndUse = false; private needSatCalc = false; + private readonly pendingChannelStateUpdates = new Map>(); private readonly pendingSatStateUpdates = new Map>(); + private almanacProgress = 0; + private lastAlamanacTime: number | undefined = undefined; + private _isAlmanacValid = false; + + private channelCount: number; + private readonly satInUseMaxCount: Subscribable; + private readonly satInUsePdopTarget: Subscribable; + private readonly satInUseOptimumCount: Subscribable; + + private readonly satelliteTimingOptions: Required; + + /** + * Gets the current satellites that are being tracked by this computer. + * @returns The collection of current satellites. + */ + public get sats(): readonly GPSSatellite[] { + return this.satellites; + } + /** * Gets the current GPS system state. * @returns The current GPS system state. @@ -232,6 +467,8 @@ export class GPSSatComputer implements Instrument { * satellite positions are calculated, satellite states change, or the system is reset. A `replica` system will * listen for the aforementioned sync events on the event bus and set its state accordingly. A system with a sync * role of `none` does neither; it maintains its own independent state and does not sync it to other systems. + * Defaults to `none`. + * @param options Options with which to configure the computer. */ constructor( public readonly index: number, @@ -240,10 +477,42 @@ export class GPSSatComputer implements Instrument { private readonly sbasFile: string, private readonly updateInterval: number, enabledSBASGroups: Iterable | SubscribableSet, - public readonly syncRole: 'primary' | 'replica' | 'none' = 'none' + public readonly syncRole: 'primary' | 'replica' | 'none' = 'none', + options?: Readonly ) { + this.channelCount = Math.max(options?.channelCount ?? Infinity, 4); + + this.satInUseMaxCount = SubscribableUtils.toSubscribable(options?.satInUseMaxCount ?? Infinity, true); + this.satInUsePdopTarget = SubscribableUtils.toSubscribable(options?.satInUsePdopTarget ?? -1, true); + this.satInUseOptimumCount = SubscribableUtils.toSubscribable(options?.satInUseOptimumCount ?? 4, true); + + this.satelliteTimingOptions = { ...options?.timingOptions } as Required; + this.satelliteTimingOptions.almanacExpireTime ??= 7776000000; + this.satelliteTimingOptions.ephemerisExpireTime ??= 7200000; + this.satelliteTimingOptions.acquisitionTimeout ??= 30000; + this.satelliteTimingOptions.acquisitionTime ??= 30000; + this.satelliteTimingOptions.acquisitionTimeRange ??= 15000; + this.satelliteTimingOptions.acquisitionTimeWithEphemeris ??= 15000; + this.satelliteTimingOptions.acquisitionTimeRangeWithEphemeris ??= 5000; + this.satelliteTimingOptions.unreachableExpireTime ??= 3600000; + this.satelliteTimingOptions.ephemerisDownloadTime ??= 30000; + this.satelliteTimingOptions.almanacDownloadTime ??= 750000; + this.satelliteTimingOptions.sbasEphemerisDownloadTime ??= 60500; + this.satelliteTimingOptions.sbasEphemerisDownloadTimeRange ??= 59500; + this.satelliteTimingOptions.sbasCorrectionDownloadTime ??= 150500; + this.satelliteTimingOptions.sbasCorrectionDownloadTimeRange ??= 149500; + this.enabledSBASGroups = 'isSubscribableSet' in enabledSBASGroups ? enabledSBASGroups : SetSubject.create(enabledSBASGroups); + // Initialize these properties directly from SimVars in case the computer is created before values are published + // to the bus. + this.ppos.set( + SimVar.GetSimVarValue('PLANE LATITUDE', SimVarValueType.Degree), + SimVar.GetSimVarValue('PLANE LONGITUDE', SimVarValueType.Degree) + ); + this.altitude = SimVar.GetSimVarValue('PLANE ALTITUDE', SimVarValueType.Meters); + this.simTime = (SimVar.GetSimVarValue('E:ABSOLUTE TIME', SimVarValueType.Seconds) - 62135596800) * 1000; + this.bus.getSubscriber().on('gps-position').handle(pos => { this.ppos.set(pos.lat, pos.long); Vec2Math.set(pos.lat, pos.long, this.pposVec); @@ -267,7 +536,7 @@ export class GPSSatComputer implements Instrument { this.sbasServiceAreas.set(sbasDef.group, sbasDef.coverage); for (const satDef of sbasDef.constellation) { - const sat = new GPSSatellite(satDef.prn, sbasDef.group); + const sat = new GPSSatellite(satDef.prn, sbasDef.group, undefined, this.satelliteTimingOptions); tempGeoPoint.set(0, satDef.lon); const positionCartesian = Vec3Math.multScalar(tempGeoPoint.toCartesian(tempVec), orbitHeight, tempVec); @@ -288,27 +557,43 @@ export class GPSSatComputer implements Instrument { this.publisher.pub(this.vdopTopic, this._vdop, false, true); this.loadEphemerisData().then(() => this.loadSbasData()).then(() => { + this.publishedSatStates.length = this.satellites.length; + this.publishedSatStates.fill(GPSSatelliteState.None); + + this.channelCount = Math.min(this.channelCount, this.satellites.length); + this.channels.length = this.channelCount; + this.channels.fill(null); + this.isInit = true; // Setup sync logic. if (this.syncRole === 'replica') { const sub = this.bus.getSubscriber(); + sub.on(this.channelStateSyncTopic).handle(data => { this.pendingChannelStateUpdates.set(data.index, data); }); sub.on(this.satCalcSyncTopic).handle(() => { this.needSatCalc = true; }); sub.on(this.satStateSyncTopic).handle(data => { this.pendingSatStateUpdates.set(data.prn, data); }); sub.on(this.resetSyncTopic).handle(() => { this.reset(); }); - sub.on(this.satStateResponseSyncTopic).handle(response => { + sub.on(this.stateResponseSyncTopic).handle(response => { this.needSatCalc = true; - response.forEach(data => { this.pendingSatStateUpdates.set(data.prn, data); }); + for (const channelState of response.channels) { + this.pendingChannelStateUpdates.set(channelState.index, channelState); + } + for (const satState of response.satStates) { + this.pendingSatStateUpdates.set(satState.prn, satState); + } }); // Request initial state. - this.syncPublisher.pub(this.satStateRequestSyncTopic, undefined, true, false); + this.syncPublisher.pub(this.stateRequestSyncTopic, undefined, true, false); } else if (this.syncRole === 'primary') { const sub = this.bus.getSubscriber(); - sub.on(this.satStateRequestSyncTopic).handle(() => { - this.syncPublisher.pub(this.satStateResponseSyncTopic, this.satellites.map(sat => { return { prn: sat.prn, state: sat.state.get() }; }), true, false); + sub.on(this.stateRequestSyncTopic).handle(() => { + this.syncPublisher.pub(this.stateResponseSyncTopic, { + channels: this.channels.map((sat, index) => { return { index, prn: sat === null ? null : sat.prn }; }), + satStates: this.satellites.map(sat => { return { prn: sat.prn, state: sat.state.get() }; }) + }, true, false); }); } @@ -332,7 +617,7 @@ export class GPSSatComputer implements Instrument { if (request.status === 200) { this.ephemerisData = JSON.parse(request.responseText); for (const prn in this.ephemerisData) { - this.satellites.push(new GPSSatellite(parseInt(prn), undefined, this.ephemerisData[prn])); + this.satellites.push(new GPSSatellite(parseInt(prn), undefined, this.ephemerisData[prn], this.satelliteTimingOptions)); } resolve(); @@ -372,13 +657,87 @@ export class GPSSatComputer implements Instrument { } /** - * Instantly acquires and starts using all satellites with sufficient signal strength. If signal strength allows, - * SBAS satellites are instantly promoted to the {@link GPSSatelliteState.Acquired} state, and GPS satellites are - * instantly promoted to the {@link GPSSatelliteState.InUse}/{@link GPSSatelliteState.InUseDiffApplied} state. - * - * If this system is not initialized, the operation will be delayed until just after initialization, unless `reset()` - * is called between now and then. - * + * Gets the index of a satellite with a given PRN identifier. + * @param prn The PRN identifier for which to get the satellite index. + * @returns The index of the satellite with the specified PRN identifier, or `-1` if the PRN does not belong to any + * satellite. + */ + private getSatelliteIndexFromPrn(prn: number): number { + for (let i = 0; i < this.satellites.length; i++) { + if (this.satellites[i].prn === prn) { + return i; + } + } + + return -1; + } + + /** + * Calculates the horizon zenith angle. + * @returns The calculated horizon zenith angle based on the current altitude. + */ + public calcHorizonAngle(): number { + return Math.acos(6378100 / (6378100 + this.altitude)); + } + + /** + * Syncs this computer's last known position with a given value. + * @param pos The position with which to sync the last known position. Defaults to the airplane's current position. + */ + public syncLastKnownPosition(pos: LatLonInterface = this.ppos): void { + this.lastKnownPosition.set(pos); + } + + /** + * Erases this computer's last known position. + */ + public eraseLastKnownPosition(): void { + this.lastKnownPosition.set(NaN, NaN); + } + + /** + * Checks whether this computer's downloaded almanac data is valid at a given simulation time. + * @param simTime The simulation time at which to check for almanac validity, as a Javascript timestamp. Defaults to + * the current simulation time. + * @returns Whether this computer's downloaded almanac data is valid at the specified simulation time. + */ + public isAlmanacValid(simTime = this.simTime): boolean { + return this.lastAlamanacTime !== undefined && Math.abs(simTime - this.lastAlamanacTime) < this.satelliteTimingOptions.almanacExpireTime; + } + + /** + * Forces this computer to immediately download a complete alamanac. + * @param simTime The simulation time at which the almanac is considered to have been downloaded, as a Javascript + * timestamp. Defaults to the current simulation time. + */ + public downloadAlamanac(simTime = this.simTime): void { + this.almanacProgress = 0; + this.lastAlamanacTime = simTime; + } + + /** + * Erases this computer's downloaded almanac and any partial download progress. + */ + public eraseAlamanac(): void { + this.almanacProgress = 0; + this.lastAlamanacTime = undefined; + } + + /** + * Erases this computer's cached ephemeris data for all satellites. + */ + public eraseCachedEphemeris(): void { + for (let i = 0; i < this.satellites.length; i++) { + this.satellites[i].eraseCachedEphemeris(); + } + } + + /** + * Instantly chooses the optimal satellites to track for all receiver channels, then acquires and downloads all data + * (ephemeris, almanac, and differential corrections) from tracked satellites with sufficient signal strength. If + * this system is not initialized, the operation will be delayed until just after initialization, unless `reset()` is + * called in the interim. + * * Has no effect if this system is a replica. */ public acquireAndUseSatellites(): void { @@ -387,16 +746,16 @@ export class GPSSatComputer implements Instrument { } if (this.isInit) { - this.updateSatellites(0, true, true); + this.updateSatellites(this.simTime, 0, true, true); } else { this.needAcquireAndUse = true; } } /** - * Resets the GPSSatComputer system. This will set the of the system to {@link GPSSystemState.Searching} and the - * state of every satellite to {@link GPSSatelliteState.None}. - * + * Resets the GPSSatComputer system. This will set the state of the system to {@link GPSSystemState.Searching}, + * unassign all receiver channels, and set the state of every satellite to {@link GPSSatelliteState.None}. + * * If this system is not initialized, this method has no effect other than to cancel any pending operations triggered * by previous calls to `acquireAndUseSatellites()`. */ @@ -407,14 +766,18 @@ export class GPSSatComputer implements Instrument { return; } - this.satellites.forEach(sat => { + for (let i = 0; i < this.channels.length; i++) { + this.channels[i] = null; + } + + for (const sat of this.satellites) { const currentState = sat.state.get(); sat.state.set(GPSSatelliteState.None); if (currentState !== GPSSatelliteState.None) { this.publisher.pub(this.satStateChangedTopic, sat, false, false); } - }); + } const currentState = this._state; this._state = GPSSystemState.Searching; @@ -441,7 +804,7 @@ export class GPSSatComputer implements Instrument { if (this.syncRole !== 'replica') { if (deltaTime < 0 || deltaTime > (this.updateInterval * 2)) { this.previousSimTime = this.simTime; - this.previousUpdate = this.simTime; + this.lastUpdateTime = this.simTime; return; } @@ -449,24 +812,25 @@ export class GPSSatComputer implements Instrument { const shouldUpdatePositions = this.syncRole === 'replica' ? this.needSatCalc - : this.simTime >= this.previousUpdate + this.updateInterval; + : this.simTime >= this.lastUpdateTime + this.updateInterval; this.needSatCalc = false; - this.updateSatellites(deltaTime, shouldUpdatePositions, false); + this.updateSatellites(this.simTime, deltaTime, shouldUpdatePositions, false); } /** * Updates the states and optionally the orbital positions of all satellites. + * @param simTime The current simulation time, as a Javascript timestamp. * @param deltaTime The time elapsed, in milliseconds, since the last satellite update. * @param shouldUpdatePositions Whether to update the orbital positions of the satellites. - * @param forceAcquireAndUse Whether to immediately force satellites to the highest possible use state - * ({@link GPSSatelliteState.Acquired} for SBAS satellites and {@link GPSSatelliteState.InUse}/ - * {@link GPSSatelliteState.InUseDiffApplied} for GPS satellites) if signal strength is sufficient. + * @param forceAcquireAndUse Whether to immediately choose the optimal satellites to track for all receiver channels, + * then acquire and download all data (ephemeris, almanac, and differential corrections) from tracked satellites with + * sufficient signal strength. */ - private updateSatellites(deltaTime: number, shouldUpdatePositions: boolean, forceAcquireAndUse: boolean): void { + private updateSatellites(simTime: number, deltaTime: number, shouldUpdatePositions: boolean, forceAcquireAndUse: boolean): void { let numAcquiring = 0; - let numActiveSbas = 0; + let canApplyDiffCorrections = false; let shouldUpdateDop = shouldUpdatePositions; @@ -474,7 +838,18 @@ export class GPSSatComputer implements Instrument { this.syncPublisher?.pub(this.satCalcSyncTopic, undefined, true, false); } - this.currentSbasGroupsInView.clear(); + if (forceAcquireAndUse) { + this.lastKnownPosition.set(this.ppos); + } + + this.distanceFromLastKnownPos = isNaN(this.lastKnownPosition.lat) || isNaN(this.lastKnownPosition.lon) + ? Infinity + : this.ppos.distance(this.lastKnownPosition); + + this._isAlmanacValid = this.isAlmanacValid(); + + this.updateAvailableSbasGroups(); + const enabledSBASGroups = this.enabledSBASGroups.get(); for (let i = 0; i < this.satellites.length; i++) { @@ -486,148 +861,698 @@ export class GPSSatComputer implements Instrument { } sat.calculateSignalStrength(this.altitude); + } + + if (this.syncRole === 'replica') { + for (const update of this.pendingChannelStateUpdates.values()) { + const sat = update.prn === null ? null : (this.satellites[this.getSatelliteIndexFromPrn(update.prn)] ?? null); + this.assignSatelliteToChannel(update.index, sat); + } + } else if (shouldUpdatePositions) { + this.updateChannelAssignments(forceAcquireAndUse); + } + + this.pendingChannelStateUpdates.clear(); + + for (let i = 0; i < this.satellites.length; i++) { + const sat = this.satellites[i]; const updatedState = this.syncRole === 'replica' - ? sat.forceUpdateState(this.pendingSatStateUpdates.get(sat.prn)?.state ?? sat.state.get()) - : sat.updateState(deltaTime, this._state === GPSSystemState.DiffSolutionAcquired, forceAcquireAndUse); + ? sat.forceUpdateState(simTime, this.pendingSatStateUpdates.get(sat.prn)?.state ?? sat.state.get()) + : sat.updateState(simTime, deltaTime, this.distanceFromLastKnownPos, forceAcquireAndUse); if (updatedState) { - this.publisher.pub(this.satStateChangedTopic, sat, false, false); - if (this.syncRole === 'primary') { - this.syncPublisher.pub(this.satStateSyncTopic, { prn: sat.prn, state: sat.state.get() }, true, false); - } shouldUpdateDop = true; } const satState = sat.state.get(); - if (satState === GPSSatelliteState.Acquired || satState === GPSSatelliteState.DataCollected) { + if ( + satState === GPSSatelliteState.DataCollected + || satState === GPSSatelliteState.InUse + || satState === GPSSatelliteState.InUseDiffApplied + ) { numAcquiring++; - if (sat.sbasGroup !== undefined && enabledSBASGroups.has(sat.sbasGroup)) { - numActiveSbas++; - this.currentSbasGroupsInView.add(sat.sbasGroup); + if (sat.areDiffCorrectionsDownloaded && this.currentAvailableSbasGroups.has(sat.sbasGroup as string)) { + canApplyDiffCorrections = true; } + } else if (satState === GPSSatelliteState.Acquired) { + numAcquiring++; } } this.pendingSatStateUpdates.clear(); - let withinSbasArea = false; - for (const group of this.currentSbasGroupsInView) { - const coverage = this.sbasServiceAreas.get(group); - if (coverage !== undefined) { - withinSbasArea = Vec2Math.pointWithinPolygon(coverage, this.pposVec) ?? false; - } + const newSBASState = canApplyDiffCorrections + ? GPSSystemSBASState.Active + : enabledSBASGroups.size === 0 ? GPSSystemSBASState.Disabled : GPSSystemSBASState.Inactive; - if (withinSbasArea) { - break; + let pdop = this._pdop, hdop = this._hdop, vdop = this._vdop; + + if (shouldUpdateDop) { + if (this.syncRole !== 'replica') { + [pdop, hdop, vdop] = this.selectSatellites(this.dops); + } else if (shouldUpdateDop) { + [pdop, hdop, vdop] = this.calculateDop(this.dops); } } - const newSBASState = withinSbasArea - ? GPSSystemSBASState.Active - : enabledSBASGroups.size === 0 ? GPSSystemSBASState.Disabled : GPSSystemSBASState.Inactive; - let newSystemState = GPSSystemState.Searching; - if (numAcquiring > 0) { + if (pdop >= 0) { + newSystemState = canApplyDiffCorrections ? GPSSystemState.DiffSolutionAcquired : GPSSystemState.SolutionAcquired; + this.lastKnownPosition.set(this.ppos); + } else if (numAcquiring > 0) { newSystemState = GPSSystemState.Acquiring; + } else if (this.distanceFromLastKnownPos < 0.0290367 /* 100 nautical miles */) { + // Set system state to 'Acquiring' if we are attempting to acquire at least one satellite for which we have + // predicted geometry data (either from the almanac or cached ephemeris data). + for (let i = 0; i < this.channels.length; i++) { + const sat = this.channels[i]; + if (sat && sat.state.get() === GPSSatelliteState.None && (this._isAlmanacValid || sat.isCachedEphemerisValid(this.simTime))) { + newSystemState = GPSSystemState.Acquiring; + break; + } + } } - let pdop = this._pdop, hdop = this._hdop, vdop = this._vdop; + if (this.syncRole !== 'replica') { + for (let i = 0; i < this.channels.length; i++) { + const sat = this.channels[i]; + if (sat) { + sat.updateDiffCorrectionsApplied(canApplyDiffCorrections); + } + } - if (shouldUpdateDop) { - [pdop, hdop, vdop] = this.calculateDop(this.dops); + this.updateAlmanacState(simTime, deltaTime, forceAcquireAndUse); } - const is3dSolutionPossible = pdop >= 0; - - if (is3dSolutionPossible) { - newSystemState = numActiveSbas > 0 && withinSbasArea ? GPSSystemState.DiffSolutionAcquired : GPSSystemState.SolutionAcquired; - } + this.diffAndPublishSatelliteStates(); if (this._state !== newSystemState) { this._state = newSystemState; this.publisher.pub(this.stateChangedTopic, newSystemState, false, true); } - if (this._sbasState !== newSBASState) { - this._sbasState = newSBASState; - this.publisher.pub(this.sbasStateChangedTopic, newSBASState, false, true); + if (this._sbasState !== newSBASState) { + this._sbasState = newSBASState; + this.publisher.pub(this.sbasStateChangedTopic, newSBASState, false, true); + } + + if (shouldUpdatePositions) { + this.lastUpdateTime = this.simTime; + this.publisher.pub(this.satPosCalcTopic, undefined, false, false); + } + + this.setDop(pdop, hdop, vdop); + + this.previousSimTime = this.simTime; + } + + /** + * Updates which SBAS groups are enabled and whose coverage area contain the airplane's current position. + */ + private updateAvailableSbasGroups(): void { + const enabledSBASGroups = this.enabledSBASGroups.get(); + + for (let i = 0; i < this.sbasData.length; i++) { + const sbasData = this.sbasData[i]; + if (enabledSBASGroups.has(sbasData.group) && Vec2Math.pointWithinPolygon(sbasData.coverage, this.pposVec)) { + this.currentAvailableSbasGroups.add(sbasData.group); + } else { + this.currentAvailableSbasGroups.delete(sbasData.group); + } + } + } + + private readonly covarMatrix = [ + new Float64Array(4), + new Float64Array(4), + new Float64Array(4), + new Float64Array(4), + ]; + + private static readonly EPHEMERIS_COLLECTED_SATELLITE_STATES = new Set([GPSSatelliteState.DataCollected, GPSSatelliteState.InUse, GPSSatelliteState.InUseDiffApplied]); + + private readonly ephemerisCollectedSatelliteFilter = (sat: GPSSatellite): boolean => { + return GPSSatComputer.EPHEMERIS_COLLECTED_SATELLITE_STATES.has(sat.state.get()); + }; + + private readonly losSatelliteFilter = (sat: GPSSatellite): boolean => { + return sat.signalStrength.get() > 0.05 + && ( + ( + this.distanceFromLastKnownPos < 0.0290367 // 100 nautical miles + && (this._isAlmanacValid || sat.isCachedEphemerisValid(this.simTime)) + ) + || GPSSatComputer.EPHEMERIS_COLLECTED_SATELLITE_STATES.has(sat.state.get()) + ); + }; + + private readonly losSatelliteFilterOmniscient = (sat: GPSSatellite): boolean => { + return sat.signalStrength.get() > 0.05; + }; + + private readonly untrackedSatelliteFilter = (sat: GPSSatellite): boolean => { + return !this.channels.includes(sat) && sat.state.get() !== GPSSatelliteState.Unreachable; + }; + + /** + * Updates the satellites assigned to be tracked by this computer's receiver channels. + * @param forceAcquireAndUse Whether to immediately choose the optimal satellites to track and acquire all data from + * tracked satellites if signal strength is sufficient. + */ + private updateChannelAssignments(forceAcquireAndUse: boolean): void { + // If we have at least one channel for every satellite, then we will simply assign each satellite to its own + // channel. + if (this.channelCount >= this.satellites.length) { + const end = Math.min(this.channelCount, this.satellites.length); + for (let i = 0; i < end; i++) { + if (this.channels[i] === null) { + this.assignSatelliteToChannel(i, this.satellites[i]); + } + } + return; + } + + const losSatellites = this.satellites.filter(forceAcquireAndUse ? this.losSatelliteFilterOmniscient : this.losSatelliteFilter); + + let losSatellitesNotTrackedIndexes: number[]; + let openChannelIndexes: number[]; + + let isTrackingSbasSatelliteInLos = false; + + if (forceAcquireAndUse) { + losSatellitesNotTrackedIndexes = ArrayUtils.range(losSatellites.length); + openChannelIndexes = ArrayUtils.range(this.channelCount, this.channelCount - 1, -1); + } else { + losSatellitesNotTrackedIndexes = []; + + for (let i = 0; i < losSatellites.length; i++) { + const sat = losSatellites[i]; + if (this.channels.includes(sat)) { + if (sat.sbasGroup !== undefined && this.currentAvailableSbasGroups.has(sat.sbasGroup)) { + isTrackingSbasSatelliteInLos = true; + } + } else { + losSatellitesNotTrackedIndexes.push(i); + } + } + + openChannelIndexes = []; + + for (let i = this.channels.length - 1; i >= 0; i--) { + const sat = this.channels[i]; + + if (!sat || sat.state.get() === GPSSatelliteState.Unreachable) { + openChannelIndexes.push(i); + } + } + } + + if (openChannelIndexes.length === 0 && (this.channels as GPSSatellite[]).every(this.ephemerisCollectedSatelliteFilter)) { + // There are no open channels and we have collected ephemeris data from every tracked satellite. + + const trackedLosMatrix = GPSSatComputer.getLosMatrix(this.channels as GPSSatellite[]); + const trackedCovarMatrix = GPSSatComputer.calculateCovarMatrix(trackedLosMatrix, this.covarMatrix); + + if (!isFinite(trackedCovarMatrix[0][0]) || !isFinite(trackedCovarMatrix[1][1]) || !isFinite(trackedCovarMatrix[2][2])) { + // The currently tracked satellites are not sufficient to produce a 3D position solution. In this case we + // will replace a random tracked satellite with an untracked. + + openChannelIndexes.push(Math.trunc(Math.random() * this.channelCount)); + } else { + // The currently tracked satellites are sufficient to produce a 3D position solution. In this case we will + // only try to replace a tracked satellite if we are tracking at least one redundant satellite, we are not + // tracking an SBAS satellite within LOS, and there is a SBAS satellite within LOS available for us to track. + // If the above is true, then we will replace the tracked satellite with the smallest contribution to reducing + // PDOP with the SBAS satellite with highest signal strength. + + if (this.channelCount > 4 && !isTrackingSbasSatelliteInLos) { + let highestSbasSignal = 0; + let highestSbasSignalIndex = -1; + + for (let i = 0; i < losSatellitesNotTrackedIndexes.length; i++) { + const index = losSatellitesNotTrackedIndexes[i]; + const sat = losSatellites[index]; + const signalStrength = sat.signalStrength.get(); + if (sat.sbasGroup !== undefined && this.currentAvailableSbasGroups.has(sat.sbasGroup) && signalStrength > highestSbasSignal) { + highestSbasSignal = signalStrength; + highestSbasSignalIndex = index; + } + } + + if (highestSbasSignalIndex >= 0) { + const sTranspose = this.channels.map(GPSSatComputer.createVec4); + GPSSatComputer.calculateDowndateSTranspose(trackedLosMatrix, trackedCovarMatrix, sTranspose); + const pDiag = GPSSatComputer.calculateDowndatePDiag(trackedLosMatrix, sTranspose, new Float64Array(trackedLosMatrix.length)); + GPSSatComputer.calculateSatelliteCosts(sTranspose, pDiag, this.satelliteCosts); + + let satToReplaceCost = Infinity; + let satToReplaceChannelIndex = -1; + + for (let i = 0; i < this.channels.length; i++) { + const cost = this.satelliteCosts[i]; + if (cost < satToReplaceCost) { + satToReplaceCost = cost; + satToReplaceChannelIndex = i; + } + } + + if (satToReplaceChannelIndex >= 0) { + this.assignSatelliteToChannel(satToReplaceChannelIndex, losSatellites[highestSbasSignalIndex]); + } + } + } + + return; + } + } + + if (openChannelIndexes.length > 0) { + if (openChannelIndexes.length < losSatellitesNotTrackedIndexes.length) { + // We don't have enough open channels to begin tracking all satellites currently within line-of-sight. + // Therefore, we will choose those with the largest contribution to reducing PDOP. + + const losMatrix = GPSSatComputer.getLosMatrix(losSatellites); + const covarMatrix = GPSSatComputer.calculateCovarMatrix(losMatrix, this.covarMatrix); + const sTranspose = losSatellites.map(GPSSatComputer.createVec4); + GPSSatComputer.calculateDowndateSTranspose(losMatrix, covarMatrix, sTranspose); + const pDiag = GPSSatComputer.calculateDowndatePDiag(losMatrix, sTranspose, new Float64Array(losMatrix.length)); + GPSSatComputer.calculateSatelliteCosts(sTranspose, pDiag, this.satelliteCosts); + + // If we are not already tracking an SBAS satellite within LOS, we will prioritize adding the SBAS satellite + // with the highest cost over non-SBAS satellites. + if (!isTrackingSbasSatelliteInLos) { + let highestSbasCost = -Infinity; + let highestSbasCostIndex = -1; + + for (let i = 0; i < this.satelliteCosts.length; i++) { + const sbasGroup = losSatellites[i].sbasGroup; + if (sbasGroup !== undefined && this.currentAvailableSbasGroups.has(sbasGroup)) { + const cost = this.satelliteCosts[i]; + if (cost > highestSbasCost) { + highestSbasCost = cost; + highestSbasCostIndex = i; + } + } + } + + if (highestSbasCostIndex >= 0) { + this.satelliteCosts[highestSbasCostIndex] = Infinity; + } + } + + const satelliteIndexes = ArrayUtils.range(losSatellites.length); + satelliteIndexes.sort(this.satelliteCostCompare); + + for (let i = satelliteIndexes.length - 1; i >= 0; i--) { + if (losSatellitesNotTrackedIndexes.includes(i)) { + const sat = losSatellites[i]; + const channelIndex = openChannelIndexes.pop() as number; + this.assignSatelliteToChannel(channelIndex, sat); + + if (openChannelIndexes.length === 0) { + break; + } + } + } + } else { + // We have enough open channels to begin tracking all satellites currently within LOS. + for (let i = 0; i < losSatellitesNotTrackedIndexes.length; i++) { + const channelIndex = openChannelIndexes.pop() as number; + this.assignSatelliteToChannel(channelIndex, losSatellites[i]); + } + } + + // If we still have open channels available, fill them with random satellites that have not been marked as + // unreachable. + if (openChannelIndexes.length > 0) { + const untrackedSatellites = this.satellites.filter(this.untrackedSatelliteFilter); + + let untrackedIndex = 0; + while (openChannelIndexes.length > 0 && untrackedIndex < untrackedSatellites.length) { + const channelIndex = openChannelIndexes.pop() as number; + this.assignSatelliteToChannel(channelIndex, untrackedSatellites[untrackedIndex++]); + } + } + } + } + + /** + * Assigns a satellite to a receiver channel. + * @param channelIndex The index of the receiver channel. + * @param sat The satellite to assign, or `null` if the channel is to be assigned no satellite. + */ + private assignSatelliteToChannel(channelIndex: number, sat: GPSSatellite | null): void { + const oldSat = this.channels[channelIndex]; + + if (oldSat === sat) { + return; + } + + if (oldSat && oldSat.state.get() !== GPSSatelliteState.Unreachable) { + oldSat.setTracked(false); + } + + this.channels[channelIndex] = sat; + + if (sat !== null) { + sat.setTracked(true); + } + + if (this.syncRole === 'primary') { + this.syncPublisher.pub(this.channelStateSyncTopic, { index: channelIndex, prn: sat === null ? null : sat.prn }, true, false); + } + } + + private static readonly inUseSatelliteFilter = (sat: GPSSatellite): boolean => { + const state = sat.state.get(); + return state === GPSSatelliteState.InUse || state === GPSSatelliteState.InUseDiffApplied; + }; + + /** + * Calculates dilution of precision values (PDOP, HDOP, VDOP) for the satellite constellation consisting of all + * satellites that are currently in-use. + * @param out The vector to which to write the results. + * @returns Dilution of precision values for the current in-use satellite constellation, as `[PDOP, HDOP, VDOP]`. If + * the constellation is insufficient to provide a 3D position solution, then `[-1, -1, -1]` will be returned. + */ + private calculateDop(out: Float64Array): Float64Array { + Vec3Math.set(-1, -1, -1, out); + + const satsInUse = this.satellites.filter(GPSSatComputer.inUseSatelliteFilter); + + if (satsInUse.length < 4) { + return out; + } + + const losMatrix = GPSSatComputer.getLosMatrix(satsInUse); + const covarMatrix = GPSSatComputer.calculateCovarMatrix(losMatrix, this.covarMatrix); + + // Grab the variance terms var(x), var(y), var(z) along the diagonal of the covariance matrix + const varX = covarMatrix[0][0]; + const varY = covarMatrix[1][1]; + const varZ = covarMatrix[2][2]; + + if (!isFinite(varX) || !isFinite(varY) || !isFinite(varZ)) { + return out; + } + + const horizSumVar = varX + varY; + + const pdop = Math.sqrt(horizSumVar + varZ); + const hdop = Math.sqrt(horizSumVar); + const vdop = Math.sqrt(varZ); + + return Vec3Math.set(pdop, hdop, vdop, out); + } + + private static readonly readySatelliteFilter = (sat: GPSSatellite): boolean => { + const state = sat.state.get(); + return state === GPSSatelliteState.DataCollected || state === GPSSatelliteState.InUse || state === GPSSatelliteState.InUseDiffApplied; + }; + + private static readonly createVec4 = (): Float64Array => new Float64Array(4); + + private readonly satelliteCosts: number[] = []; + private readonly satelliteCostCompare = (indexA: number, indexB: number): number => { + return this.satelliteCosts[indexA] - this.satelliteCosts[indexB]; + }; + + /** + * Selects satellites to use for calculating position solutions and returns the dilution of precision values for + * the selected constellation. + * @param out The vector to which to write the dilution of precision values. + * @returns Dilution of precision values for the selected satellite constellation, as `[PDOP, HDOP, VDOP]`. If the + * constellation is insufficient to provide a 3D position solution, then `[-1, -1, -1]` will be returned. + */ + private selectSatellites(out: Float64Array): Float64Array { + Vec3Math.set(-1, -1, -1, out); + + const satellitesToUse = this.satellites.filter(GPSSatComputer.readySatelliteFilter); + + if (satellitesToUse.length < 4) { + this.updateSatelliteInUseStates(satellitesToUse, []); + return out; + } + + const losMatrix = GPSSatComputer.getLosMatrix(satellitesToUse); + const covarMatrix = GPSSatComputer.calculateCovarMatrix(losMatrix, this.covarMatrix); + + const maxCount = MathUtils.clamp(this.satInUseMaxCount.get(), 4, this.channelCount); + + if ( + !VecNMath.isFinite(covarMatrix[0]) + || !VecNMath.isFinite(covarMatrix[1]) + || !VecNMath.isFinite(covarMatrix[2]) + || !VecNMath.isFinite(covarMatrix[3]) + ) { + const satellitesToDiscard = satellitesToUse.splice(maxCount); + this.updateSatelliteInUseStates(satellitesToUse, satellitesToDiscard); + return out; + } + + const satellitesToDiscard: GPSSatellite[] = []; + + const pdopTarget = this.satInUsePdopTarget.get(); + const optimumCount = Math.max(this.satInUseOptimumCount.get(), 4); + const pdopTargetSq = pdopTarget < 0 ? -1 : pdopTarget * pdopTarget; + let pdopSq = covarMatrix[0][0] + covarMatrix[1][1] + covarMatrix[2][2]; + + if (satellitesToUse.length > maxCount || (satellitesToUse.length > optimumCount && pdopSq < pdopTargetSq)) { + // There are more in-sight satellites than we can select. Therefore we will attempt to discard excess satellites + // in manner that minimizes the increase to PDOP relative to selecting all in-sight satellites. + + // We will use the "downdate" selection algorithm presented in Walter, T, Blanch, J and Kropp, V, 2016. + // Define Sᵀ = LC and P = I - LCLᵀ, where L is the line-of-sight matrix and C is the covariance matrix. + // Then Ci = C + (Si)(Si)ᵀ / P(i, i), where Ci is the covariance matrix after removing the ith satellite and + // Si is the ith column of S. + + // If PDOP = sqrt(C(1, 1) + C(2, 2) + C(3, 3)), then from the above it can be seen that removing the ith + // satellite increases PDOP² by (S(1, i)² + S(2, i)² + S(3, i)²) / P(i, i). Defining this to be the cost of + // removing satellite i, we are then guaranteed that removing the satellite with the lowest cost will result + // in the smallest increase to PDOP. + + const sTranspose = satellitesToUse.map(GPSSatComputer.createVec4); + GPSSatComputer.calculateDowndateSTranspose(losMatrix, covarMatrix, sTranspose); + const pDiag = GPSSatComputer.calculateDowndatePDiag(losMatrix, sTranspose, new Float64Array(losMatrix.length)); + GPSSatComputer.calculateSatelliteCosts(sTranspose, pDiag, this.satelliteCosts); + + const satelliteIndexes = ArrayUtils.range(satellitesToUse.length); + satelliteIndexes.sort(this.satelliteCostCompare); + + pdopSq = covarMatrix[0][0] + covarMatrix[1][1] + covarMatrix[2][2]; + let indexToRemove = satelliteIndexes[0]; + + while ( + satellitesToUse.length > maxCount + || ( + satellitesToUse.length > optimumCount + && pdopSq + this.satelliteCosts[indexToRemove] <= pdopTargetSq + ) + ) { + + satellitesToDiscard.push(satellitesToUse[indexToRemove]); + satellitesToUse.splice(indexToRemove, 1); + losMatrix.splice(indexToRemove, 1); + + // Reset satellite index array. + satelliteIndexes.length--; + for (let i = 0; i < satelliteIndexes.length; i++) { + satelliteIndexes[i] = i; + } + + // Update covariance matrix after removing a satellite. + for (let i = 0; i < 4; i++) { + for (let j = 0; j < 4; j++) { + covarMatrix[i][j] += sTranspose[indexToRemove][i] * sTranspose[indexToRemove][j] / pDiag[indexToRemove]; + } + } + + // Recompute satellite costs. + sTranspose.length--; + GPSSatComputer.calculateDowndateSTranspose(losMatrix, covarMatrix, sTranspose); + GPSSatComputer.calculateDowndatePDiag(losMatrix, sTranspose, pDiag); + GPSSatComputer.calculateSatelliteCosts(sTranspose, pDiag, this.satelliteCosts); + satelliteIndexes.sort(this.satelliteCostCompare); + + pdopSq = covarMatrix[0][0] + covarMatrix[1][1] + covarMatrix[2][2]; + indexToRemove = satelliteIndexes[0]; + } + } + + this.updateSatelliteInUseStates(satellitesToUse, satellitesToDiscard); + + // Grab the variance terms var(x), var(y), var(z) along the diagonal of the covariance matrix + const varX = covarMatrix[0][0]; + const varY = covarMatrix[1][1]; + const varZ = covarMatrix[2][2]; + + if (!isFinite(varX) || !isFinite(varY) || !isFinite(varZ)) { + return out; + } + + const horizSumVar = varX + varY; + + const pdop = Math.sqrt(horizSumVar + varZ); + const hdop = Math.sqrt(horizSumVar); + const vdop = Math.sqrt(varZ); + + return Vec3Math.set(pdop, hdop, vdop, out); + } + + /** + * Updates the in-use state of satellites. + * @param satellitesToUse The satellites to use for position solution calculations. + * @param satellitesToNotUse The satellites to not use for position solution calculations. + */ + private updateSatelliteInUseStates(satellitesToUse: readonly GPSSatellite[], satellitesToNotUse: readonly GPSSatellite[]): void { + for (let i = 0; i < satellitesToUse.length; i++) { + satellitesToUse[i].updateInUse(true); + } + + for (let i = 0; i < satellitesToNotUse.length; i++) { + satellitesToNotUse[i].updateInUse(false); + } + } + + private static readonly COLLECTING_DATA_SATELLITE_STATES = new Set([ + GPSSatelliteState.Acquired, + GPSSatelliteState.DataCollected, + GPSSatelliteState.InUse, + GPSSatelliteState.InUseDiffApplied + ]); + + private readonly collectingDataSatelliteFilter = (sat: GPSSatellite | null): boolean => { + return sat !== null && GPSSatComputer.COLLECTING_DATA_SATELLITE_STATES.has(sat.state.get()); + }; + + /** + * Updates the almanac download state. + * @param simTime The current simulation time, as a Javascript timestamp. + * @param deltaTime The time elapsed, in milliseconds, since the last update. + * @param forceDownload Whether to force the entire almanac to be instantly downloaded. + */ + private updateAlmanacState(simTime: number, deltaTime: number, forceDownload: boolean): void { + if (forceDownload) { + this.lastAlamanacTime = simTime; + this.almanacProgress = 0; + } else { + const isCollectingData = this.channels.some(this.collectingDataSatelliteFilter); + + if (isCollectingData) { + this.almanacProgress += deltaTime / this.satelliteTimingOptions.almanacDownloadTime; + if (this.almanacProgress >= 1) { + this.lastAlamanacTime = simTime; + this.almanacProgress -= 1; + } + } else { + this.almanacProgress = 0; + } + } + } + + /** + * For each satellite, checks if its state is different from the most recently published state, and if so publishes + * the new state. If this computer's sync role is `primary`, then a satellite state sync event will be published + * alongside any regular state events. + */ + private diffAndPublishSatelliteStates(): void { + for (let i = 0; i < this.satellites.length; i++) { + const sat = this.satellites[i]; + const state = sat.state.get(); + + if (this.publishedSatStates[i] !== state) { + this.publishedSatStates[i] = state; + this.publisher.pub(this.satStateChangedTopic, sat, false, false); + if (this.syncRole === 'primary') { + this.syncPublisher.pub(this.satStateSyncTopic, { prn: sat.prn, state }, true, false); + } + } + } + } + + /** + * Sets this system's dilution of precision values, and if they are different from the current values, publishes the + * new values to the event bus. + * @param pdop The position DOP value to set. + * @param hdop The horizontal DOP value to set. + * @param vdop The vertical DOP value to set. + */ + private setDop(pdop: number, hdop: number, vdop: number): void { + if (this._pdop !== pdop) { + this._pdop = pdop; + this.publisher.pub(this.pdopTopic, pdop, false, true); + } + + if (this._hdop !== hdop) { + this._hdop = hdop; + this.publisher.pub(this.hdopTopic, hdop, false, true); } - if (shouldUpdatePositions) { - this.previousUpdate = this.simTime; - this.publisher.pub(this.satPosCalcTopic, undefined, false, false); + if (this._vdop !== vdop) { + this._vdop = vdop; + this.publisher.pub(this.vdopTopic, vdop, false, true); } - - this.setDop(pdop, hdop, vdop); - - this.previousSimTime = this.simTime; } /** - * Gets the current satellites that are being tracked by this computer. - * @returns The collection of current satellites. + * Creates a line-of-sight position matrix for a satellite constellation. Each row in the matrix is a 4-vector of + * a satellite's position relative to the airplane, as `[x, y, z, 1]`. The index of the matrix row containing a + * satellite's position vector matches the index of the satellite in the provided array. + * @param satellites The satellites in the constellation. + * @returns The line-of-sight position matrix for the specified satellite constellation. */ - public get sats(): readonly GPSSatellite[] { - return this.satellites; - } + private static getLosMatrix(satellites: readonly GPSSatellite[]): Float64Array[] { + const los: Float64Array[] = []; - /** - * Calculates the horizon zenith angle. - * @returns The calculated horizon zenith angle based on the current altitude. - */ - public calcHorizonAngle(): number { - return Math.acos(6378100 / (6378100 + this.altitude)); + // Get unit line-of-sight vectors for each satellite + for (let i = 0; i < satellites.length; i++) { + const [zenith, hour] = satellites[i].position.get(); + los[i] = Vec3Math.setFromSpherical(1, zenith, hour, new Float64Array(4)); + los[i][3] = 1; + } + + return los; } + private static readonly covarMultiplyFuncs = [ + [0, 1, 2, 3].map(col => (sum: number, vec: ArrayLike): number => sum + vec[0] * vec[col]), + [1, 2, 3].map(col => (sum: number, vec: ArrayLike): number => sum + vec[1] * vec[col]), + [2, 3].map(col => (sum: number, vec: ArrayLike): number => sum + vec[2] * vec[col]) + ]; + /** - * Calculates dilution of precision values (PDOP, HDOP, VDOP) for the current satellite constellation. - * @param out The vector to which to write the results. - * @returns Dilution of precision values for the current satellite constellation, as `[PDOP, HDOP, VDOP]`. + * Calculates a position-covariance matrix for a satellite constellation. + * @param los The line-of-sight position matrix for the satellite constellation. + * @param out The matrix to which to write the result. + * @returns The position-covariance matrix for the specified satellite constellation. */ - private calculateDop(out: Float64Array): Float64Array { - Vec3Math.set(-1, -1, -1, out); - - const satsInUse = this.satellites.filter(sat => { - const state = sat.state.get(); - return state === GPSSatelliteState.InUse || state === GPSSatelliteState.InUseDiffApplied; - }); + private static calculateCovarMatrix(los: readonly ReadonlyFloat64Array[], out: Float64Array[]): Float64Array[] { + if (los.length < 4) { + for (let i = 0; i < 4; i++) { + out[i].fill(NaN, 0, 4); + } - if (satsInUse.length < 4) { return out; } - // Get unit line-of-sight vectors for each satellite - for (let i = 0; i < satsInUse.length; i++) { - const [zenith, hour] = satsInUse[i].position.get(); - satsInUse[i] = Vec3Math.setFromSpherical(1, zenith, hour, this.vecHeap.allocate()) as any; - } - - const satVecs = satsInUse as unknown as Float64Array[]; - - // First define line-of-sight matrix L composed of row vectors Si = [xi, yi, zi, 1], where xi, yi, zi are the - // components of the unit line-of-sight vector for satellite i. Then compute the covariance matrix as C = (LᵀL)⁻¹. - + // The covariance matrix is defined as C = (LᵀL)⁻¹, where L is the satellite line-of-sight matrix. // P = LᵀL is guaranteed to be symmetric, so we need only compute the upper triangular part of the product. - const P11 = satVecs.reduce((sum, vec) => sum + vec[0] * vec[0], 0); - const P12 = satVecs.reduce((sum, vec) => sum + vec[0] * vec[1], 0); - const P13 = satVecs.reduce((sum, vec) => sum + vec[0] * vec[2], 0); - const P14 = satVecs.reduce((sum, vec) => sum + vec[0], 0); + const P11 = los.reduce(GPSSatComputer.covarMultiplyFuncs[0][0], 0); + const P12 = los.reduce(GPSSatComputer.covarMultiplyFuncs[0][1], 0); + const P13 = los.reduce(GPSSatComputer.covarMultiplyFuncs[0][2], 0); + const P14 = los.reduce(GPSSatComputer.covarMultiplyFuncs[0][3], 0); - const P22 = satVecs.reduce((sum, vec) => sum + vec[1] * vec[1], 0); - const P23 = satVecs.reduce((sum, vec) => sum + vec[1] * vec[2], 0); - const P24 = satVecs.reduce((sum, vec) => sum + vec[1], 0); + const P22 = los.reduce(GPSSatComputer.covarMultiplyFuncs[1][0], 0); + const P23 = los.reduce(GPSSatComputer.covarMultiplyFuncs[1][1], 0); + const P24 = los.reduce(GPSSatComputer.covarMultiplyFuncs[1][2], 0); - const P33 = satVecs.reduce((sum, vec) => sum + vec[2] * vec[2], 0); - const P34 = satVecs.reduce((sum, vec) => sum + vec[2], 0); + const P33 = los.reduce(GPSSatComputer.covarMultiplyFuncs[2][0], 0); + const P34 = los.reduce(GPSSatComputer.covarMultiplyFuncs[2][1], 0); - const P44 = satVecs.length; - - for (let i = 0; i < satVecs.length; i++) { - this.vecHeap.free(satVecs[i]); - } + const P44 = los.length; // Perform block-wise inversion of LᵀL (which is 4x4, so neatly decomposes into four 2x2 matrices) with optimizations // presented in Ingemarsson, C and Gustafsson O, 2015. @@ -638,8 +1563,6 @@ export class GPSSatComputer implements Instrument { // C = P⁻¹ = [E F] // [Fᵀ H] - // Since we only care about the variance terms along the diagonal of C, we can skip calculating F. - // V = A⁻¹ (A is symmetric, therefore V is also symmetric, so we only need to compute the upper triangular part) const detA = 1 / (P11 * P22 - P12 * P12); const V11 = P22 * detA; @@ -662,56 +1585,102 @@ export class GPSSatComputer implements Instrument { const H12 = -Hi12 * detHi; const H22 = Hi11 * detHi; - // Z = XH + // Z = XH, F = -Z const Z11 = X11 * H11 + X12 * H12; const Z12 = X11 * H12 + X12 * H22; const Z21 = X21 * H11 + X22 * H12; const Z22 = X21 * H12 + X22 * H22; - // E = V + ZXᵀ (We can skip calculating E12 and E21 since we only care about the diagonal) + // E = V + ZXᵀ (E is symmetric, so we only need to compute the upper triangular part) const E11 = V11 + Z11 * X11 + Z12 * X12; + const E12 = V12 + Z11 * X21 + Z12 * X22; const E22 = V22 + Z21 * X21 + Z22 * X22; - // Grab the variance terms var(x), var(y), var(z) along the diagonal of C - const varX = E11; - const varY = E22; - const varZ = H11; + out[0][0] = E11; + out[0][1] = E12; + out[0][2] = -Z11; + out[0][3] = -Z12; + out[1][0] = E12; // E is symmetric, so E21 = E12 + out[1][1] = E22; + out[1][2] = -Z21; + out[1][3] = -Z22; + out[2][0] = -Z11; + out[2][1] = -Z21; + out[2][2] = H11; + out[2][3] = H12; + out[3][0] = -Z12; + out[3][1] = -Z22; + out[3][2] = H12; // H is symmetric, so H21 = H12 + out[3][3] = H22; + + return out; + } - if (!isFinite(varX) || !isFinite(varY) || !isFinite(varZ)) { - return out; + /** + * Calculates the transpose of the `S` matrix in the downdate satellite selection algorithm for a satellite + * constellation. The index of a satellite's corresponding row in the `Sᵀ` matrix matches the index of its position + * vector in the provided line-of-sight position matrix. + * @param los The line-of-sight position matrix for the satellite constellation. + * @param covar The position-covariance matrix for the satellite constellation. + * @param out The matrix to which to write the result. + * @returns The transpose of the `S` matrix in the downdate satellite selection algorithm for the specified satellite + * constellation. + */ + private static calculateDowndateSTranspose(los: readonly ReadonlyFloat64Array[], covar: readonly ReadonlyFloat64Array[], out: Float64Array[]): Float64Array[] { + for (let i = 0; i < los.length; i++) { + for (let j = 0; j < 4; j++) { + out[i][j] = 0; + for (let k = 0; k < 4; k++) { + out[i][j] += los[i][k] * covar[k][j]; + } + } } - const horizSumVar = varX + varY; + return out; + } - const pdop = Math.sqrt(horizSumVar + varZ); - const hdop = Math.sqrt(horizSumVar); - const vdop = Math.sqrt(varZ); + /** + * Calculates the diagonal of the `P` matrix in the downdate satellite selection algorithm for a satellite + * constellation. + * @param los The line-of-sight position matrix for the satellite constellation. + * @param sTranspose The transpose of the `S` matrix in the downdate satellite selection algorithm for the satellite + * constellation. + * @param out The vector to which to write the result. + * @returns The diagonal of the `P` matrix in the downdate satellite selection algorithm for the specified satellite + * constellation. + */ + private static calculateDowndatePDiag(los: readonly ReadonlyFloat64Array[], sTranspose: readonly ReadonlyFloat64Array[], out: Float64Array): Float64Array { + out.fill(1); - return Vec3Math.set(pdop, hdop, vdop, out); + for (let i = 0; i < los.length; i++) { + for (let j = 0; j < 4; j++) { + out[i] -= sTranspose[i][j] * los[i][j]; + } + } + + return out; } /** - * Sets this system's dilution of precision values, and if they are different from the current values, publishes the - * new values to the event bus. - * @param pdop The position DOP value to set. - * @param hdop The horizontal DOP value to set. - * @param vdop The vertical DOP valu to set. + * Calculates the costs of removing each satellite from a constellation. The cost of removing a satellite is defined + * as the amount by which `PDOP²` will increase when the satellite is removed relative to the full constellation. The + * index of a satellite's cost in the returned array matches the index of the satellite's corresponding row in the + * provided `Sᵀ` matrix. + * @param sTranspose The transpose of the `S` matrix in the downdate satellite selection algorithm for the satellite + * constellation. + * @param pDiag The diagonal of the `P` matrix in the downdate satellite selection algorithm for the satellite + * constellation. + * @param out The array to which to write the results. + * @returns The costs of removing each satellite from a constellation. */ - private setDop(pdop: number, hdop: number, vdop: number): void { - if (this._pdop !== pdop) { - this._pdop = pdop; - this.publisher.pub(this.pdopTopic, pdop, false, true); - } + private static calculateSatelliteCosts(sTranspose: readonly ReadonlyFloat64Array[], pDiag: Float64Array, out: number[]): number[] { + out.length = sTranspose.length; - if (this._hdop !== hdop) { - this._hdop = hdop; - this.publisher.pub(this.hdopTopic, hdop, false, true); + for (let i = 0; i < sTranspose.length; i++) { + out[i] = (sTranspose[i][0] * sTranspose[i][0] + sTranspose[i][1] * sTranspose[i][1] + sTranspose[i][2] * sTranspose[i][2]) / pDiag[i]; } - if (this._vdop !== vdop) { - this._vdop = vdop; - this.publisher.pub(this.vdopTopic, vdop, false, true); - } + return out; } } @@ -849,8 +1818,6 @@ export interface GPSEphemerisRecords { * A tracked GPS satellite. */ export class GPSSatellite { - private readonly stateChangeTime = (5 + (10 * Math.random())) * 1000; - private stateChangeTimeRemaining = 0; private readonly vec3Cache = [new Float64Array(3), new Float64Array(3), new Float64Array(3), new Float64Array(3), new Float64Array(3)]; /** The current satellite state. */ @@ -865,16 +1832,54 @@ export class GPSSatellite { /** The current satellite signal strength. */ public readonly signalStrength = Subject.create(0); - private isApplyingDiffCorrections = false; + private isTracked = false; private hasComputedPosition = false; + private _lastEphemerisTime: number | undefined = undefined; + // eslint-disable-next-line jsdoc/require-returns + /** + * The most recent simulation time at which this satellite's ephemeris was downloaded, as a Javascript timestamp, or + * `undefined` if this satellite's ephemeris has not yet been downloaded. + */ + public get lastEphemerisTime(): number | undefined { + return this._lastEphemerisTime; + } + + private _lastUnreachableTime: number | undefined = undefined; + // eslint-disable-next-line jsdoc/require-returns + /** + * The most recent simulation time at which this satellite was confirmed to be unreachable, as a Javascript + * timestamp, or `undefined` if this satellite has not been confirmed to be unreachable. + */ + public get lastUnreachableTime(): number | undefined { + return this._lastUnreachableTime; + } + + private _areDiffCorrectionsDownloaded = false; + // eslint-disable-next-line jsdoc/require-returns + /** Whether SBAS differential correction data have been downloaded from this satellite. */ + public get areDiffCorrectionsDownloaded(): boolean { + return this._areDiffCorrectionsDownloaded; + } + + private timeSpentAcquiring: number | undefined = undefined; + private timeToAcquire: number | undefined = undefined; + private timeToDownloadEphemeris: number | undefined = undefined; + private timeToDownloadCorrections: number | undefined = undefined; + /** * Creates an instance of a GPSSatellite. * @param prn The GPS PRN number for this satellite. * @param sbasGroup Whether or not this satellite is a SBAS satellite. * @param ephemeris The ephemeris data to use for position calculation. + * @param timingOptions Options with which to configure the timing of this satellite's state changes. */ - constructor(public readonly prn: number, public readonly sbasGroup?: string, private readonly ephemeris?: GPSEphemeris) { } + constructor( + public readonly prn: number, + public readonly sbasGroup: string | undefined, + private readonly ephemeris: GPSEphemeris | undefined, + private readonly timingOptions: Readonly> + ) { } /** * Computes the current satellite positions given the loaded ephemeris data. @@ -1032,36 +2037,111 @@ export class GPSSatellite { return Math.acos(6378100 / (6378100 + Math.max(altitude, 0))); } + /** + * Checks whether this satellite's cached ephemeris data is valid at a given simulation time. + * @param simTime The simulation time at which to check for ephemeris validity, as a Javascript timestamp. + * @returns Whether this satellite's cached ephemeris data is valid at the specified simulation time. + */ + public isCachedEphemerisValid(simTime: number): boolean { + return this._lastEphemerisTime !== undefined && Math.abs(simTime - this._lastEphemerisTime) < this.timingOptions.ephemerisExpireTime; + } + + /** + * Erases this satellite's cached ephemeris data. + */ + public eraseCachedEphemeris(): void { + this._lastEphemerisTime = undefined; + } + + /** + * Sets whether this satellite is being tracked by a receiver channel. + * @param tracked Whether this satellite is being tracked by a receiver channel. + */ + public setTracked(tracked: boolean): void { + if (this.isTracked === tracked) { + return; + } + + this.isTracked = tracked; + + this.timeSpentAcquiring = undefined; + this.timeToAcquire = undefined; + this.timeToDownloadEphemeris = undefined; + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; + + if (tracked || this.state.get() !== GPSSatelliteState.Unreachable) { + this.state.set(GPSSatelliteState.None); + } + } + /** * Updates the state of the satellite. - * @param deltaTime The amount of sim time that has passed, in milliseconds. - * @param applyDiffCorrections Whether or not to apply differential corrections to this GPS satellite. + * @param simTime The current simulation time, as a Javascript timestamp. + * @param deltaTime The amount of sim time that has elapsed since the last update, in milliseconds. + * @param distanceFromLastKnownPos The distance, in great-arc radians, from the airplane's current actual position to + * its last known position. * @param forceAcquireAndUse Whether to force this satellite to the highest possible use state - * ({@link GPSSatelliteState.Acquired} if this is an SBAS satellite or {@link GPSSatelliteState.InUse}/ - * {@link GPSSatelliteState.InUseDiffApplied} if this is a GPS satellite) if signal strength is sufficient. - * @returns True if the satellite state changed, false otherwise. + * ({@link GPSSatelliteState.DataCollected}) if signal strength is sufficient. + * @returns Whether this satellite's state changed as a result of the update. */ - public updateState(deltaTime: number, applyDiffCorrections: boolean, forceAcquireAndUse: boolean): boolean { - const reachable = this.signalStrength.get() > 0.05; - if (this.stateChangeTimeRemaining >= 0) { - this.stateChangeTimeRemaining -= deltaTime; + public updateState(simTime: number, deltaTime: number, distanceFromLastKnownPos: number, forceAcquireAndUse: boolean): boolean { + const stateChanged = this.isTracked + ? this.updateStateTracked(simTime, deltaTime, distanceFromLastKnownPos, forceAcquireAndUse) + : this.updateStateUntracked(simTime); + + switch (this.state.get()) { + case GPSSatelliteState.Unreachable: + if (this.isTracked) { + this._lastUnreachableTime = simTime; + } + break; + case GPSSatelliteState.DataCollected: + case GPSSatelliteState.InUse: + case GPSSatelliteState.InUseDiffApplied: + this._lastEphemerisTime = simTime; + break; } - if (forceAcquireAndUse) { - this.isApplyingDiffCorrections = applyDiffCorrections; + return stateChanged; + } + + /** + * Updates the state of the satellite while it is being tracked. + * @param simTime The current simulation time, as a Javascript timestamp. + * @param deltaTime The amount of sim time that has elapsed since the last update, in milliseconds. + * @param distanceFromLastKnownPos The distance, in great-arc radians, from the airplane's current actual position to + * its last known position. + * @param forceAcquireAndUse Whether to force this satellite to the highest possible use state + * ({@link GPSSatelliteState.DataCollected}) if signal strength is sufficient. + * @returns Whether this satellite's state changed as a result of the update. + */ + private updateStateTracked(simTime: number, deltaTime: number, distanceFromLastKnownPos: number, forceAcquireAndUse: boolean): boolean { + const reachable = this.signalStrength.get() > 0.05; + if (forceAcquireAndUse) { const state = this.state.get(); if (reachable) { - const targetState = this.sbasGroup === undefined - ? applyDiffCorrections ? GPSSatelliteState.InUseDiffApplied : GPSSatelliteState.InUse - : GPSSatelliteState.Acquired; + if (this.sbasGroup !== undefined) { + this._areDiffCorrectionsDownloaded = true; + this.timeToDownloadCorrections = undefined; + } - if (state !== targetState) { - this.state.set(targetState); + if (state !== GPSSatelliteState.DataCollected) { + this.timeSpentAcquiring = undefined; + this.timeToAcquire = undefined; + this.timeToDownloadEphemeris = undefined; + + this.state.set(GPSSatelliteState.DataCollected); return true; } } else { if (state !== GPSSatelliteState.Unreachable) { + this.timeSpentAcquiring = undefined; + this.timeToAcquire = undefined; + this.timeToDownloadEphemeris = undefined; + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; this.state.set(GPSSatelliteState.Unreachable); return true; } @@ -1069,64 +2149,107 @@ export class GPSSatellite { } else { switch (this.state.get()) { case GPSSatelliteState.None: + if (this.timeSpentAcquiring === undefined) { + this.timeSpentAcquiring = 0; + } + + this.timeSpentAcquiring += deltaTime; + if (reachable) { - this.state.set(GPSSatelliteState.Acquired); - this.stateChangeTimeRemaining = this.stateChangeTime; - return true; + if (this.timeToAcquire === undefined) { + this.timeToAcquire = distanceFromLastKnownPos < 5.80734e-4 /* 2 nautical miles */ && this.isCachedEphemerisValid(simTime) + ? this.timingOptions.acquisitionTimeWithEphemeris + (Math.random() - 0.5) * this.timingOptions.acquisitionTimeRangeWithEphemeris + : this.timingOptions.acquisitionTime + (Math.random() - 0.5) * this.timingOptions.acquisitionTimeRange; + } + + this.timeToAcquire -= deltaTime; + + if (this.timeToAcquire <= 0) { + this.timeSpentAcquiring = undefined; + this.timeToAcquire = undefined; + + // If we have valid cached ephemeris data for this satellite, then we can use the cached data for + // calculating position solutions immediately instead of having to wait to download new ephemeris data. + if (this.isCachedEphemerisValid(simTime)) { + this.state.set(GPSSatelliteState.DataCollected); + } else { + this.state.set(GPSSatelliteState.Acquired); + } + + return true; + } } else { - this.state.set(GPSSatelliteState.Unreachable); - this.stateChangeTimeRemaining = this.stateChangeTime; - return true; + this.timeToAcquire = undefined; + + if (this.timeSpentAcquiring >= this.timingOptions.acquisitionTimeout) { + this.timeSpentAcquiring = undefined; + this.state.set(GPSSatelliteState.Unreachable); + return true; + } } + break; case GPSSatelliteState.Unreachable: - if (reachable) { - this.state.set(GPSSatelliteState.Acquired); - this.stateChangeTimeRemaining = this.stateChangeTime; + if (this._lastUnreachableTime === undefined) { + this._lastUnreachableTime = simTime; + } else if (Math.abs(simTime - this._lastUnreachableTime) >= this.timingOptions.unreachableExpireTime) { + this._lastUnreachableTime = undefined; + this.state.set(GPSSatelliteState.None); return true; } break; case GPSSatelliteState.Acquired: if (!reachable) { - this.state.set(GPSSatelliteState.Unreachable); - return true; - } else if (this.stateChangeTimeRemaining <= 0 && this.sbasGroup === undefined) { - this.state.set(GPSSatelliteState.DataCollected); - this.stateChangeTimeRemaining = this.stateChangeTime; + this.timeToDownloadEphemeris = undefined; + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; + this.state.set(GPSSatelliteState.None); return true; + } else { + if (this.timeToDownloadEphemeris === undefined) { + this.timeToDownloadEphemeris = this.sbasGroup === undefined + ? this.timingOptions.ephemerisDownloadTime + : this.timingOptions.sbasEphemerisDownloadTime + (Math.random() - 0.5) * this.timingOptions.sbasEphemerisDownloadTimeRange; + } + + this.timeToDownloadEphemeris -= deltaTime; + + this.updateSbasCorrectionsDownload(deltaTime); + + if (this.timeToDownloadEphemeris <= 0) { + this.timeToDownloadEphemeris = undefined; + this.state.set(GPSSatelliteState.DataCollected); + return true; + } } break; case GPSSatelliteState.DataCollected: if (!reachable) { - this.state.set(GPSSatelliteState.Unreachable); - return true; - } else if (this.stateChangeTimeRemaining <= 0) { - this.state.set(GPSSatelliteState.InUse); - this.stateChangeTimeRemaining = this.stateChangeTime; + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; + this.state.set(GPSSatelliteState.None); return true; + } else { + this.updateSbasCorrectionsDownload(deltaTime); } break; case GPSSatelliteState.InUse: if (!reachable) { - this.state.set(GPSSatelliteState.Unreachable); + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; + this.state.set(GPSSatelliteState.None); return true; - } else if (applyDiffCorrections) { - if (this.isApplyingDiffCorrections && this.stateChangeTimeRemaining <= 0) { - this.state.set(GPSSatelliteState.InUseDiffApplied); - return true; - } else if (!this.isApplyingDiffCorrections) { - this.isApplyingDiffCorrections = true; - this.stateChangeTimeRemaining = this.stateChangeTime; - } + } else { + this.updateSbasCorrectionsDownload(deltaTime); } break; case GPSSatelliteState.InUseDiffApplied: if (!reachable) { - this.state.set(GPSSatelliteState.Unreachable); - return true; - } else if (!applyDiffCorrections) { - this.isApplyingDiffCorrections = false; - this.state.set(GPSSatelliteState.InUse); + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; + this.state.set(GPSSatelliteState.None); return true; + } else { + this.updateSbasCorrectionsDownload(deltaTime); } break; } @@ -1135,14 +2258,74 @@ export class GPSSatellite { return false; } + /** + * Updates the download state of SBAS differential corrections from this satellite. + * @param deltaTime The amount of sim time that has elapsed since the last update, in milliseconds. + */ + private updateSbasCorrectionsDownload(deltaTime: number): void { + if (this.sbasGroup === undefined || this._areDiffCorrectionsDownloaded) { + return; + } + + if (this.timeToDownloadCorrections === undefined) { + this.timeToDownloadCorrections = this.timingOptions.sbasCorrectionDownloadTime + (Math.random() - 0.5) * this.timingOptions.sbasCorrectionDownloadTimeRange; + } + + this.timeToDownloadCorrections -= deltaTime; + if (this.timeToDownloadCorrections <= 0) { + this._areDiffCorrectionsDownloaded = true; + this.timeToDownloadCorrections = undefined; + } + } + + /** + * Updates the state of the satellite while it is not being tracked. + * @param simTime The current simulation time, as a Javascript timestamp. + * @returns Whether this satellite's state changed as a result of the update. + */ + private updateStateUntracked(simTime: number): boolean { + if (this.state.get() === GPSSatelliteState.Unreachable) { + if (this._lastUnreachableTime === undefined) { + this._lastUnreachableTime = simTime; + } else if (Math.abs(simTime - this._lastUnreachableTime) >= this.timingOptions.unreachableExpireTime) { + this._lastUnreachableTime = undefined; + this.state.set(GPSSatelliteState.None); + return true; + } + } + + return false; + } + /** * Forces an update of this satellite's state to a specific value. + * @param simTime The current simulation time, as a Javascript timestamp. * @param state The state to which to update this satellite. - * @returns Whether the satellite's state was changed as a result of the forced update. + * @returns Whether this satellite's state changed as a result of the update. */ - public forceUpdateState(state: GPSSatelliteState): boolean { - this.stateChangeTimeRemaining = 0; - this.isApplyingDiffCorrections = state === GPSSatelliteState.InUseDiffApplied; + public forceUpdateState(simTime: number, state: GPSSatelliteState): boolean { + switch (state) { + case GPSSatelliteState.Unreachable: + this.timeSpentAcquiring = undefined; + this.timeToAcquire = undefined; + + if (this.isTracked) { + this._lastUnreachableTime = simTime; + } + // fallthrough + case GPSSatelliteState.None: + this.timeToDownloadEphemeris = undefined; + this._areDiffCorrectionsDownloaded = false; + this.timeToDownloadCorrections = undefined; + break; + case GPSSatelliteState.DataCollected: + case GPSSatelliteState.InUse: + case GPSSatelliteState.InUseDiffApplied: + this.timeToDownloadEphemeris = undefined; + + this._lastEphemerisTime = simTime; + break; + } if (this.state.get() !== state) { this.state.set(state); @@ -1151,61 +2334,52 @@ export class GPSSatellite { return false; } } -} - -/** - * Possible state on GPS satellites. - */ -export enum GPSSatelliteState { - /** There is no current valid state. */ - None = 'None', - - /** The satellite is out of view and cannot be reached. */ - Unreachable = 'Unreachable', - - /** The satellite has been found and data is being downloaded. */ - Acquired = 'Acquired', - - /** The satellite is faulty. */ - Faulty = 'Faulty', - - /** The satellite has been found, data is downloaded, but is not presently used in the GPS solution. */ - DataCollected = 'DataCollected', - - /** The satellite is being active used in the GPS solution. */ - InUse = 'InUse', - - /** The satellite is being active used in the GPS solution and SBAS differential corrections are being applied. */ - InUseDiffApplied = 'InUseDiffApplied' -} - -/** - * Possible {@link GPSSatComputer} states. - */ -export enum GPSSystemState { - /** The GPS receiver is trying to locate satellites. */ - Searching = 'Searching', - - /** The GPS receiver has found satellites and is acquiring a solution. */ - Acquiring = 'Acquiring', - - /** A 3D solution has been acquired. */ - SolutionAcquired = 'SolutionAcquired', - /** A 3D solution using differential computations has been acquired. */ - DiffSolutionAcquired = 'DiffSolutionAcquired' -} + /** + * Updates whether this satellite is being used to calculate a position solution. + * @param inUse Whether the satellite is being used to calculate a position solution. + * @returns Whether this satellite's state changed as a result of the update. + */ + public updateInUse(inUse: boolean): boolean { + if (inUse) { + if (this.state.get() === GPSSatelliteState.DataCollected) { + this.state.set(GPSSatelliteState.InUse); + return true; + } + } else { + switch (this.state.get()) { + case GPSSatelliteState.InUse: + case GPSSatelliteState.InUseDiffApplied: + this.state.set(GPSSatelliteState.DataCollected); + return true; + } + } -/** - * Possible SBAS connection states. - */ -export enum GPSSystemSBASState { - /** SBAS is disabled. */ - Disabled = 'Disabled', + return false; + } - /** SBAS is enabled but not receiving differential corrections. */ - Inactive = 'Inactive', + /** + * Updates whether differential corrections are applied to this satellite's ranging data when they are used to + * calculate a position solution. + * @param apply Whether differential corrections are applied. + * @returns Whether this satellite's state changed as a result of the update. + */ + public updateDiffCorrectionsApplied(apply: boolean): boolean { + switch (this.state.get()) { + case GPSSatelliteState.InUse: + if (apply) { + this.state.set(GPSSatelliteState.InUseDiffApplied); + return true; + } + break; + case GPSSatelliteState.InUseDiffApplied: + if (!apply) { + this.state.set(GPSSatelliteState.InUse); + return true; + } + break; + } - /** SBAS is enabled and is receiving differential corrections. */ - Active = 'Active' + return false; + } } \ No newline at end of file diff --git a/src/sdk/instruments/RadioCommon.ts b/src/sdk/instruments/RadioCommon.ts index 4d8aa0763..9d8227702 100644 --- a/src/sdk/instruments/RadioCommon.ts +++ b/src/sdk/instruments/RadioCommon.ts @@ -98,4 +98,5 @@ export type ComSpacingChangeEvent = { /** The spacing of the COM radio. */ spacing: ComSpacing -} \ No newline at end of file +} + diff --git a/src/sdk/instruments/index.ts b/src/sdk/instruments/index.ts index 84ee01747..de1316bf2 100644 --- a/src/sdk/instruments/index.ts +++ b/src/sdk/instruments/index.ts @@ -1,6 +1,8 @@ +export * from './Accelerometer'; export * from './Adc'; export * from './Ahrs'; export * from './AiPilotPublisher'; +export * from './AircraftInertialPublisher'; export * from './Ambient'; export * from './AntiIce'; export * from './APPublisher'; diff --git a/src/sdk/math/NumberUnit.ts b/src/sdk/math/NumberUnit.ts index 8340a63ae..9d6876afb 100644 --- a/src/sdk/math/NumberUnit.ts +++ b/src/sdk/math/NumberUnit.ts @@ -927,7 +927,9 @@ export enum UnitFamily { MassFlux = 'weight_flux', VolumeFlux = 'volume_flux', Density = 'density', - Force = 'force' + Force = 'force', + DistancePerWeight = 'distance_per_weight', + DistanceRatio = 'distance_ratio' } /** @@ -975,6 +977,8 @@ export class UnitType { /** Hectopascal. */ public static readonly HPA = new SimpleUnit(UnitFamily.Pressure, 'hectopascal', 1); + /** Millibar. */ + public static readonly MB = new SimpleUnit(UnitFamily.Pressure, 'millibar', 1); /** Atmosphere. */ public static readonly ATM = new SimpleUnit(UnitFamily.Pressure, 'atmosphere', 1013.25); /** Inch of mercury. */ @@ -1041,4 +1045,12 @@ export class UnitType { public static readonly NEWTON = new CompoundUnit(UnitFamily.Force, [UnitType.KILOGRAM, UnitType.METER], [UnitType.SECOND, UnitType.SECOND]); /** Pound (force). */ public static readonly POUND_FORCE = new CompoundUnit(UnitFamily.Force, [UnitType.POUND, UnitType.G_METER], [UnitType.SECOND, UnitType.SECOND]); + + /** One statute mile per weight equivalent of one gallon of fuel, using the generic conversion 1 gallon = 6.7 pounds. */ + public static readonly MILE_PER_GALLON_FUEL = new CompoundUnit(UnitFamily.DistancePerWeight, [UnitType.MILE], [UnitType.GALLON_FUEL]); + /** One nautical mile per weight equivalent of one gallon of fuel, using the generic conversion 1 gallon = 6.7 pounds. */ + public static readonly NMILE_PER_GALLON_FUEL = new CompoundUnit(UnitFamily.DistancePerWeight, [UnitType.NMILE], [UnitType.GALLON_FUEL]); + + /** One foot per nautical mile. */ + public static readonly FOOT_PER_NMILE = new CompoundUnit(UnitFamily.DistanceRatio, [UnitType.FOOT], [UnitType.NMILE]); } \ No newline at end of file diff --git a/src/sdk/navigation/Facilities.ts b/src/sdk/navigation/Facilities.ts index 3dedbcba5..3118d36b1 100644 --- a/src/sdk/navigation/Facilities.ts +++ b/src/sdk/navigation/Facilities.ts @@ -551,7 +551,7 @@ export interface VorFacility extends Facility { * A NDB facility. */ export interface NdbFacility extends Facility { - /** The frequency of the facility, in MHz. */ + /** The frequency of the facility, in kilohertz. (Despite the name of the property, the value is not given in megahertz.) */ readonly freqMHz: number; /** The type of NDB. */ diff --git a/src/sdk/simbrief/index.ts b/src/sdk/simbrief/index.ts index 5934997ba..67776c294 100644 --- a/src/sdk/simbrief/index.ts +++ b/src/sdk/simbrief/index.ts @@ -1,2 +1,3 @@ export * from './SimbriefClient'; -export * from './SimbriefDataExtraction'; \ No newline at end of file +export * from './SimbriefDataExtraction'; +export * from './SimbriefTypes'; \ No newline at end of file diff --git a/src/sdk/sub/AbstractSubscribable.ts b/src/sdk/sub/AbstractSubscribable.ts index f214c1611..078ae9a68 100644 --- a/src/sdk/sub/AbstractSubscribable.ts +++ b/src/sdk/sub/AbstractSubscribable.ts @@ -255,7 +255,7 @@ export abstract class AbstractSubscribable implements Subscribable { * An implementation of {@link MappedSubscribable}. */ class MappedSubscribableClass extends AbstractSubscribable implements MappedSubscribable { - public readonly isSubscribable = true; + public readonly canInitialNotify = true; private readonly inputSub: Subscription; diff --git a/src/sdk/sub/CombinedSubject.ts b/src/sdk/sub/CombinedSubject.ts index d7dcc58a9..a9063a7e5 100644 --- a/src/sdk/sub/CombinedSubject.ts +++ b/src/sdk/sub/CombinedSubject.ts @@ -20,6 +20,9 @@ export type CombinedSubscribableInputs = { * @deprecated This class has been deprecated in favor of using `MappedSubject` without an explicit mapping function. */ export class CombinedSubject extends AbstractSubscribable> implements MappedSubscribable> { + /** @inheritdoc */ + public readonly canInitialNotify = true; + private readonly inputs: CombinedSubscribableInputs; private readonly inputValues: I; private readonly inputSubs: Subscription[]; diff --git a/src/sdk/sub/ComputedSubject.ts b/src/sdk/sub/ComputedSubject.ts index d86669318..ccf939dd2 100644 --- a/src/sdk/sub/ComputedSubject.ts +++ b/src/sdk/sub/ComputedSubject.ts @@ -222,4 +222,4 @@ export class ComputedSubject implements MutableSubscribable { return sub; } -} \ No newline at end of file +} diff --git a/src/sdk/sub/MappedSubject.ts b/src/sdk/sub/MappedSubject.ts index 3b30a1171..2491cf034 100644 --- a/src/sdk/sub/MappedSubject.ts +++ b/src/sdk/sub/MappedSubject.ts @@ -23,7 +23,8 @@ export class MappedSubject extends AbstractSubscribable i private static readonly IDENTITY_MAP = SubscribableMapFunctions.identity(); private static readonly NEVER_EQUALS = (): boolean => false; - public readonly isSubscribable = true; + /** @inheritdoc */ + public readonly canInitialNotify = true; private readonly inputs: MappedSubscribableInputs; private readonly inputValues: I; diff --git a/src/sdk/sub/Subscribable.ts b/src/sdk/sub/Subscribable.ts index 01dd5028d..443cbc196 100644 --- a/src/sdk/sub/Subscribable.ts +++ b/src/sdk/sub/Subscribable.ts @@ -78,7 +78,7 @@ export interface Subscribable { /** * A subscribable which is mapped from another subscribable. */ -export interface MappedSubscribable extends Subscribable { +export interface MappedSubscribable extends Subscribable, Subscription { /** * Whether the subscription to the parent subscribable is alive. While alive, this subscribable will update its state * based on its parent's state, unless it is paused. Once dead, this subscribable will no longer update its state, @@ -103,6 +103,9 @@ export interface MappedSubscribable extends Subscribable { /** * Resumes the subscription to the parent subscribable. Once resumed, this subscribable will immediately begin to * update its state based its parent's state. + * + * Any `initialNotify` argument passed to this method is ignored. This subscribable is always immediately notified of + * its parent's state when resumed. * @returns This subscribable, after it has been resumed. * @throws Error if the subscription to the parent subscribable is not alive. */ diff --git a/src/sdk/sub/SubscribableArray.ts b/src/sdk/sub/SubscribableArray.ts index 3b3a5f383..b6148f0b4 100644 --- a/src/sdk/sub/SubscribableArray.ts +++ b/src/sdk/sub/SubscribableArray.ts @@ -11,7 +11,7 @@ export enum SubscribableArrayEventType { Removed = 'Removed', /** The array was cleared. */ - Cleared = 'Cleared' + Cleared = 'Cleared', } /** diff --git a/src/sdk/sub/SubscribableMapFunctions.ts b/src/sdk/sub/SubscribableMapFunctions.ts index f5759dc92..5af73df37 100644 --- a/src/sdk/sub/SubscribableMapFunctions.ts +++ b/src/sdk/sub/SubscribableMapFunctions.ts @@ -77,6 +77,25 @@ export class SubscribableMapFunctions { return Math.abs; } + /** + * Generates a function which maps an input tuple to a count of the number of items in the tuple that satisfy a + * given condition. + * @param predicate A function which evaluates whether an item should be counted. + * @returns A function which maps an input tuple to a count of the number of items in the tuple that satisfy the + * condition specified by the predicate. + */ + public static count(predicate: (value: T) => boolean): (input: readonly T[], currentVal?: number) => number { + const reduceFunc = (sum: number, curr: T): number => { + if (predicate(curr)) { + return sum + 1; + } else { + return sum; + } + }; + + return (input: readonly T[]): number => input.reduce(reduceFunc, 0); + } + /** * Generates a function which maps an input number to a rounded version of itself at a certain precision. * @param precision The precision to which to round the input. diff --git a/src/sdk/traffic/TCAS.ts b/src/sdk/traffic/TCAS.ts index 456920ee7..9ee7ad858 100644 --- a/src/sdk/traffic/TCAS.ts +++ b/src/sdk/traffic/TCAS.ts @@ -14,6 +14,7 @@ import { NumberUnitSubject } from '../math/NumberUnitSubject'; import { ReadonlyFloat64Array, Vec2Math, Vec3Math } from '../math/VecMath'; import { Subject } from '../sub/Subject'; import { Subscribable } from '../sub/Subscribable'; +import { SubscribableUtils } from '../sub/SubscribableUtils'; import { Subscription } from '../sub/Subscription'; /** @@ -448,6 +449,10 @@ export abstract class Tcas; + protected readonly realTimeUpdateFreq: Subscribable; + protected readonly simTimeUpdateFreq: Subscribable; + protected readonly operatingModeSub = Subject.create(TcasOperatingMode.Standby); protected readonly sensitivity: S; @@ -498,11 +503,15 @@ export abstract class Tcas, + realTimeUpdateFreq: number | Subscribable, + simTimeUpdateFreq: number | Subscribable, raOptions?: Partial ) { + this.maxIntruderCount = SubscribableUtils.toSubscribable(maxIntruderCount, true); + this.realTimeUpdateFreq = SubscribableUtils.toSubscribable(realTimeUpdateFreq, true); + this.simTimeUpdateFreq = SubscribableUtils.toSubscribable(simTimeUpdateFreq, true); + this.sensitivity = this.createSensitivity(); this.ownAirplane = new OwnAirplane(this.ownAirplaneSubs); @@ -587,13 +596,27 @@ export abstract class Tcas { this.onContactAdded(contact.uid); }); // init own airplane subjects - sub.on('gps-position').atFrequency(this.realTimeUpdateFreq).handle(lla => { - this.ownAirplaneSubs.position.set(lla.lat, lla.long); - this.ownAirplaneSubs.altitude.set(lla.alt, UnitType.METER); - }); - sub.on('ground_speed').whenChanged().atFrequency(this.realTimeUpdateFreq).handle(gs => { this.ownAirplaneSubs.groundSpeed.set(gs); }); - sub.on('vertical_speed').whenChanged().atFrequency(this.realTimeUpdateFreq).handle(vs => { this.ownAirplaneSubs.verticalSpeed.set(vs); }); - sub.on('radio_alt').whenChanged().atFrequency(this.realTimeUpdateFreq).handle(alt => { this.ownAirplaneSubs.radarAltitude.set(alt); }); + + const atFreqSubs: Subscription[] = []; + + this.realTimeUpdateFreq.sub(freq => { + for (const atFreqSub of atFreqSubs) { + atFreqSub.destroy(); + } + + atFreqSubs.length = 0; + + atFreqSubs.push( + sub.on('gps-position').atFrequency(freq).handle(lla => { + this.ownAirplaneSubs.position.set(lla.lat, lla.long); + this.ownAirplaneSubs.altitude.set(lla.alt, UnitType.METER); + }), + sub.on('ground_speed').atFrequency(freq).handle(gs => { this.ownAirplaneSubs.groundSpeed.set(gs); }), + sub.on('vertical_speed').atFrequency(freq).handle(vs => { this.ownAirplaneSubs.verticalSpeed.set(vs); }), + sub.on('radio_alt').atFrequency(freq).handle(alt => { this.ownAirplaneSubs.radarAltitude.set(alt); }) + ); + }, true); + this.ownAirplaneSubs.groundTrack.setConsumer(sub.on('track_deg_true')); this.ownAirplaneSubs.isOnGround.setConsumer(sub.on('on_ground')); @@ -754,8 +777,8 @@ export abstract class Tcas curr.length > accum ? curr.length : accum, 0); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Assets/Fonts/DejaVuSans-SemiBold.ttf b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Assets/Fonts/DejaVuSans-SemiBold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..a95e6e903ba20cc41c8e7a6741c002a2cbd13585 GIT binary patch literal 732148 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

Pn1J!{vBugV9AuhwEM&%;0R@c<8KbZ^cT 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�%uz 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 #2-yjJ8{$b`#V!S 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 Ak^lez literal 0 HcmV?d00001 diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/DialGauge.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/DialGauge.tsx index 4eaddb6ac..c7596488b 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/DialGauge.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/DialGauge.tsx @@ -190,10 +190,10 @@ class ColorLine extends DisplayComponent { */ public render(): VNode { return (); + x1={this.props.geometry.origin.x} y1={this.props.geometry.origin.y - this.props.geometry.radius} + x2={this.props.geometry.origin.x} y2={this.props.geometry.origin.y - this.props.geometry.radius + this.props.length} + stroke={this.props.color} stroke-width={this.props.width} + style={`transform-origin: ${this.props.geometry.origin.x}px ${this.props.geometry.origin.y}px`} />); } } @@ -215,11 +215,11 @@ class ColorLines extends DisplayComponent, this.groupRef.instance); + geometry={this.props.geometry} + color={this.props.colorLines[i].color} + position={this.props.colorLines[i].position} + smoothFactor={this.props.colorLines[i].smoothFactor} + length={15} width={2} />, this.groupRef.instance); } } } @@ -251,7 +251,7 @@ class ReferenceBugs extends DisplayComponent, this.groupRef.instance); + config={this.props.referenceBugs[i]} />, this.groupRef.instance); } } } @@ -411,8 +411,8 @@ export class XMLCircleGauge extends BaseGauge & X const pointA = XMLCircleGauge.polarToCartesian(this.origin, this.arcRadius - 11, ticks[i]); const pointB = XMLCircleGauge.polarToCartesian(this.origin, this.arcRadius, ticks[i]); FSComponent.render( - - + + , this.ticksRef.instance); } } @@ -576,7 +576,7 @@ export class XMLCircleGauge extends BaseGauge & X /** * Construct an SVG path string for a given arc based on its coordinates and radius. - @param center The cartesian center of the arc. + @param center The cartesian center of the arc. * @param radius The radius in pixels. * @param startAngle The starting azimuth of the arc in degrees. * @param endAngle The final azimuth of the arc in degrees. @@ -596,7 +596,7 @@ export class XMLCircleGauge extends BaseGauge & X /** * Determine the height "below the line" of the arc in pixels. - @param center The cartesian center of the arc. + @param center The cartesian center of the arc. * @param radius The radius in pixels. * @param startAngle The starting azimuth of the arc in degrees. * @param endAngle The final azimuth of the arc in degrees diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/HorizontalBarGauge.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/HorizontalBarGauge.tsx index 584185666..3ef69f2b1 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/HorizontalBarGauge.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/HorizontalBarGauge.tsx @@ -275,7 +275,7 @@ class SinglePointer extends DisplayComponent & if (alerting !== 0) { this.ptrPath.instance.setAttribute('fill', 'red'); } else { - this.ptrPath.instance.setAttribute('fill', 'white'); + this.ptrPath.instance.setAttribute('fill', `${this.props.style?.cursorColor ?? 'white'}`); } } @@ -287,7 +287,7 @@ class SinglePointer extends DisplayComponent & return (

- +
); @@ -454,9 +454,9 @@ class ColorLine extends DisplayComponent { */ public render(): VNode { return ; + x1={this.props.geometry.startX} y1={this.props.geometry.startY + this.props.tickFall} + x2={this.props.geometry.startX} y2={this.props.geometry.startY - this.props.tickRise} + stroke={this.props.color} stroke-width={this.props.width} />; } } @@ -697,11 +697,11 @@ class SingleValueText extends DisplayComponent<(Partial */ public render(): VNode { return ; + valueSubject={this.props.valueSubject} + valueColorSubject={this.valueColorSubject} + alignment={this.props.alignment} + textIncrement={this.props.style?.textIncrement} + valuePrecision={this.props.style?.valuePrecision} />; } } @@ -756,15 +756,15 @@ class DoubleValueText extends DisplayComponent<(Partial public render(): VNode { return + valueSubject={this.props.valueSubjects[0]} + valueColorSubject={this.valueColorSubjects[0]} + alignment={this.props.alignment} + doubleValue='upper' /> + valueSubject={this.props.valueSubjects[1]} + valueColorSubject={this.valueColorSubjects[1]} + alignment={this.props.alignment} + doubleValue='lower' /> ; } } @@ -824,7 +824,7 @@ export class XMLHorizontalGauge extends BaseGauge, + values={this.props.colorZones[i]} gaugeMin={this.props.minimum} gaugeMax={this.props.maximum} geometry={this.geometry} />, this.zoneGroupRef.instance); } } @@ -833,11 +833,11 @@ export class XMLHorizontalGauge extends BaseGauge, + geometry={this.geometry} + color={this.props.colorLines[i].color} + tickRise={15} tickFall={0} width={2} + position={this.props.colorLines[i].position} + smoothFactor={this.props.colorLines[i].smoothFactor} />, this.lineGroupRef.instance); } } @@ -948,7 +948,7 @@ export class XMLDoubleHorizontalGauge extends BaseGauge, + values={this.props.colorZones[i]} gaugeMin={this.props.minimum} gaugeMax={this.props.maximum} geometry={this.geometry} />, this.zoneGroupRef.instance); } } @@ -957,11 +957,11 @@ export class XMLDoubleHorizontalGauge extends BaseGauge, + geometry={this.geometry} + color={this.props.colorLines[i].color} + tickRise={10} tickFall={10} width={2} + position={this.props.colorLines[i].position} + smoothFactor={this.props.colorLines[i].smoothFactor} />, this.lineGroupRef.instance); } } @@ -984,7 +984,7 @@ export class XMLDoubleHorizontalGauge extends BaseGauge + valueSubjects={this.valueSubjects} alignment={this.props.style?.valuePos} /> diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/VerticalBarGauge.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/VerticalBarGauge.tsx index 6dd3862f8..963e79037 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/VerticalBarGauge.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/EngineInstruments/VerticalBarGauge.tsx @@ -327,7 +327,7 @@ class VerticalBar extends DisplayComponent, + values={this.props.colorZones[i]} gaugeMin={this.props.minimum} gaugeMax={this.props.maximum} gaugeHeight={this.height} />, this.zoneGroupRef.instance); } } @@ -336,13 +336,13 @@ class VerticalBar extends DisplayComponent, + geometry={this.geometry} + color={this.props.colorLines[i].color} + tickLeft={this.props.tickSide == 'left' || this.props.tickSide == 'both' ? 15 : -1} + tickRight={this.props.tickSide == 'right' || this.props.tickSide == 'both' ? 15 : -1} + height={3} + position={this.props.colorLines[i].position} + smoothFactor={this.props.colorLines[i].smoothFactor} />, this.lineGroupRef.instance); } } @@ -357,12 +357,12 @@ class VerticalBar extends DisplayComponent + stroke-width="1px" stroke="white" ref={this.baseLineRef} class="baseline" /> + stroke-width="1px" stroke="white" class="topBar" /> + stroke-width="1px" stroke="white" class="bottomBar" /> ; @@ -439,9 +439,9 @@ class ColorLine extends DisplayComponent { return ( + x1={this.props.geometry.startX - this.props.tickLeft} y1={this.props.geometry.startY} + x2={this.props.geometry.startX + this.props.tickRight} y2={this.props.geometry.startY} + stroke={this.props.color} stroke-width={this.props.height} shape-rendering="crispEdges" /> ); } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/ConstraintSelector.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/ConstraintSelector.tsx index 0fd350c1e..a75d1b906 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/ConstraintSelector.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/ConstraintSelector.tsx @@ -1,7 +1,8 @@ -import { ComputedSubject, FocusPosition, FSComponent, Subject, Subscribable, VNode } from '@microsoft/msfs-sdk'; +import { ComputedSubject, FocusPosition, FSComponent, MathUtils, Subject, Subscribable, VNode } from '@microsoft/msfs-sdk'; import { G1000UiControl, G1000UiControlProps } from '../../../../Shared/UI/G1000UiControl'; import { UiControl } from '../../../../Shared/UI/UiControl'; +import { FmsHEvent } from '../../../../Shared//UI/FmsHEvent'; /** Props on the ConstraintSelector component. */ interface ConstraintSelectorProps extends G1000UiControlProps { @@ -60,6 +61,7 @@ export class ConstraintSelector extends G1000UiControl ]; private isEditing = false; + private focusedDigit = 0; /** @inheritdoc */ public onAfterRender(node: VNode): void { @@ -128,8 +130,9 @@ export class ConstraintSelector extends G1000UiControl * Sets whether or not the control is presently in an edit state. * @param isEditing Whether or not the control is editing. * @param notify Whether or not to notify of the new value when changing state. + * @param focusFirst Whether or not to focus the first digit when entering edit mode. Focuses last digit when false */ - private setEditing(isEditing: boolean, notify = true): void { + private setEditing(isEditing: boolean, notify = true, focusFirst = true): void { if (this.isEditing !== isEditing) { if (isEditing) { this.setIsolated(true); @@ -137,7 +140,7 @@ export class ConstraintSelector extends G1000UiControl this.failedBoxRef.instance.style.display = 'none'; this.isEditing = isEditing; - this.getChild(0)?.focus(FocusPosition.First); + this.getChild(focusFirst ? 0 : 4)?.focus(FocusPosition.First); } else { this.setIsolated(false); this.setChildrenDisabled(true); @@ -212,6 +215,7 @@ export class ConstraintSelector extends G1000UiControl private onDigitFocused(digit: number): void { this.el.instance.classList.remove(UiControl.FOCUS_CLASS); this.digitRefs[digit].instance.classList.add(UiControl.FOCUS_CLASS); + this.focusedDigit = digit; } /** @@ -273,6 +277,64 @@ export class ConstraintSelector extends G1000UiControl this.el.instance.classList.remove(UiControl.FOCUS_CLASS); } + /** @inheritDoc */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + switch (evt) { + case FmsHEvent.D0: + return this.handleDigitInput(0); + case FmsHEvent.D1: + return this.handleDigitInput(1); + case FmsHEvent.D2: + return this.handleDigitInput(2); + case FmsHEvent.D3: + return this.handleDigitInput(3); + case FmsHEvent.D4: + return this.handleDigitInput(4); + case FmsHEvent.D5: + return this.handleDigitInput(5); + case FmsHEvent.D6: + return this.handleDigitInput(6); + case FmsHEvent.D7: + return this.handleDigitInput(7); + case FmsHEvent.D8: + return this.handleDigitInput(8); + case FmsHEvent.D9: + return this.handleDigitInput(9); + } + return super.consolidateKeyboardHEvent(source, evt); + } + + /** + * Handles a digit input from consolidated FMSHEvents. + * @param digit The digit that was input. + * @returns True as the event is always handled. + */ + private handleDigitInput(digit: number): boolean { + if (!this.isEditing) { + this.setEditing(true, false, false); + this.value.set(digit); + } else { + if (this.focusedDigit === 0) { + // the last digit is focused + if (this.value.get() < 10000) { + // if not all digits are used, add the new digit to the end + this.value.set(this.value.get() * 10 + digit); + } else { + // if all digits are used, replace the last digit with the new one + this.value.set(MathUtils.floor(this.value.get(), 10) + digit); + } + } else { + // if any other digit is focused, replace the focused digit with the new one + const digitsBeforeFocused = MathUtils.floor(this.value.get(), Math.pow(10, this.focusedDigit + 1)); + const digitsAfterFocused = this.value.get() % Math.pow(10, this.focusedDigit); + this.value.set(digitsBeforeFocused + digit * Math.pow(10, this.focusedDigit) + digitsAfterFocused); + // focus the next digit + this.scroll('forward'); + } + } + return true; + } + /** @inheritdoc */ public render(): VNode { return ( @@ -312,4 +374,4 @@ export class ConstraintSelector extends G1000UiControl
); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/MFDFPLVNavProfile.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/MFDFPLVNavProfile.tsx index 6f5dfe624..7789a6d22 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/MFDFPLVNavProfile.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/FPL/MFDFPLVNavProfile.tsx @@ -1,6 +1,6 @@ import { AdcEvents, ComputedSubject, ConsumerSubject, DurationDisplay, DurationDisplayDelim, DurationDisplayFormat, EventBus, FlightPlanner, FocusPosition, - FSComponent, GNSSEvents, LegDefinition, MappedSubject, MathUtils, NumberFormatter, NumberUnitSubject, Subject, Subscribable, UnitType, VNavControlEvents, + FSComponent, GNSSEvents, LegDefinition, MappedSubject, MathUtils, NumberFormatter, NumberUnitSubject, Subject, Subscribable, UnitType, VNavEvents, VNavState, VNode } from '@microsoft/msfs-sdk'; @@ -170,9 +170,23 @@ export class MFDFPLVNavProfile extends G1000UiControl { * @param fpa The FPA Value to set. */ private setFpa = (fpa: number): void => { - const publisher = this.props.bus.getPublisher(); - fpa = Math.round(fpa * 10) / 10; - publisher.pub('vnav_set_current_fpa', fpa); + const plan = this.props.fms.getPrimaryFlightPlan(); + const leg = this.vnavDataProvider?.activeConstraintLeg.get(); + + if (leg === null || leg === undefined) { + return; + } + + const globalLegIndex = plan.getLegIndexFromLeg(leg); + + if (globalLegIndex < 0) { + return; + } + + const segmentIndex = plan.getSegmentIndex(globalLegIndex); + const segmentLegIndex = plan.getSegmentLegIndex(globalLegIndex); + + this.props.fms.setUserFpa(Fms.PRIMARY_PLAN_INDEX, segmentIndex, segmentLegIndex, fpa); }; /** @inheritdoc */ diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.css index 935f6295c..8dc21d99f 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.css @@ -20,6 +20,47 @@ height: 100%; } -.mfd-pagemenu-list > div + div { +.mfd-pagemenu-list>div+div { margin-top: 0.25em; +} + +.sr22t-mfd-load-frequency-popup { + z-index: 901; + height: 275px; + width: 368px; + background-color: #404040; + border: 4px solid #C0C0C0; + border-radius: 9px; + font-size: 20px; + padding: 10px 9px; + transform: translate3d(505px, 56px, 0); +} + +.mfd-load-frequency-options { + margin-top: -4px; +} + +.sr22t-mfd-load-frequency-popup .load-frequency-option { + margin-bottom: 5px; + margin-top: 5px; + padding-bottom: 2px; + width: 94%; +} + +.mfd-load-frequency-header-text { + text-align: center; + width: 100%; + height: 18px; + font-size: 18px; +} + +.mfd-load-frequency-footer-text { + text-align: center; + width: 100%; + padding-top: 3px; + padding-left: 10%; + padding-right: 10%; + line-height: 30px; + align-self: center; + font-size: 20px; } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.tsx index a9a2dbe82..f7099ed40 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageMenuDialog.tsx @@ -8,7 +8,7 @@ import { GroupBox } from './GroupBox'; import './MFDPageMenuDialog.css'; /** - * Dialog used for displaying MFD FPL page menus. + * Dialog used for displaying MFD page menus. */ export class MFDPageMenuDialog extends ListMenuDialog { @@ -45,4 +45,4 @@ export class MFDPageMenuDialog extends ListMenuDialog {
); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageSelect.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageSelect.tsx index e07e1d4a4..2f9e4d715 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageSelect.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDPageSelect.tsx @@ -1,4 +1,4 @@ -import { ArraySubject, FSComponent, NodeReference, PluginSystem, VNode } from '@microsoft/msfs-sdk'; +import { ArraySubject, FSComponent, HEvent, NodeReference, PluginSystem, VNode } from '@microsoft/msfs-sdk'; import { G1000AvionicsPlugin, G1000PluginBinder } from '../../../Shared'; import { MenuItemDefinition, PopoutMenuItem } from '../../../Shared/UI/Dialogs/PopoutMenuItem'; @@ -210,7 +210,7 @@ export class MFDPageSelect extends UiView { this.compute(); // Now plugins can modify things. - this.props.pluginSystem.callPlugins(p => p.onPageSelectMenuSystemInitialized()); + this.props.pluginSystem.callPlugins(p => p.onPageSelectMenuSystemInitialized?.()); } // eslint-disable-next-line jsdoc/require-jsdoc @@ -228,6 +228,11 @@ export class MFDPageSelect extends UiView { this.setActiveGroup(groupIndex, itemIndex); } }, true); + + // Scroll to Navigation Map (first list item) in pag elist when home button is pressed + this.props.pluginSystem.binder?.bus.getSubscriber().on('hEvent').handle(eventName => { + if (eventName === 'AS1000_CONTROL_PAD_Home') { this.listRef.instance.scrollToIndex(0); } + }); } /** diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDUiPage.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDUiPage.tsx index a6fa4fd82..7b76a653b 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDUiPage.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDUiPage.tsx @@ -59,6 +59,8 @@ export abstract class MFDUiPage exten return this.onDirectToPressed(); case FmsHEvent.MENU: return this.onMenuPressed(); + case FmsHEvent.HOME: + return this.onHomePressed(); } return false; @@ -72,6 +74,15 @@ export abstract class MFDUiPage exten return false; } + /** + * This method is called when a HOME button event occurs. + * @returns whether the event was handled. + */ + protected onHomePressed(): boolean { + this.props.viewService.open('NavMapPage'); + return true; + } + /** * This method is called when a PROC button event occurs. * @returns whether the event was handled. diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDViewService.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDViewService.ts index 7126ea321..d8d9d8f60 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDViewService.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/MFDViewService.ts @@ -1,3 +1,6 @@ +import { EventBus, Publisher } from '@microsoft/msfs-sdk'; + +import { MFDViewServiceEvents } from '../../../Shared/UI/Controllers/ControlpadInputController'; import { FmsHEvent } from '../../../Shared/UI/FmsHEvent'; import { ViewService } from '../../../Shared/UI/ViewService'; @@ -6,6 +9,9 @@ import { ViewService } from '../../../Shared/UI/ViewService'; */ export class MFDViewService extends ViewService { + /** A publisher for publishing flight planner update events. */ + private readonly publisher: Publisher; + protected readonly fmsEventMap: Map = new Map([ ['AS1000_MFD_FMS_Upper_INC', FmsHEvent.UPPER_INC], ['AS1000_MFD_FMS_Upper_DEC', FmsHEvent.UPPER_DEC], @@ -24,6 +30,22 @@ export class MFDViewService extends ViewService { ['AS1000_MFD_JOYSTICK_LEFT', FmsHEvent.JOYSTICK_LEFT], ['AS1000_MFD_JOYSTICK_UP', FmsHEvent.JOYSTICK_UP], ['AS1000_MFD_JOYSTICK_RIGHT', FmsHEvent.JOYSTICK_RIGHT], - ['AS1000_MFD_JOYSTICK_DOWN', FmsHEvent.JOYSTICK_DOWN] + ['AS1000_MFD_JOYSTICK_DOWN', FmsHEvent.JOYSTICK_DOWN], ]); -} \ No newline at end of file + + /** + * Constructs the view service. + * @param bus The event bus. + */ + constructor(readonly bus: EventBus) { + super(bus); + + this.publisher = bus.getPublisher(); + + // For the controlpad input routing, we need to share among the instruments, whether the MFD has opened the home view (nav map) or not: + this.activeViewKey.sub(newViewKey => { + const isNotNavMapPage = newViewKey !== 'NavMapPage'; // Prevent generic controlpad use (COM, NAV, XPDR) if any otehr page than NavMap is opened. + this.bus.getPublisher().pub('inhibitGenericControlpadUse', isNotNavMapPage, true, true); + }, true); + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/NavDataBar/MFDNavDataBar.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/NavDataBar/MFDNavDataBar.css index 01c045af8..23a536162 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/NavDataBar/MFDNavDataBar.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/NavDataBar/MFDNavDataBar.css @@ -1,33 +1,35 @@ .nav-data-bar-container { position: relative; - background: linear-gradient(to bottom, rgb(4,4,12), rgb(24, 28, 43)); + background: linear-gradient(to bottom, rgb(4, 4, 12), rgb(24, 28, 43)); border-style: solid; border-width: 1px; - border-color:rgb(133, 133, 133); + border-color: rgb(133, 133, 133); border-top: none; border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; } - .nav-data-bar { - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 50%; - padding: 0 2px; - display: grid; - grid-template-rows: 100%; - grid-template-columns: repeat(auto-fit, minmax(10px, 1fr)); - align-items: center; - font-size: 20px; - } - .nav-data-bar-page-title { - position: absolute; - left: 0; - top: 75%; - transform: translateY(-50%); - width: 100%; - text-align: center; - font-size: 20px; - color: cyan; - } \ No newline at end of file + +.nav-data-bar { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 50%; + padding: 0 2px; + display: grid; + grid-template-rows: 100%; + grid-template-columns: repeat(auto-fit, minmax(10px, 1fr)); + align-items: center; + font-size: 20px; +} + +.nav-data-bar-page-title { + position: absolute; + left: 0; + top: 75%; + transform: translateY(-50%); + width: 100%; + text-align: center; + font-size: 20px; + color: cyan; +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/Airports/FrequenciesGroup.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/Airports/FrequenciesGroup.tsx index 2bcbb7341..3952c3335 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/Airports/FrequenciesGroup.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/Airports/FrequenciesGroup.tsx @@ -74,7 +74,7 @@ export class NearestAirportFrequenciesGroup extends G1000UiControl { +export class FrequencyItem extends G1000UiControl { private readonly number = FSComponent.createRef(); /** @inheritdoc */ @@ -158,4 +158,4 @@ class FrequencyItem extends G1000UiControl {
); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/MFDNearestAirportsPage.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/MFDNearestAirportsPage.tsx index ec07c3856..607861b0f 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/MFDNearestAirportsPage.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Nearest/MFDNearestAirportsPage.tsx @@ -1,7 +1,7 @@ import { AdaptiveNearestSubscription, AirportClassMask, AirportFacility, AirportUtils, ApproachProcedure, FocusPosition, FSComponent, - NearestAirportSubscription, NearestSubscription, VNode + NearestAirportSubscription, NearestSubscription, Subject, Subscription, VNode } from '@microsoft/msfs-sdk'; import { ProcedureType } from '@microsoft/msfs-garminsdk'; @@ -15,6 +15,8 @@ import { NearestAirportInformationGroup, NearestAirportRunwaysGroup, } from './Airports'; import { MFDNearestPage, MFDNearestPageProps } from './MFDNearestPage'; +import { MFDPageMenuDialog } from '../MFDPageMenuDialog'; +import { MenuItemDefinition } from '../../../../Shared'; export enum NearestAirportSoftKey { APT, @@ -30,17 +32,70 @@ export enum NearestAirportSoftKey { */ export class MFDNearestAirportsPage extends MFDNearestPage { + private g1000ControlPublisher = this.props.bus.getPublisher(); + private readonly informationGroup = FSComponent.createRef(); private readonly runwaysGroup = FSComponent.createRef(); private readonly frequenciesGroup = FSComponent.createRef(); private readonly approachesGroup = FSComponent.createRef(); - private facility: AirportFacility | undefined; - private approach: ApproachProcedure | undefined; + private pageMenu?: MFDPageMenuDialog; + private pageMenuSub?: Subscription; + private isPageMenuRunwayEnabledSub?: Subscription; + private readonly isPageMenuRunwayEnabled = Subject.create(false); + + private facility: AirportFacility | undefined = undefined; + private approach: ApproachProcedure | undefined = undefined; private searchSettings = NearestAirportSearchSettings.getManager(this.props.bus); private searchSubscription: NearestAirportSubscription | undefined; + private readonly pageMenuItems = (): MenuItemDefinition[] => [ + { + id: 'select-airport-window', + renderContent: (): VNode => Select Airport Window, + action: (): void => { + this.g1000ControlPublisher.pub('nearest_airports_key', NearestAirportSoftKey.APT); + } + }, + { + id: 'select-runway-window', + renderContent: (): VNode => Select Runway Window, + isEnabled: this.isPageMenuRunwayEnabled.get(), + action: (): void => { + this.g1000ControlPublisher.pub('nearest_airports_key', NearestAirportSoftKey.RNWY); + } + }, + { + id: 'select-frequency-window', + renderContent: (): VNode => Select Frequency Window, + action: (): void => { + this.g1000ControlPublisher.pub('nearest_airports_key', NearestAirportSoftKey.FREQ); + } + }, + { + id: 'select-approach-window', + renderContent: (): VNode => Select Approach Window, + action: (): void => { + this.g1000ControlPublisher.pub('nearest_airports_key', NearestAirportSoftKey.APR); + } + }, + { + id: 'load-approach', + renderContent: (): VNode => Load Approach, + isEnabled: this.pageMenu?.inputData.get() !== undefined && this.approach !== undefined, + action: (): void => { + this.g1000ControlPublisher.pub('nearest_airports_key', NearestAirportSoftKey.LD_APR); + } + }, + { + id: 'charts', + renderContent: (): VNode => Charts, + isEnabled: false, + }, + ]; + + /** * Creates an instance of a nearest airport box. * @param props The props. @@ -94,6 +149,36 @@ export class MFDNearestAirportsPage extends MFDNearestPage { this.props.menuSystem.clear(); this.props.menuSystem.pushMenu('nearest-airports-menu'); + this._title.set('NRST - Nearest Airports'); + } + + /** + * Opens the Page Menu popup when Menu button is pressed. + * @returns whether the event was handled. + */ + protected override onMenuPressed(): boolean { + if (this.pageMenuSub) { + this.pageMenuSub.destroy(); + this.pageMenuSub = undefined; + } + + if (this.isPageMenuRunwayEnabledSub) { + this.isPageMenuRunwayEnabledSub.destroy(); + this.isPageMenuRunwayEnabledSub = undefined; + } + + this.pageMenu = this.props.viewService.open('PageMenuDialog'); + this.pageMenuSub = this.pageMenu + .setInput(this.facility) + .inputData.sub((input: AirportFacility | undefined) => { + this.isPageMenuRunwayEnabled.set(input !== undefined && input.runways.length > 1); + }, true); + + this.isPageMenuRunwayEnabled.sub(() => { + this.pageMenu?.setMenuItems(this.pageMenuItems()); + }, true); + + return true; } /** @inheritdoc */ @@ -120,7 +205,6 @@ export class MFDNearestAirportsPage extends MFDNearestPage { /** @inheritdoc */ protected onFacilitySelected(airport: AirportFacility | null): void { super.onFacilitySelected(airport); - this.informationGroup.instance.set(airport); this.runwaysGroup.instance.set(airport); this.frequenciesGroup.instance.set(airport); @@ -148,12 +232,11 @@ export class MFDNearestAirportsPage extends MFDNearestPage { */ private onApproachSelected(approach: ApproachProcedure | undefined): void { this.approach = approach; - const publisher = this.props.bus.getPublisher(); if (this.approach !== undefined) { - publisher.pub('ld_apr_enabled', true, false, false); + this.g1000ControlPublisher.pub('ld_apr_enabled', true, false, false); } else { - publisher.pub('ld_apr_enabled', false, false, false); + this.g1000ControlPublisher.pub('ld_apr_enabled', false, false, false); } } @@ -177,4 +260,22 @@ export class MFDNearestAirportsPage extends MFDNearestPage { ); } + + /** @inheritdoc */ + public pause(): void { + this.pageMenuSub?.pause(); + this.isPageMenuRunwayEnabledSub?.pause(); + } + + /** @inheritdoc */ + public resume(): void { + this.pageMenuSub?.resume(); + this.isPageMenuRunwayEnabledSub?.resume(); + } + + /** @inheritdoc */ + public destroy(): void { + this.pageMenuSub?.destroy(); + this.isPageMenuRunwayEnabledSub?.destroy(); + } } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/MFDProc.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/MFDProc.tsx index 80c16275f..211856c55 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/MFDProc.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/MFDProc.tsx @@ -158,6 +158,7 @@ export class MFDProc extends UiView { switch (evt) { case FmsHEvent.PROC: case FmsHEvent.CLR: + case FmsHEvent.HOME: this.close(); return true; } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/ProcSequenceItem.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/ProcSequenceItem.tsx index 6b3ff5e21..0ab64d6a6 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/ProcSequenceItem.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/Procedure/ProcSequenceItem.tsx @@ -61,7 +61,7 @@ export class ProcSequenceItem extends UiControl { oldVal.set(newVal); }, BasicNavAngleUnit.create(true).createNumber(NaN) - ) as MappedSubscribable>; + ) as MappedSubscribable>; private readonly distanceSub = this.props.data.map( leg => { diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDataBarGroup.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDataBarGroup.tsx index 4174a62d8..eb54d09fb 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDataBarGroup.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDataBarGroup.tsx @@ -11,11 +11,33 @@ import { MFDSystemSetupSelectRow } from './MFDSystemSetupRow'; * The MFD System Setup page MFD Data Bar Fields group. */ export class MFDSystemSetupDataBarGroup extends DisplayComponent { + private static readonly SUPPORTED_FIELD_TYPES = [ + NavDataFieldType.BearingToWaypoint, + NavDataFieldType.Destination, + NavDataFieldType.DistanceToWaypoint, + NavDataFieldType.DistanceToDestination, + NavDataFieldType.DesiredTrack, + NavDataFieldType.Endurance, + NavDataFieldType.TimeToDestination, + NavDataFieldType.TimeOfWaypointArrival, + NavDataFieldType.TimeToWaypoint, + NavDataFieldType.FuelOnBoard, + NavDataFieldType.FuelOverDestination, + NavDataFieldType.GroundSpeed, + NavDataFieldType.ISA, + NavDataFieldType.TimeOfDestinationArrival, + NavDataFieldType.TrueAirspeed, + NavDataFieldType.TrackAngleError, + NavDataFieldType.GroundTrack, + NavDataFieldType.VerticalSpeedRequired, + NavDataFieldType.CrossTrack + ]; + private readonly settingManager = MFDNavDataBarUserSettings.getManager(this.props.bus); /** @inheritdoc */ public render(): VNode { - const valueArray = ArraySubject.create(Object.values(NavDataFieldType).filter(type => type !== NavDataFieldType.TimeToDestination)); + const valueArray = ArraySubject.create(Array.from(MFDSystemSetupDataBarGroup.SUPPORTED_FIELD_TYPES)); return ( diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDateTimeGroup.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDateTimeGroup.tsx index 9ed538a9a..946a818c4 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDateTimeGroup.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupDateTimeGroup.tsx @@ -8,7 +8,7 @@ import { TimeDisplay, TimeDisplayFormat } from '../../../../Shared/UI/Common/Tim import { UiControl } from '../../../../Shared/UI/UiControl'; import { DigitInput } from '../../../../Shared/UI/UiControls2/DigitInput'; import { G1000UiControlWrapper } from '../../../../Shared/UI/UiControls2/G1000UiControlWrapper'; -import { GenericNumberInput } from '../../../../Shared/UI/UiControls2/GenericNumberInput'; +import { TimeNumberInput } from '../../../../Shared/UI/UiControls2/TimeNumberInput'; import { SignInput } from '../../../../Shared/UI/UiControls2/SignInput'; import { UserSettingNumberController } from '../../../../Shared/UI/UserSettings/UserSettingNumberController'; import { GroupBox } from '../GroupBox'; @@ -169,7 +169,7 @@ class LocalOffsetInput extends DisplayComponent { private static readonly MIN_TO_MS = UnitType.MINUTE.convertTo(1, UnitType.MILLISECOND); private readonly rootRef = FSComponent.createRef(); - private readonly inputRef = FSComponent.createRef(); + private readonly inputRef = FSComponent.createRef(); private readonly controller = new UserSettingNumberController( this.props.settingManager, @@ -204,7 +204,7 @@ class LocalOffsetInput extends DisplayComponent { return (
- { @@ -231,10 +231,10 @@ class LocalOffsetInput extends DisplayComponent { : - +
––:––
); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupRow.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupRow.tsx index 5409b3541..206bd378e 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupRow.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/Components/UI/SystemSetup/MFDSystemSetupRow.tsx @@ -139,4 +139,4 @@ export class MFDSystemSetupToggleRow< /> ); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/WTG1000_MFD.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/WTG1000_MFD.tsx index 1a129b5b8..e075a1e0a 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/WTG1000_MFD.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/MFD/WTG1000_MFD.tsx @@ -6,16 +6,16 @@ /// import { - AdcPublisher, APRadioNavInstrument, AutopilotInstrument, AvionicsSystem, BaseInstrumentPublisher, Clock, ClockEvents, CompositeLogicXMLHost, ControlPublisher, EISPublisher, - ElectricalPublisher, EventBus, EventSubscriber, FacilityLoader, FacilityRepository, FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, - FSComponent, GameStateProvider, GNSSPublisher, GpsSynchronizer, HEvent, HEventPublisher, InstrumentBackplane, InstrumentEvents, LNavSimVarPublisher, MinimumsManager, - MinimumsSimVarPublisher, NavComSimVarPublisher, PluginSystem, SimVarValueType, SmoothingPathCalculator, TrafficInstrument, UserSettingSaveManager, - VNavSimVarPublisher, Wait, XMLGaugeConfigFactory + AdcPublisher, AltitudeSelectManagerAccelFilter, APRadioNavInstrument, AutopilotInstrument, AvionicsSystem, BaseInstrumentPublisher, Clock, ClockEvents, + CompositeLogicXMLHost, ControlPublisher, EISPublisher, ElectricalPublisher, EventBus, EventSubscriber, FacilityLoader, FacilityRepository, + FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, FSComponent, GameStateProvider, GNSSPublisher, GpsSynchronizer, HEvent, HEventPublisher, + InstrumentBackplane, InstrumentEvents, LNavSimVarPublisher, MinimumsManager, MinimumsSimVarPublisher, NavComSimVarPublisher, NavEvents, NavSourceType, + PluginSystem, SimVarValueType, SmoothingPathCalculator, TrafficInstrument, UserSettingSaveManager, VNavSimVarPublisher, VNode, Wait, XMLGaugeConfigFactory } from '@microsoft/msfs-sdk'; import { - AdcSystem, DateTimeUserSettings, Fms, GarminAdsb, GarminAPConfig, GarminAPStateManager, GarminVNavUtils, LNavDataSimVarPublisher, NavdataComputer, TrafficAdvisorySystem, - TrafficOperatingModeManager, UnitsUserSettings + ActiveNavSource, AdcSystem, DateTimeUserSettings, Fms, GarminAdsb, GarminAPConfig, GarminAPStateManager, GarminGoAroundManager, GarminNavEvents, + GarminVNavUtils, LNavDataSimVarPublisher, NavdataComputer, TrafficAdvisorySystem, TrafficOperatingModeManager, UnitsUserSettings } from '@microsoft/msfs-garminsdk'; import { PFDUserSettings } from '../PFD/PFDUserSettings'; @@ -35,6 +35,7 @@ import { StartupLogo } from '../Shared/StartupLogo'; import { ADCAvionicsSystem, AHRSSystem, AvionicsComputerSystem, EngineAirframeSystem, G1000AvionicsSystem, MagnetometerSystem, TransponderSystem } from '../Shared/Systems'; +import { ControlpadInputController, ControlpadTargetInstrument } from '../Shared/UI/Controllers/ControlpadInputController'; import { ContextMenuDialog } from '../Shared/UI/Dialogs/ContextMenuDialog'; import { MessageDialog } from '../Shared/UI/Dialogs/MessageDialog'; import { EngineMenu } from '../Shared/UI/Menus/MFD/EngineMenu'; @@ -160,6 +161,12 @@ class WTG1000_MFD extends BaseInstrument { private readonly pluginSystem = new PluginSystem(); + private readonly comRadio = FSComponent.createRef(); + private readonly navRadio = FSComponent.createRef(); + private controlPadHandler: ControlpadInputController; + + private goAroundManager?: GarminGoAroundManager; + /** * Creates an instance of the WTG1000_MFD. */ @@ -213,7 +220,7 @@ class WTG1000_MFD extends BaseInstrument { this.backplane.addPublisher('gnss', this.gnss); this.backplane.addPublisher('eis', this.eis); this.backplane.addPublisher('control', this.controlPublisher); - this.backplane.addPublisher('g1000', this.g1000ControlPublisher); + this.backplane.addPublisher('g1000Control', this.g1000ControlPublisher); this.backplane.addPublisher('lnav', this.lNavPublisher); this.backplane.addPublisher('lnavdata', this.lNavDataPublisher); this.backplane.addPublisher('vnav', this.vNavPublisher); @@ -268,6 +275,8 @@ class WTG1000_MFD extends BaseInstrument { this.initDuration = 3000; this.needValidationAfterInit = true; + + this.controlPadHandler = new ControlpadInputController(this.bus, ControlpadTargetInstrument.MFD); } /** @@ -293,6 +302,9 @@ class WTG1000_MFD extends BaseInstrument { super.connectedCallback(); this.airframeOptions.parseConfig(); + // The NXi does not support FMS-managed speed. + SimVar.SetSimVarValue('L:XMLVAR_SpeedIsManuallySet', SimVarValueType.Bool, 1); + this.verticalPathCalculator = new SmoothingPathCalculator(this.bus, this.planner, 0, { defaultFpa: 3, maxFpa: 6, @@ -302,12 +314,28 @@ class WTG1000_MFD extends BaseInstrument { invalidateDescentConstraint: GarminVNavUtils.invalidateDescentConstraint }); - const apConfig = new GarminAPConfig(this.bus, this.planner, this.verticalPathCalculator); + const apConfig = new GarminAPConfig(this.bus, this.planner, this.verticalPathCalculator, { + rollMinBankAngle: this.airframeOptions.autopilotConfig.rollOptions.minBankAngle, + rollMaxBankAngle: this.airframeOptions.autopilotConfig.rollOptions.maxBankAngle, + hdgMaxBankAngle: this.airframeOptions.autopilotConfig.hdgOptions.maxBankAngle, + vorMaxBankAngle: this.airframeOptions.autopilotConfig.vorOptions.maxBankAngle, + locMaxBankAngle: this.airframeOptions.autopilotConfig.locOptions.maxBankAngle, + lnavMaxBankAngle: this.airframeOptions.autopilotConfig.lnavOptions.maxBankAngle, + lowBankAngle: this.airframeOptions.autopilotConfig.lowBankOptions.maxBankAngle, + }); this.autopilot = new G1000Autopilot( this.bus, this.planner, apConfig, new GarminAPStateManager(this.bus, apConfig), - PFDUserSettings.getManager(this.bus) + { + metricAltSettingsManager: PFDUserSettings.getManager(this.bus), + altSelectOptions: { + accelInputCountThreshold: 11, + accelResetOnDirectionChange: true, + accelFilter: AltitudeSelectManagerAccelFilter.ZeroIncDec, + transformSetToIncDec: this.airframeOptions.autopilotConfig.supportAltSelCompatibility + } + } ); Wait.awaitSubscribable(GameStateProvider.get(), state => state === GameState.briefing || state === GameState.ingame).then(() => { @@ -317,6 +345,7 @@ class WTG1000_MFD extends BaseInstrument { }); this.fms = new Fms(true, this.bus, this.planner, this.verticalPathCalculator); + this.goAroundManager = new GarminGoAroundManager(this.bus, this.fms); const softKeyMenuSystem = new SoftKeyMenuSystem(this.bus, 'AS1000_MFD_SOFTKEYS_'); const rotaryMenuSystem = new PageSelectMenuSystem(); @@ -327,7 +356,10 @@ class WTG1000_MFD extends BaseInstrument { this.pluginSystem.addScripts(this.xmlConfig, this.templateID, (target) => { return target === this.templateID; }).then(() => { - this.pluginSystem.startSystem({ bus: this.bus, viewService: this.viewService, menuSystem: softKeyMenuSystem, pageSelectMenuSystem: rotaryMenuSystem }).then(() => { + this.pluginSystem.startSystem({ + bus: this.bus, backplane: this.backplane, fms: this.fms, viewService: this.viewService, + menuSystem: softKeyMenuSystem, pageSelectMenuSystem: rotaryMenuSystem + }).then(() => { softKeyMenuSystem.addMenu('empty', new SoftKeyMenu(softKeyMenuSystem)); softKeyMenuSystem.addMenu('navmap-root', new MFDNavMapRootMenu(softKeyMenuSystem)); @@ -353,9 +385,14 @@ class WTG1000_MFD extends BaseInstrument { softKeyMenuSystem.pushMenu('navmap-root'); - this.pluginSystem.callPlugins(p => p.onMenuSystemInitialized()); + this.pluginSystem.callPlugins(p => p.onMenuSystemInitialized?.()); - FSComponent.render(, document.getElementsByClassName('eis')[0] as HTMLDivElement); + let eisNode: VNode | null = null; + this.pluginSystem.callPlugins(p => { + eisNode ??= p.renderEIS?.() || null; + }); + + FSComponent.render(eisNode ?? , document.getElementsByClassName('eis')[0] as HTMLDivElement); FSComponent.render( , document.getElementById('NavComBox') ); - FSComponent.render(, document.querySelector('#NavComBox #Left')); - FSComponent.render(, document.querySelector('#NavComBox #Right')); + FSComponent.render(, document.querySelector('#NavComBox #Left')); + FSComponent.render(, document.querySelector('#NavComBox #Right')); FSComponent.render(, document.getElementById('Electricity')); FSComponent.render( this.initAcknowledged = true} />, this); @@ -413,9 +450,11 @@ class WTG1000_MFD extends BaseInstrument { // this.viewService.registerView('Turb', () => ); + this.controlPadHandler.setFrequencyElementRefs(this.comRadio.instance, this.navRadio.instance); + this.viewService.open('NavMapPage'); - this.pluginSystem.callPlugins(p => p.onViewServiceInitialized()); + this.pluginSystem.callPlugins(p => p.onViewServiceInitialized?.()); this.controlPublisher.publishEvent('init_cdi', true); }); @@ -460,6 +499,21 @@ class WTG1000_MFD extends BaseInstrument { } }); + //Bridge G1000 CDI to newer nav source events for GoAoundManager + this.bus.getSubscriber().on('cdi_select').handle(v => { + const publisher = this.bus.getPublisher(); + + if (v.type === NavSourceType.Gps) { + publisher.pub('active_nav_source_1', ActiveNavSource.Gps1, false, true); + } else if (v.type === NavSourceType.Nav) { + publisher.pub('active_nav_source_1', v.index === 0 ? ActiveNavSource.Nav1 : ActiveNavSource.Nav2); + } else { + publisher.pub('active_nav_source_1', ActiveNavSource.Nav1); + } + + }); + this.goAroundManager?.init(); + this.doDelayedInit(); } @@ -583,8 +637,14 @@ class WTG1000_MFD extends BaseInstrument { * @param args The H event and associated arguments, if any. */ public onInteractionEvent(args: string[]): void { - this.hEventPublisher.dispatchHEvent(args[0]); + const isHandled = this.controlPadHandler.handleControlPadEventInput(args[0]); + if (isHandled === false) { + // If the controlpad handler did not handle the event, continue and publish: + this.hEventPublisher.dispatchHEvent(args[0]); + } } + + } -registerInstrument('wtg1000-mfd', WTG1000_MFD); \ No newline at end of file +registerInstrument('wtg1000-mfd', WTG1000_MFD); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.css deleted file mode 100644 index 87419816d..000000000 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.css +++ /dev/null @@ -1,260 +0,0 @@ -.airspeed { - transform: rotateX(0); - position: absolute; - top: 111px; - height: 363px; - left: 152px; - width: 90px; - background: linear-gradient(to bottom, rgba(0, 0, 0, .5), rgba(0, 0, 0, 0), rgba(0, 0, 0, .5)); - border-top-left-radius: 10px; - border-bottom-left-radius: 10px; -} - -.airspeed-top-border { - position: absolute; - top: -1px; - left: -1px; - height: 15px; - width: 91px; - border: 1px solid rgb(100, 100, 100); - border-top-left-radius: 10px; - border-bottom: none; -} - -.airspeed-middle-border { - position: absolute; - top: 14px; - left: -1px; - height: 320px; - width: 91px; - border-top: none; - border-image: linear-gradient(to bottom, rgba(100, 100, 100, 1), rgba(0, 0, 0, 1)) 1 100%; - border-width: 1px; - border-bottom-width: 0; - overflow: hidden; -} - -.speed-tape { - position: relative; - left: 90%; - bottom: 3.3%; - width: 8px; - height: 45.9%; -} - -#barberpole { - position: absolute; - right: 0; - width: 9px; - background: repeating-linear-gradient(315deg, white, white 10px, red 0px, red 19px); -} - -.tick-marks, -.airspeed-trend-vector { - position: absolute; - left: 18px; - top: 0; - width: 70px; - height: 92%; - overflow: hidden; -} - -.airspeed-trend-vector { - left: unset; - right: -6px; -} - -.flc-box { - position: absolute; - width: 89px; - height: 8%; - top: 0; - font-size: 20px; - border-top-left-radius: 10px; - background-color: black; - border-bottom: none; -} - -.flc-value { - position: absolute; - top: 2px; - left: 30px; - text-align: right; - width: 50px; -} - -.ias-box { - position: absolute; - top: 132px; - width: 100%; - height: 70px; - border: none; - fill: none; - --speedNumberColor: white; -} - -.scroller-background { - position: absolute; - top: 17px; - width: 17px; - border: none; - text-align: center; - font-size: 32px; - background: linear-gradient(to bottom, rgba(0, 0, 0, 1.0), rgb(30, 30, 30), rgba(0, 0, 0, 1.0)); - overflow: hidden; -} - -.scroller-background svg { - height: 500px -} - -.overspeed.ias-box path { - fill: red; - stroke: none; -} - -.overspeed .scroller-background, -.overspeed .ones-scroller-mask { - background: none; -} - -.hundreds-scroller { - position: absolute; - left: 14px; - height: 35px; -} - -.tens-scroller { - position: absolute; - left: 34px; - height: 35px; - padding-bottom: 5px; -} - -.ones-scroller { - position: absolute; - z-index: 10; - top: 6px; - left: 54px; - height: 57px; -} - -.ones-scroller-mask { - position: absolute; - top: -4px; - width: 17px; - height: 65px; - overflow: hidden; - padding-top: 4px; -} - -.ones-scroller-overlay { - position: absolute; - top: 0; - width: 17px; - height: 65px; - background: linear-gradient(to bottom, rgba(0, 0, 0, 1) 5%, rgba(0, 0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%, rgba(0, 0, 0, 1) 95%); -} - -.flc-bug { - position: absolute; - right: 0px; - top: 157px; -} - -.airspeed-bug { - position: absolute; - font-size: 16px; - color: cyan; -} - -.bug-values { - position: absolute; - font-size: 20px; - right: 8px; -} - -.vspeed-bug-container { - position: absolute; - height: 335px; - width: 30px; - left: 92px; - top: 0px; - overflow: hidden; -} - -.vspeed-values-background { - position: absolute; - width: 89px; - height: 169px; - top: 151px; - text-align: right; - background: rgba(16, 15, 14, .7); -} - -.glide, -.vr, -.vx, -.vy { - top: 157px; -} - -.value1 { - position: absolute; - bottom: 4px; -} - -.value2 { - position: absolute; - bottom: 26px; -} - -.value3 { - position: absolute; - bottom: 48px; -} - -.value4 { - position: absolute; - bottom: 70px; -} - -.tas-box { - position: absolute; - top: 92%; - width: 91px; - height: 8%; - left: -1px; - padding: 10% 5%; - font-size: 12px; - border-bottom-left-radius: 10px; - background-color: black; - overflow: hidden; - transform: rotateX(0); -} - -.tas-value { - position: absolute; - text-align: right; - top: 10%; - right: 5%; - font-size: 20px; -} - -/** Fail States **/ - -.failed-instr .ias-box { - display: none; -} - -.failed-instr .speed-tape-numers { - display: none; -} - -.failed-instr .tas-box { - display: none; -} - -.failed-instr .vspeed-values-container { - display: none; -} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.tsx deleted file mode 100644 index c5fc55b09..000000000 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator.tsx +++ /dev/null @@ -1,883 +0,0 @@ -import { AdcEvents, APEvents, APLockType, ComputedSubject, DisplayComponent, EventBus, FSComponent, MathUtils, NodeReference, Subject, VNode } from '@microsoft/msfs-sdk'; - -import { G1000ControlEvents } from '../../../Shared/G1000Events'; -import { ADCSystemEvents } from '../../../Shared/Systems/ADCAvionicsSystem'; -import { AvionicsSystemState, AvionicsSystemStateEvent } from '../../../Shared/Systems/G1000AvionicsSystem'; - -import './AirspeedIndicator.css'; - -/** - * A Vspeed type. - */ -export enum VSpeedType { - Vx, - Vy, - Vglide, - Vapp, - Vr -} - -enum SpeedWarning { - None, - Caution, - Overspeed -} - -/** - * A Vspeed Object. - */ -export class VSpeed { - type: VSpeedType; - value: number; - modified = Subject.create(false); - display: boolean | undefined; - - /** - * Creates an instance of a VSpeed. - * @param type is the type of vspeed - * @param value is the value of a vspeed in knots - * @param modified is whether the pilot has modified this vspeed - * @param display is whether this vspeed should be displayed - */ - constructor(type: VSpeedType, value = 0, modified = false, display: boolean | undefined = undefined) { - this.type = type; - this.value = value; - this.modified.set(modified); - this.display = display; - } -} - -/** - * The properties on the airspeed component. - */ -interface AirspeedIndicatorProps { - - /** An instance of the event bus. */ - bus: EventBus; -} - -/** - * The PFD airspeed indicator with speed tape. - */ -export class AirspeedIndicator extends DisplayComponent { - - private containerRef = FSComponent.createRef(); - private airspeedHundredsDataElement = FSComponent.createRef(); - private airspeedTensDataElement = FSComponent.createRef(); - private airspeedOnesDataElement = FSComponent.createRef(); - private airspeedTapeTickElement = FSComponent.createRef(); - private airspeedBoxElement = FSComponent.createRef(); - private airspeedTrendVector = FSComponent.createRef(); - private currentDrawnIas = 0; - private ias = 0; - private speedTrend = Subject.create(0); - private iasScrollerValues: NodeReference[] = []; - private tasElement = FSComponent.createRef(); - - private speedRangeValues = { - barber: FSComponent.createRef(), - yellow: FSComponent.createRef(), - green: FSComponent.createRef(), - greenWhite: FSComponent.createRef(), - white: FSComponent.createRef(), - red: FSComponent.createRef() - }; - private readonly vxSpeedRef = FSComponent.createRef(); - private readonly vySpeedRef = FSComponent.createRef(); - private readonly vgSpeedRef = FSComponent.createRef(); - private readonly vrSpeedRef = FSComponent.createRef(); - private readonly vappSpeedRef = FSComponent.createRef(); - private readonly vSpeedBackgroundRef = FSComponent.createRef(); - private readonly vSpeedContainerRef = FSComponent.createRef(); - private readonly flcBugRef = FSComponent.createRef(); - private readonly flcBoxRef = FSComponent.createRef(); - - private readonly hundredsSvg = FSComponent.createRef(); - private readonly tensSvg = FSComponent.createRef(); - private readonly onesSvg = FSComponent.createRef(); - - private flcSubject = Subject.create('- - - '); - private stallDirty = Simplane.getDesignSpeeds().VS0; - private stallClean = Simplane.getDesignSpeeds().VS1; - private flapsExtend = Simplane.getDesignSpeeds().VFe; - private yellowSpeed = Simplane.getDesignSpeeds().VNo; - private barberSpeed = Simplane.getDesignSpeeds().VNe; - - private flcSpeed = 0; - private vSpeeds: VSpeed[] = [ - { type: VSpeedType.Vx, value: Simplane.getDesignSpeeds().Vx, modified: Subject.create(false), display: true }, - { type: VSpeedType.Vy, value: Simplane.getDesignSpeeds().Vy, modified: Subject.create(false), display: true }, - { type: VSpeedType.Vr, value: Simplane.getDesignSpeeds().Vr, modified: Subject.create(false), display: true }, - { type: VSpeedType.Vglide, value: Simplane.getDesignSpeeds().BestGlide, modified: Subject.create(false), display: true }, - { type: VSpeedType.Vapp, value: Simplane.getDesignSpeeds().Vapp, modified: Subject.create(false), display: false } - ]; - - private vSpeedSubjects: Subject[] = [ - Subject.create('0'), - Subject.create('0'), - Subject.create('0'), - Subject.create('0'), - Subject.create('0') - ]; - - private speedWarningSubject = Subject.create(SpeedWarning.None); - private isFailed = false; - - private tasSubject = Subject.create(0); - - /** - * Builds a numerical scroller for the airspeed window. - * @param startYValue The starting Y value in the svg to start number at. - * @param blankZeroValue Whether or not the 0 digit should be replaced by an empty space. - * @returns A collection of text elements for the numerical scroller. - */ - private buildScroller(startYValue = -2, blankZeroValue = false): SVGTextElement[] { - const scroller: SVGTextElement[] = []; - let yValue = startYValue; - - for (let i = 11; i > -3; i--) { - const number = i > 9 ? i - 10 : i < 0 ? i + 10 : i; - let numberText = number.toString(); - - if (blankZeroValue && number === 0) { - numberText = ' '; - } - - scroller.push({numberText}); - yValue += 30; - } - - scroller.push(–); - return scroller; - } - - /** - * Builds the tick marks on the airspeed tape. - * @returns A collection of tick mark line elements. - */ - private buildSpeedTapeTicks(): SVGLineElement[] { - const ticks: SVGLineElement[] = []; - - for (let i = 1; i < 18; i++) { - const length = i % 2 == 0 ? 15 : 30; - - const startX = 94 + (length == 30 ? 0 : 15); - const startY = 450 - (i * 50); - - const endX = startX + length; - const endY = startY; - - ticks.push(); - } - - return ticks; - } - - /** - * Builds the airspeed numbers for the airspeed tape. - * @returns A collection of airspeed number text elements. - */ - private buildSpeedTapeNumbers(): SVGTextElement[] { - const text: SVGTextElement[] = []; - - for (let i = 1; i < 10; i++) { - const startX = 75; - const startY = 513 - (i * 100); - - const numberText = (10 + (i * 10)).toString(); - const textElement = FSComponent.createRef(); - - text.push({numberText}); - this.iasScrollerValues.push(textElement); - } - - return text; - } - - /** - * Builds the airspeed tape color ranges. - * @returns A collection of color range rect elements. - */ - private buildSVGSpeedTapeRanges(): SVGRectElement[] { - const rectangle: SVGRectElement[] = []; - const zeroYValue = 0; - - //red band (full width 8px top left) - const redMin = zeroYValue; - const redMax = 400 - redMin - (10 * (this.stallDirty - 20)); - rectangle.push(); - - const whiteMin = redMax; - const whiteMax = Math.max(-400, whiteMin - (10 * (this.flapsExtend - this.stallDirty))); - rectangle.push(); - - const halfGreenMin = whiteMin - (10 * (this.stallClean - this.stallDirty)); - const halfGreenMax = whiteMax; - rectangle.push(); - - const greenMin = whiteMax; - const greenMax = Math.max(-400, greenMin - (10 * (this.yellowSpeed - this.flapsExtend))); - rectangle.push(); - - const yellowMin = greenMax; - const yellowMax = Math.max(-400, yellowMin - (10 * (this.barberSpeed - this.yellowSpeed))); - rectangle.push(); - - return rectangle; - } - /** - * Builds the airspeed tape color ranges. - * @returns A collection of color range rect elements. - */ - private buildHTMLSpeedTapeRanges(): HTMLDivElement[] { - const divs: HTMLDivElement[] = []; - - divs.push(
); - - return divs; - } - - /** - * A callback called after the component renders. - */ - public onAfterRender(): void { - this.updateSpeedBugs(this.ias); - const adc = this.props.bus.getSubscriber(); - const ap = this.props.bus.getSubscriber(); - - this.speedWarningSubject.sub(this.speedWarningChanged.bind(this)); - - const g1000Events = this.props.bus.getSubscriber(); - g1000Events.on('vspeed_set').handle(this.setVSpeed); - g1000Events.on('vspeed_display').handle(this.setVSpeedVisibility); - - //init the FLC elements to off - this.flcBugRef.instance.style.display = 'none'; - this.flcBoxRef.instance.style.display = 'none'; - - this.props.bus.getSubscriber() - .on('adc_state') - .handle(this.onAdcStateChanged.bind(this)); - - this.speedTrend.sub(this.onSpeedTrendChanged.bind(this)); - - adc.on('ias') - .withPrecision(2) - .handle(this.onUpdateIAS); - adc.on('tas') - .withPrecision(0) - .handle(this.onUpdateTAS); - ap.on('ap_ias_selected') - .whenChangedBy(1) - .handle(this.setFlcBug); - ap.on('ap_lock_set') - .handle(this.toggleFlcElements); - } - - /** - * A callaback called when the system screen state changes. - * @param state The state change event to handle. - */ - private onAdcStateChanged(state: AvionicsSystemStateEvent): void { - if (state.previous === undefined && state.current !== AvionicsSystemState.Off) { - this.setFailed(false); - } else { - if (state.current === AvionicsSystemState.On) { - this.setFailed(false); - } else { - this.setFailed(true); - } - } - } - - /** - * Sets if the display should be failed or not. - * @param isFailed True if failed, false otherwise. - */ - private setFailed(isFailed: boolean): void { - if (isFailed) { - this.isFailed = true; - this.containerRef.instance.classList.add('failed-instr'); - } else { - this.isFailed = false; - this.containerRef.instance.classList.remove('failed-instr'); - } - } - - /** - * A callback called when the speedwarning state changes. - * @param state the speed warning state - */ - private speedWarningChanged(state: SpeedWarning): void { - switch (state) { - case SpeedWarning.None: - this.airspeedBoxElement.instance.classList.remove('overspeed'); - this.airspeedBoxElement.instance.style.setProperty('--speedNumberColor', 'white'); - break; - case SpeedWarning.Caution: - this.airspeedBoxElement.instance.style.setProperty('--speedNumberColor', 'yellow'); - break; - case SpeedWarning.Overspeed: - this.airspeedBoxElement.instance.style.setProperty('--speedNumberColor', 'white'); - this.airspeedBoxElement.instance.classList.add('overspeed'); - break; - } - } - - /** - * A method called when a flc speed value changes. - * @param speed The flc ias speed value. - */ - private setFlcBug = (speed: number): void => { - this.flcSpeed = Math.round(speed); - this.flcSubject.set(`${this.flcSpeed}`); - this.updateFlcBug(); - }; - - /** - * A method called to update the location of the FLC Bug on the tape. - */ - private updateFlcBug(): void { - let deltaBug = this.flcSpeed - this.ias; - if (this.ias < 20) { - deltaBug = this.flcSpeed < 20 ? 0 : this.flcSpeed - 20; - } else if (this.ias < 50) { - deltaBug = Math.max(this.flcSpeed - (this.ias - 20), -30); - } - this.flcBugRef.instance.style.transform = `translate3d(0,${-5.583 * Utils.Clamp(deltaBug, -30, 25)}px,0)`; - } - - /** - * A method called to update the location of the FLC Bug on the tape. - * @param mode The enum of the ap mode - */ - private toggleFlcElements = (mode: APLockType): void => { - switch (mode) { - case APLockType.Flc: - this.flcBugRef.instance.style.display = ''; - this.flcBoxRef.instance.style.display = ''; - break; - case APLockType.Pitch: - case APLockType.Vs: - case APLockType.Alt: - case APLockType.Glideslope: - this.flcBugRef.instance.style.display = 'none'; - this.flcBoxRef.instance.style.display = 'none'; - break; - } - }; - - /** - * A method called when a vspeed update event from the event bus is received. - * @param vSpeed The vSpeed object to change. - */ - private setVSpeed = (vSpeed: VSpeed): void => { - const index = this.vSpeeds.findIndex((type) => { - if (type.type === vSpeed.type) { return true; } - }); - this.vSpeeds[index].value = vSpeed.value; - this.vSpeedSubjects[index].set(`${vSpeed.value}`); - this.updateSpeedBugs(this.ias); - }; - - /** - * A method called when a vspeed display event from the event bus is received. - * @param vSpeed The vSpeed object to change. - */ - private setVSpeedVisibility = (vSpeed: VSpeed): void => { - const index = this.vSpeeds.findIndex((speed) => { - if (speed.type === vSpeed.type) { return true; } - }); - this.vSpeeds[index].display = vSpeed.display === undefined ? false : vSpeed.display; - - - /** - * Handle updating visibility for each element. - * @param speed instance to update - */ - const setVisibility = (speed: VSpeed): void => { - const instance = speed.type === VSpeedType.Vx ? this.vxSpeedRef.instance : - speed.type === VSpeedType.Vy ? this.vySpeedRef.instance : - speed.type === VSpeedType.Vr ? this.vrSpeedRef.instance : - speed.type === VSpeedType.Vglide ? this.vgSpeedRef.instance : undefined; - // speed.type === VSpeedType.Vapp ? this.vappSpeedRef.instance : undefined; - - if (instance !== null && instance !== undefined) { - instance.style.display = speed.display ? '' : 'none'; - } - }; - this.vSpeeds.forEach(setVisibility); - this.updateSpeedBugs(this.ias); - }; - - /** - * Determines whether speed trend is in the overspeed range. - * @param ias the current ias - * @returns true if speed trend in overspeed - */ - private isSpeedTrendInOverspeed(ias: number): boolean { - return ias + (this.speedTrend.get() / 10) >= this.barberSpeed; - } - - private readonly iasHundredsTranslate = ComputedSubject.create(0, (trans: number) => { - return `translate(0,${trans})`; - }); - private readonly iasTensTranslate = ComputedSubject.create(0, (trans: number) => { - return `translate(0,${trans})`; - }); - private readonly iasOnesTranslate = ComputedSubject.create(0, (trans: number) => { - return `translate(0,${trans})`; - }); - - /** - * A callback called when the IAS updates from the event bus. - * @param ias The current IAS value. - */ - private onUpdateIAS = (ias: number): void => { - if (this.isFailed) { - ias = 0; - } - - this.updateTrendVector(ias); - - if (ias <= this.barberSpeed) { - this.speedWarningSubject.set(this.isSpeedTrendInOverspeed(ias) ? SpeedWarning.Caution : SpeedWarning.None); - } else { - this.speedWarningSubject.set(SpeedWarning.Overspeed); - } - - this.ias = ias; - const ones = ias % 10; - const tens = (ias % 100 - ones) / 10; - const hundreds = (ias - tens * 10 - ones) / 100; - - if (this.airspeedHundredsDataElement.instance !== null) { - let newTranslation = -300 + (hundreds * 30); - if (tens === 9 && ones > 9) { - newTranslation -= ((10 - ones) * 30) - 30; - } - if (ias < 20) { - newTranslation = -420; - } - this.hundredsSvg.instance.style.transform = `translate3d(0px, ${newTranslation}px, 0px)`; - } - - if (this.airspeedTensDataElement.instance !== null) { - let newTranslation = -300 + (tens * 30); - if (ones > 9) { - newTranslation -= ((10 - ones) * 30) - 30; - } - if (ias < 20) { - newTranslation = -420; - } - this.tensSvg.instance.style.transform = `translate3d(0px, ${newTranslation}px, 0px)`; - } - - if (this.airspeedOnesDataElement.instance !== null) { - let newTranslation = -300 + (ones * 30); - if (ias < 20) { - newTranslation = -420; - } - this.onesSvg.instance.style.transform = `translate3d(0px, ${newTranslation}px, 0px)`; - } - - if (this.airspeedTapeTickElement.instance !== null) { - let newTranslation = 10 * ((ias % 10)); - if (ias < 20) { - newTranslation = -400; - } else if (ias < 50) { - newTranslation = -400 + (10 * (ias - 20)); - } - this.airspeedTapeTickElement.instance.style.transform = `translate3d(0px, ${(newTranslation - 120.6) * (446 / 800)}px, 0px)`; - } - - if (ias >= 50 && (ias / 10 >= this.currentDrawnIas + 1 || ias / 10 < this.currentDrawnIas)) { - this.currentDrawnIas = Math.floor(ias / 10); - for (let i = 0; i < this.iasScrollerValues.length; i++) { - const scrollerValue = this.iasScrollerValues[i].instance; - if (scrollerValue !== null) { - scrollerValue.textContent = (10 * ((i - 4) + this.currentDrawnIas)).toString(); - } - } - this.updateSpeedRanges(ias); - } else if (ias < 50 && (ias / 10 > this.currentDrawnIas + 1 || ias / 10 < this.currentDrawnIas)) { - this.currentDrawnIas = Math.floor(ias / 10); - for (let i = 0; i < this.iasScrollerValues.length; i++) { - const scrollerValue = this.iasScrollerValues[i].instance; - if (scrollerValue !== null) { - scrollerValue.textContent = ((i + 2) * 10).toString(); - } - } - this.updateSpeedRanges(ias, true); - } - this.updateSpeedBugs(ias); - this.updateFlcBug(); - }; - - private _lastIAS = 0; - private _lastTime = 0; - private _computedIASAcceleration = 0; - /** - * A computation of the current IAS Acceleration used for the Airspeed Trend Vector. - * @param ias The current IAS value. - * @returns The current IAS Acceleration. - */ - private computeIASAcceleration = (ias: number): number => { - const newIASTime = { - ias: ias, - t: performance.now() / 1000 - }; - if (this._lastTime == 0) { - this._lastIAS = ias; - this._lastTime = performance.now() / 1000; - return 0; - } - let frameIASAcceleration = (newIASTime.ias - this._lastIAS) / (newIASTime.t - this._lastTime); - frameIASAcceleration = MathUtils.clamp(frameIASAcceleration, -10, 10); - if (isFinite(frameIASAcceleration)) { - this._computedIASAcceleration += (frameIASAcceleration - this._computedIASAcceleration) / (50 / ((newIASTime.t - this._lastTime) / .016)); - } - this._lastIAS = ias; - this._lastTime = performance.now() / 1000; - const accel = this._computedIASAcceleration * 6; - return accel; - }; - - /** - * Updates the Airspeed Trend Vector. - * @param ias The current IAS value. - */ - private updateTrendVector(ias: number): void { - this.speedTrend.set((ias >= 20) ? this.computeIASAcceleration(ias) * 5 : 0); - } - - /** - * Callback for when the speed trend changes. - * @param speedTrend The current speed trend. - */ - private onSpeedTrendChanged(speedTrend: number): void { - const verticalOffset = -117 - Math.max(0, speedTrend); - - this.airspeedTrendVector.instance.setAttribute('y', verticalOffset.toString()); - this.airspeedTrendVector.instance.setAttribute('height', Math.abs(speedTrend).toString()); - } - - /** - * Updates the speed bugs on the speed tape. (displayed if within 30 kts of ias) - * @param ias The current IAS value. - */ - private updateSpeedBugs(ias: number): void { - if (this.ias < 20) { - /** - * Sort function for the v speeds - * @param a the first value to compare - * @param b the second value to compare - * @returns the sorted array - */ - const sortSpeeds = (a: VSpeed, b: VSpeed): number => { - const speedA = a.value; - const speedB = b.value; - let comparison = 0; - if (speedA > speedB) { - comparison = 1; - } else if (speedA < speedB) { - comparison = -1; - } - return comparison; - }; - - const sortedSpeeds = this.vSpeeds.sort(sortSpeeds); - - let offset = 153; - let value = 0; - for (let i = 0; i < 5; i++) { - if (sortedSpeeds[i] && sortedSpeeds[i].display) { - const instance = sortedSpeeds[i].type === VSpeedType.Vx ? this.vxSpeedRef.instance : - sortedSpeeds[i].type === VSpeedType.Vy ? this.vySpeedRef.instance : - sortedSpeeds[i].type === VSpeedType.Vr ? this.vrSpeedRef.instance : - sortedSpeeds[i].type === VSpeedType.Vglide ? this.vgSpeedRef.instance : undefined; - // this.vSpeeds[i].type === VSpeedType.Vapp ? this.vappSpeedRef.instance : undefined; - - if (instance !== null && instance !== undefined) { - instance.style.transform = `translate3d(0,${offset}px,0)`; - } - this.vSpeedSubjects[value].set('' + Math.round(sortedSpeeds[i].value)); - - offset -= 22; - value++; - } - } - if (value < 4) { - for (let j = value; j < 4; j++) { - this.vSpeedSubjects[j].set(''); - } - } - this.vSpeedContainerRef.instance.style.display = ''; - } else { - this.vSpeedContainerRef.instance.style.display = 'none'; - const vxIndex = this.vSpeeds.findIndex((type) => { - if (type.type === VSpeedType.Vx) { return true; } - }); - const vyIndex = this.vSpeeds.findIndex((type) => { - if (type.type === VSpeedType.Vy) { return true; } - }); - const vrIndex = this.vSpeeds.findIndex((type) => { - if (type.type === VSpeedType.Vr) { return true; } - }); - const vgIndex = this.vSpeeds.findIndex((type) => { - if (type.type === VSpeedType.Vglide) { return true; } - }); - // const vappIndex = this.vSpeeds.findIndex((type) => { - // if (type.type === VSpeedType.Vapp) { return true; } - // }); - const deltaVx = this.vSpeeds[vxIndex].value - ias; - const deltaVy = this.vSpeeds[vyIndex].value - ias; - const deltaVr = this.vSpeeds[vrIndex].value - ias; - const deltaVg = this.vSpeeds[vgIndex].value - ias; - // const deltaVapp = this.vSpeeds[vappIndex].value - ias; - - if (Math.abs(deltaVx) < 35) { - this.vxSpeedRef.instance.style.transform = `translate3d(0,${-5.583 * deltaVx}px,0)`; - } else { - this.vxSpeedRef.instance.style.transform = `translate3d(0,${-5.583 * 35}px,0)`; - } - if (Math.abs(deltaVy) < 35) { - this.vySpeedRef.instance.style.transform = `translate3d(0,${-5.583 * deltaVy}px,0)`; - } else { - this.vySpeedRef.instance.style.transform = `translate3d(0,${-5.583 * 35}px,0)`; - } - if (Math.abs(deltaVr) < 35) { - this.vrSpeedRef.instance.style.transform = `translate3d(0,${-5.583 * deltaVr}px,0)`; - } else { - this.vrSpeedRef.instance.style.transform = `translate3d(0,${-5.583 * 35}px,0)`; - } - if (Math.abs(deltaVg) < 35) { - this.vgSpeedRef.instance.style.transform = `translate3d(0,${-5.583 * deltaVg}px,0)`; - } else { - this.vgSpeedRef.instance.style.transform = `translate3d(0,${-5.583 * 35}px,0)`; - } - // if (Math.abs(deltaVapp) < 30) { - // this.vappSpeedRef.instance.style.transform = `translate3d(0,${10 * deltaVapp}px,0)`; - // } - } - - if (this.ias >= 0 && this.ias < 50) { - this.vSpeedBackgroundRef.instance.style.display = 'block'; - if (this.ias >= 20) { - this.vSpeedBackgroundRef.instance.style.transform = `translate3d(0,${5.583 * (ias - 20)}px,0)`; - } - } else { - this.vSpeedBackgroundRef.instance.style.display = 'none'; - } - } - - /** - * A callback called when the TAS updates from the event bus. - * @param tas The current TAS value. - */ - private onUpdateTAS = (tas: number): void => { - this.tasSubject.set(tas); - }; - - /** - * Updates the speed range color bars and the IAS box style. - * @param ias The current IAS value. - * @param slowSpeed Whether or not the IAS is in the slow speed range. - */ - private updateSpeedRanges(ias: number, slowSpeed = false): void { - for (let i = 1; i < 7; i++) { - let instance: SVGRectElement | HTMLDivElement | null; - let rangeBottom: number; - let rangeTop: number; - let isSVG = true; - - switch (i) { - case 1: - instance = this.speedRangeValues.red.instance; - rangeBottom = 20; - rangeTop = this.stallDirty; - break; - case 2: - instance = this.speedRangeValues.white.instance; - rangeBottom = this.stallDirty; - rangeTop = this.flapsExtend; - break; - case 3: - instance = this.speedRangeValues.greenWhite.instance; - rangeBottom = this.stallClean; - rangeTop = this.flapsExtend; - break; - case 4: - instance = this.speedRangeValues.green.instance; - rangeBottom = this.flapsExtend; - rangeTop = this.yellowSpeed; - break; - case 5: - instance = this.speedRangeValues.yellow.instance; - rangeBottom = this.yellowSpeed; - rangeTop = this.barberSpeed; - break; - case 6: - instance = this.speedRangeValues.barber.instance; - rangeBottom = this.barberSpeed; - rangeTop = Infinity; - isSVG = false; - break; - default: - return; - } - - if (ias < 40 + rangeTop && ias > rangeBottom - 41 && instance !== null) { - let top: number; - let bottom: number; - if (slowSpeed) { - top = Math.max(-400, 400 - (10 * (rangeTop - 20))); - bottom = Math.min(400, 400 - (10 * (rangeBottom - 20))); - } else { - top = Math.max(-400, 10 * ((10 * this.currentDrawnIas) - rangeTop)); - bottom = Math.min(400, 10 * ((10 * this.currentDrawnIas) - rangeBottom)); - } - if (isSVG) { - instance.setAttribute('y', `${top}`); - instance.setAttribute('height', `${bottom - top}`); - } else { - instance.style.top = (233 + top * 0.5575).toString() + 'px'; - instance.style.height = Math.max(0, ((bottom - top) * 0.5575)).toString() + 'px'; - } - instance.style.display = ''; - } else if (instance !== null) { - instance.style.display = 'none'; - } - } - } - // private readonly vxSpeedRef = FSComponent.createRef(); - // private readonly vySpeedRef = FSComponent.createRef(); - // private readonly vgSpeedRef = FSComponent.createRef(); - // private readonly vrSpeedRef = FSComponent.createRef(); - // private readonly vappSpeedRef = FSComponent.createRef(); - /** - * Renders the component. - * @returns The component VNode. - */ - public render(): VNode { - return ( -
-
-
-
-
-
{this.vSpeedSubjects[0]}
-
{this.vSpeedSubjects[1]}
-
{this.vSpeedSubjects[2]}
-
{this.vSpeedSubjects[3]}
-
-
-
-
-
-
- - - {this.buildSVGSpeedTapeRanges()} - {this.buildSpeedTapeTicks()} - - {this.buildSpeedTapeNumbers()} - - - - {this.buildHTMLSpeedTapeRanges()} -
-
- -
-
- - - -
-
- -
- - - - -
- - {this.buildScroller(-2, true)} - -
- -
- - {this.buildScroller()} - -
- -
-
- - {this.buildScroller(9)} - -
-
-
-
- -
- - - -
- -
-
- - - G - -
- -
- - - R - -
- -
- - - X - -
- - -
- - - Y - -
-
- -
- - - - -
{this.flcSubject}KT
- -
- -
TAS -
- {this.tasSubject} - KT -
-
- -
- ); - } -} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.css new file mode 100644 index 000000000..7c3b974fa --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.css @@ -0,0 +1,679 @@ +.airspeed { + position: absolute; + left: 154px; + top: 82px; + /* width: 90px; */ + /* height: 363px; */ + + width: 87px; + height: 390px; + font-family: "DejaVuSans-SemiBold"; + font-size: 21px; + transform: rotateX(0deg); + + --airspeed-ias-box-height: 70px; + --digit-scroller-line-height: 1.2em; + --digit-scroller-line-offset-y: 2px; + + /* Top/bottom box vars */ + + --airspeed-top-box-height: 31px; + --airspeed-bottom-box-height: 28px; + + --airspeed-refspeed-font-size: 0.8em; + --airspeed-refspeed-bg: rgba(0, 0, 0, 0.83); + --airspeed-refspeed-icon-margin-left: 6px; + --airspeed-refspeed-icon-width: 8px; + --airspeed-refspeed-icon-height: 16px; + + --airspeed-alert-font-size: 0.8em; + --airspeed-alert-border-radius: 3px; + + --airspeed-bottom-speed-display-bg: rgba(0, 0, 0, 0.83); + + --airspeed-tas-display-font-size: 0.8em; + --airspeed-tas-display-title-offset-y: 0.1em; + --airspeed-tas-display-title-font-size: 0.6em; + + --airspeed-mach-display-font-size: 0.8em; + + --airspeed-vspeed-annunciation-font-size: 0.8em; + + /* Tape vars */ + + --airspeed-tape-bg: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.5)); + --airspeed-tape-bg-border-radius: 10px; + --airspeed-tape-top-border-color: #646464; + --airspeed-tape-bottom-border-color: #2c2c2c; + + --airspeed-tick-minor-width: 12%; + --airspeed-tick-minor-stroke-width: 2px; + --airspeed-tick-major-width: 24%; + --airspeed-tick-major-stroke-width: 2px; + + --airspeed-tape-label-margin-right: 0.5em; + --airspeed-tape-label-font-size: 1em; + + --airspeed-tape-overflow-background: rgba(30, 30, 30, 0.5); + + /* IAS display box vars */ + + --airspeed-ias-box-margin-right: 0%; + --airspeed-ias-box-height: 2.4em; + --airspeed-ias-box-font-size: 1.25em; + --airspeed-ias-box-border-width: 1px; + + /* Color range vars */ + + --airspeed-tape-color-range-full-width: 12%; + --airspeed-tape-color-range-half-width: 6%; + + /* Reference speed bug vars */ + + --airspeed-refspeed-bug-manual-right: 0px; + --airspeed-refspeed-bug-manual-height: calc(var(--airspeed-ias-box-font-size) * 0.8); + --airspeed-refspeed-bug-manual-width: calc(var(--airspeed-ias-box-margin-right) + (100% - var(--airspeed-ias-box-margin-right)) * 0.16); + --airspeed-refspeed-bug-manual-fill: cyan; + --airspeed-refspeed-bug-manual-stroke: #505050; + + --airspeed-refspeed-bug-fms-right: calc(var(--airspeed-ias-box-margin-right) + (100% - var(--airspeed-ias-box-margin-right)) * 0.0444); + --airspeed-refspeed-bug-fms-height: calc(var(--airspeed-ias-box-font-size) * 0.55); + --airspeed-refspeed-bug-fms-width: calc((100% - var(--airspeed-ias-box-margin-right)) * 0.15); + --airspeed-refspeed-bug-fms-fill: magenta; + --airspeed-refspeed-bug-fms-stroke: #505050; + + /* Trend vector vars */ + + --airspeed-trend-width: 6px; + + /* Reference V-speed bug vars */ + + --airspeed-vspeed-bug-icon-height: 1.1em; + --airspeed-vspeed-bug-icon-font-size: 0.6em; + --airspeed-vspeed-bug-icon-color: cyan; + --airspeed-vspeed-bug-icon-bg-color: black; + + --airspeed-vspeed-bug-container-width-factor: 0.6; + --airspeed-vspeed-bug-margin-left: 4px; + + --airspeed-vspeed-offscale-container-height: 50%; + --airspeed-vspeed-offscale-label-margin-bottom: 4px; + --airspeed-vspeed-offscale-label-margin-right: 8px; + --airspeed-vspeed-offscale-label-font-size: 0.8em; + + --airspeed-vspeed-legend-container-width-factor: 0.85; + --airspeed-vspeed-legend-container-padding: 3px 1px 3px 2px; + --airspeed-vspeed-legend-margin-bottom: 2px; + --airspeed-vspeed-legend-font-size: 0.7em; + + /* Computed vars */ + + --airspeed-tape-topleft-border-radius: var(--airspeed-tape-bg-border-radius); + --airspeed-tape-bottomleft-border-radius: var(--airspeed-tape-bg-border-radius); + + --airspeed-tape-top-border: 1px solid var(--airspeed-tape-top-border-color); + --airspeed-tape-bottom-border: 1px solid var(--airspeed-tape-bottom-border-color); + + --airspeed-tape-top-border-actual: var(--airspeed-tape-top-border); + --airspeed-tape-bottom-border-actual: var(--airspeed-tape-bottom-border); +} + +.airspeed.airspeed-reference-visible { + --airspeed-tape-topleft-border-radius: 0px; + --airspeed-tape-top-border-actual: none; +} + +.airspeed.airspeed-bottom-display-visible { + --airspeed-tape-bottomleft-border-radius: 0px; + --airspeed-tape-bottom-border-actual: none; +} + +/* ---- Top container displays ---- */ + +.airspeed-top-container { + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: var(--airspeed-top-box-height); + transform: rotateX(0deg); +} + +.airspeed-refspeed-container { + position: absolute; + left: 0%; + top: 0%; + width: 100%; + height: 100%; + background: var(--airspeed-refspeed-bg); + border-radius: var(--airspeed-tape-bg-border-radius) 0 0 0; + border: var(--airspeed-tape-top-border); + border-bottom: none; +} + +.airspeed-refspeed-container-manual { + --airspeed-refspeed-container-text-color: cyan; +} + +.airspeed-refspeed-container-fms { + --airspeed-refspeed-container-text-color: magenta; +} + +.airspeed-refspeed-icon { + position: absolute; + left: var(--airspeed-refspeed-icon-margin-left); + top: calc(50% - var(--airspeed-refspeed-icon-height) / 2); + width: var(--airspeed-refspeed-icon-width); + height: var(--airspeed-refspeed-icon-height); +} + +.airspeed-refspeed-icon-manual { + fill: var(--airspeed-refspeed-bug-manual-fill); +} + +.airspeed-refspeed-icon-fms { + fill: var(--airspeed-refspeed-bug-fms-fill); +} + +.airspeed-refspeed-text { + position: absolute; + left: 20%; + top: 0%; + width: 80%; + height: 100%; + color: var(--airspeed-refspeed-container-text-color); + font-size: var(--airspeed-refspeed-font-size); + white-space: nowrap; +} + +.airspeed-refspeed-ias, +.airspeed-refspeed-mach { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); +} + +@keyframes airspeed-alert-flash { + 0% { + background: yellow; + color: black; + } + + 75% { + background: black; + color: yellow; + } +} + +.airspeed-protection-container { + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + border-radius: var(--airspeed-alert-border-radius); + animation: airspeed-alert-flash 1s infinite step-end; +} + +.airspeed-protection-text { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + font-size: var(--airspeed-alert-font-size); +} + +.airspeed-bottom-container { + position: absolute; + left: 0%; + bottom: 0%; + width: 100%; + height: var(--airspeed-bottom-box-height); + transform: rotateX(0deg); + --airspeed-bottom-speed-display-bg-actual: var(--airspeed-bottom-speed-display-bg); + --airspeed-bottom-speed-display-color: white; +} + +.airspeed-alert-overspeed .airspeed-bottom-container, +.airspeed-alert-underspeed .airspeed-bottom-container { + --airspeed-bottom-speed-display-bg-actual: red; +} + +.airspeed-alert-trend-overspeed .airspeed-bottom-container, +.airspeed-alert-trend-underspeed .airspeed-bottom-container { + --airspeed-bottom-speed-display-color: yellow; +} + +/* ---- Bottom container displays ---- */ + +.airspeed-bottom-display { + position: absolute; + left: 0%; + top: 0%; + width: 100%; + height: 100%; + background: var(--airspeed-bottom-speed-display-bg-actual); + border-radius: 0 0 0 var(--airspeed-tape-bg-border-radius); + border: var(--airspeed-tape-bottom-border); + border-top: none; + color: var(--airspeed-bottom-speed-display-color); +} + +.airspeed-tas-display { + font-size: var(--airspeed-tas-display-font-size); + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + align-items: center; +} + +.airspeed-tas-display-title { + margin-top: var(--airspeed-tas-display-title-offset-y); + margin-left: 1px; + font-size: var(--airspeed-tas-display-title-font-size); +} + +.airspeed-tas-display-value { + margin-right: 1px; +} + +.airspeed-mach-display { + font-size: var(--airspeed-mach-display-font-size); +} + +.airspeed-mach-display-value { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + white-space: nowrap; +} + +.airspeed-vspeed-annunciation { + font-size: var(--airspeed-vspeed-annunciation-font-size); +} + +.airspeed-vspeed-annunciation-box { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + padding: 1px 2px; + border-radius: 5px; + color: black; + letter-spacing: -1px; +} + +.airspeed-vspeed-annunciation-takeoff .airspeed-vspeed-annunciation-box { + background: yellow; +} + +.airspeed-vspeed-annunciation-landing .airspeed-vspeed-annunciation-box { + background: white; +} + +/* ---- Airspeed tape ---- */ + +.airspeed-tape-container { + position: absolute; + left: 0%; + top: var(--airspeed-top-box-height); + width: 100%; + height: calc(100% - var(--airspeed-top-box-height) - var(--airspeed-bottom-box-height)); + background: var(--airspeed-tape-bg); + border-radius: var(--airspeed-tape-topleft-border-radius) 0 0 var(--airspeed-tape-bottomleft-border-radius); +} + +.airspeed-tape-border-top { + position: absolute; + left: 0%; + top: 0%; + width: 100%; + height: 50%; + border-radius: var(--airspeed-tape-topleft-border-radius) 0 0 0; + border: var(--airspeed-tape-top-border); + border-top: var(--airspeed-tape-top-border-actual); + border-bottom: none; +} + +.airspeed-tape-border-bottom { + position: absolute; + left: 0%; + bottom: 0%; + width: 100%; + height: 50%; + border-radius: 0 0 0 var(--airspeed-tape-bottomleft-border-radius); + border: var(--airspeed-tape-bottom-border); + border-bottom: var(--airspeed-tape-bottom-border-actual); + border-top: none; +} + +.airspeed-tape-window { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + border-radius: inherit; + border-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) var(--airspeed-tape-bg-border-radius), var(--airspeed-tape-top-border-color) calc(var(--airspeed-tape-bg-border-radius) + 1px), var(--airspeed-tape-bottom-border-color) calc(100% - var(--airspeed-tape-bg-border-radius) - 1px), rgba(0, 0, 0, 0) calc(100% - var(--airspeed-tape-bg-border-radius))) 1 100%; + border-width: 1px; + border-top: 1px none; + border-bottom: 1px none; +} + +.airspeed-tape { + position: absolute; + bottom: 50%; + width: 100%; +} + +.airspeed-tape-tick-minor-container { + position: absolute; + right: 0%; + width: var(--airspeed-tick-minor-width); + height: 100%; + stroke: white; + stroke-width: var(--airspeed-tick-minor-stroke-width); +} + +.airspeed-tape-tick-major-container { + position: absolute; + right: 0%; + width: var(--airspeed-tick-major-width); + height: 100%; + stroke: white; + stroke-width: var(--airspeed-tick-major-stroke-width); +} + +.airspeed-tape-label-container { + position: absolute; + --airspeed-tape-label-container-right: calc(var(--airspeed-tick-major-width) + var(--airspeed-tape-label-margin-right)); + right: var(--airspeed-tape-label-container-right); + width: calc(100% - var(--airspeed-tape-label-container-right)); + height: 100%; + font-size: var(--airspeed-tape-label-font-size); + color: white; + text-align: right; +} + +.airspeed-tape-overflow { + background: var(--airspeed-tape-overflow-background); +} + +.airspeed-ias-box { + position: absolute; + right: var(--airspeed-ias-box-margin-right); + width: calc(100% - var(--airspeed-ias-box-margin-right)); + top: 50%; + height: var(--airspeed-ias-box-height); + transform: translateY(-50%); + font-size: var(--airspeed-ias-box-font-size); + color: white; + --airspeed-ias-box-fill: black; + --airspeed-ias-box-stroke: white; + --airspeed-ias-box-bg: linear-gradient(to bottom, rgba(0, 0, 0, 1.0), rgb(30, 30, 30), rgba(0, 0, 0, 1.0)); + --airspeed-ias-box-scroller-mask-bg: linear-gradient(to bottom, rgba(0, 0, 0, 1) 5%, rgba(0, 0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%, rgba(0, 0, 0, 1) 95%); +} + +.airspeed-alert-overspeed .airspeed-ias-box, +.airspeed-alert-underspeed .airspeed-ias-box { + --airspeed-ias-box-fill: red; + --airspeed-ias-box-stroke: red; + --airspeed-ias-box-bg: red; + --airspeed-ias-box-scroller-mask-bg: transparent; +} + +.airspeed-alert-trend-overspeed .airspeed-ias-box, +.airspeed-alert-trend-underspeed .airspeed-ias-box { + color: yellow; + --airspeed-ias-box-bg: black; + --airspeed-ias-box-scroller-mask-bg: transparent; +} + +.airspeed-ias-box-bg { + width: 100%; + height: 100%; + fill: var(--airspeed-ias-box-fill); + stroke: var(--airspeed-ias-box-stroke); + stroke-width: var(--airspeed-ias-box-border-width); +} + +.airspeed-ias-box-scrollers { + display: flex; + flex-flow: row nowrap; + justify-content: flex-end; + align-items: center; +} + +.airspeed-ias-box-digit-container { + position: relative; + width: calc(33% - 2px); + height: calc(100% - 2 * var(--airspeed-ias-box-border-width)); + margin: 0 1px; + overflow: hidden; +} + +.airspeed-ias-box-digit-container.airspeed-ias-box-hundreds, +.airspeed-ias-box-digit-container.airspeed-ias-box-tens { + height: calc(60% - 2 * var(--airspeed-ias-box-border-width)); +} + +.airspeed-ias-box-digit-container .digit-scroller { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + text-align: center; +} + +.airspeed-ias-box-digit-bg { + position: absolute; + left: 0; + top: 0%; + width: 100%; + height: 100%; + background: var(--airspeed-ias-box-bg); +} + +.airspeed-ias-box-scroller-mask { + position: absolute; + left: -1px; + top: -1px; + right: -1px; + bottom: -1px; + background: var(--airspeed-ias-box-scroller-mask-bg); +} + +.airspeed-tape-color-range { + right: 0%; +} + +.airspeed-tape-color-range-full { + width: var(--airspeed-tape-color-range-full-width); +} + +.airspeed-tape-color-range-half { + width: var(--airspeed-tape-color-range-half-width); +} + +.airspeed-tape-color-range-red { + background: red; +} + +.airspeed-tape-color-range-white { + background: white; +} + +.airspeed-tape-color-range-green { + background: #008000; +} + +.airspeed-tape-color-range-yellow { + background: yellow; +} + +.airspeed-tape-color-range-barber-pole { + background: repeating-linear-gradient(135deg, red, red 6px, white 6px, white 12px); +} + +.airspeed-refspeed-bug-manual { + right: var(--airspeed-refspeed-bug-manual-right); + width: var(--airspeed-refspeed-bug-manual-width); + height: var(--airspeed-refspeed-bug-manual-height); +} + +.airspeed-refspeed-bug-fms { + right: var(--airspeed-refspeed-bug-fms-right); + width: var(--airspeed-refspeed-bug-fms-width); + height: var(--airspeed-refspeed-bug-fms-height); +} + +.airspeed-refspeed-bug-icon { + position: absolute; + left: 0px; + top: 0px; + width: 100%; + height: 100%; + stroke-width: 1px; +} + +.airspeed-refspeed-bug-icon-manual { + fill: var(--airspeed-refspeed-bug-manual-fill); + stroke: var(--airspeed-refspeed-bug-manual-stroke); +} + +.airspeed-refspeed-bug-icon-fms { + fill: var(--airspeed-refspeed-bug-fms-fill); + stroke: var(--airspeed-refspeed-bug-fms-stroke); +} + +.airspeed-trend { + left: 100%; + width: var(--airspeed-trend-width); + background: magenta; + border: 1px solid white; +} + +/* ---- V-speed bugs ---- */ + +.airspeed-vspeed-fms { + --airspeed-vspeed-bug-icon-color: magenta; +} + +.airspeed-vspeed-bug-icon { + height: var(--airspeed-vspeed-bug-icon-height); + font-size: var(--airspeed-vspeed-bug-icon-font-size); + display: flex; + flex-flow: row nowrap; + align-items: center; + transform: rotateX(0deg); +} + +.airspeed-vspeed-bug-icon-arrow { + height: 100%; + width: 0.5em; + fill: var(--airspeed-vspeed-bug-icon-bg-color); +} + +.airspeed-vspeed-bug-icon-label { + background: var(--airspeed-vspeed-bug-icon-bg-color); + color: var(--airspeed-vspeed-bug-icon-color); + padding-right: 2px; + white-space: pre; +} + +.airspeed-vspeed-bug-container { + left: 100%; + width: calc(100% * var(--airspeed-vspeed-bug-container-width-factor)); +} + +.airspeed-vspeed-bug { + left: var(--airspeed-vspeed-bug-margin-left); +} + +.airspeed-vspeed-offscale-container { + left: 0; + width: calc(100% * (1 + var(--airspeed-vspeed-bug-container-width-factor))); + height: var(--airspeed-vspeed-offscale-container-height); + align-items: stretch; +} + +.airspeed-vspeed-offscale-label { + position: relative; + display: grid; + grid-template-rows: 100%; + grid-template-columns: calc(100% * 1 / (1 + var(--airspeed-vspeed-bug-container-width-factor))) 1fr; + align-items: center; + margin-bottom: var(--airspeed-vspeed-offscale-label-margin-bottom); + + --airspeed-vspeed-offscale-label-color: var(--airspeed-vspeed-bug-icon-color); +} + +.airspeed-vspeed-offscale-label.airspeed-vspeed-fms.airspeed-vspeed-fms-config-miscompare { + --airspeed-vspeed-offscale-label-color: yellow; +} + +.airspeed-vspeed-offscale-label-value { + justify-self: end; + margin-right: var(--airspeed-vspeed-offscale-label-margin-right); + font-size: var(--airspeed-vspeed-offscale-label-font-size); + color: var(--airspeed-vspeed-offscale-label-color); +} + +.airspeed-vspeed-offscale-label .airspeed-vspeed-bug-icon { + justify-self: start; + margin-left: var(--airspeed-vspeed-bug-margin-left); +} + +.airspeed-vspeed-legend-container { + left: 0; + width: calc(100% * var(--airspeed-vspeed-legend-container-width-factor)); + padding: var(--airspeed-vspeed-legend-container-padding); + border-radius: 0 0 0 var(--airspeed-tape-bottomleft-border-radius); + background: black; + align-items: stretch; +} + +.airspeed-vspeed-legend { + position: relative; + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + align-items: baseline; + margin-bottom: var(--airspeed-vspeed-legend-margin-bottom); + font-size: var(--airspeed-vspeed-legend-font-size); + + --airspeed-vspeed-legend-value-color: var(--airspeed-vspeed-bug-icon-color); +} + +.airspeed-vspeed-legend.airspeed-vspeed-fms.airspeed-vspeed-fms-config-miscompare { + --airspeed-vspeed-legend-value-color: yellow; +} + +.airspeed-vspeed-legend-name { + color: var(--airspeed-vspeed-bug-icon-color); +} + +.airspeed-vspeed-legend-value { + color: var(--airspeed-vspeed-legend-value-color); +} + +/* ---- Failed state ---- */ + +.airspeed .failed-box { + position: absolute; + left: 0%; + top: var(--airspeed-top-box-height); + width: 100%; + height: calc(100% - var(--airspeed-top-box-height) - var(--airspeed-bottom-box-height)); +} + +.airspeed.data-failed .failed-box { + display: block; +} + +.airspeed.data-failed .airspeed-tape-label-container { + display: none; +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.tsx new file mode 100644 index 000000000..20ac465ff --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator.tsx @@ -0,0 +1,77 @@ +import { ArrayUtils, ComponentProps, DisplayComponent, FSComponent, SimVarValueType, Subscribable, VNode } from '@microsoft/msfs-sdk'; + +import { AirspeedIndicator, AirspeedIndicatorDataProvider, VSpeedBugDefinition } from '@microsoft/msfs-garminsdk'; + +import { AirspeedIndicatorConfig } from '../../../../Shared/Profiles/AirspeedIndicator/AirspeedIndicatorConfig'; +import { VSpeedUserSettingManager } from '../../../../Shared/VSpeed/VSpeedUserSettings'; + +import './G1000AirspeedIndicator.css'; + +/** + * Component props for {@link G1000AirspeedIndicator}. + */ +export interface G1000AirspeedIndicatorProps extends ComponentProps { + /** A provider of airspeed indicator data. */ + dataProvider: AirspeedIndicatorDataProvider; + + /** A configuration object defining options for the airspeed indicator. */ + config: AirspeedIndicatorConfig; + + /** A manager for reference V-speed settings. */ + vSpeedSettingManager: VSpeedUserSettingManager; + + /** Whether the indicator should be decluttered. */ + declutter: Subscribable; +} + +/** + * A G3000 airspeed indicator. + */ +export class G1000AirspeedIndicator extends DisplayComponent { + private readonly ref = FSComponent.createRef(); + + /** @inheritdoc */ + public onAfterRender(): void { + this.props.dataProvider.overspeedThreshold.sub(v => { + SimVar.SetGameVarValue('AIRCRAFT_MAXSPEED_OVERRIDE', SimVarValueType.Knots, v - 3); + }, true); + } + + /** @inheritdoc */ + public render(): VNode { + const vSpeedDefs = ArrayUtils.flatMap(Array.from(this.props.vSpeedSettingManager.vSpeedGroups.values()), group => group.vSpeedDefinitions); + const vSpeedBugDefinitions = this.props.config.vSpeedBugConfigs + .map(config => config.resolve()(vSpeedDefs)) + .filter(def => def !== undefined) as VSpeedBugDefinition[]; + + return ( + + ); + } + + /** @inheritdoc */ + public destroy(): void { + this.ref.getOrDefault()?.destroy(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicatorDataProvider.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicatorDataProvider.ts new file mode 100644 index 000000000..d927d1a4e --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicatorDataProvider.ts @@ -0,0 +1,19 @@ +import { EventBus } from '@microsoft/msfs-sdk'; + +import { DefaultAirspeedIndicatorDataProvider } from '@microsoft/msfs-garminsdk'; + +import { AirspeedIndicatorConfig } from '../../../../Shared/Profiles/AirspeedIndicator/AirspeedIndicatorConfig'; + +/** + * A G1000 NXi provider of airspeed indicator data. + */ +export class G1000AirspeedIndicatorDataProvider extends DefaultAirspeedIndicatorDataProvider { + /** + * Creates a new instance of G1000AirspeedIndicatorDataProvider. + * @param bus The event bus. + * @param config A configuration object defining options for the airspeed indicator. + */ + public constructor(bus: EventBus, config: AirspeedIndicatorConfig) { + super(bus, 1, config.dataProviderOptions); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/index.ts new file mode 100644 index 000000000..539b2f6c6 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/AirspeedIndicator/index.ts @@ -0,0 +1,2 @@ +export * from './G1000AirspeedIndicator'; +export * from './G1000AirspeedIndicatorDataProvider'; \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/Altimeter.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/Altimeter.tsx index a412e4cce..478026033 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/Altimeter.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/Altimeter.tsx @@ -93,9 +93,9 @@ export class Altimeter extends DisplayComponent { private readonly activeNavSource = ConsumerValue.create(this.props.bus.getSubscriber().on('cdi_select'), { index: 1, type: NavSourceType.Gps }); private readonly vnavTrackingPhase = ConsumerValue.create(this.props.bus.getSubscriber().on('vnav_tracking_phase'), GarminVNavTrackingPhase.None); private readonly vnavTodIndex = ConsumerValue.create(this.props.bus.getSubscriber().on('vnav_tod_global_leg_index'), -1); - private readonly vnavTodDistance = ConsumerValue.create(this.props.bus.getSubscriber().on('vnav_tod_distance'), -1); + private readonly vnavTodDistance = ConsumerSubject.create(this.props.bus.getSubscriber().on('vnav_tod_distance'), -1); private readonly vnavBodDistance = ConsumerValue.create(this.props.bus.getSubscriber().on('vnav_bod_distance'), -1); - private readonly groundSpeed = ConsumerValue.create(this.props.bus.getSubscriber().on('ground_speed').atFrequency(1), 0); + private readonly groundSpeed = ConsumerSubject.create(this.props.bus.getSubscriber().on('ground_speed').atFrequency(1), 0); private vnavState = VNavState.Enabled_Inactive; private vnavConstraintDetails: AltitudeConstraintDetails = { type: AltitudeRestrictionType.Unused, altitude: 0 }; @@ -108,6 +108,15 @@ export class Altimeter extends DisplayComponent { private readonly updateTapeEvent = new SubEvent(); private readonly isGroundLineVisible = Subject.create(false); + private readonly timeToTod = MappedSubject.create( // minutes + ([todDistance, groundSpeed]): number => { + const todDistanceNm = UnitType.METER.convertTo(todDistance, UnitType.NMILE); + return (todDistanceNm / groundSpeed) * 60; + }, + this.vnavTodDistance, this.groundSpeed, + ); + private readonly closeToTod = Subject.create(false); + /** * A callback called after the component renders. @@ -134,9 +143,9 @@ export class Altimeter extends DisplayComponent { .withPrecision(-1) .handle(this.updateVerticalSpeed.bind(this)); sub.on('hEvent').handle(hEvent => { - if (hEvent == 'AS1000_PFD_BARO_INC') { + if ((hEvent == 'AS1000_PFD_BARO_INC') || hEvent == ('AS1000_MFD_BARO_INC')) { this.onbaroKnobTurn(true); - } else if (hEvent == 'AS1000_PFD_BARO_DEC') { + } else if ((hEvent == 'AS1000_PFD_BARO_DEC') || (hEvent == 'AS1000_MFD_BARO_DEC')) { this.onbaroKnobTurn(false); } }); @@ -194,6 +203,9 @@ export class Altimeter extends DisplayComponent { this.vnavState = state; this.manageVnavConstraintAltitudeDisplay(); }); + this.closeToTod.sub((close) => { + if (close) { this.manageVnavConstraintAltitudeDisplay(); } + }, true); this.controller.alerterState.sub(this.onAlerterStateChanged.bind(this)); @@ -202,6 +214,15 @@ export class Altimeter extends DisplayComponent { this.altitudeBugRef.instance.style.display = 'none'; sub.on('adc_state').handle(this.onAdcStateChanged.bind(this)); + + this.timeToTod.sub((t) => { + // true if less than 1 minute from TOD, else false + if (t < 1) { + this.closeToTod.set(true); + } else { + this.closeToTod.set(false); + } + }, true); } /** @@ -283,8 +304,6 @@ export class Altimeter extends DisplayComponent { if (this.vnavTrackingPhase.get() === GarminVNavTrackingPhase.Climb) { showTargetAltitude = this.vnavConstraintDetails.type !== AltitudeRestrictionType.Unused; } else { - const todDistanceNm = UnitType.METER.convertTo(this.vnavTodDistance.get(), UnitType.NMILE); - const PATH_TRACKING_LOOKAHEAD = 1 / 60; if ( // VNAV target altitude is valid this.vnavConstraintDetails.type !== AltitudeRestrictionType.Unused @@ -293,7 +312,7 @@ export class Altimeter extends DisplayComponent { // TOD exists && this.vnavTodIndex.get() >= 0 // Within one minute of TOD - && todDistanceNm / this.groundSpeed.get() < PATH_TRACKING_LOOKAHEAD + && this.closeToTod.get() // Above 250 feet below the VNAV target altitude && this.indicatedAltitudeSub.get().asUnit(UnitType.FOOT) >= this.vnavConstraintDetails.altitude - 250 ) { diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.css index 64acf2352..8745f4ae2 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.css @@ -5,38 +5,39 @@ width: 148px; height: auto; background-color: black; - border: 1px solid rgb(100,100,100); + border: 1px solid rgb(100, 100, 100); font-size: 16px; - display: none; } #cas>div { margin: 2px 0px 0px 2px; - display: none; } .annunciations-divider { position: relative; width: 90%; height: 0px; - border-bottom: 1px solid rgb(100, 100, 100); + border-bottom: 1px solid rgb(235, 235, 235); left: 5%; display: none; } - .annunciation.warning { + animation: none; color: red; } .annunciation.caution { + animation: none; color: yellow; } .annunciation.advisory { + animation: none; color: white; } .annunciation.safeop { - color: green; + animation: none; + color: limegreen; } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.tsx index 57ec9b404..7136eba81 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/CAS.tsx @@ -1,18 +1,42 @@ import { - Annunciation, AnnunciationType, ComponentProps, CompositeLogicXMLHost, DisplayComponent, EventBus, FSComponent, KeyEventData, KeyEvents, KeyEventManager, - VNode, SoundServerController, + Annunciation, AnnunciationType, CasActiveMessage, CasEvents, CasStateEvents, CasSystem, CasSystemLegacyAdapter, ComponentProps, CompositeLogicXMLHost, + DisplayComponent, EventBus, FilteredMappedSubscribableArray, FSComponent, ObjectSubject, SortedMappedSubscribableArray, SoundServerController, VNode } from '@microsoft/msfs-sdk'; +import { CASAlertCounts, CASDisplay } from '@microsoft/msfs-garminsdk'; + import { G1000ControlEvents } from '../../../Shared/G1000Events'; +import { AlertMessage } from '../UI'; import './CAS.css'; -/** The two states an alert can be in. */ -enum AlertState { - /** A newly arrived, unackowledged alert message. */ - New, - /** An alert message that has been acknowledged with the Alert softkey. */ - Acked +/** + * An alerts level on the G1000 NXi. + */ +export enum G1000AlertsLevel { + None, + Advisory, + Caution, + Warning +} + +/** + * CAS events specific to the G1000 NXi. + */ +export interface G1000CasEvents { + /** Synchronizes the current CAS unacknowledged alerts level with the Alerts component. */ + 'cas_unacknowledged_alerts_level': G1000AlertsLevel; +} + +/** + * An alerts message to be associated with a specified CAS. + */ +export interface CasAssociatedMessage { + /** The ID of the CAS alert. */ + casUid: string, + + /** The alert message to display when the CAS alert is active. */ + message: AlertMessage } /** The props for a CAS element. */ @@ -34,315 +58,137 @@ export class CAS extends DisplayComponent { /** The overall container for the CAS elements. */ private divRef = FSComponent.createRef(); /** The div for new, unacked annunciations. */ - private newRef = FSComponent.createRef(); - /** The div for acknowledged but still active annunciations. */ - private ackRef = FSComponent.createRef(); /** The well little div for the divider bar beween acked and unacked. */ private dividerRef = FSComponent.createRef(); private readonly soundController = new SoundServerController(this.props.bus); - - /** The number of unacked messages currently displayed. */ - private numNewDisplayed = 0; - /** The number of acked messages currently displayed. */ - private numAckedDisplayed = 0; - /** The number of warnings we need to be playing a sound for. */ - private numActiveWarnings = 0; - /** The total number of warnings displayed. */ - private totalWarnings = 0; - /** The total number of cautions displayed. */ - private totalCautions = 0; - - /** - * Determine whether we need to hide or unhide ourselves when a child's state changes. - * @param state Whether the alert is acknowledged or not. - * @param type The type of alert. - * @param active Whether the child has gone active. - */ - private setDisplayed(state: AlertState, type: AnnunciationType, active: boolean): void { - switch (state) { - case AlertState.New: - if (active) { - // A new alert has been displayed. - this.numNewDisplayed++; - switch (type) { - case AnnunciationType.Caution: - this.totalCautions++; - this.setMasterStatus(AnnunciationType.Caution, true); - break; - case AnnunciationType.Warning: - this.totalWarnings++; - this.setMasterStatus(AnnunciationType.Warning, true); - break; - } - // If we are adding our first active alert, we need to display the full CAS block. - if (this.numNewDisplayed == 1) { - this.divRef.instance.style.display = 'block'; - } - // If we have any acked messages displayed, we'll show the divider. - if (this.numAckedDisplayed > 0) { - this.dividerRef.instance.style.display = 'block'; - } - // Trigger the play of caution or warning sounds if appropriate. - if (type == AnnunciationType.Caution && this.props.cautionSoundId !== undefined && !this.numActiveWarnings) { - this.soundController.playSound(this.props.cautionSoundId); - } else if (type == AnnunciationType.Warning && this.props.warningSoundId !== undefined && ++this.numActiveWarnings == 1) { - this.soundController.startSound(this.props.warningSoundId); - } - } else { - // A previously displayed alert has been hidden. - this.numNewDisplayed--; - switch (type) { - case AnnunciationType.Caution: - if (--this.totalCautions == 0) { - this.setMasterStatus(AnnunciationType.Caution, false); - } - break; - case AnnunciationType.Warning: - if (--this.totalWarnings == 0) { - this.setMasterStatus(AnnunciationType.Warning, false); - } - } - // If nothing other new alerts are displayed we can hide divider block. - if (this.numNewDisplayed == 0) { - this.dividerRef.instance.style.display = 'none'; - // We'll also go ahead and hide the whole CAS div if there's nothing else displayed. - if (this.numAckedDisplayed == 0) { - this.divRef.instance.style.display = 'none'; - } - } - // Disable the warning sound if it's playing and nothing else needs it. - if (type == AnnunciationType.Warning && this.props.warningSoundId !== undefined && --this.numActiveWarnings == 0) { - this.soundController.stop(this.props.warningSoundId); - } - } - break; - case AlertState.Acked: - if (active) { - // A new acked alert has been displayed. - this.numAckedDisplayed++; - switch (type) { - case AnnunciationType.Caution: - this.totalCautions++; - this.setMasterStatus(AnnunciationType.Caution, true); - break; - case AnnunciationType.Warning: - this.totalWarnings++; - this.setMasterStatus(AnnunciationType.Warning, true); - break; - } - // If we're adding our first acked alert, we need to display the full CAS block. - if (this.numAckedDisplayed == 1) { - this.divRef.instance.style.display = 'block'; - } - if (this.numNewDisplayed > 0) { - // If there are also unacked messages displayed, activate the divider. - this.dividerRef.instance.style.display = 'block'; - } else { - // Otherwise, make sure it's turned off. - this.dividerRef.instance.style.display = 'none'; - } - } else { - // A previously acked alert has been hidden. - this.numAckedDisplayed--; - switch (type) { - case AnnunciationType.Caution: - if (--this.totalCautions == 0) { - this.setMasterStatus(AnnunciationType.Caution, false); - } - break; - case AnnunciationType.Warning: - if (--this.totalWarnings == 0) { - this.setMasterStatus(AnnunciationType.Warning, false); - } - } - // If that was the last one, hide the divider. - if (this.numAckedDisplayed == 0) { - this.dividerRef.instance.style.display = 'none'; - // And if there are also no new ones, hide the full div. - if (this.numNewDisplayed == 0) { - this.divRef.instance.style.display = 'none'; - } - } - } - break; - } - } - - /** Iterate through the configured annunciations and render each into the new and acked divs. */ + private readonly casSystem = new CasSystem(this.props.bus, true); + private readonly casLegacyAdapater = new CasSystemLegacyAdapter(this.props.bus, this.props.logicHandler, this.props.annunciations); + + private readonly newMessages = SortedMappedSubscribableArray.create(FilteredMappedSubscribableArray.create(this.casSystem.casActiveMessageSubject, a => !a.acknowledged), + this.orderMessages.bind(this)); + private readonly ackedMessages = SortedMappedSubscribableArray.create(FilteredMappedSubscribableArray.create(this.casSystem.casActiveMessageSubject, a => a.acknowledged), + this.orderMessages.bind(this)); + + private readonly newMessageCounts = ObjectSubject.create({ + totalAlerts: 0, + countAboveWindow: 0, + countBelowWindow: 0, + numAdvisory: 0, + numCaution: 0, + numWarning: 0, + numSafeOp: 0 + }); + + /** @inheritdoc */ public onAfterRender(): void { - this.setMasterStatus(AnnunciationType.Caution, false); - this.setMasterStatus(AnnunciationType.Warning, false); + this.newMessages.sub(this.onMessagesChanged.bind(this)); + this.ackedMessages.sub(this.onMessagesChanged.bind(this)); - KeyEventManager.getManager(this.props.bus).then(manager => { - manager.interceptKey('MASTER_CAUTION_ACKNOWLEDGE', true); - manager.interceptKey('MASTER_WARNING_ACKNOWLEDGE', true); - }); + this.casLegacyAdapater.start(); - for (const ann of this.props.annunciations) { - FSComponent.render( - , - this.newRef.instance); - FSComponent.render( - , - this.ackRef.instance); - } + this.props.bus.getSubscriber().on('cas_master_caution_active').handle(this.onCautionActive.bind(this)); + this.props.bus.getSubscriber().on('cas_master_warning_active').handle(this.onWarningActive.bind(this)); + this.props.bus.getSubscriber().on('pfd_alert_push').handle(v => v && this.acknowledgeMessages()); + + this.newMessageCounts.sub(this.onMessageCountsChanged.bind(this)); } /** - * Set both sets of simvars relevant to a master caution or warning status. - * @param type The type of the status to set - * @param active Whether or not the status is active + * Handles when unacknowledged message counts have changed. + * @param counts The message counts. */ - private setMasterStatus(type: AnnunciationType, active: boolean): void { - switch (type) { - case AnnunciationType.Caution: - SimVar.SetSimVarValue('K:MASTER_CAUTION_SET', 'bool', active); - SimVar.SetSimVarValue('L:Generic_Master_Caution_Active', 'bool', active); - break; - case AnnunciationType.Warning: - SimVar.SetSimVarValue('K:MASTER_WARNING_SET', 'bool', active); - SimVar.SetSimVarValue('L:Generic_Master_Warning_Active', 'bool', active); - break; + private onMessageCountsChanged(counts: Readonly): void { + let level = G1000AlertsLevel.None; + if (counts.numWarning > 0) { + level = G1000AlertsLevel.Warning; + } else if (counts.numCaution > 0) { + level = G1000AlertsLevel.Caution; + } else if (counts.numAdvisory > 0) { + level = G1000AlertsLevel.Advisory; } + + this.props.bus.getPublisher().pub('cas_unacknowledged_alerts_level', level); } /** - * Render the CAS. - * @returns A VNode. + * Handles when the CAS messages are changed. */ - public render(): VNode { - return ( -
-
-
-
-
) - ; - } -} - -/** The props for a single annunciation. */ -interface AnnunciationProps extends ComponentProps { - /** An event bus. */ - bus: EventBus - /** Our logic handler. */ - logicHandler: CompositeLogicXMLHost, - /** Our annunciation config. */ - config: Annunciation, - /** A subject for passing our state back to the CAS. */ - stateCb: (active: boolean) => void, - /** The state we represent. */ - stateShown: AlertState; -} - -/** An individual annunciation. */ -class CASAnnunciation extends DisplayComponent { - private divRef = FSComponent.createRef(); - /** Whether or not the actual alert condition is currently active. */ - private active = false; - /** Whether or not we are currently showing ourselves. */ - private shown = false; - - /** Show ourselves and let the CAS know, if we're not already shown. */ - private showSelf(): void { - if (!this.shown) { - this.divRef.instance.style.display = 'block'; - this.props.stateCb(true); - this.shown = true; + private onMessagesChanged(): void { + if (this.newMessages.length > 0 && this.ackedMessages.length > 0) { + this.dividerRef.instance.style.display = 'block'; + } else { + this.dividerRef.instance.style.display = 'none'; } - } - /** Hide ourselves and let the CAS know, if we're currently shown. */ - private hideSelf(): void { - if (this.shown) { + if (this.newMessages.length === 0 && this.ackedMessages.length === 0) { this.divRef.instance.style.display = 'none'; - this.props.stateCb(false); - this.shown = false; + } else { + this.divRef.instance.style.display = 'block'; } } - /** Register our alert logic handlers and subscribe to the G1000 bus for alert push events. */ - public onAfterRender(): void { - let intercept: string | undefined; - switch (this.props.config.type) { - case AnnunciationType.Caution: - intercept = 'MASTER_CAUTION_ACKNOWLEDGE'; break; - case AnnunciationType.Warning: - intercept = 'MASTER_WARNING_ACKNOWLEDGE'; break; - } - - if (intercept) { - this.props.bus.getSubscriber().on('key_intercept').handle( - (keyData: KeyEventData) => { - if (keyData.key === intercept) { - this.handleAcknowledgement(); - } - }); - } + /** + * Orders CAS messages as required. + * @param a The first CAS message to compare. + * @param b The second CAS message to compare. + * @returns Negative if b is before a, zero if equal, positive otherwise. + */ + private orderMessages(a: CasActiveMessage, b: CasActiveMessage): number { + return a.priority === b.priority ? b.lastActive - a.lastActive : a.priority - b.priority; + } - const g1000ControlEvents = this.props.bus.getSubscriber(); - g1000ControlEvents.on('pfd_alert_push').handle((evt: boolean) => { - if (evt) { - this.handleAcknowledgement(); - } + /** + * Acknowledges CAS messages. + */ + private acknowledgeMessages(): void { + SimVar.SetSimVarValue('K:MASTER_CAUTION_ACKNOWLEDGE', 'number', 1); + SimVar.SetSimVarValue('K:MASTER_WARNING_ACKNOWLEDGE', 'number', 1); + + const publisher = this.props.bus.getPublisher(); + //Do this on the next frame since the K events will be cached until the end of the frame + //This avoids these being ack'd on this frame and the others the next frame + setTimeout(() => { + publisher.pub('cas_master_acknowledge', AnnunciationType.Advisory, true); + publisher.pub('cas_master_acknowledge', AnnunciationType.SafeOp, true); }); + } - // The composite logic host passes a 1 in the callback if the alert has entered an active state, - // or 0 if it has become inactive. - this.props.logicHandler.addLogicAsNumber(this.props.config.condition, (v: number): void => { - if (v == 1) { - this.active = true; - // We're going active, which means we can't be acked yet. In this case, we only need to - // take action if we show the new alerts; acked alert divs stay idle. - if (this.props.stateShown == AlertState.New) { - this.showSelf(); - } - } else { - this.active = false; - // We're toggling false. Whether we're acked or unacked, we need to hide ourselves and - // let the CAS know. - this.hideSelf(); - } - }, 0); + /** + * Handles when the CAS master caution active state changes. + * @param isActive True if master caution is active, false otherwise. + */ + private onCautionActive(isActive: boolean): void { + if (this.props.cautionSoundId !== undefined && isActive) { + this.soundController.playSound(this.props.cautionSoundId); + } } /** - * Handle a potential acknowledgement event. + * Handles when the CAS master warning active state changes. + * @param isActive True if master warning is active, false otherwise. */ - private handleAcknowledgement(): void { - if (this.props.stateShown == AlertState.New) { - // If we are the new alert, we need to hide ourselves so the acked version can show. - this.hideSelf(); - } else { - // But if we're the acked div, we need to activate ourselves, assuming the alert is hot. - if (this.active) { - this.showSelf(); + private onWarningActive(isActive: boolean): void { + if (this.props.warningSoundId !== undefined) { + if (isActive) { + this.soundController.play({ key: this.props.warningSoundId, sequence: this.props.warningSoundId, continuous: true }); + } else { + this.soundController.stop(this.props.warningSoundId); } } } /** - * Render an annunciation. + * Render the CAS. * @returns A VNode. */ public render(): VNode { - let type: string; - switch (this.props.config.type) { - case AnnunciationType.Advisory: - type = 'advisory'; break; - case AnnunciationType.Caution: - type = 'caution'; break; - case AnnunciationType.SafeOp: - type = 'safeop'; break; - case AnnunciationType.Warning: - type = 'warning'; break; - } - return ( - - ); +
+ +
+ +
) + ; } } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/index.ts index d3d266ab7..be406b4b6 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/index.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/FlightInstruments/index.ts @@ -1,4 +1,5 @@ export * from './AirspeedIndicator'; + export * from './Altimeter'; export * from './AltitudeAlertController'; export * from './ArtificialHorizon'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/BottomInfoPanel.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/BottomInfoPanel.css index 968712a0e..cd3c941da 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/BottomInfoPanel.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/BottomInfoPanel.css @@ -78,29 +78,28 @@ text-align: right; } -.left-brg-ptr-crs-ident>div { - display: inline-block; -} - .left-brg-ptr-crs { color: magenta; padding-right: 5px; + display: inline-block; } .left-brg-ptr-ident { color: white; padding-right: 5px; - ; + display: inline-block; } .left-brg-ptr-src { font-size: 16px; line-height: 25px; color: cyan; + display: inline-block; } .left-brg-ptr-svg { height: 12px; + display: inline-block; } .right-brg-ptr-container { @@ -128,12 +127,9 @@ text-align: left; } -.right-brg-ptr-crs-ident>div { - display: inline-block; -} - .right-brg-ptr-svg { height: 12px; + display: inline-block; } .right-brg-ptr-src { @@ -142,16 +138,19 @@ text-align: left; line-height: 25px; color: cyan; + display: inline-block; } .right-brg-ptr-ident { color: white; padding-left: 5px; + display: inline-block; } .right-brg-ptr-crs { color: magenta; padding-left: 5px; + display: inline-block; } .bip-time { diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Fma/Fma.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Fma/Fma.tsx index 2fd8cdffa..8a0619176 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Fma/Fma.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Fma/Fma.tsx @@ -215,6 +215,12 @@ export class Fma extends DisplayComponent { return 'GP'; case APVerticalModes.PITCH: return 'PIT'; + case APVerticalModes.LEVEL: + return 'LVL'; + case APVerticalModes.GA: + return 'GA'; + case APVerticalModes.TO: + return 'TO'; case APVerticalModes.CAP: { const alt = this.autopilotModes.verticalAltitudeArmed; return alt === APAltitudeModes.ALTS ? 'ALTS' : alt === APAltitudeModes.ALTV ? 'ALTV' : 'ALT'; @@ -293,6 +299,10 @@ export class Fma extends DisplayComponent { return 'ROL'; case APLateralModes.LEVEL: return 'LVL'; + case APLateralModes.GA: + return 'GA'; + case APLateralModes.TO: + return 'TO'; default: return ''; } @@ -319,6 +329,10 @@ export class Fma extends DisplayComponent { return 'LVL'; case APLateralModes.BC: return 'BC'; + case APLateralModes.GA: + return 'GA'; + case APLateralModes.TO: + return 'TO'; default: return ''; } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.css index 084c9720f..4d1fd04ae 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.css @@ -25,6 +25,16 @@ color: rgb(44, 44, 44); } +/* Override green color with white on ground */ +.xpdr-container .on-ground.green { + color: white; + } + +/* Override green highlight with white on ground */ +.xpdr-container .on-ground.highlight-green { + background-color: white; + color: rgb(44, 44, 44); +} /* .highlight { @@ -44,4 +54,4 @@ background-color: none; color: cyan } -} */ \ No newline at end of file +} */ diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.tsx index 1a9c85efa..f945b05b6 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/Overlays/Transponder.tsx @@ -1,4 +1,6 @@ -import { ComputedSubject, ControlPublisher, DisplayComponent, EventBus, FSComponent, VNode, XPDRMode, XPDRSimVarEvents } from '@microsoft/msfs-sdk'; +import { + AdcEvents, ComputedSubject, ConsumerSubject, ControlPublisher, DisplayComponent, EventBus, FSComponent, HEvent, VNode, XPDRMode, XPDRSimVarEvents, +} from '@microsoft/msfs-sdk'; import { G1000ControlEvents } from '../../../Shared/G1000Events'; @@ -30,7 +32,8 @@ export class Transponder extends DisplayComponent { tempCode: '' }; private readonly xpdrCodeSubject = ComputedSubject.create(0, (v): string => { - return `${Math.round(v)}`.padStart(4, '0'); + const roundedCode = Math.round(v); + return `${isNaN(roundedCode) ? 0 : roundedCode}`.padStart(4, '0'); }); private readonly xpdrModeSubject = ComputedSubject.create(XPDRMode.OFF, (v): string => { switch (v) { @@ -48,6 +51,7 @@ export class Transponder extends DisplayComponent { return 'XXX'; }); + private readonly isOnGround = ConsumerSubject.create(this.props.bus.getSubscriber().on('on_ground').whenChanged(), true); /** * A callback called after the component renders. @@ -68,6 +72,99 @@ export class Transponder extends DisplayComponent { .handle(this.updateCodeEdit.bind(this)); g1000ControlEvents.on('xpdr_code_digit') .handle(this.editCode.bind(this)); + + this.isOnGround.sub(onGround => { + this.xpdrCodeElement.instance.classList.toggle('on-ground', onGround); + this.xpdrModeElement.instance.classList.toggle('on-ground', onGround); + }, true); + + this.props.bus.getSubscriber().on('hEvent').handle(this.handleXpdrHEvent.bind(this)); + } + + /** + * A method to handle XPDR-related Control Pad HEvents. + * @param evt the name of the HEvent. + */ + private handleXpdrHEvent(evt: string): void { + switch (evt) { + case 'AS1000_CONTROL_PAD_Ident': + this.props.controlPublisher.publishEvent('xpdr_send_ident_1', true); + break; + case 'AS1000_PFD_XPDR_Small_INC': + this.changeCodeByOne(true); + break; + case 'AS1000_PFD_XPDR_Small_DEC': + this.changeCodeByOne(false); + break; + case 'AS1000_PFD_XPDR_Large_INC': + this.changeCodeByHundreds(true); + break; + case 'AS1000_PFD_XPDR_Large_DEC': + this.changeCodeByHundreds(false); + break; + } + } + + /** + * Changes the second two digits of the xpdr code by one (tens and ones). + * @param increment whether to increment or decrement the code. + */ + private changeCodeByOne(increment: boolean): void { + // current code will be a rounded number in a padded string, so we parse it as base-8 + const currentCode = parseInt(this.xpdrCodeSubject.get()); + if (isNaN(currentCode)) { + return; + } + let ones = currentCode % 10; + let tens = Math.floor(currentCode / 10) % 10; + ones += (increment ? 1 : -1); + if (ones > 7) { + ones = 0; + tens += 1; + if (tens > 7) { + tens = 0; + } + } + if (ones < 0) { + ones = 7; + tens -= 1; + if (tens < 0) { + tens = 7; + } + } + const newCode = (Math.floor(currentCode / 100) * 100) + tens * 10 + ones; + this.props.controlPublisher.publishEvent('publish_xpdr_code_1', newCode); + } + + /** + * Changes the first two digits of the xpdr code by one (thousands and hundreds). + * @param increment whether to increment or decrement the code. + */ + private changeCodeByHundreds(increment: boolean): void { + // current code will be a rounded number in a padded string, so we parse it as base-8 + const currentCode = parseInt(this.xpdrCodeSubject.get()); + if (isNaN(currentCode)) { + return; + } + let hundreds = Math.floor(currentCode / 100) % 10; + let thousands = Math.floor(currentCode / 1000) % 10; + hundreds += (increment ? 1 : -1); + if (hundreds > 7) { + hundreds = 0; + thousands += 1; + if (thousands > 7) { + thousands = 0; + } + } + if (hundreds < 0) { + hundreds = 7; + thousands -= 1; + if (thousands < 0) { + thousands = 7; + } + } + const newCode = thousands * 1000 + hundreds * 100 + currentCode % 100; + this.props.controlPublisher.publishEvent('publish_xpdr_code_1', newCode); } /** @@ -76,6 +173,7 @@ export class Transponder extends DisplayComponent { */ private updateCodeEdit(edit: boolean): void { if (edit && this.xpdrCodeElement.instance !== null) { + this.codeEdit.charIndex = !this.codeEdit.editMode ? 0 : this.codeEdit.charIndex; this.codeEdit.editMode = true; this.codeEdit.tempCode = ' '; if (this.xpdrModeSubject.getRaw() === XPDRMode.STBY || this.xpdrModeSubject.getRaw() === XPDRMode.OFF) { @@ -87,6 +185,7 @@ export class Transponder extends DisplayComponent { } else if (!edit && this.xpdrCodeElement.instance !== null) { this.codeEdit.editMode = false; this.codeEdit.tempCode = ''; + this.codeEdit.charIndex = 0; this.xpdrCodeElement.instance.classList.remove('highlight-green'); this.xpdrCodeElement.instance.classList.remove('highlight-white'); this.onXpdrModeUpdate(this.xpdrModeSubject.getRaw()); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/AlertsSubject.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/AlertsSubject.ts index d3b4d474a..41ca9dc22 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/AlertsSubject.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/AlertsSubject.ts @@ -1,4 +1,6 @@ -import { ArraySubject, EventBus, Publisher, SubscribableArray, SubscribableArrayHandler, Subscription } from '@microsoft/msfs-sdk'; +import { + AnnunciationType, ArraySubject, EventBus, Publisher, SortedMappedSubscribableArray, SubscribableArray, SubscribableArrayHandler, Subscription +} from '@microsoft/msfs-sdk'; /** * A message to be displayed in the Alerts pane. @@ -12,6 +14,9 @@ export interface AlertMessage { /** The body of the message. */ message: string; + + /** The optional priority of the message. */ + priority?: AnnunciationType; } /** @@ -34,6 +39,9 @@ export interface AlertMessageEvents { export class AlertsSubject implements SubscribableArray { private readonly data = ArraySubject.create([]); + private readonly timestamps = new Map(); + + private readonly sortedData = SortedMappedSubscribableArray.create(this.data, this.orderAlerts.bind(this), (a, b) => a.key === b.key); private readonly publisher: Publisher; /** @@ -48,6 +56,30 @@ export class AlertsSubject implements SubscribableArray { this.publisher = bus.getPublisher(); } + /** + * Orders the alert messages. + * @param a The first message to order. + * @param b The second message to order. + * @returns Negative if b comes before a, zero if equal, positive if b comes after a. + */ + private orderAlerts(a: AlertMessage, b: AlertMessage): number { + if (a.key === b.key) { + return 0; + } + + const aPriority = a.priority ?? AnnunciationType.SafeOp; + const bPriority = b.priority ?? AnnunciationType.SafeOp; + + if (aPriority === bPriority) { + const aTimestamp = this.timestamps.get(a.key) ?? 0; + const bTimestamp = this.timestamps.get(b.key) ?? 0; + + return bTimestamp - aTimestamp; + } else { + return aPriority - bPriority; + } + } + /** * A callback called when an alert is pushed on the bus. * @param message The alert message that was pushed. @@ -55,6 +87,7 @@ export class AlertsSubject implements SubscribableArray { private onAlertPushed(message: AlertMessage): void { const index = this.data.getArray().findIndex(x => x.key === message.key); if (index < 0) { + this.timestamps.set(message.key, Date.now()); this.data.insert(message, 0); this.publisher.pub('alerts_available', true, false, true); } @@ -68,6 +101,7 @@ export class AlertsSubject implements SubscribableArray { const index = this.data.getArray().findIndex(x => x.key === key); if (index >= 0) { this.data.removeAt(index); + this.timestamps.delete(key); if (this.data.length === 0) { this.publisher.pub('alerts_available', false, false, true); @@ -77,31 +111,31 @@ export class AlertsSubject implements SubscribableArray { /** @inheritdoc */ public get length(): number { - return this.data.length; + return this.sortedData.length; } /** @inheritdoc */ public get(index: number): AlertMessage { - return this.data.get(index); + return this.sortedData.get(index); } /** @inheritdoc */ public tryGet(index: number): AlertMessage | undefined { - return this.data.tryGet(index); + return this.sortedData.tryGet(index); } /** @inheritdoc */ public getArray(): readonly AlertMessage[] { - return this.data.getArray(); + return this.sortedData.getArray(); } /** @inheritdoc */ public sub(handler: SubscribableArrayHandler, initialNotify = false, paused = false): Subscription { - return this.data.sub(handler, initialNotify, paused); + return this.sortedData.sub(handler, initialNotify, paused); } /** @inheritdoc */ public unsub(handler: SubscribableArrayHandler): void { - this.data.unsub(handler); + this.sortedData.unsub(handler); } } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/CasAlertsBridge.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/CasAlertsBridge.ts new file mode 100644 index 000000000..3045287a8 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/CasAlertsBridge.ts @@ -0,0 +1,74 @@ +import { CasAlertEventData, CasStateEvents, EventBus } from '@microsoft/msfs-sdk'; +import { AlertMessage, AlertMessageEvents } from './AlertsSubject'; + +/** + * CAS events specific to the G1000 NXi. + */ +export interface CasAlertBridgeEvents { + /** Registers an alert message associated with a specified CAS. The alert message key must match the uid of the associated CAS alert. */ + 'cas_register_associated_message': AlertMessage; + + /** Unregisters an alert message associated with a specified CAS. */ + 'cas_unregister_associated_message': string; +} + +/** + * A class for associating alert messages with specific CAS alerts. + */ +export class CasAlertsBridge { + + private readonly publisher = this.bus.getPublisher(); + private readonly associatedAlertMessages = new Map(); + + /** + * Creates an instance of a CasAlertsBridge. + * @param bus The event bus to use with this instance. + */ + constructor(private readonly bus: EventBus) { + const subscriber = this.bus.getSubscriber(); + subscriber.on('cas_register_associated_message').handle(this.registerAssociatedAlertMessage.bind(this)); + subscriber.on('cas_unregister_associated_message').handle(this.unregisterAssociatedAlertMessage.bind(this)); + + subscriber.on('cas_alert_displayed').handle(this.onMessageDisplayed.bind(this)); + subscriber.on('cas_alert_hidden').handle(this.onMessageHidden.bind(this)); + } + + /** + * Handles when a CAS message is displayed. + * @param data The event data about the displayed message. + */ + private onMessageDisplayed(data: CasAlertEventData): void { + const associatedMessage = this.associatedAlertMessages.get(data.uuid); + if (associatedMessage !== undefined) { + associatedMessage.priority = data.priority; + this.publisher.pub('alerts_push', { key: associatedMessage.key, title: associatedMessage.title, message: associatedMessage.message, priority: data.priority }); + } + } + + /** + * Handles when a CAS message is hidden. + * @param data The event data about the hidden message. + */ + private onMessageHidden(data: CasAlertEventData): void { + const associatedMessage = this.associatedAlertMessages.get(data.uuid); + if (associatedMessage !== undefined) { + this.publisher.pub('alerts_remove', associatedMessage.key); + } + } + + /** + * Registers an associated alert message. + * @param alertMessage The alert message to register. + */ + private registerAssociatedAlertMessage(alertMessage: AlertMessage): void { + this.associatedAlertMessages.set(alertMessage.key, alertMessage); + } + + /** + * Unregisters an associated alert message. + * @param uid The ID to unregister. + */ + private unregisterAssociatedAlertMessage(uid: string): void { + this.associatedAlertMessages.delete(uid); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/index.ts index e9e9b3517..ac81ebe71 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/index.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/Alerts/index.ts @@ -1,2 +1,3 @@ export * from './Alerts'; export * from './AlertsSubject'; +export * from './CasAlertsBridge'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSection.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSection.tsx index cb1ae401a..a6bb61fbf 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSection.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSection.tsx @@ -22,6 +22,8 @@ import { PFDPageMenuDialog } from '../PFDPageMenuDialog'; import { FixInfo } from '../../../../Shared/UI/FPL/FixInfo'; import type { MenuItemDefinition } from '../../../../Shared/UI/Dialogs/PopoutMenuItem'; +import { FmsHEvent } from '../../../../MFD'; +import { ControlpadHEventHandler, ControlPadKeyOperations } from '../../../../Shared/Input/ControlpadHEventHandler'; /** The properties of an FPL detail section item. */ export interface FPLSectionProps extends G1000UiControlProps { /** The view service. */ @@ -728,33 +730,23 @@ export abstract class FPLSection extends G1000UiControl impleme return this.emptyRowRef.getOrDefault()?.isFocused ?? false; } + /** @inheritdoc */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + const keyboardInputEvaluation = ControlpadHEventHandler.evaluateKeyboardInput(evt); + if (keyboardInputEvaluation.KeyboardOperation === ControlPadKeyOperations.InsertCharacter) { + this.openWaypointSelectionView(source); + return true; + } + return false; + } + /** * Callback for when UpperKnob event happens on a leg. * @param source The FixInfo element. * @returns True if the control handled the event. */ protected readonly onUpperKnobLegBase = (source: G1000UiControl): boolean => { - let idx = (source instanceof FixInfo) ? this.listRef.instance.indexOf(source) : undefined; - this.props.viewService.open('WptInfo', true) - .onAccept.on((sender, fac: Facility) => { - - if (idx !== undefined) { - if ( - BitFlags.isAll(this.segment.legs[idx]?.flags ?? 0, LegDefinitionFlags.VectorsToFinalFaf) - && BitFlags.isAll(this.segment.legs[idx - 1]?.flags ?? 0, LegDefinitionFlags.VectorsToFinal) - ) { - // If we are inserting before a VTF faf leg with a preceding discontinuity leg, we need to shift the index - // by -1 to ensure we insert the new leg before the discontinuity leg. - idx -= 1; - } - } - - const success = this.props.fms.insertWaypoint(this.segment.segmentIndex, fac, idx); - if (!success) { - this.props.viewService.open('MessageDialog', true).setInput({ inputString: 'Invalid flight plan modification.' }); - } - }); - + this.openWaypointSelectionView(source); return true; }; @@ -815,6 +807,31 @@ export abstract class FPLSection extends G1000UiControl impleme return this.onClrLegBase(sender as FixInfo); }; + /** + * Open the WaypointInfo popup + * @param source Source element + */ + private openWaypointSelectionView(source: G1000UiControl): void { + let idx = (source instanceof FixInfo) ? this.listRef.instance.indexOf(source) : undefined; + this.props.viewService.open('WptInfo', true) + .onAccept.on((sender, fac: Facility) => { + + if (idx !== undefined) { + if (BitFlags.isAll(this.segment.legs[idx]?.flags ?? 0, LegDefinitionFlags.VectorsToFinalFaf) + && BitFlags.isAll(this.segment.legs[idx - 1]?.flags ?? 0, LegDefinitionFlags.VectorsToFinal)) { + // If we are inserting before a VTF faf leg with a preceding discontinuity leg, we need to shift the index + // by -1 to ensure we insert the new leg before the discontinuity leg. + idx -= 1; + } + } + + const success = this.props.fms.insertWaypoint(this.segment.segmentIndex, fac, idx); + if (!success) { + this.props.viewService.open('MessageDialog', true).setInput({ inputString: 'Invalid flight plan modification.' }); + } + }); + } + /** * A callback which is called when a leg selection changes. * @param item The selected item. @@ -986,7 +1003,9 @@ export abstract class FPLSection extends G1000UiControl impleme ref={this.listRef} data={this.legs} renderItem={this.renderItem} onItemSelected={this.onLegItemSelected.bind(this)} - hideScrollbar scrollContainer={this.props.scrollContainer} + hideScrollbar + scrollToMostRecentlyAdded + scrollContainer={this.props.scrollContainer} reconcileChildBlur={(): BlurReconciliation => BlurReconciliation.Next} requireChildFocus /> diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDeparture.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDeparture.tsx index 8f4e58f6a..23241288f 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDeparture.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDeparture.tsx @@ -10,11 +10,59 @@ import { SetRunway } from '../../../../Shared/UI/SetRunway/SetRunway'; import { WptInfo } from '../../../../Shared/UI/WptInfo/WptInfo'; import { FixInfo } from '../../../../Shared/UI/FPL/FixInfo'; import { FPLSection } from './FPLSection'; +import { ControlpadHEventHandler, ControlPadKeyOperations } from '../../../../Shared/Input/ControlpadHEventHandler'; +import { FmsHEvent } from '../../../../MFD'; /** * Render the departure phase of the flight plan. */ export class FPLDeparture extends FPLSection { + /** @inheritdoc */ + public onAfterRender(node: VNode): void { + super.onAfterRender(node); + } + + /** @inheritdoc */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + const keyboardInputEvaluation = ControlpadHEventHandler.evaluateKeyboardInput(evt); + if (keyboardInputEvaluation.KeyboardOperation === ControlPadKeyOperations.InsertCharacter) { + const plan = this.props.fms.getFlightPlan(); + const origin = plan.originAirport; + if (!origin || origin === undefined) { + this.openDepartureSelectionView(); + return true; + } + } + return false; + } + + /** Open the WaypointInfo popup */ + private openDepartureSelectionView(): void { + this.props.viewService.open('WptInfo', true) + .onAccept.on((sender, fac) => { + if (fac === undefined) { + return; + } + + // check if its airportfacility interface + if ('bestApproach' in fac) { + this.props.fms.setOrigin(fac as AirportFacility); + this.props.viewService.open('SetRunway', true).setInput(fac as AirportFacility) + .onAccept.on((subSender, data) => { + this.props.fms.setOrigin(this.props.facilities.originFacility, data); + }); + } else { + const firstEnrSegment = this.props.fms.getFlightPlan().segmentsOfType(FlightPlanSegmentType.Enroute).next().value; + if (firstEnrSegment) { + const success = this.props.fms.insertWaypoint(firstEnrSegment.segmentIndex, fac, 0); + if (!success) { + this.props.viewService.open('MessageDialog', true).setInput({ inputString: 'Invalid flight plan modification.' }); + } + } + } + }); + } + /** @inheritdoc */ protected getEmptyRowVisbility(): boolean { const plan = this.props.fms.getFlightPlan(0); @@ -54,33 +102,9 @@ export class FPLDeparture extends FPLSection { const plan = this.props.fms.getFlightPlan(); const origin = plan.originAirport; if (!origin || origin === undefined) { - this.props.viewService.open('WptInfo', true) - .onAccept.on((sender, fac) => { - if (fac === undefined) { - return; - } - - // check if its airportfacility interface - if ('bestApproach' in fac) { - this.props.fms.setOrigin(fac as AirportFacility); - this.props.viewService.open('SetRunway', true).setInput(fac as AirportFacility) - .onAccept.on((subSender, data) => { - this.props.fms.setOrigin(this.props.facilities.originFacility, data); - }); - } else { - const firstEnrSegment = this.props.fms.getFlightPlan().segmentsOfType(FlightPlanSegmentType.Enroute).next().value; - if (firstEnrSegment) { - const success = this.props.fms.insertWaypoint(firstEnrSegment.segmentIndex, fac, 0); - if (!success) { - this.props.viewService.open('MessageDialog', true).setInput({ inputString: 'Invalid flight plan modification.' }); - } - } - } - }); - + this.openDepartureSelectionView(); return true; } - return false; }; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDestination.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDestination.tsx index b95e3201d..a1b729880 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDestination.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/FPL/FPLSectionDestination.tsx @@ -6,6 +6,8 @@ import { G1000UiControl } from '../../../../Shared/UI/G1000UiControl'; import { SetRunway } from '../../../../Shared/UI/SetRunway/SetRunway'; import { FixInfo } from '../../../../Shared/UI/FPL/FixInfo'; import { FPLSection } from './FPLSection'; +import { FmsHEvent } from '../../../../MFD'; +import { ControlpadHEventHandler, ControlPadKeyOperations } from '../../../../Shared/Input/ControlpadHEventHandler'; /** * Render the destination info for a flight plan. @@ -20,6 +22,20 @@ export class FPLDestination extends FPLSection { return noAppArr && !hasRunway && (!destination || destination == ''); } + /** @inheritdoc */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + const keyboardInputEvaluation = ControlpadHEventHandler.evaluateKeyboardInput(evt); + if (keyboardInputEvaluation.KeyboardOperation === ControlPadKeyOperations.InsertCharacter) { + const plan = this.props.fms.getFlightPlan(); + const destination = plan.destinationAirport; + if (!destination || destination === undefined) { + this.openDestinationSelectionView(); + return true; + } + } + return false; + } + /** @inheritdoc */ protected onUpperKnobLegBase = (source: G1000UiControl): boolean => { const legIndex = this.listRef.instance.indexOf(source); @@ -43,16 +59,8 @@ export class FPLDestination extends FPLSection { const plan = this.props.fms.getFlightPlan(); const destination = plan.destinationAirport; if (!destination || destination === undefined) { - // EMPTY ROW - this.props.viewService.open('WptInfo', true) - .onAccept.on((sender, fac: AirportFacility) => { - this.props.fms.setDestination(fac as AirportFacility); - this.props.viewService.open('SetRunway', true).setInput(fac as AirportFacility).onAccept.on((subSender, data) => { - this.props.fms.setDestination(this.props.facilities.destinationFacility, data); - }); - }); + this.openDestinationSelectionView(); } - return true; }; @@ -74,6 +82,19 @@ export class FPLDestination extends FPLSection { return false; }; + /** Open the WaypointInfo popup */ + private openDestinationSelectionView(): void { + // EMPTY ROW + this.props.viewService.open('WptInfo', true) + .onAccept.on((sender, fac: AirportFacility) => { + this.props.fms.setDestination(fac as AirportFacility); + this.props.viewService.open('SetRunway', true).setInput(fac as AirportFacility).onAccept.on((subSender, data) => { + this.props.fms.setDestination(this.props.facilities.destinationFacility, data); + }); + }); + + } + /** @inheritdoc */ protected onHeaderFocused(): void { super.onHeaderFocused(); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/PFDViewService.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/PFDViewService.ts index b1066053a..7e425eba6 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/PFDViewService.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/PFDViewService.ts @@ -29,7 +29,7 @@ export class PFDViewService extends ViewService { ['AS1000_PFD_FPL_Push', FmsHEvent.FPL], ['AS1000_PFD_PROC_Push', FmsHEvent.PROC], ['AS1000_PFD_RANGE_INC', FmsHEvent.RANGE_INC], - ['AS1000_PFD_RANGE_DEC', FmsHEvent.RANGE_DEC] + ['AS1000_PFD_RANGE_DEC', FmsHEvent.RANGE_DEC], ]); /** @@ -38,6 +38,7 @@ export class PFDViewService extends ViewService { */ constructor(readonly bus: EventBus) { super(bus); + const g1000Pub = this.bus.getSubscriber(); g1000Pub.on('pfd_timerref_push').handle(() => { this.onInteractionEvent('pfd_timerref_push'); @@ -53,11 +54,8 @@ export class PFDViewService extends ViewService { }); } - /** - * Routes the HEvents to the views. - * @param hEvent The event identifier. - */ - protected onInteractionEvent(hEvent: string): void { + /** @inheritdoc */ + protected onInteractionEvent(hEvent: string): boolean { // Handling a few special cases here to keep the other stuff nice ;) const activeView = this.activeView.get(); @@ -66,19 +64,17 @@ export class PFDViewService extends ViewService { if (hEvent === 'AS1000_PFD_MENU_Push') { if (!activeView) { this.open(PFDSetup.name); - return; + return true; } else if (activeView instanceof PFDSetup) { activeView.close(); - return; + return true; } } - const evt = this.fmsEventMap.get(hEvent); - if (evt !== undefined && this.routeInteractionEventToViews(evt)) { - return; + if (super.onInteractionEvent(hEvent)) { + return true; } - switch (hEvent) { // TODO move these events out in the next iteration, since we dont want type refs to the views in here case 'AS1000_PFD_FPL_Push': @@ -127,5 +123,6 @@ export class PFDViewService extends ViewService { this.open('DirectTo'); break; } + return true; } } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.css index 3ca2842d9..8f7bba92a 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.css @@ -38,78 +38,74 @@ .timerref-hr1 { position: absolute; - top: 30px; left: -3px; + top: 30px; width: 99%; border: 1px solid rgb(100, 100, 100); } -.timerref-glide-title { +.timerref-ref-container { position: absolute; + left: 0px; top: 35px; + width: 100%; + height: 80px; } -.timerref-glide-value, -.timerref-vr-value, -.timerref-vx-value, -.timerref-vy-value { +.timerref-ref-list { position: absolute; - top: 35px; - left: 146px; - width: 60px; - color: cyan; - text-align: right; + left: 0px; + top: 0px; + width: calc(100% - 4px); + height: 100%; } -.timerref-glide-toggle { - position: absolute; - right: 20px; - top: 35px; -} - -.timerref-vr-title { - position: absolute; - top: 55px; -} - -.timerref-vr-value { - top: 55px; +.timerref-ref-row { + position: relative; + height: 20px; + display: flex; + flex-flow: row nowrap; } -.timerref-vr-toggle { - position: absolute; - right: 20px; - top: 55px; +.timerref-ref-header { + justify-content: center; + align-items: center; + font-size: 15px; } -.timerref-vx-title { - position: absolute; - top: 75px; +.timerref-ref-entry { + justify-content: flex-start; + align-items: baseline; } -.timerref-vx-value { - top: 75px; +.timerref-ref-title { + flex-shrink: 0; + width: 146px; + font-size: 16px; } -.timerref-vx-toggle { - position: absolute; - right: 20px; - top: 75px; +.timerref-ref-value { + flex-shrink: 0; + width: 60px; + color: cyan; + text-align: right; } -.timerref-vy-title { - position: absolute; - top: 95px; +.timerref-ref-unit { + font-size: 14px; } -.timerref-vy-value { - top: 95px; +.timerref-ref-asterisk { + color: #fff; + width: 9px; + display: inline-block; } -.timerref-vy-toggle { - position: absolute; - right: 20px; - top: 95px; +.timerref-ref-toggle { + flex-grow: 1; + max-width: 78px; + justify-content: flex-end; + font-size: 16px; } .timerref-hr2 { @@ -195,10 +191,4 @@ left: 4px; height: 50px; padding: 5px; -} - -.timerref-asterisk { - color: #fff; - width: 9px; - display: inline-block; -} +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.tsx index bd92434f3..44a59f309 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/Components/UI/TimerRef/TimerRef.tsx @@ -1,18 +1,25 @@ import { - ArraySubject, ComputedSubject, EventBus, FSComponent, MinimumsControlEvents, MinimumsEvents, MinimumsMode, NumberUnitSubject, Subject, Unit, UnitFamily, - UnitType, VNode + ArraySubject, ArrayUtils, ComputedSubject, EventBus, FSComponent, MappedSubject, MappedSubscribable, MinimumsControlEvents, MinimumsEvents, + MinimumsMode, NumberUnitSubject, Subject, Unit, UnitFamily, UnitType, UserSetting, VNode } from '@microsoft/msfs-sdk'; -import { G1000ControlEvents } from '../../../../Shared/G1000Events'; +import { VSpeedUserSettingUtils } from '@microsoft/msfs-garminsdk'; + import { ContextMenuDialog, ContextMenuItemDefinition } from '../../../../Shared/UI/Dialogs/ContextMenuDialog'; +import { MenuItemDefinition } from '../../../../Shared/UI/Dialogs/PopoutMenuItem'; import { FmsHEvent } from '../../../../Shared/UI/FmsHEvent'; +import { G1000ControlList, G1000UiControl } from '../../../../Shared/UI/G1000UiControl'; import { ActionButton } from '../../../../Shared/UI/UIControls/ActionButton'; import { ArrowToggle } from '../../../../Shared/UI/UIControls/ArrowToggle'; import { NumberInput } from '../../../../Shared/UI/UIControls/NumberInput'; import { SelectControl } from '../../../../Shared/UI/UIControls/SelectControl'; +import { ArrowControl } from '../../../../Shared/UI/UiControls2/ArrowControl'; +import { DigitInput } from '../../../../Shared/UI/UiControls2/DigitInput'; +import { G1000UiControlWrapper } from '../../../../Shared/UI/UiControls2/G1000UiControlWrapper'; import { UiView, UiViewProps } from '../../../../Shared/UI/UiView'; import { UnitsUserSettingManager } from '../../../../Shared/Units/UnitsUserSettings'; -import { VSpeed, VSpeedType } from '../../FlightInstruments/AirspeedIndicator'; +import { VSpeedDefinition, VSpeedGroup } from '../../../../Shared/VSpeed/VSpeed'; +import { VSpeedUserSettingManager } from '../../../../Shared/VSpeed/VSpeedUserSettings'; import { PFDPageMenuDialog } from '../PFDPageMenuDialog'; import { Timer, TimerMode } from './Timer'; import { TimerInput } from './TimerInput'; @@ -25,37 +32,139 @@ import './TimerRef.css'; interface TimerRefProps extends UiViewProps { /** An instance of the event bus. */ bus: EventBus; + + /** A manager for reference V-speed user settings. */ + vSpeedSettingManager: VSpeedUserSettingManager; + /** A user setting manager. */ unitsSettingManager: UnitsUserSettingManager; + /** Whether this instance of the G1000 has a Radio Altimeter. */ hasRadioAltimeter: boolean; } +/** + * An entry describing a reference V-speed that can be edited through the TimerRef menu. + */ +type VSpeedEntry = { + /** The V-speed definition. */ + definition: VSpeedDefinition; + + /** The user setting controlling whether the V-speed bug is shown on the airspeed indicator. */ + showSetting: UserSetting; + + /** The user setting controlling the default value of the V-speed. */ + defaultValueSetting: UserSetting; + + /** The user setting controlling the user-defined value of the V-speed. */ + userValueSetting: UserSetting; + + /** The current active value of the V-speed. */ + activeValue: MappedSubscribable; + + /** Whether the active value of the V-speed differs from the default value. */ + isEdited: MappedSubscribable; +}; + /** * The PFD timer ref popout. */ export class TimerRef extends UiView { + private static readonly VSPEED_GROUP_COMPARATOR = (a: VSpeedGroup, b: VSpeedGroup): number => { + // Default group ('') goes before all other groups. + if (a.name === '') { + return -1; + } else if (b.name === '') { + return 1; + } else { + return 0; + } + }; + public popoutRef = FSComponent.createRef(); private readonly containerRef = FSComponent.createRef(); private readonly minsToggleComponent = FSComponent.createRef(); private readonly minsInputComponent = FSComponent.createRef(); - private readonly glideRef = Subject.create(1); - private readonly glideRefChanged = ComputedSubject.create(false, (v) => { return v ? ' *' : ''; }); - private readonly vrRef = Subject.create(1); - private readonly vrRefChanged = ComputedSubject.create(false, (v) => { return v ? ' *' : ''; }); - private readonly vxRef = Subject.create(1); - private readonly vxRefChanged = ComputedSubject.create(false, (v) => { return v ? ' *' : ''; }); - private readonly vyRef = Subject.create(1); - private readonly vyRefChanged = ComputedSubject.create(false, (v) => { return v ? ' *' : ''; }); + private readonly vSpeedGroups = Array.from(this.props.vSpeedSettingManager.vSpeedGroups.values()).sort(TimerRef.VSPEED_GROUP_COMPARATOR); + + private readonly vSpeedRowData = ArraySubject.create( + ArrayUtils.flatMap(this.vSpeedGroups, group => { + return group.name === '' ? group.vSpeedDefinitions : [group.name, ...group.vSpeedDefinitions]; + }).map(row => { + if (typeof row === 'string') { + return row; + } + + const definition = row; + const activeValue = VSpeedUserSettingUtils.activeValue(definition.name, this.props.vSpeedSettingManager, false, true); + + return { + definition, + showSetting: this.props.vSpeedSettingManager.getSetting(`vSpeedShow_${definition.name}`), + defaultValueSetting: this.props.vSpeedSettingManager.getSetting(`vSpeedDefaultValue_${definition.name}`), + userValueSetting: this.props.vSpeedSettingManager.getSetting(`vSpeedUserValue_${definition.name}`), + activeValue, + isEdited: MappedSubject.create( + ([activeVal, defaultVal]) => activeVal !== defaultVal, + activeValue, + this.props.vSpeedSettingManager.getSetting(`vSpeedDefaultValue_${definition.name}`) + ) + } as VSpeedEntry; + }) + ); + + private readonly menuItems: MenuItemDefinition[] = [ + { + id: 'enable-all', + renderContent: (): VNode => All References On, + isEnabled: true, + action: this.setShowVSpeedBugs.bind(this, true, undefined) + }, + { + id: 'disable-all', + renderContent: (): VNode => All References Off, + isEnabled: true, + action: this.setShowVSpeedBugs.bind(this, false, undefined) + }, + { + id: 'restore-defaults', + renderContent: (): VNode => Restore Defaults, + isEnabled: true, + action: this.resetVSpeeds.bind(this, undefined) + }, + ...ArrayUtils.flatMap(this.vSpeedGroups.filter(group => group.name !== ''), group => { + return [ + { + id: `enable-all-${group.name}`, + renderContent: (): VNode => {group.name} References On, + isEnabled: true, + action: this.setShowVSpeedBugs.bind(this, true, group.name) + }, + { + id: `disable-all-${group.name}`, + renderContent: (): VNode => {group.name} References Off, + isEnabled: true, + action: this.setShowVSpeedBugs.bind(this, false, group.name) + }, + { + id: `restore-defaults-${group.name}`, + renderContent: (): VNode => Restore {group.name} Defaults, + isEnabled: true, + action: this.resetVSpeeds.bind(this, group.name) + } + ]; + }) + ]; + private readonly minsRef = Subject.create(0); private readonly timerComponentRef = FSComponent.createRef(); private readonly upDownItems = ArraySubject.create(); private readonly buttonRef = FSComponent.createRef(); private readonly upDownControlRef = FSComponent.createRef>(); private timerButtonSubject = Subject.create('Start?'); - private g1000Pub = this.props.bus.getPublisher(); + private controlPub = this.props.bus.getPublisher(); /** @@ -78,22 +187,6 @@ export class TimerRef extends UiView { public timer = new Timer(this.props.bus, this.onTimerModeChanged, this.onTimerValueChanged); - private vSpeeds: VSpeed[] = [ - { type: VSpeedType.Vx, value: Math.round(Simplane.getDesignSpeeds().Vx), modified: Subject.create(false), display: true }, - { type: VSpeedType.Vy, value: Math.round(Simplane.getDesignSpeeds().Vy), modified: Subject.create(false), display: true }, - { type: VSpeedType.Vr, value: Math.round(Simplane.getDesignSpeeds().Vr), modified: Subject.create(false), display: true }, - { type: VSpeedType.Vglide, value: Math.round(Simplane.getDesignSpeeds().BestGlide), modified: Subject.create(false), display: true }, - { type: VSpeedType.Vapp, value: Math.round(Simplane.getDesignSpeeds().Vapp), modified: Subject.create(false), display: false } - ]; - private vSpeedSubjects = { - vx: Subject.create(this.vSpeeds[0].value), - vy: Subject.create(this.vSpeeds[1].value), - vr: Subject.create(this.vSpeeds[2].value), - vg: Subject.create(this.vSpeeds[3].value), - vapp: Subject.create(this.vSpeeds[4].value) - }; - - // minimums private readonly minimumsSubscriber = this.props.bus.getSubscriber(); private readonly decisionHeight = NumberUnitSubject.create(UnitType.FOOT.createNumber(0)); @@ -104,13 +197,7 @@ export class TimerRef extends UiView { ); private minsToggleOptions = ['Off', 'BARO', 'RA', 'TEMP COMP']; - private vSpeedToggleMap: Map = new Map(); - private vSpeedSubjectMap: Map> = new Map(); - private vSpeedObjectMap: Map = new Map(); - - private onOffToggleOptions = ['Off', 'On']; - - /** @inheritdoc */ + /** @inheritDoc */ public onInteractionEvent(evt: FmsHEvent): boolean { switch (evt) { case FmsHEvent.CLR: @@ -130,38 +217,12 @@ export class TimerRef extends UiView { public onMenu(): boolean { // console.log('called menu'); const dialog = this.props.viewService.open('PageMenuDialog', true) as PFDPageMenuDialog; - dialog.setMenuItems([ - { - id: 'enable-all', - renderContent: (): VNode => All References On, - isEnabled: true, - action: (): void => { - this.enableAllRefSpeeds(true); - } - }, - { - id: 'disable-all', - renderContent: (): VNode => All References Off, - isEnabled: true, - action: (): void => { - this.enableAllRefSpeeds(false); - } - }, - { - id: 'restore-defaults', - renderContent: (): VNode => Restore Defaults, - isEnabled: true, - action: (): void => { - // console.log('Restore defaults'); - this.resetVSpeeds(); - } - }, - ]); + dialog.setMenuItems(this.menuItems); return true; } - /** @inheritdoc */ + /** @inheritDoc */ public onAfterRender(node: VNode): void { super.onAfterRender(node); @@ -173,23 +234,6 @@ export class TimerRef extends UiView { this.minsToggleComponent.instance.props.options = this.minsToggleOptions; this.upDownItems.set(['Up', 'Dn']); - this.vSpeedToggleMap.set(3, this.vSpeeds[3]); - this.vSpeedToggleMap.set(5, this.vSpeeds[2]); - this.vSpeedToggleMap.set(7, this.vSpeeds[0]); - this.vSpeedToggleMap.set(9, this.vSpeeds[1]); - this.vSpeedSubjectMap.set(VSpeedType.Vglide, this.vSpeedSubjects.vg); - this.vSpeedSubjectMap.set(VSpeedType.Vr, this.vSpeedSubjects.vr); - this.vSpeedSubjectMap.set(VSpeedType.Vx, this.vSpeedSubjects.vx); - this.vSpeedSubjectMap.set(VSpeedType.Vy, this.vSpeedSubjects.vy); - this.vSpeedObjectMap.set(VSpeedType.Vglide, this.vSpeeds[3]); - this.vSpeedObjectMap.set(VSpeedType.Vr, this.vSpeeds[2]); - this.vSpeedObjectMap.set(VSpeedType.Vx, this.vSpeeds[0]); - this.vSpeedObjectMap.set(VSpeedType.Vy, this.vSpeeds[1]); - - this.vSpeeds[0].modified.sub(v => this.vxRefChanged.set(v)); - this.vSpeeds[1].modified.sub(v => this.vyRefChanged.set(v)); - this.vSpeeds[2].modified.sub(v => this.vrRefChanged.set(v)); - this.vSpeeds[3].modified.sub(v => this.glideRefChanged.set(v)); this.minimumsUnit.set(this.props.unitsSettingManager.altitudeUnits.get()); @@ -235,51 +279,42 @@ export class TimerRef extends UiView { } }; - /** Method to reset all v speeds to defaults */ - private resetVSpeeds(): void { - this.vSpeeds[0].value = Math.round(Simplane.getDesignSpeeds().Vx); - this.vSpeedSubjects.vx.set(this.vSpeeds[0].value); - this.vSpeeds[0].modified.set(false); - this.g1000Pub.pub('vspeed_set', this.vSpeeds[0], true); - this.vSpeeds[1].value = Math.round(Simplane.getDesignSpeeds().Vy); - this.vSpeedSubjects.vy.set(this.vSpeeds[1].value); - this.vSpeeds[1].modified.set(false); - this.g1000Pub.pub('vspeed_set', this.vSpeeds[1], true); - this.vSpeeds[2].value = Math.round(Simplane.getDesignSpeeds().Vr); - this.vSpeedSubjects.vr.set(this.vSpeeds[2].value); - this.vSpeeds[2].modified.set(false); - this.g1000Pub.pub('vspeed_set', this.vSpeeds[2], true); - this.vSpeeds[3].value = Math.round(Simplane.getDesignSpeeds().BestGlide); - this.vSpeedSubjects.vg.set(this.vSpeeds[3].value); - this.vSpeeds[3].modified.set(false); - this.g1000Pub.pub('vspeed_set', this.vSpeeds[3], true); - this.vSpeeds[4].value = Math.round(Simplane.getDesignSpeeds().Vapp); - this.vSpeeds[4].modified.set(false); - } - /** - * Method enable or disable all ref speeds. - * @param enable Whether to enable or disable the ref speeds. + * Resets V-speeds to their default values. + * @param groupName The name of the V-speed group containing the V-speeds to reset. If not defined, then the change + * will be applied to all V-speeds in every group. */ - private enableAllRefSpeeds(enable: boolean): void { - const value = enable ? 1 : 0; - this.onVyRefOptionSelected(value); - this.onVxRefOptionSelected(value); - this.onVrRefOptionSelected(value); - this.onGlideRefOptionSelected(value); + private resetVSpeeds(groupName?: string): void { + let currentGroup = ''; + for (const row of this.vSpeedRowData.getArray()) { + if (typeof row === 'string') { + currentGroup = row; + continue; + } + + if (groupName === undefined || groupName === currentGroup) { + row.userValueSetting.value = -1; + } + } } /** - * Method to set vspeed asterisk visibility. - * @param vspeed is the VSpeedType to be updated - * @param value is the vspeed value + * Sets whether to show V-speed bugs. + * @param show Whether to show the bugs. + * @param groupName The name of the V-speed group containing the V-speeds to show or hide. If not defined, then the + * change will be applied to all V-speeds in every group. */ - private updateVSpeed(vspeed: VSpeedType, value: number): void { - const object = this.vSpeedObjectMap.get(vspeed); - if (object !== undefined) { - object.value = value; - object.modified.set(true); - this.g1000Pub.pub('vspeed_set', object, true); + private setShowVSpeedBugs(show: boolean, groupName?: string): void { + let currentGroup = ''; + for (const row of this.vSpeedRowData.getArray()) { + if (typeof row === 'string') { + currentGroup = row; + continue; + } + + if (groupName === undefined || groupName === currentGroup) { + row.showSetting.value = show; + } } } @@ -299,51 +334,6 @@ export class TimerRef extends UiView { } }; - // ---- TOGGLE Vg CALLBACK - private onGlideRefOptionSelected = (index: number): void => { - // console.log('INDEX HERE -- ', index); - this.glideRef.set(index); - const vSpeed = this.vSpeedObjectMap.get(VSpeedType.Vglide); - if (vSpeed !== undefined) { - vSpeed.value = this.vSpeedSubjects.vg.get(); - vSpeed.display = index === 1; - this.g1000Pub.pub('vspeed_display', vSpeed, true); - } - }; - - // ---- TOGGLE Vr CALLBACK - private onVrRefOptionSelected = (index: number): void => { - this.vrRef.set(index); - const vSpeed = this.vSpeedObjectMap.get(VSpeedType.Vr); - if (vSpeed !== undefined) { - vSpeed.value = this.vSpeedSubjects.vr.get(); - vSpeed.display = index === 1; - this.g1000Pub.pub('vspeed_display', vSpeed, true); - } - }; - - // ---- TOGGLE Vx CALLBACK - private onVxRefOptionSelected = (index: number): void => { - this.vxRef.set(index); - const vSpeed = this.vSpeedObjectMap.get(VSpeedType.Vx); - if (vSpeed !== undefined) { - vSpeed.value = this.vSpeedSubjects.vx.get(); - vSpeed.display = index === 1; - this.g1000Pub.pub('vspeed_display', vSpeed, true); - } - }; - - // ---- TOGGLE Vy CALLBACK - private onVyRefOptionSelected = (index: number): void => { - this.vyRef.set(index); - const vSpeed = this.vSpeedObjectMap.get(VSpeedType.Vy); - if (vSpeed !== undefined) { - vSpeed.value = this.vSpeedSubjects.vy.get(); - vSpeed.display = index === 1; - this.g1000Pub.pub('vspeed_display', vSpeed, true); - } - }; - // ---- TOGGLE MINIMUMS CALLBACK private onMinimumsRefOptionSelected = (index: number): void => { this.minsRef.set(index); @@ -378,30 +368,7 @@ export class TimerRef extends UiView { return { id: index.toString(), renderContent: (): VNode => {item}, estimatedWidth: item.length * ContextMenuDialog.CHAR_WIDTH }; }; - // ---- updateVy Callback method - private updateVy = (value: number): void => { - this.updateVSpeed(VSpeedType.Vy, value); - }; - - // ---- updateVy Callback method - private updateVx = (value: number): void => { - this.updateVSpeed(VSpeedType.Vx, value); - }; - - // ---- updateVy Callback method - private updateVr = (value: number): void => { - this.updateVSpeed(VSpeedType.Vr, value); - }; - - // ---- updateVy Callback method - private updateVglide = (value: number): void => { - this.updateVSpeed(VSpeedType.Vglide, value); - }; - - /** - * Renders the component. - * @returns The component VNode. - */ + /** @inheritDoc */ public render(): VNode { return (
@@ -410,32 +377,64 @@ export class TimerRef extends UiView { +
-
GLIDE
-
- - KT{this.glideRefChanged} +
+ + { + if (typeof row === 'string') { + return ( + +
{row}
+ + ); + } else { + const entry = row; + const inputValue = Subject.create(0); + + entry.activeValue.pipe(inputValue); + + MappedSubject.create( + ([inputVal, defaultVal]) => inputVal === defaultVal ? -1 : inputVal, + inputValue, + entry.defaultValueSetting + ).pipe(entry.userValueSetting); + + return ( + +
+
{entry.definition.label}
+
+ + KT{entry.isEdited.map(isEdited => isEdited ? '*' : '')} +
+ value ? 'On' : 'Off'} + class='timerref-ref-toggle' + /> +
+ + ); + } + }} + hideScrollbar={this.vSpeedRowData.length <= 4} + class='timerref-ref-list' + /> +
- -
Vr
-
- - KT{this.vrRefChanged} -
- -
Vx
-
- - KT{this.vxRefChanged} -
- -
Vy
-
- - KT{this.vyRefChanged} -
-
+
MINS
diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/WTG1000_PFD.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/WTG1000_PFD.tsx index cc27593bc..47fd6d866 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/WTG1000_PFD.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/PFD/WTG1000_PFD.tsx @@ -4,22 +4,23 @@ /// import { - AdcPublisher, AutopilotInstrument, BaseInstrumentPublisher, Clock, CompositeLogicXMLHost, ControlPublisher, ElectricalPublisher, EventBus, FacilityLoader, - FacilityRepository, FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, FlightPlannerEvents, FSComponent, GNSSPublisher, HEventPublisher, InstrumentBackplane, - InstrumentEvents, LNavSimVarPublisher, MinimumsControlEvents, MinimumsSimVarPublisher, NavComInstrument, NavComSimVarPublisher, NavProcessor, PluginSystem, SimVarValueType, - SoundServer, - TrafficInstrument, UnitType, UserSettingSaveManager, VNavSimVarPublisher, Wait, XMLGaugeConfigFactory, XMLWarningFactory, - XPDRInstrument + AdcPublisher, AnnunciationType, AutopilotInstrument, AvionicsSystem, BaseInstrumentPublisher, CasEvents, Clock, CompositeLogicXMLHost, ControlPublisher, ControlSurfacesPublisher, + DebounceTimer, + ElectricalPublisher, EventBus, FacilityLoader, FacilityRepository, FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, FlightPlannerEvents, + FSComponent, GNSSPublisher, HEventPublisher, InstrumentBackplane, InstrumentEvents, LNavSimVarPublisher, MinimumsControlEvents, MinimumsSimVarPublisher, + NavComInstrument, NavComSimVarPublisher, NavProcessor, PluginSystem, SimVarValueType, SoundServer, Subject, TrafficInstrument, UnitType, + UserSettingSaveManager, VNavSimVarPublisher, Wait, XMLGaugeConfigFactory, XMLWarningFactory, XPDRInstrument } from '@microsoft/msfs-sdk'; -import { Fms, GarminAdsb, LNavDataSimVarPublisher, NavIndicatorController, TrafficAdvisorySystem } from '@microsoft/msfs-garminsdk'; +import { AdcSystem, Fms, GarminAdsb, LNavDataSimVarPublisher, NavIndicatorController, TrafficAdvisorySystem } from '@microsoft/msfs-garminsdk'; import { EIS } from '../MFD/Components/EIS'; import { MapInset } from '../PFD/Components/Overlays/MapInset'; import { BacklightManager } from '../Shared/Backlight/BacklightManager'; import { FlightPlanAsoboSync } from '../Shared/FlightPlanAsoboSync'; import { G1000ControlPublisher } from '../Shared/G1000Events'; -import { G1000AvionicsPlugin, G1000PluginBinder } from '../Shared/G1000Plugin'; +import { G1000PfdAvionicsPlugin } from '../Shared/G1000PfdPlugin'; +import { G1000PfdPluginBinder } from '../Shared/G1000Plugin'; import { AhrsPublisher } from '../Shared/Instruments/AhrsPublisher'; import { NavComRadio } from '../Shared/NavCom/NavComRadio'; import { G1000Config } from '../Shared/NavComConfig'; @@ -30,26 +31,29 @@ import { StartupLogo } from '../Shared/StartupLogo'; import { ADCAvionicsSystem, AHRSSystem, AvionicsComputerSystem, EngineAirframeSystem, G1000AvionicsSystem, MagnetometerSystem, SoundSystem, TransponderSystem } from '../Shared/Systems'; +import { ControlpadInputController, ControlpadTargetInstrument } from '../Shared/UI/Controllers/ControlpadInputController'; import { ContextMenuDialog } from '../Shared/UI/Dialogs/ContextMenuDialog'; import { MessageDialog } from '../Shared/UI/Dialogs/MessageDialog'; import { ALTUnitsMenu } from '../Shared/UI/Menus/ALTUnitsMenu'; import { MapHSILayoutMenu } from '../Shared/UI/Menus/MapHSILayoutMenu'; import { MapHSIMenu } from '../Shared/UI/Menus/MapHSIMenu'; -import { SoftKeyMenuSystem } from '../Shared/UI/Menus/SoftKeyMenuSystem'; import { EngineMenu } from '../Shared/UI/Menus/MFD/EngineMenu'; import { FuelRemMenu } from '../Shared/UI/Menus/MFD/FuelRemMenu'; import { LeanMenu } from '../Shared/UI/Menus/MFD/LeanMenu'; import { SystemMenu } from '../Shared/UI/Menus/MFD/SystemMenu'; import { PFDOptMenu } from '../Shared/UI/Menus/PFDOptMenu'; import { RootMenu } from '../Shared/UI/Menus/RootMenu'; +import { SoftKeyMenuSystem } from '../Shared/UI/Menus/SoftKeyMenuSystem'; import { SVTMenu } from '../Shared/UI/Menus/SVTMenu'; import { WindMenu } from '../Shared/UI/Menus/WindMenu'; import { XPDRCodeMenu } from '../Shared/UI/Menus/XPDRCodeMenu'; import { XPDRMenu } from '../Shared/UI/Menus/XPDRMenu'; import { SoftKeyBar } from '../Shared/UI/SoftKeyBar'; import { UnitsUserSettings } from '../Shared/Units/UnitsUserSettings'; +import { VSpeedUserSettingManager } from '../Shared/VSpeed/VSpeedUserSettings'; import { WaypointIconImageCache } from '../Shared/WaypointIconImageCache'; -import { AirspeedIndicator } from './Components/FlightInstruments/AirspeedIndicator'; +import { G1000AirspeedIndicator } from './Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicator'; +import { G1000AirspeedIndicatorDataProvider } from './Components/FlightInstruments/AirspeedIndicator/G1000AirspeedIndicatorDataProvider'; import { Altimeter } from './Components/FlightInstruments/Altimeter'; import { CAS } from './Components/FlightInstruments/CAS'; import { FlightDirector } from './Components/FlightInstruments/FlightDirector'; @@ -66,6 +70,7 @@ import { ADFDME } from './Components/UI/ADF-DME/ADFDME'; import { PFDSelectAirway } from './Components/UI/Airway/PFDSelectAirway'; import { Alerts } from './Components/UI/Alerts/Alerts'; import { AlertsSubject } from './Components/UI/Alerts/AlertsSubject'; +import { CasAlertsBridge } from './Components/UI/Alerts/CasAlertsBridge'; import { PFDDirectTo } from './Components/UI/DirectTo/PFDDirectTo'; import { FPL } from './Components/UI/FPL/FPL'; import { PFDHold } from './Components/UI/Hold/PFDHold'; @@ -85,14 +90,14 @@ import { VNavAlertForwarder } from './Components/VNavAlertForwarder'; import { WarningDisplay } from './Components/Warnings'; import '../Shared/UI/Common/g1k_common.css'; -import './WTG1000_PFD.css'; import '../Shared/UI/Common/LatLonDisplay.css'; +import './WTG1000_PFD.css'; /** * The base G1000 PFD instrument class. */ class WTG1000_PFD extends BaseInstrument { - private readonly bus: EventBus; + private readonly bus = new EventBus(); private readonly baseInstrumentPublisher: BaseInstrumentPublisher; private readonly adcPublisher: AdcPublisher; @@ -120,6 +125,7 @@ class WTG1000_PFD extends BaseInstrument { private readonly calculator: FlightPathCalculator; private readonly soundServer: SoundServer; private readonly minimumsPublisher: MinimumsSimVarPublisher; + private readonly controlSurfacesPublisher: ControlSurfacesPublisher; private lastCalculate = 0; @@ -139,14 +145,26 @@ class WTG1000_PFD extends BaseInstrument { private readonly airframeOptions: G1000AirframeOptionsManager; - private readonly systems: G1000AvionicsSystem[] = []; + private readonly g1000Systems: G1000AvionicsSystem[] = []; + private readonly systems: AvionicsSystem[] = []; + private readonly alerts: AlertsSubject; + private readonly casAlertsBridge: CasAlertsBridge; private isMfdPoweredOn = false; private gamePlanSynced = false; private vnavAlertForwarder: any; - private readonly pluginSystem = new PluginSystem(); + private readonly pluginSystem = new PluginSystem(); + + private airspeedIndicatorDataProvider!: G1000AirspeedIndicatorDataProvider; + + private vSpeedSettingManager!: VSpeedUserSettingManager; + + private readonly comRadio = FSComponent.createRef(); + private readonly navRadio = FSComponent.createRef(); + private controlPadHandler = new ControlpadInputController(this.bus, ControlpadTargetInstrument.PFD); + private casPowerDebounce = new DebounceTimer(); /** * Creates an instance of the WTG1000_PFD. @@ -158,8 +176,6 @@ class WTG1000_PFD extends BaseInstrument { WaypointIconImageCache.init(); - this.bus = new EventBus(); - this.baseInstrumentPublisher = new BaseInstrumentPublisher(this, this.bus); this.vnavAlertForwarder = new VNavAlertForwarder(this.bus); @@ -183,6 +199,8 @@ class WTG1000_PFD extends BaseInstrument { this.trafficInstrument = new TrafficInstrument(this.bus, { realTimeUpdateFreq: 2, simTimeUpdateFreq: 1, contactDeprecateTime: 10 }); this.minimumsPublisher = new MinimumsSimVarPublisher(this.bus); + this.controlSurfacesPublisher = new ControlSurfacesPublisher(this.bus, 3); + this.clock = new Clock(this.bus); this.facLoader = new FacilityLoader(FacilityRepository.getRepository(this.bus)); @@ -210,7 +228,7 @@ class WTG1000_PFD extends BaseInstrument { this.backplane.addPublisher('vnav', this.vNavPublisher); this.backplane.addPublisher('hEvents', this.hEventPublisher); this.backplane.addPublisher('control', this.controlPublisher); - this.backplane.addPublisher('g1000', this.g1000ControlPublisher); + this.backplane.addPublisher('g1000Control', this.g1000ControlPublisher); this.backplane.addPublisher('gnss', this.gnssPublisher); this.backplane.addPublisher('electrical', this.electricalPublisher); this.backplane.addPublisher('minimums', this.minimumsPublisher); @@ -222,6 +240,8 @@ class WTG1000_PFD extends BaseInstrument { this.backplane.addInstrument('xpdr', this.xpdrInstrument); this.backplane.addInstrument('traffic', this.trafficInstrument); + this.backplane.addPublisher('ControlSurfaces', this.controlSurfacesPublisher); + this.gaugeFactory = new XMLGaugeConfigFactory(this, this.bus); this.airframeOptions = new G1000AirframeOptionsManager(this, this.bus); @@ -246,6 +266,7 @@ class WTG1000_PFD extends BaseInstrument { this.settingSaveManager.load(saveKey); this.alerts = new AlertsSubject(this.bus); + this.casAlertsBridge = new CasAlertsBridge(this.bus); this.initDuration = 5000; } @@ -274,7 +295,9 @@ class WTG1000_PFD extends BaseInstrument { this.classList.add('hidden-element'); - this.backplane.init(); + this.airspeedIndicatorDataProvider = new G1000AirspeedIndicatorDataProvider(this.bus, this.airframeOptions.airspeedIndicatorConfig); + + this.vSpeedSettingManager = new VSpeedUserSettingManager(this.bus, this.airframeOptions.vSpeedGroups); const gaugeConfig = this.airframeOptions.gaugeConfig; const menuSystem = new SoftKeyMenuSystem(this.bus, 'AS1000_PFD_SOFTKEYS_'); @@ -282,7 +305,10 @@ class WTG1000_PFD extends BaseInstrument { this.pluginSystem.addScripts(this.xmlConfig, this.templateID, (target) => { return target === this.templateID; }).then(() => { - this.pluginSystem.startSystem({ bus: this.bus, viewService: this.viewService, menuSystem: menuSystem }).then(() => { + this.pluginSystem.startSystem({ + bus: this.bus, backplane: this.backplane, viewService: this.viewService, menuSystem: menuSystem, + fms: this.fms, navIndicatorController: this.navIndicatorController + }).then(() => { // if (alertsPopoutRef.instance !== null) { menuSystem.addMenu('root', new RootMenu(menuSystem, this.controlPublisher, this.g1000ControlPublisher, this.bus)); @@ -303,29 +329,46 @@ class WTG1000_PFD extends BaseInstrument { menuSystem.pushMenu('root'); - this.pluginSystem.callPlugins(p => p.onMenuSystemInitialized()); + this.pluginSystem.callPlugins(p => p.onMenuSystemInitialized?.()); FSComponent.render(, document.getElementById('HorizonContainer')); FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('InstrumentsContainer')); - FSComponent.render(, document.getElementById('InstrumentsContainer')); + FSComponent.render( + , + document.getElementById('InstrumentsContainer') + ); FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('InstrumentsContainer')); - FSComponent.render(, document.querySelector('#NavComBox #Left')); - FSComponent.render(, document.querySelector('#NavComBox #Right')); + FSComponent.render(, document.querySelector('#NavComBox #Left')); + FSComponent.render(, document.querySelector('#NavComBox #Right')); FSComponent.render(, document.getElementById('NavComBox')); FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('Electricity')); FSComponent.render(, document.getElementById('InstrumentsContainer')); - FSComponent.render(, - document.getElementById('InstrumentsContainer')); + FSComponent.render(, document.getElementById('InstrumentsContainer')); FSComponent.render(, document.getElementById('cas')); FSComponent.render(, document.getElementById('warnings')); + + this.pluginSystem.callPlugins(plugin => { + + // At last, let the plugins directly render on the instruments container: + const node = plugin.renderToPfdInstruments?.(); + if (node) { + FSComponent.render(node, document.getElementById('InstrumentsContainer')); + } + }); + FSComponent.render(, this); FSComponent.render(, document.getElementsByClassName('eis')[0] as HTMLDivElement); @@ -340,7 +383,19 @@ class WTG1000_PFD extends BaseInstrument { this.viewService.registerView('SelectArrival', () => ); this.viewService.registerView(ContextMenuDialog.name, () => ); this.viewService.registerView('PageMenuDialog', () => ); - this.viewService.registerView(TimerRef.name, () => ); + this.viewService.registerView(TimerRef.name, () => { + return ( + + ); + }); this.viewService.registerView(ADFDME.name, () => ); this.viewService.registerView('WptDup', () => ); this.viewService.registerView(Nearest.name, () => ); @@ -349,11 +404,12 @@ class WTG1000_PFD extends BaseInstrument { this.viewService.registerView('SelectAirway', () => ); this.viewService.registerView('HoldAt', () => ); - this.pluginSystem.callPlugins(p => p.onViewServiceInitialized()); + this.pluginSystem.callPlugins(p => p.onViewServiceInitialized?.()); + this.backplane.init(); this.controlPublisher.publishEvent('init_cdi', true); this.bus.on('mfd_power_on', this.onMfdPowerOn); - + this.controlPadHandler.setFrequencyElementRefs(this.comRadio.instance, this.navRadio.instance); }); // force enable animations @@ -374,14 +430,18 @@ class WTG1000_PFD extends BaseInstrument { this.initializeAvElectrical(); - this.systems.push(new MagnetometerSystem(1, this.bus)); - this.systems.push(new ADCAvionicsSystem(1, this.bus)); - this.systems.push(new AHRSSystem(1, this.bus)); - this.systems.push(new TransponderSystem(1, this.bus)); - this.systems.push(new AvionicsComputerSystem(1, this.bus)); - this.systems.push(new AvionicsComputerSystem(2, this.bus)); - this.systems.push(new EngineAirframeSystem(1, this.bus)); - this.systems.push(new SoundSystem(1, this.bus, this.soundServer)); + this.g1000Systems.push(new MagnetometerSystem(1, this.bus)); + this.g1000Systems.push(new ADCAvionicsSystem(1, this.bus)); + this.g1000Systems.push(new AHRSSystem(1, this.bus)); + this.g1000Systems.push(new TransponderSystem(1, this.bus)); + this.g1000Systems.push(new AvionicsComputerSystem(1, this.bus)); + this.g1000Systems.push(new AvionicsComputerSystem(2, this.bus)); + this.g1000Systems.push(new EngineAirframeSystem(1, this.bus)); + this.g1000Systems.push(new SoundSystem(1, this.bus, this.soundServer)); + + this.systems.push(new AdcSystem(1, this.bus, 1, 1, 'elec_av1_bus')); + + this.airspeedIndicatorDataProvider.init(); const sub = this.bus.getSubscriber(); @@ -499,6 +559,10 @@ class WTG1000_PFD extends BaseInstrument { super.onPowerOn(); this.classList.remove('hidden-element'); + this.casPowerDebounce.clear(); + this.casPowerDebounce.schedule(() => { + this.bus.getPublisher().pub('cas_set_initial_acknowledge', false, true, true); + }, 2000); } /** @inheritdoc */ @@ -506,6 +570,12 @@ class WTG1000_PFD extends BaseInstrument { super.onShutDown(); this.classList.add('hidden-element'); + + this.bus.getPublisher().pub('cas_set_initial_acknowledge', true, true, true); + SimVar.SetSimVarValue('K:MASTER_CAUTION_ACKNOWLEDGE', SimVarValueType.Number, 0); + SimVar.SetSimVarValue('K:MASTER_WARNING_ACKNOWLEDGE', SimVarValueType.Number, 0); + this.bus.getPublisher().pub('cas_master_acknowledge', AnnunciationType.SafeOp, true, false); + this.bus.getPublisher().pub('cas_master_acknowledge', AnnunciationType.Advisory, true, false); } /** @@ -519,6 +589,8 @@ class WTG1000_PFD extends BaseInstrument { this.clock.onUpdate(); this.backplane.onUpdate(); + this.updateSystems(); + const now = Date.now(); if (now - this.lastCalculate > 3000) { if (this.planner.hasFlightPlan(this.planner.activePlanIndex)) { @@ -531,6 +603,15 @@ class WTG1000_PFD extends BaseInstrument { this.eisXmlLogicHost.update(this.deltaTime); } + /** + * Updates this instrument's systems. + */ + private updateSystems(): void { + for (let i = 0; i < this.systems.length; i++) { + this.systems[i].onUpdate(); + } + } + /** * Handles when the instrument screen state has changed. * @param newState The current screen state. @@ -603,8 +684,12 @@ class WTG1000_PFD extends BaseInstrument { * @param args The H event and associated arguments, if any. */ public onInteractionEvent(args: string[]): void { - this.hEventPublisher.dispatchHEvent(args[0]); + const isHandled = this.controlPadHandler.handleControlPadEventInput(args[0]); + if (isHandled === false) { + // If the controlpad handler did not handle the event, continue and publish: + this.hEventPublisher.dispatchHEvent(args[0]); + } } } -registerInstrument('wtg1000-pfd', WTG1000_PFD); \ No newline at end of file +registerInstrument('wtg1000-pfd', WTG1000_PFD); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Autopilot/G1000Autopilot.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Autopilot/G1000Autopilot.ts index 208f086cd..c277ba7ae 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Autopilot/G1000Autopilot.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Autopilot/G1000Autopilot.ts @@ -1,36 +1,18 @@ -import { - AltitudeSelectManager, AltitudeSelectManagerOptions, APAltitudeModes, APConfig, APLateralModes, APStateManager, APVerticalModes, Autopilot, - EventBus, FlightPlanner, MetricAltitudeSettingsManager, ObjectSubject, Subject, UnitType -} from '@microsoft/msfs-sdk'; +import { APAltitudeModes, APLateralModes, APStateManager, APVerticalModes, EventBus, FlightPlanner, Subject } from '@microsoft/msfs-sdk'; + +import { FmaDataEvents, GarminAPConfigInterface, GarminAutopilot, GarminAutopilotOptions } from '@microsoft/msfs-garminsdk'; import { G1000ControlEvents } from '../G1000Events'; import { G1000APSimVarEvents } from '../Instruments/G1000APPublisher'; -import { FmaData } from './FmaData'; /** * A Garmin GFC700 autopilot. */ -export class G1000Autopilot extends Autopilot { - private static readonly ALT_SELECT_OPTIONS: AltitudeSelectManagerOptions = { - supportMetric: true, - minValue: UnitType.FOOT.createNumber(-1000), - maxValue: UnitType.FOOT.createNumber(50000), - inputIncrLargeThreshold: 999, - incrSmall: UnitType.FOOT.createNumber(100), - incrLarge: UnitType.FOOT.createNumber(1000), - incrSmallMetric: UnitType.METER.createNumber(50), - incrLargeMetric: UnitType.METER.createNumber(500), - initOnInput: true, - initToIndicatedAlt: true - }; - +export class G1000Autopilot extends GarminAutopilot { public readonly externalAutopilotInstalled = Subject.create(false); protected readonly lateralArmedModeSubject = Subject.create(APLateralModes.NONE); protected readonly altArmedSubject = Subject.create(false); - protected readonly altSelectManager = new AltitudeSelectManager(this.bus, this.settingsManager, G1000Autopilot.ALT_SELECT_OPTIONS); - - protected readonly fmaData: ObjectSubject; private fmaUpdateDebounce: NodeJS.Timeout | undefined; /** @@ -39,25 +21,18 @@ export class G1000Autopilot extends Autopilot { * @param flightPlanner This autopilot's associated flight planner. * @param config This autopilot's configuration. * @param stateManager This autopilot's state manager. - * @param settingsManager The settings manager to pass to altitude preselect system. + * @param options Options with which to configure the new autopilot. */ - constructor(bus: EventBus, flightPlanner: FlightPlanner, config: APConfig, stateManager: APStateManager, - private readonly settingsManager: MetricAltitudeSettingsManager) { - super(bus, flightPlanner, config, stateManager); - - this.fmaData = ObjectSubject.create({ - verticalActive: APVerticalModes.NONE, - verticalArmed: APVerticalModes.NONE, - verticalApproachArmed: APVerticalModes.NONE, - verticalAltitudeArmed: APAltitudeModes.NONE, - altitideCaptureArmed: false, - altitideCaptureValue: -1, - lateralActive: APLateralModes.NONE, - lateralArmed: APLateralModes.NONE, - lateralModeFailed: false - }); - - const publisher = this.bus.getPublisher(); + constructor( + bus: EventBus, + flightPlanner: FlightPlanner, + config: GarminAPConfigInterface, + stateManager: APStateManager, + options?: Readonly + ) { + super(bus, flightPlanner, config, stateManager, options); + + const publisher = this.bus.getPublisher(); this.fmaData.sub(() => { // dirty debounce, need better ObjectSubject if (this.fmaUpdateDebounce) { @@ -67,6 +42,7 @@ export class G1000Autopilot extends Autopilot { this.fmaUpdateDebounce = setTimeout(() => { this.fmaUpdateDebounce = undefined; publisher.pub('fma_modes', this.fmaData.get(), true); + publisher.pub('fma_data', Object.assign({}, this.fmaData.get()), true, true); //For GoAroundManager }, 0); }, true); } @@ -74,22 +50,17 @@ export class G1000Autopilot extends Autopilot { /** @inheritdoc */ protected onAfterUpdate(): void { if (!this.externalAutopilotInstalled.get()) { - this.updateFma(); + this.updateG1000Fma(); } else { this.lateralArmedModeSubject.set(this.apValues.lateralArmed.get()); this.altArmedSubject.set(this.altCapArmed); } } - /** @inheritdoc */ - protected onInitialized(): void { - this.bus.pub('vnav_set_state', true); - - this.monitorAdditionalEvents(); - } - /** @inheritdoc */ protected monitorAdditionalEvents(): void { + super.monitorAdditionalEvents(); + //check for KAP140 installed const g1000APSimvars = this.bus.getSubscriber(); g1000APSimvars.on('kap_140_installed').whenChanged().handle(this.setExternalAutopilotInstalled.bind(this)); @@ -108,7 +79,7 @@ export class G1000Autopilot extends Autopilot { this.config.defaultLateralMode = APLateralModes.LEVEL; this.altSelectManager.setEnabled(false); this.handleApFdStateChange(); - this.updateFma(true); + this.updateG1000Fma(true); this.bus.getPublisher().pub('fd_not_installed', true, true); } @@ -118,7 +89,7 @@ export class G1000Autopilot extends Autopilot { * Publishes data for the FMA. * @param clear Is to clear the FMA */ - private updateFma(clear = false): void { + private updateG1000Fma(clear = false): void { const fmaTemp = this.fmaData; fmaTemp.set('verticalApproachArmed', (clear ? APVerticalModes.NONE : this.verticalApproachArmed)); fmaTemp.set('verticalArmed', (clear ? APVerticalModes.NONE : this.apValues.verticalArmed.get())); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/Config.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/Config.ts new file mode 100644 index 000000000..bbf421e9e --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/Config.ts @@ -0,0 +1,34 @@ +/** + * A configuration object. + */ +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface Config { + +} + +/** + * A configuration object which can be resolved to a value. + */ +export interface ResolvableConfig extends Config { + /** Flags this object as a ResolvableConfig. */ + readonly isResolvableConfig: true; + + /** + * Resolves this config to a value. + * @returns This config's resolved value. + */ + resolve(): T; +} + +/** + * A configuration object factory. + */ +export interface ConfigFactory { + /** + * Creates a configuration object from a configuration document element. + * @param element A configuration document element. + * @returns The configuration object defined by the specified element, or `undefined` if the element does not define + * a configuration object recognized by this factory. + */ + create(element: Element): Config | undefined; +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/DefaultConfigFactory.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/DefaultConfigFactory.ts new file mode 100644 index 000000000..a9d1f12ad --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/DefaultConfigFactory.ts @@ -0,0 +1,28 @@ +import { SpeedConfig } from './SpeedConfig'; +import { Config, ConfigFactory } from './Config'; +import { LookupTableConfig } from './LookupTableConfig'; +import { NumericConstantConfig, NumericMaxConfig, NumericMinConfig } from './NumericConfig'; + +/** + * A default implementation of {@link ConfigFactory}. + */ +export class DefaultConfigFactory implements ConfigFactory { + private static readonly TAG_MAP: Record Config> = { + 'Number': NumericConstantConfig, + 'Min': NumericMinConfig, + 'Max': NumericMaxConfig, + 'LookupTable': LookupTableConfig, + 'Speed': SpeedConfig + }; + + /** @inheritdoc */ + public create(element: Element): Config | undefined { + const ctor = DefaultConfigFactory.TAG_MAP[element.tagName]; + + if (ctor === undefined) { + return undefined; + } + + return new ctor(element, this); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/LookupTableConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/LookupTableConfig.ts new file mode 100644 index 000000000..d22ee29c9 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/LookupTableConfig.ts @@ -0,0 +1,73 @@ +import { LerpLookupTable } from '@microsoft/msfs-sdk'; + +import { ResolvableConfig } from './Config'; + +/** + * A configuration object which defines a lookup table. + */ +export class LookupTableConfig implements ResolvableConfig { + /** @inheritdoc */ + public readonly isResolvableConfig = true; + + /** The dimension count of this config's lookup table. */ + public readonly dimensions: number; + + /** The breakpoints of this config's lookup table. */ + public readonly breakpoints: readonly (readonly number[])[]; + + /** + * Creates a new LookupTableConfig from a configuration document element. + * @param element A configuration document element. + */ + constructor(element: Element) { + if (element.tagName !== 'LookupTable') { + throw new Error(`Invalid LookupTableConfig definition: expected tag name 'LookupTable' but was '${element.tagName}'`); + } + + const dimensions = element.getAttribute('dimensions'); + if (dimensions === null) { + throw new Error('Invalid LookupTableConfig definition: undefined \'dimensions\' attribute'); + } + + const parsedDimensions = Number(dimensions); + if (isNaN(parsedDimensions) || Math.trunc(parsedDimensions) !== parsedDimensions || parsedDimensions <= 0) { + throw new Error(`Invalid LookupTableConfig definition: expected 'dimensions' to be a positive integer but was '${dimensions}'`); + } + this.dimensions = parsedDimensions; + + const value = element.textContent; + if (value === null) { + throw new Error('Invalid LookupTableConfig definition: undefined value'); + } + + let parsedValue: any = undefined; + try { + parsedValue = JSON.parse(value); + } catch { + // continue + } + + if (parsedValue instanceof Array) { + for (const breakpoint of parsedValue) { + if (!(breakpoint instanceof Array && breakpoint.length === parsedDimensions + 1 && breakpoint.every(el => typeof el === 'number'))) { + throw new Error('Invalid LookupTableConfig definition: malformed lookup table array'); + } + } + } else { + throw new Error('Invalid LookupTableConfig definition: value was not an array'); + } + + this.breakpoints = parsedValue; + } + + /** @inheritdoc */ + public resolve(): LerpLookupTable { + const table = new LerpLookupTable(this.dimensions); + + for (const breakpoint of this.breakpoints) { + table.insertBreakpoint(breakpoint); + } + + return table; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/NumericConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/NumericConfig.ts new file mode 100644 index 000000000..9e0e335ce --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/NumericConfig.ts @@ -0,0 +1,321 @@ +import { MappedSubject, MappedSubscribable, MutableSubscribable, Subscription } from '@microsoft/msfs-sdk'; + +import { ConfigFactory, ResolvableConfig } from './Config'; + +/** + * A configuration object which defines a factory for a numeric value. + */ +export interface NumericConfig extends ResolvableConfig<(context?: any) => number | MappedSubscribable> { + /** Flags this object as a NumericConfig. */ + readonly isNumericConfig: true; +} + +/** + * A configuration object which defines a factory for a numeric constant. + */ +export class NumericConstantConfig implements NumericConfig { + public readonly isResolvableConfig = true; + public readonly isNumericConfig = true; + + /** The numeric value of this config. */ + public readonly value: number; + + /** + * Creates a new NumericConstantConfig from a configuration document element. + * @param element A configuration document element. + */ + constructor(element: Element) { + if (element.tagName !== 'Number') { + throw new Error(`Invalid NumericConstantConfig definition: expected tag name 'Number' but was '${element.tagName}'`); + } + + const value = element.textContent; + if (value === null) { + throw new Error('Invalid NumericConstantConfig definition: undefined value'); + } + + const parsedValue = Number(value); + if (isNaN(parsedValue)) { + throw new Error('Invalid NumericConstantConfig definition: value was not a number'); + } + + this.value = parsedValue; + } + + /** @inheritdoc */ + public resolve(): () => number { + return () => this.value; + } +} + +/** + * A configuration object which defines a factory for a numeric value which is the minimum of one or more inputs. + */ +export class NumericMinConfig implements NumericConfig { + public readonly isResolvableConfig = true; + public readonly isNumericConfig = true; + + /** The inputs of this config. */ + public readonly inputs: readonly NumericConfig[]; + + /** + * Creates a new NumericMinConfig from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + */ + constructor(element: Element, factory: ConfigFactory) { + if (element.tagName !== 'Min') { + throw new Error(`Invalid NumericMinConfig definition: expected tag name 'Min' but was '${element.tagName}'`); + } + + const args = []; + + for (const child of element.children) { + const config = factory.create(child); + if (config !== undefined && 'isNumericConfig' in config) { + args.push(config as NumericConfig); + } + } + + if (args.length === 0) { + throw new Error('Invalid NumericMinConfig definition: found zero inputs (must have at least one)'); + } + + this.inputs = args; + } + + /** @inheritdoc */ + public resolve(): (context?: any) => number | MappedSubscribable { + return (context?: any): number | MappedSubscribable => { + const resolvedArgs = this.inputs.map(arg => typeof arg === 'number' ? arg : arg.resolve()(context)); + + if (resolvedArgs.some(arg => typeof arg === 'object')) { + if (resolvedArgs.length === 1) { + return resolvedArgs[0]; + } else { + const numbers = resolvedArgs.filter(arg => typeof arg === 'number') as number[]; + const subscribables = resolvedArgs.filter(arg => typeof arg === 'object') as MappedSubscribable[]; + const min = Math.min(...numbers, Number.POSITIVE_INFINITY); + + return new ChainedMappedSubscribable( + MappedSubject.create( + (args: readonly number[]): number => { + return Math.min(min, ...args); + }, + ...subscribables + ), + subscribables + ); + } + } else { + return Math.min(...resolvedArgs as number[]); + } + }; + } +} + +/** + * A configuration object which defines a factory for a numeric value which is the maximum of one or more inputs. + */ +export class NumericMaxConfig implements NumericConfig { + public readonly isResolvableConfig = true; + public readonly isNumericConfig = true; + + /** The inputs of this config. */ + public readonly inputs: readonly NumericConfig[]; + + /** + * Creates a new NumericMaxConfig from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + */ + constructor(element: Element, factory: ConfigFactory) { + if (element.tagName !== 'Max') { + throw new Error(`Invalid NumericMaxConfig definition: expected tag name 'Max' but was '${element.tagName}'`); + } + + const args = []; + + for (const child of element.children) { + const config = factory.create(child); + if (config !== undefined && 'isNumericConfig' in config) { + args.push(config as NumericConfig); + } + } + + if (args.length === 0) { + throw new Error('Invalid NumericMaxConfig definition: found zero inputs (must have at least one)'); + } + + this.inputs = args; + } + + /** @inheritdoc */ + public resolve(): (context?: any) => number | MappedSubscribable { + return (context?: any): number | MappedSubscribable => { + const resolvedArgs = this.inputs.map(arg => typeof arg === 'number' ? arg : arg.resolve()(context)); + + if (resolvedArgs.some(arg => typeof arg === 'object')) { + if (resolvedArgs.length === 1) { + return resolvedArgs[0]; + } else { + const numbers = resolvedArgs.filter(arg => typeof arg === 'number') as number[]; + const subscribables = resolvedArgs.filter(arg => typeof arg === 'object') as MappedSubscribable[]; + const max = Math.max(...numbers, Number.NEGATIVE_INFINITY); + + return new ChainedMappedSubscribable( + MappedSubject.create( + (args: readonly number[]): number => { + return Math.max(max, ...args); + }, + ...subscribables + ), + subscribables + ); + } + } else { + return Math.max(...resolvedArgs as number[]); + } + }; + } +} + +/** + * A subscribable which wraps a mapped subscribable chained from another mapped subscribable. Pause/resume/destroy + * operations on this subscribable are transferred to the source of the wrapped subscribable. + */ +class ChainedMappedSubscribable implements MappedSubscribable { + /** @inheritdoc */ + public readonly isSubscribable = true; + + /** @inheritdoc */ + public readonly canInitialNotify = true; + + /** @inheritdoc */ + public get isAlive(): boolean { + return this.mapped.isAlive; + } + + /** @inheritdoc */ + public get isPaused(): boolean { + return this.mapped.isPaused; + } + + /** + * Constructor. + * @param mapped The mapped subscribable wrapped by this chained subscribable. + * @param sources The sources of this chained subscribable's wrapped subscribable. + */ + constructor( + private readonly mapped: MappedSubscribable, + private readonly sources: MappedSubscribable[] + ) { + } + + /** @inheritdoc */ + public get(): number { + return this.mapped.get(); + } + + /** @inheritdoc */ + public sub(handler: (value: number) => void, initialNotify?: boolean, paused?: boolean): Subscription { + return this.mapped.sub(handler, initialNotify, paused); + } + + /** @inheritdoc */ + public unsub(handler: (value: number) => void): void { + this.mapped.unsub(handler); + } + + /** + * Maps this subscribable to a new subscribable. + * @param fn The function to use to map to the new subscribable. + * @param equalityFunc The function to use to check for equality between mapped values. Defaults to the strict + * equality comparison (`===`). + * @returns The mapped subscribable. + */ + public map(fn: (input: number, previousVal?: M) => M, equalityFunc?: ((a: M, b: M) => boolean)): MappedSubscribable; + /** + * Maps this subscribable to a new subscribable with a persistent, cached value which is mutated when it changes. + * @param fn The function to use to map to the new subscribable. + * @param equalityFunc The function to use to check for equality between mapped values. + * @param mutateFunc The function to use to change the value of the mapped subscribable. + * @param initialVal The initial value of the mapped subscribable. + * @returns The mapped subscribable. + */ + public map( + fn: (input: number, previousVal?: M) => M, + equalityFunc: (a: M, b: M) => boolean, + mutateFunc: (oldVal: M, newVal: M) => void, + initialVal: M + ): MappedSubscribable; + // eslint-disable-next-line jsdoc/require-jsdoc + public map( + fn: (input: number, previousVal?: M) => M, + equalityFunc?: (a: M, b: M) => boolean, + mutateFunc?: (oldVal: M, newVal: M) => void, + initialVal?: M + ): MappedSubscribable { + if (mutateFunc === undefined) { + return this.mapped.map(fn, equalityFunc); + } else { + return this.mapped.map(fn, equalityFunc as (a: M, b: M) => boolean, mutateFunc, initialVal as M); + } + } + + /** + * Subscribes to and pipes this subscribable's state to a mutable subscribable. Whenever an update of this + * subscribable's state is received through the subscription, it will be used as an input to change the other + * subscribable's state. + * @param to The mutable subscribable to which to pipe this subscribable's state. + * @param paused Whether the new subscription should be initialized as paused. Defaults to `false`. + * @returns The new subscription. + */ + public pipe(to: MutableSubscribable, paused?: boolean): Subscription; + /** + * Subscribes to this subscribable's state and pipes a mapped version to a mutable subscribable. Whenever an update + * of this subscribable's state is received through the subscription, it will be transformed by the specified mapping + * function, and the transformed state will be used as an input to change the other subscribable's state. + * @param to The mutable subscribable to which to pipe this subscribable's mapped state. + * @param map The function to use to transform inputs. + * @param paused Whether the new subscription should be initialized as paused. Defaults to `false`. + * @returns The new subscription. + */ + public pipe(to: MutableSubscribable, map: (fromVal: number, toVal: M) => M, paused?: boolean): Subscription; + // eslint-disable-next-line jsdoc/require-jsdoc + public pipe(to: MutableSubscribable | MutableSubscribable, arg2?: ((fromVal: number, toVal: M) => M) | boolean, arg3?: boolean): Subscription { + if (typeof arg2 === 'function') { + return this.mapped.pipe(to as MutableSubscribable, arg2, arg3); + } else { + return this.mapped.pipe(to as MutableSubscribable, arg2 as boolean | undefined); + } + } + + /** @inheritdoc */ + public pause(): this { + this.mapped.pause(); + for (let i = 0; i < this.sources.length; i++) { + this.sources[i].pause(); + } + + return this; + } + + /** @inheritdoc */ + public resume(): this { + for (let i = 0; i < this.sources.length; i++) { + this.sources[i].resume(); + } + this.mapped.resume(); + + return this; + } + + /** @inheritdoc */ + public destroy(): void { + this.mapped.destroy(); + for (let i = 0; i < this.sources.length; i++) { + this.sources[i].destroy(); + } + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/SpeedConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/SpeedConfig.ts new file mode 100644 index 000000000..77337c028 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/SpeedConfig.ts @@ -0,0 +1,209 @@ +import { MappedSubject, MappedSubscribable, SubscribableUtils } from '@microsoft/msfs-sdk'; + +import { AirspeedDefinitionContext } from '@microsoft/msfs-garminsdk'; + +import { LookupTableConfig } from './LookupTableConfig'; +import { NumericConfig } from './NumericConfig'; +import { VSpeedValueKey } from '../VSpeed/VSpeed'; + +/** + * Types of speed configs. + */ +export enum SpeedConfigType { + Ias = 'Ias', + Mach = 'Mach', + Tas = 'Tas', + Aoa = 'Aoa', + Reference = 'Reference' +} + +/** + * A configuration object which defines a factory for an airspeed value presented as knots indicated airspeed. + * + * The airspeed value can be defined from a specific indicated airspeed, mach number, true airspeed, or angle-of-attack + * value, from a one-dimensional lookup table of any of the previous value types keyed on pressure altitude, or from an + * aircraft reference speed. + */ +export class SpeedConfig implements NumericConfig { + public readonly isResolvableConfig = true; + public readonly isNumericConfig = true; + + /** The type of this config. */ + public readonly type: SpeedConfigType; + + /** The value of this config. */ + public readonly value: number | LookupTableConfig | VSpeedValueKey; + + /** + * Creates a new SpeedConfig from a configuration document element. + * @param element A configuration document element. + */ + constructor(element: Element) { + if (element.tagName !== 'Speed') { + throw new Error(`Invalid SpeedConfig definition: expected tag name 'Speed' but was '${element.tagName}'`); + } + + const type = element.getAttribute('type'); + switch (type) { + case SpeedConfigType.Ias: + case SpeedConfigType.Mach: + case SpeedConfigType.Tas: + case SpeedConfigType.Aoa: + case SpeedConfigType.Reference: + this.type = type; + break; + default: + throw new Error(`Invalid SpeedConfig definition: unrecognized type '${type}'`); + } + + if (this.type === SpeedConfigType.Reference) { + const value = element.textContent; + if (value === null) { + throw new Error('Invalid SpeedConfig definition: undefined value'); + } + + if (Object.values(VSpeedValueKey).includes(value as any)) { + this.value = value as VSpeedValueKey; + } else { + throw new Error(`Invalid SpeedConfig definition: unrecognized value ${value} (value must be a valid reference speed key)`); + } + } else { + const lookupTable = element.querySelector(':scope>LookupTable'); + + if (lookupTable !== null) { + this.value = new LookupTableConfig(lookupTable); + } else { + const value = element.textContent; + if (value === null) { + throw new Error('Invalid SpeedConfig definition: undefined value'); + } + + const parsedValue = Number(value); + if (isNaN(parsedValue)) { + throw new Error('Invalid SpeedConfig definition: value was not a number or a lookup table'); + } + + this.value = parsedValue; + } + } + } + + /** @inheritdoc */ + public resolve(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + switch (this.type) { + case SpeedConfigType.Ias: + return this.resolveIas(); + case SpeedConfigType.Mach: + return this.resolveMach(); + case SpeedConfigType.Tas: + return this.resolveTas(); + case SpeedConfigType.Aoa: + return this.resolveAoa(); + case SpeedConfigType.Reference: + return this.resolveReference(); + } + } + + /** + * Resolves this config as a factory for an airspeed value defined from indicated airspeed. + * @returns A factory for an airspeed value defined from indicated airspeed. + */ + private resolveIas(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + const value = this.value as number | LookupTableConfig; + + return (context: AirspeedDefinitionContext) => { + if (typeof value === 'number') { + return value; + } else { + const table = value.resolve(); + + return context.pressureAlt.map(indicatedAlt => table.get(indicatedAlt)); + } + }; + } + + /** + * Resolves this config as a factory for an airspeed value defined from mach number. + * @returns A factory for an airspeed value defined from mach number. + */ + private resolveMach(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + const value = this.value as number | LookupTableConfig; + + return (context: AirspeedDefinitionContext) => { + if (typeof value === 'number') { + return context.machToKias.map(machToKias => machToKias * value); + } else { + const table = value.resolve(); + + return MappedSubject.create( + ([indicatedAlt, machToKias]): number => { + return table.get(indicatedAlt) * machToKias; + }, + context.pressureAlt, + context.machToKias + ); + } + }; + } + + /** + * Resolves this config as a factory for an airspeed value defined from true airspeed. + * @returns A factory for an airspeed value defined from true airspeed. + */ + private resolveTas(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + const value = this.value as number | LookupTableConfig; + + return (context: AirspeedDefinitionContext) => { + if (typeof value === 'number') { + return context.tasToIas.map(tasToIas => tasToIas * value); + } else { + const table = value.resolve(); + + return MappedSubject.create( + ([indicatedAlt, tasToIas]): number => { + return table.get(indicatedAlt) * tasToIas; + }, + context.pressureAlt, + context.tasToIas + ); + } + }; + } + + /** + * Resolves this config as a factory for an airspeed value defined from angle of attack. + * @returns A factory for an airspeed value defined from angle of attack. + */ + private resolveAoa(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + const value = this.value as number | LookupTableConfig; + + return (context: AirspeedDefinitionContext) => { + if (typeof value === 'number') { + return context.normAoaIasCoef.map((coef) => coef === null ? NaN : context.estimateIasFromNormAoa(value), SubscribableUtils.NUMERIC_NAN_EQUALITY); + } else { + const table = value.resolve(); + + return MappedSubject.create( + ([indicatedAlt, coef]): number => { + return coef === null ? NaN : context.estimateIasFromNormAoa(table.get(indicatedAlt)); + }, + SubscribableUtils.NUMERIC_NAN_EQUALITY, + context.pressureAlt, + context.normAoaIasCoef + ); + } + }; + } + + /** + * Resolves this config as a factory for an airspeed value defined from a reference speed. + * @returns A factory for an airspeed value defined from a reference speed. + */ + private resolveReference(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + const value = this.value as VSpeedValueKey; + + return () => { + return Math.round(Simplane.getDesignSpeeds()[value]); + }; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/index.ts new file mode 100644 index 000000000..f2fb4d14b --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Config/index.ts @@ -0,0 +1,5 @@ +export * from './Config'; +export * from './DefaultConfigFactory'; +export * from './LookupTableConfig'; +export * from './NumericConfig'; +export * from './SpeedConfig'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/FuelComputer.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/FuelComputer.ts index 55ce80245..064b9746c 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/FuelComputer.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/FuelComputer.ts @@ -21,7 +21,7 @@ export type FuelRemaingAdjustment = { } /** Simvars for the fuel computer to monitor. */ -interface FuelSimVars { +export interface FuelSimVars { /** The amount of fuel remaining. */ fuelQty: number; /** The flow on engine 1. */ @@ -30,6 +30,18 @@ interface FuelSimVars { fuelFlow2: number; } +/** Simvars for the fuel totalizer to publish. */ +export interface FuelTotalizerSimVars { + /** The amount of fuel remaining in the fuel totalizer. */ + remainingFuel: number; + /** The amount of fuel burned in the fuel totalizer. */ + burnedFuel: number; + /** The fuel endurance calculated by the fuel totalizer. */ + fuelEndurance: number; + /** The fuel range calculated by the fuel totalizer. */ + fuelRange: number; +} + /** A publisher to poll fuel-related simvars. */ class FuelSimVarPublisher extends SimVarPublisher { private static simvars = new Map([ @@ -47,6 +59,24 @@ class FuelSimVarPublisher extends SimVarPublisher { } } +/** A publisher to poll fuel-related simvars. */ +class FuelTotalizerSimVarPublisher extends SimVarPublisher { + private static simvars = new Map([ + ['remainingFuel', { name: FuelComputerSimVars.Remaining, type: SimVarValueType.GAL }], + ['burnedFuel', { name: FuelComputerSimVars.Burned, type: SimVarValueType.GAL }], + ['fuelEndurance', { name: FuelComputerSimVars.Endurance, type: SimVarValueType.GPH }], + ['fuelRange', { name: FuelComputerSimVars.Range, type: SimVarValueType.NM }], + ]); + + /** + * Create a FuelSimVarPublisher + * @param bus The EventBus to publish to + */ + public constructor(bus: EventBus) { + super(FuelTotalizerSimVarPublisher.simvars, bus); + } +} + /** A simple fuel totalizer and related logic. */ class Totalizer { private _fuelCapacity = 0; @@ -165,13 +195,17 @@ export class FuelComputer { private simVarSubscriber: EventSubscriber; private controlSubscriber: EventSubscriber; private totalizer: Totalizer; + private totalizerSimVarPublisher: FuelTotalizerSimVarPublisher; + + private readonly controlPublisher = this.bus.getPublisher(); /** * Create a fuel computer. * @param bus An event bus */ - constructor(bus: EventBus) { + constructor(private readonly bus: EventBus) { this.simVarPublisher = new FuelSimVarPublisher(bus); + this.totalizerSimVarPublisher = new FuelTotalizerSimVarPublisher(bus); this.simVarSubscriber = bus.getSubscriber(); this.controlSubscriber = bus.getSubscriber(); this.totalizer = new Totalizer(); @@ -180,10 +214,14 @@ export class FuelComputer { /** Intialize the instrument. */ public init(): void { this.simVarPublisher.startPublish(); + this.totalizerSimVarPublisher.startPublish(); this.totalizer.setCapacity(SimVar.GetSimVarValue('FUEL TOTAL CAPACITY', 'gallons') - SimVar.GetSimVarValue('UNUSABLE FUEL TOTAL QUANTITY', 'gallons')); this.totalizer.fuelRemaining = SimVar.GetSimVarValue('FUEL TOTAL QUANTITY', 'gallons'); this.simVarSubscriber.on('fuelQty').whenChangedBy(0.1).handle((qty) => { this.totalizer.rawQty = qty; }); - this.controlSubscriber.on('fuel_adjustment').handle((adjustment) => { this.totalizer.adjust(adjustment); }); + this.controlSubscriber.on('fuel_adjustment').handle((adjustment) => { + this.totalizer.adjust(adjustment); + this.controlPublisher.pub('fuel_adjusted_qty', this.totalizer.fuelRemaining); + }); this.controlSubscriber.on('fuel_comp_reset').handle((flag) => { this.totalizer.reset(flag); }); } @@ -192,5 +230,6 @@ export class FuelComputer { */ public onUpdate(): void { this.simVarPublisher.onUpdate(); + this.totalizerSimVarPublisher.onUpdate(); } } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Events.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Events.ts index ed96520ea..bde4dc590 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Events.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Events.ts @@ -5,11 +5,9 @@ import { ProcedureType } from '@microsoft/msfs-garminsdk'; import { EISPageTypes } from '../MFD/Components/EIS'; import { NearestAirportSoftKey } from '../MFD/Components/UI/Nearest/MFDNearestAirportsPage'; import { NearestVorSoftKey } from '../MFD/Components/UI/Nearest/MFDNearestVORsPage'; -import { VSpeed } from '../PFD/Components/FlightInstruments/AirspeedIndicator'; import { FmaData } from './Autopilot/FmaData'; import { FuelRemaingAdjustment } from './FuelComputer'; - /** Extension of generic ControlEvents to handle G1000-specific events. */ export interface G1000ControlEvents { /** Event representing pfd alert button push. */ @@ -33,15 +31,12 @@ export interface G1000ControlEvents { /** Event representing xpdr code menu button push. */ xpdr_code_digit: number - /** Event for updating the v speeds from the soft menu to the airspeed indicator. */ - vspeed_set: VSpeed - - /** Event for updating the display of v speeds from the soft menu to the airspeed indicator. */ - vspeed_display: VSpeed - /** Event for updating the timer display. */ timer_value: number; + /** Sending reversionary EIS tab selections. */ + eis_reversionary_tab_select: EISPageTypes; + /** Sending EIS page selections. */ eis_page_select: EISPageTypes; @@ -54,6 +49,9 @@ export interface G1000ControlEvents { /** Adjust the remaining fuel total in the fuel computer. */ fuel_adjustment: FuelRemaingAdjustment; + /** Fuel in the totalizer after adjustment, gallons. */ + fuel_adjusted_qty: number; + /** Reset the fuel burn total. */ fuel_comp_reset: boolean; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000PfdPlugin.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000PfdPlugin.ts new file mode 100644 index 000000000..b4e73c225 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000PfdPlugin.ts @@ -0,0 +1,16 @@ +import { VNode } from '@microsoft/msfs-sdk'; + +import { G1000AvionicsPlugin, G1000PfdPluginBinder } from './G1000Plugin'; + +/** + * A G1000 PFD plugin. + */ +export abstract class G1000PfdAvionicsPlugin extends G1000AvionicsPlugin { + + /** Renders components to the PFD instrument container. + * @returns The rendered vnode + */ + public renderToPfdInstruments?(): VNode | null { + return null; + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Plugin.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Plugin.ts index 35c838b90..808519c92 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Plugin.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/G1000Plugin.ts @@ -1,12 +1,11 @@ -import { AvionicsPlugin, EventBus } from '@microsoft/msfs-sdk'; +import { AvionicsPlugin, EventBus, InstrumentBackplane, VNode } from '@microsoft/msfs-sdk'; import { SoftKeyMenuSystem } from './UI/Menus/SoftKeyMenuSystem'; import { ViewService } from './UI/ViewService'; import { PageSelectMenuSystem } from '../MFD'; +import { Fms, NavIndicatorController } from '@microsoft/msfs-garminsdk'; -/** - * A plugin binder for G1000 plugins. - */ +/** A plugin binder for G1000 plugins. */ export interface G1000PluginBinder { /** The softkey menu system. */ menuSystem: SoftKeyMenuSystem; @@ -17,27 +16,61 @@ export interface G1000PluginBinder { /** The system-wide event bus. */ bus: EventBus; + /** The backplane instance. */ + backplane: InstrumentBackplane; + + /** The flight management system. */ + fms: Fms; + /** The FMS knob menu system (only needed on the MFD, as it does not move to the PFD in reversionary mode). */ pageSelectMenuSystem?: PageSelectMenuSystem; } +/** A plugin binder for G1000 PFD plugin. */ +export interface G1000PfdPluginBinder extends G1000PluginBinder { + /** The flight management system. */ + fms: Fms; + + /** An instance of the nav indicator controller. */ + navIndicatorController: NavIndicatorController; +} + +/** A plugin binder for G1000 MFD plugin. */ +export interface G1000MfdPluginBinder extends G1000PluginBinder { + /** The flight management system. */ + fms: Fms; +} + /** * An avionics plugin for the G1000 NXi. */ -export abstract class G1000AvionicsPlugin extends AvionicsPlugin { +export abstract class G1000AvionicsPlugin extends AvionicsPlugin { /** * A lifecycle callback called when the G1000 softkey menu system has been initialized. */ - public abstract onMenuSystemInitialized(): void; + public onMenuSystemInitialized?(): void { + return; + } /** * A lifecycle callback called when the G1000 page view service has been initialized. */ - public abstract onViewServiceInitialized(): void; + public onViewServiceInitialized?(): void { + return; + } /** * A lifecycle callback called when the G1000 rotary menu system has been initialized. */ - public abstract onPageSelectMenuSystemInitialized(): void; -} \ No newline at end of file + public onPageSelectMenuSystemInitialized?(): void { + return; + } + + + /** @returns null. Callback for rendering the EIS from a plugin. + */ + public renderEIS?(): VNode | null { + return null; + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/AltimeterBaroKeyEventHandler.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/AltimeterBaroKeyEventHandler.ts index d4e9c6419..c36e7383b 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/AltimeterBaroKeyEventHandler.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/AltimeterBaroKeyEventHandler.ts @@ -1,5 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { EventBus, KeyEventData, KeyEventManager, KeyEvents, Subscription } from '@microsoft/msfs-sdk'; +import { ControlEvents, EventBus, KeyEventData, KeyEventManager, KeyEvents, Subscription } from '@microsoft/msfs-sdk'; + +import { G1000ControlEvents } from '../G1000Events'; /** * A handler for altimeter barometric setting key events. @@ -63,6 +65,7 @@ export class AltimeterBaroKeyEventHandler { this.isInit = true; this.keyEventManager!.interceptKey('BAROMETRIC', true); + this.keyEventManager!.interceptKey('BAROMETRIC_STD_PRESSURE', true); this.keyEventSub = this.bus.getSubscriber().on('key_intercept').handle(this.onKeyIntercepted.bind(this)); } @@ -74,7 +77,11 @@ export class AltimeterBaroKeyEventHandler { private onKeyIntercepted(data: KeyEventData): void { switch (data.key) { case 'BAROMETRIC': { - this.bus.pub('baro_set', true, true, false); + this.bus.getPublisher().pub('baro_set', true, true, false); + break; + } + case 'BAROMETRIC_STD_PRESSURE': { + this.bus.getPublisher().pub('std_baro_switch', true, true, false); break; } } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/ControlpadHEventHandler.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/ControlpadHEventHandler.ts new file mode 100644 index 000000000..191730c10 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Input/ControlpadHEventHandler.ts @@ -0,0 +1,121 @@ +/* eslint-disable @typescript-eslint/no-non-null-assertion */ +import { FmsHEvent } from '../UI/FmsHEvent'; + +export enum ControlPadKeyOperations { + None, + InsertCharacter, + ApplyBackSpace, + ReverseSign, +} + +/** + * + */ +interface KeyboardEventTranslationResult { + /** The operation found by the evaluation */ + KeyboardOperation: ControlPadKeyOperations, + /** Pressed key as string, to be inserted e.g. into InputComponent */ + ReceivedKey: string | null +} + +/** + * Handling the raw H-events, coming from the control pad (e.g. of the SR22). + * This provides an abstraction for the 40 raw events, which are translated into three operations: + * - insert character + * - backspace + * - signReversal (+/-) + */ +export class ControlpadHEventHandler { + + private static prefetchedCharacter: string | undefined; + + private static readonly touchPadKeyMap = new Map([ + [FmsHEvent.A, 'A'], + [FmsHEvent.B, 'B'], + [FmsHEvent.C, 'C'], + [FmsHEvent.D, 'D'], + [FmsHEvent.E, 'E'], + [FmsHEvent.F, 'F'], + [FmsHEvent.G, 'G'], + [FmsHEvent.H, 'H'], + [FmsHEvent.I, 'I'], + [FmsHEvent.J, 'J'], + [FmsHEvent.K, 'K'], + [FmsHEvent.L, 'L'], + [FmsHEvent.M, 'M'], + [FmsHEvent.N, 'N'], + [FmsHEvent.O, 'O'], + [FmsHEvent.P, 'P'], + [FmsHEvent.Q, 'Q'], + [FmsHEvent.R, 'R'], + [FmsHEvent.S, 'S'], + [FmsHEvent.T, 'T'], + [FmsHEvent.U, 'U'], + [FmsHEvent.V, 'V'], + [FmsHEvent.W, 'W'], + [FmsHEvent.X, 'X'], + [FmsHEvent.Y, 'Y'], + [FmsHEvent.Z, 'Z'], + [FmsHEvent.SPC, ' '], + [FmsHEvent.D0, '0'], + [FmsHEvent.D1, '1'], + [FmsHEvent.D2, '2'], + [FmsHEvent.D3, '3'], + [FmsHEvent.D4, '4'], + [FmsHEvent.D5, '5'], + [FmsHEvent.D6, '6'], + [FmsHEvent.D7, '7'], + [FmsHEvent.D8, '8'], + [FmsHEvent.D9, '9'], + [FmsHEvent.Dot, '.'], + ]); + + + /** + * Checks an FmsHEvent whether it represents a character key from the controlpad keyboard + * @param evt FmsHEvent, which needs to be checked + * @returns boolean result of check + */ + public static isKeyboardTextInput(evt: FmsHEvent): boolean { + return this.touchPadKeyMap.has(evt); + } + + /** + * Translate an FmsHEvent into one of the keyboard operations insert character, backspace or +/- + * @param evt FmsHEvent, which needs to be translated + * @returns the found keyboard input operation and the key as string argument if available + */ + public static evaluateKeyboardInput(evt: FmsHEvent): KeyboardEventTranslationResult { + const containedCharacter = this.touchPadKeyMap.get(evt); + if (containedCharacter !== undefined) { + ControlpadHEventHandler.prefetchedCharacter = containedCharacter; + return { KeyboardOperation: ControlPadKeyOperations.InsertCharacter, ReceivedKey: containedCharacter }; + } else { + switch (evt) { + case FmsHEvent.BKSP: + return { KeyboardOperation: ControlPadKeyOperations.ApplyBackSpace, ReceivedKey: null }; + case FmsHEvent.PlusMinus: + return { KeyboardOperation: ControlPadKeyOperations.ReverseSign, ReceivedKey: null }; + default: + return { KeyboardOperation: ControlPadKeyOperations.None, ReceivedKey: null }; + } + } + } + + /** + * This static method returns the character, which was evaluated the last time, when evaluateKeyboardInput was called. + * @returns prefetched character. + */ + public static getPrefetchedCharacter(): string | undefined { + const prefetchedCharacter = ControlpadHEventHandler.prefetchedCharacter; + ControlpadHEventHandler.prefetchedCharacter = undefined; + return prefetchedCharacter; + } + + /** This static method clears the character, which was evaluated when evaluateKeyboardInput was called the last time. */ + public static clearPrefetchedCharacter(): void { + ControlpadHEventHandler.prefetchedCharacter = undefined; + } + +} + diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/Indicators/MapRelativeTerrainStatusIndicator.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/Indicators/MapRelativeTerrainStatusIndicator.css index 3e2b51967..898ebc4db 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/Indicators/MapRelativeTerrainStatusIndicator.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/Indicators/MapRelativeTerrainStatusIndicator.css @@ -9,6 +9,7 @@ position: relative; width: var(--map-rel-terrain-status-icon-width, 1.3em); height: var(--map-rel-terrain-status-icon-height, 1.2em); + overflow: hidden; } .map-rel-terrain-status-icon { @@ -25,6 +26,7 @@ top: 0px; width: 100%; height: 100%; + overflow: visible; } .map-rel-terrain-status-failed-cross { diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/MapUserSettings.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/MapUserSettings.ts index 058565530..895e19b52 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/MapUserSettings.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Map/MapUserSettings.ts @@ -92,6 +92,10 @@ export class MapUserSettings { name: 'mapAutoNorthUpRangeIndex', defaultValue: 27 }, + { + name: 'mapGroundNorthUpActive', + defaultValue: false + }, { name: 'mapPfdDeclutter', defaultValue: MapDeclutterSettingMode.All diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComFrequencyElement.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComFrequencyElement.tsx index 26d3bc485..43f9fda0c 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComFrequencyElement.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComFrequencyElement.tsx @@ -1,12 +1,15 @@ /* eslint-disable max-len */ // eslint-disable-next-line @typescript-eslint/no-unused-vars import { - ComponentProps, DisplayComponent, EventBus, FrequencyBank, FrequencyChangeEvent, FSComponent, IdentChangeEvent, NavEvents, NavSourceId, NavSourceType, Radio, - RadioEvents, RadioType, VNode + ComponentProps, ControlPublisher, EventBus, FrequencyBank, FrequencyChangeEvent, FSComponent, IdentChangeEvent, NavComEvents, NavEvents, NavSourceId, NavSourceType, Radio, + RadioEvents, RadioType, VNode, } from '@microsoft/msfs-sdk'; +import { ComRadioSpacingSettingMode, ComRadioUserSettings } from '@microsoft/msfs-garminsdk'; + import { AvionicsComputerSystemEvents } from '../Systems/AvionicsComputerSystem'; import { AvionicsSystemState, AvionicsSystemStateEvent } from '../Systems/G1000AvionicsSystem'; +import { FmsHEvent, G1000UiControl } from '../UI'; import './NavComFrequencyElement.css'; @@ -27,15 +30,56 @@ interface NavComFrequencyElementProps extends ComponentProps { /** * Representation of the active and standby frequencies of a nav or com radio. */ -export class NavComFrequencyElement extends DisplayComponent { +export class NavComFrequencyElement extends G1000UiControl { + private readonly controlPadFrequencyInputMap: Map = new Map([ + [FmsHEvent.D0, 0], + [FmsHEvent.D1, 1], + [FmsHEvent.D2, 2], + [FmsHEvent.D3, 3], + [FmsHEvent.D4, 4], + [FmsHEvent.D5, 5], + [FmsHEvent.D6, 6], + [FmsHEvent.D7, 7], + [FmsHEvent.D8, 8], + [FmsHEvent.D9, 9], + [FmsHEvent.Dot, -1], + ]); + + + private containerRef = FSComponent.createRef(); private selectorBorderElement = FSComponent.createRef(); private selectorArrowElement = FSComponent.createRef(); private activeFreq = FSComponent.createRef(); private standbyFreq = FSComponent.createRef(); + + private comInputDigit0 = FSComponent.createRef(); + private comInputDigit1 = FSComponent.createRef(); + private comInputDigit2 = FSComponent.createRef(); + private comInputDigit3 = FSComponent.createRef(); + private comInputDigit4 = FSComponent.createRef(); + private comInputDigit5 = FSComponent.createRef(); + private comInputDigit6 = FSComponent.createRef(); + + private comInputDigits = (this.props.type === RadioType.Com) ? + [this.comInputDigit0, this.comInputDigit1, this.comInputDigit2, this.comInputDigit3, this.comInputDigit4, this.comInputDigit5, this.comInputDigit6] : + [this.comInputDigit0, this.comInputDigit1, this.comInputDigit2, this.comInputDigit3, this.comInputDigit4, this.comInputDigit5]; + private ident = FSComponent.createRef(); private isFailed = false; + private selected = false; + + private isInInputMode = false; + private radioState: Radio | undefined; + + private digitPosition = 0; + private previousFrequency = 0; + private newFrequencyAsString = ''; + private validNextDigitSpace = [1]; + + private readonly comRadioSettingManager = ComRadioUserSettings.getManager(this.props.bus); + private readonly controlPublisher = new ControlPublisher(this.props.bus); /** * Set this frequency as the active selection visually. @@ -69,6 +113,18 @@ export class NavComFrequencyElement extends DisplayComponent() .on('avionicscomputer_state_2') .handle(this.onComputerStateChanged.bind(this)); + + this.standbyFreq.instance.style.display = ''; + this.comInputDigits.every(digit => { + digit.instance.style.display = 'none'; + return true; + }); + + if (this.props.type === RadioType.Com) { + this.props.bus.getSubscriber().on(`com_transmit_${this.props.index === 1 ? 1 : 2}`).handle(this.onComTransmitChange.bind(this)); + } + + this.controlPublisher.startPublish(); } /** @@ -111,6 +167,9 @@ export class NavComFrequencyElement extends DisplayComponent { - if (this.ident.getOrDefault() !== null) { + if (this.ident.getOrDefault() !== null && this.selected) { if (strength == 0) { if (this.ident.instance.style.display !== 'none') { this.ident.instance.style.display = 'none'; @@ -196,6 +258,244 @@ export class NavComFrequencyElement extends DisplayComponent { + this.activeFreq.instance.classList.toggle('transmit-selected', transmitting); + }; + + /** @inheritdoc */ + public onInteractionEvent(evt: FmsHEvent): boolean { + let isHandled = false; + if (this.radioState?.selected) { + if ([FmsHEvent.D0, FmsHEvent.D1, FmsHEvent.D2, FmsHEvent.D3, FmsHEvent.D4, FmsHEvent.D5, FmsHEvent.D6, FmsHEvent.D7, FmsHEvent.D8, FmsHEvent.D9, FmsHEvent.Dot].includes(evt)) { + // Digit handling: + if (this.isInInputMode === false) { + // We are entering the data input mode, set up the required variables: + this.startFrequencyEntry(); + } + this.handleFrequencyEntry(evt); + isHandled = true; + } else { + // All other events terminate the input mode, canceling the captured input with the sole exception of ENT: + this.stopFrequencyEntry(); + if (evt === FmsHEvent.ENT) { + // ENT handling, publish the respective freq change bus event: + this.controlPublisher.publishEvent(this.radioState.radioType === RadioType.Com ? 'standby_com_freq' : 'standby_nav_freq', this.newFrequencyAsString); + } else { + // All other events shall cancel the input and restore the previous frequncy: + this.onUpdateFrequency({ radio: this.radioState, bank: FrequencyBank.Standby, frequency: this.previousFrequency }); + } + } + } + return isHandled; + } + + /** Begins frequency entry phase */ + private startFrequencyEntry(): void { + this.isInInputMode = true; + this.validNextDigitSpace = [1]; + this.digitPosition = 0; + this.newFrequencyAsString = this.radioState?.standbyFrequency.toFixed((this.radioState.radioType === RadioType.Com) ? 3 : 2) ?? '000.00'; + this.previousFrequency = this.radioState?.standbyFrequency ?? 0; + + // ...and set up the UI as needed (swap the input digits for the static frequency element): + this.standbyFreq.instance.style.display = 'none'; + this.comInputDigits.every((digit, index) => { + digit.instance.style.display = ''; + digit.instance.textContent = this.newFrequencyAsString[index]; + digit.instance.classList.remove('highlight-select'); + return true; + }); + this.comInputDigits[this.digitPosition].instance.classList.add('highlight-select'); + } + + /** Begins frequency entry phase */ + private stopFrequencyEntry(): void { + this.isInInputMode = false; + + // ...and set up the UI as needed: + this.standbyFreq.instance.style.display = ''; + this.comInputDigits.every((digit) => { + digit.instance.classList.remove('highlight-select'); + digit.instance.style.display = 'none'; + return true; + }); + } + + /** + * Handles the frequency input event + * @param evt received hEvent + */ + private handleFrequencyEntry(evt: FmsHEvent): void { + // Here we handle the input of digits for a radio frequency. + // Fetch the digit from the event first: + const digit = this.controlPadFrequencyInputMap.get(evt); + if (digit !== undefined) { + // We received a valid input for frequency input: + if (this.validNextDigitSpace.includes(digit)) { + const digitAsString = digit.toFixed(0); + switch (this.digitPosition) { + case 0: + this.newFrequencyAsString = digitAsString + this.newFrequencyAsString.substring(1); + break; + case 1: + this.newFrequencyAsString = this.newFrequencyAsString.substring(0, 1) + digitAsString + this.newFrequencyAsString.substring(2); + break; + case 2: + this.newFrequencyAsString = this.newFrequencyAsString.substring(0, 2) + digitAsString + this.newFrequencyAsString.substring(3); + this.digitPosition++; // Skip the dot + break; + case 4: + if (digit < 0) { + // We received the dot while on pos 4, stay on pos 4 and expect the digit the next time: + this.newFrequencyAsString = this.newFrequencyAsString.substring(0, 3) + '.' + this.newFrequencyAsString.substring(4); + this.digitPosition--; + } else { + // We received the digit at pos 4, auto fill in the dot: + this.newFrequencyAsString = this.newFrequencyAsString.substring(0, 3) + '.' + digitAsString + this.newFrequencyAsString.substring(5); + } + break; + case 5: + this.newFrequencyAsString = this.newFrequencyAsString.substring(0, 5) + digitAsString + this.newFrequencyAsString.substring(6); + break; + case 6: + this.newFrequencyAsString = this.newFrequencyAsString.substring(0, 6) + digitAsString; + break; + } + if (this.digitPosition < 6) { + this.validNextDigitSpace = this.getNextValidFrequencyDigits(digit); + this.digitPosition++; + } else { + // After position 6, we don't consider any further digit as valid: + this.validNextDigitSpace = []; + } + // Update the new frequency on the UI: + this.comInputDigits.every((inputDigit, index) => { + inputDigit.instance.textContent = this.newFrequencyAsString[index]; + inputDigit.instance.classList.remove('highlight-select'); + return true; + }); + this.comInputDigits[this.digitPosition].instance.classList.add('highlight-select'); + } + } + } + + /** + * Returns the valid digits at the next digit position for COM entry mode + * @param digit Received digit at the current position. + * @returns the valid numbers when entering the next com frequency digit + */ + private getNextValidComDigits(digit: number): number[] { + // For COM the valid range is 118.000 - 136.990: + switch (this.digitPosition) { + case 0: + // The second digit can be: + return [1, 2, 3]; + + case 1: + switch (digit) { + case 1: + // If the second digit is 1, the third digit can be: + return [8, 9]; + case 2: + // If the second digit is 2, the third digit can be: + return [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + case 3: + // If the second digit is 3, the third digit can be: + return [0, 1, 2, 3, 4, 5, 6]; + } + break; + + case 2: + case 3: + // After the dot, any digit is valid for the fourth digit: + return [- 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + + case 4: + if (this.comRadioSettingManager.getSetting('comRadioSpacing').get() === ComRadioSpacingSettingMode.Spacing25Khz) { + // If the spacing is 0.025, the sixth digit can be: + return [0, 2, 5, 7]; + } else { + // If the spacing is 0.00833, the sixth digit can be: + return [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + } + + case 5: + if (this.comRadioSettingManager.getSetting('comRadioSpacing').get() === ComRadioSpacingSettingMode.Spacing25Khz) { + // If the spacing is 0.025, the seventh digit can be: + switch (digit) { + case 0: + // If the sixth digit is 0, the seventh digit can only be: + return [0]; + case 2: + // If the sixth digit is 2, the seventh digit can only be: + return [5]; + case 5: + // If the sixth digit is 5, the seventh digit can only be: + return [0]; + case 7: + // If the sixth digit is 7, the seventh digit can only be: + return [5]; + } + break; + } + } + return []; + } + + /** + * Returns the valid digits at the next digit position for NAV entry mode + * @param digit Received digit at the current position. + * @returns the valid numbers when entering the next nav frequency digit + */ + getNextValidNavDigits(digit: number): number[] { + switch (this.digitPosition) { + case 0: + // The second digit can be: + return [0, 1]; + + case 1: + switch (digit) { + case 0: + // If the second digit is 0, the third digit can be: + return [8, 9]; + case 1: + // If the second digit is 1, the third digit can be: + return [0, 1, 2, 3, 4, 5, 6, 7]; + } + break; + + case 2: + // The fourth digit always needs to be the dot: + return [-1]; // Next we expect the dot + + case 3: + // After the dot, any digit is valid for the fifth digit: + return [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + + case 4: + // The sixth digit can be: + return [0, 5]; + + case 5: + // The seventh digit can only be: + return [0]; + } + return []; + } + + /** + * Evaluate the valid digits at the next digit position, based on COM vs NAV and the spacing + * @param digit Received digit at the current position. + * @returns the valid numbers when entering the next digit, based on digit position: + */ + private getNextValidFrequencyDigits(digit: number): number[] { + if (this.radioState?.radioType === RadioType.Com) { + return this.getNextValidComDigits(digit); + } else { + return this.getNextValidNavDigits(digit); + } + } + /** * Render NavCom Freq Element. * @returns Vnode containing the element. @@ -208,6 +508,12 @@ export class NavComFrequencyElement extends DisplayComponent + 1 + 0 + 0 + . + 1 + 2 @@ -231,6 +537,13 @@ export class NavComFrequencyElement extends DisplayComponent + 1 + 0 + 0 + . + 1 + 2 + 0
); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.css index 9fa68b1a0..15aef1aec 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.css @@ -70,4 +70,54 @@ left: 108px; width: 88px; height: 24px; -} \ No newline at end of file +} + +.radio-armed-border { + border: solid 2px cyan; + position: absolute; + top: 1.5px; + width: 100%; + height: 100%; +} + +.radio-armed-border.com { + border-bottom-left-radius: 10px; + left: -1.5px; +} + +.radio-armed-border.nav { + border-bottom-right-radius: 10px; + right: -1.5px; +} + +.radio-armed-border.inactive { + opacity: 0; +} + +.radio-armed-border.blink { + animation: ArmedFade 1s infinite; +} + +.radio-armed-border.solid { + opacity: 1; +} + +.radio-armed-border.standby { + opacity: 0; +} + +@keyframes ArmedFade { + + 0%, + 50% { + opacity: 1; + } + + 75% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.tsx index e452757a5..ce406d633 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/NavCom/NavComRadio.tsx @@ -1,6 +1,7 @@ /* eslint-disable max-len */ -import { ComponentProps, DisplayComponent, EventBus, FSComponent, RadioType, VNode } from '@microsoft/msfs-sdk'; +import { ClockEvents, ComponentProps, ConsumerSubject, EventBus, FSComponent, RadioType, Subject, VNode } from '@microsoft/msfs-sdk'; +import { FmsHEvent, G1000UiControl } from '../UI'; import { NavComFrequencyElement } from './NavComFrequencyElement'; import './NavComRadio.css'; @@ -22,19 +23,102 @@ interface NavComRadioProps extends ComponentProps { templateId: string; } +enum ArmedModes { + inactive = 'inactive', + blink = 'blink', + solid = 'solid', + standby = 'standby', +} + /** * */ -export class NavComRadio extends DisplayComponent { +export class NavComRadio extends G1000UiControl { + frequency1Element = FSComponent.createRef(); frequency2Element = FSComponent.createRef(); + private readonly sub = this.props.bus.getSubscriber(); + private readonly simTime = ConsumerSubject.create(this.sub.on('simTime').withPrecision(-2), 0); // milliseconds, updates at 10Hz + private activeBorderRef = FSComponent.createRef(); + public armedMode = Subject.create(ArmedModes.inactive); + private lastArmedTime = 0; // milliseconds + private readonly blinkTimeout = 5; // seconds + private readonly solidTimeout = 10; // seconds + private readonly borderClasses: ArmedModes[] = [ + ArmedModes.inactive, + ArmedModes.blink, + ArmedModes.solid, + ArmedModes.standby + ]; + + /** * Stuff to do after render. */ public onAfterRender(): void { - // Nothing to do at the moment. - return; + + // Add and remove CSS classes based on changes in ArmedMode + this.armedMode.sub((mode) => { + + // Find class to add + const addClassIndex = this.borderClasses.indexOf(mode); + if (addClassIndex < 0) { return; } + const addClass = this.borderClasses[addClassIndex]; + + // Find classes to remove + const removeClasses = []; + for (let i = 0; i < this.borderClasses.length; i++) { + if (i !== addClassIndex) { + removeClasses.push(this.borderClasses[i]); + } + } + if (removeClasses.length !== this.borderClasses.length - 1) { return; } + + // Set last armed time + if (mode === ArmedModes.blink) { this.lastArmedTime = this.simTime.get(); } + + // Add and remove classes + this.activeBorderRef.instance.classList.add(addClass); + this.activeBorderRef.instance.classList.remove( + removeClasses[0], + removeClasses[1], + removeClasses[2], + ); + }, true); + + // Watch for blink and solid border timeouts + this.simTime.sub((t) => { + if (this.armedMode.get() === ArmedModes.blink && (t - this.lastArmedTime > this.blinkTimeout * 1000)) { + this.armedMode.set(ArmedModes.solid); + } + if (this.armedMode.get() === ArmedModes.solid && (t - this.lastArmedTime > this.solidTimeout * 1000)) { + this.armedMode.set(ArmedModes.standby); + } + }, true); + + // Initilize the COM radio in standby mode + if (this.props.position === 'right') { + this.armedMode.set(ArmedModes.standby); + } + } + + /** @inheritdoc */ + public onInteractionEvent(evt: FmsHEvent): boolean { + // We simply pass on the event to the frequency elements: + return this.frequency1Element.instance.onInteractionEvent(evt) || + this.frequency2Element.instance.onInteractionEvent(evt); + } + + /** Sets the armed mode of the radio input box + * @param armed whether or not the radio box is armed for input + */ + public setArmed(armed: boolean): void { + if (armed) { + this.armedMode.set(ArmedModes.blink); + } else { + this.armedMode.set(ArmedModes.inactive); + } } /** @@ -51,6 +135,7 @@ export class NavComRadio extends DisplayComponent {
+
); } else { @@ -62,8 +147,9 @@ export class NavComRadio extends DisplayComponent {
12
{this.props.title}
+
); } } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/AirspeedIndicatorConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/AirspeedIndicatorConfig.ts new file mode 100644 index 000000000..f873cb7d1 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/AirspeedIndicatorConfig.ts @@ -0,0 +1,389 @@ +import { SubscribableMapFunctions, SubscribableUtils } from '@microsoft/msfs-sdk'; + +import { + AirspeedDefinitionFactory, AirspeedIndicatorBottomDisplayMode, AirspeedIndicatorBottomDisplayOptions, AirspeedIndicatorColorRange, + AirspeedIndicatorColorRangeColor, AirspeedIndicatorColorRangeWidth, AirspeedIndicatorDataProviderOptions, AirspeedTapeScaleOptions +} from '@microsoft/msfs-garminsdk'; + +import { Config, ConfigFactory } from '../../Config/Config'; +import { NumericConfig } from '../../Config/NumericConfig'; +import { ColorRangeConfig } from './ColorRangeConfig'; +import { VSpeedBugConfig } from './VSpeedBugConfig'; + +/** + * A configuration object which defines airspeed indicator options. + */ +export class AirspeedIndicatorConfig implements Config { + private static readonly DEFAULT_DATA_OPTIONS: Readonly = { + trendLookahead: 6, + overspeedThreshold: (): number => { + const vne = Simplane.getDesignSpeeds().VNe; + return vne > 60 ? vne : Number.POSITIVE_INFINITY; + }, + underspeedThreshold: (): number => Simplane.getDesignSpeeds().VS0 + }; + + private static readonly DEFAULT_TAPE_SCALE_OPTIONS: Readonly = { + minimum: 20, + maximum: 999, + window: 60, + majorTickInterval: 10, + minorTickFactor: 2 + }; + + private static readonly DEFAULT_BOTTOM_OPTIONS: Readonly = { + mode: AirspeedIndicatorBottomDisplayMode.TrueAirspeed, + machThreshold: undefined + }; + + /** Options for the airspeed indicator data provider. */ + public readonly dataProviderOptions: Readonly; + + /** Options for the airspeed tape scale. */ + public readonly tapeScaleOptions: Readonly; + + /** Color range definitions for the airspeed tape. */ + public readonly colorRangeDefinitions: readonly AirspeedIndicatorColorRange[]; + + /** Options for the bottom display box. */ + public readonly bottomDisplayOptions: Readonly; + + /** Reference V-speed bug config options for the airspeed indicator. */ + public readonly vSpeedBugConfigs: readonly VSpeedBugConfig[]; + + /** + * Creates a new AirspeedIndicatorConfig from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + */ + constructor(element: Element | undefined, factory: ConfigFactory) { + if (element === undefined) { + this.dataProviderOptions = { ...AirspeedIndicatorConfig.DEFAULT_DATA_OPTIONS }; + this.tapeScaleOptions = { ...AirspeedIndicatorConfig.DEFAULT_TAPE_SCALE_OPTIONS }; + this.colorRangeDefinitions = this.getDefaultColorRangeDefinitions(this.tapeScaleOptions); + this.bottomDisplayOptions = { ...AirspeedIndicatorConfig.DEFAULT_BOTTOM_OPTIONS }; + this.vSpeedBugConfigs = this.getDefaultVSpeedBugOptions(); + } else { + if (element.tagName !== 'AirspeedIndicator') { + throw new Error(`Invalid AirspeedIndicatorConfig definition: expected tag name 'AirspeedIndicator' but was '${element.tagName}'`); + } + + try { + this.dataProviderOptions = this.parseDataProviderOptions(element, factory); + } catch (e) { + console.warn(e); + this.dataProviderOptions = { ...AirspeedIndicatorConfig.DEFAULT_DATA_OPTIONS }; + } + + try { + this.tapeScaleOptions = this.parseScaleOptions(element); + } catch (e) { + console.warn(e); + this.tapeScaleOptions = { ...AirspeedIndicatorConfig.DEFAULT_TAPE_SCALE_OPTIONS }; + } + + try { + this.colorRangeDefinitions = this.parseColorRangeDefinitions(element, factory, this.tapeScaleOptions); + } catch (e) { + console.warn(e); + this.colorRangeDefinitions = this.getDefaultColorRangeDefinitions(this.tapeScaleOptions); + } + + try { + this.bottomDisplayOptions = this.parseBottomDisplayOptions(element); + } catch (e) { + console.warn(e); + this.bottomDisplayOptions = { ...AirspeedIndicatorConfig.DEFAULT_BOTTOM_OPTIONS }; + } + + try { + this.vSpeedBugConfigs = this.parseVSpeedBugOptions(element); + } catch (e) { + console.warn(e); + this.vSpeedBugConfigs = this.getDefaultVSpeedBugOptions(); + } + } + } + + /** + * Parses data provider options from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + * @returns Data provider options defined by the specified element. + * @throws Error if the specified element has an invalid format. + */ + private parseDataProviderOptions(element: Element, factory: ConfigFactory): AirspeedIndicatorDataProviderOptions { + const options: Partial = {}; + + const trendVector = element.querySelector(':scope>TrendVector'); + if (trendVector !== null) { + const trendLookahead = Number(trendVector.getAttribute('lookahead') ?? undefined); + + if (isFinite(trendLookahead) && trendLookahead > 0) { + options.trendLookahead = trendLookahead; + } else { + console.warn('Invalid AirspeedIndicatorConfig definition: unrecognized trend vector lookahead option (must be a positive number). Defaulting to 6.'); + } + } + + const alerts = element.querySelector(':scope>SpeedAlerts'); + + if (alerts !== null) { + const overspeed = alerts.querySelector(':scope>Overspeed'); + options.overspeedThreshold = this.parseSpeedAlertThreshold(overspeed, factory); + + const underspeed = alerts.querySelector(':scope>Underspeed'); + options.underspeedThreshold = this.parseSpeedAlertThreshold(underspeed, factory); + } + + options.trendLookahead ??= AirspeedIndicatorConfig.DEFAULT_DATA_OPTIONS.trendLookahead; + options.overspeedThreshold ??= AirspeedIndicatorConfig.DEFAULT_DATA_OPTIONS.overspeedThreshold; + options.underspeedThreshold ??= AirspeedIndicatorConfig.DEFAULT_DATA_OPTIONS.underspeedThreshold; + + return options as AirspeedIndicatorDataProviderOptions; + } + + /** + * Parses a factory for a speed alert threshold airspeed value from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + * @returns A factory for a speed alert threshold airspeed value defined by the specified element, or `undefined` if + * `element` is `undefined`. + * @throws Error if the specified element has an invalid format. + */ + private parseSpeedAlertThreshold(element: Element | null, factory: ConfigFactory): AirspeedDefinitionFactory | undefined { + const child = element?.children[0] ?? undefined; + if (child === undefined) { + return undefined; + } + + try { + const config = factory.create(child); + + if (config === undefined || !('isNumericConfig' in config)) { + console.warn('Invalid AirspeedIndicatorConfig definition: speed alert threshold is not a numeric config'); + return undefined; + } + + return (config as NumericConfig).resolve(); + } catch (e) { + console.warn(e); + } + + return undefined; + } + + /** + * Parses tape scale options from a configuration document element. + * @param element A configuration document element. + * @returns Tape scale options defined by the specified element. + * @throws Error if the specified element has an invalid format. + */ + private parseScaleOptions(element: Element): AirspeedTapeScaleOptions { + const scale = element.querySelector(':scope>Scale'); + + if (scale === null) { + return { ...AirspeedIndicatorConfig.DEFAULT_TAPE_SCALE_OPTIONS }; + } + + const scaleOptions: Partial = { + minimum: undefined as number | undefined, + maximum: undefined as number | undefined, + window: undefined as number | undefined, + majorTickInterval: undefined as number | undefined, + minorTickFactor: undefined as number | undefined + }; + + scaleOptions.minimum = Number(scale.getAttribute('min') ?? 'NaN'); + scaleOptions.maximum = Number(scale.getAttribute('max') ?? 'NaN'); + scaleOptions.window = Number(scale.getAttribute('window') ?? 'NaN'); + scaleOptions.majorTickInterval = Number(scale.getAttribute('major-tick-interval') ?? 'NaN'); + scaleOptions.minorTickFactor = Number(scale.getAttribute('minor-tick-factor') ?? 'NaN'); + + for (const key in scaleOptions) { + const typedKey = key as keyof AirspeedTapeScaleOptions; + + if (isNaN(scaleOptions[typedKey] as number)) { + console.warn(`Invalid AirspeedIndicatorConfig definition: invalid scale option '${key}'`); + scaleOptions[typedKey] = undefined; + } + + if (scaleOptions[typedKey] === undefined) { + scaleOptions[typedKey] = AirspeedIndicatorConfig.DEFAULT_TAPE_SCALE_OPTIONS[typedKey]; + } + } + + return scaleOptions as AirspeedTapeScaleOptions; + } + + /** + * Parses color range definitions from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + * @param tapeScaleOptions Options describing the airspeed tape scale. + * @returns Color range definitions defined by the specified element. + */ + private parseColorRangeDefinitions(element: Element, factory: ConfigFactory, tapeScaleOptions: Readonly): readonly AirspeedIndicatorColorRange[] { + const colorRanges = element.querySelector(':scope>ColorRanges'); + if (colorRanges === null) { + return this.getDefaultColorRangeDefinitions(tapeScaleOptions); + } else { + return Array.from(colorRanges.querySelectorAll(':scope>ColorRange')).map(colorRangeElement => { + try { + return new ColorRangeConfig(colorRangeElement, factory).resolve(); + } catch (e) { + console.warn(e); + return null; + } + }).filter(def => def !== null) as readonly AirspeedIndicatorColorRange[]; + } + } + + /** + * Gets a default set of color range definitions. The set includes the following ranges (in order): + * 1. RED: Flaps extended stall range (tape minimum to Vs0). + * 2. WHITE: Flaps extended operating range (Vs0 to Vfe). + * 3. GREEN (half): Flaps extended or retracted operating range (Vs1 to Vfe). + * 4. GREEN (full): Flaps retracted operating range (Vfe to Vno). + * 5. YELLOW: Overspeed caution range (Vno to Vne). + * 6. BARBER POLE: Overspeed range (Vne to tape maximum). + * @param tapeScaleOptions Options describing the airspeed tape scale. + * @returns A array containing a default set of color range definitions. + */ + private getDefaultColorRangeDefinitions(tapeScaleOptions: Readonly): AirspeedIndicatorColorRange[] { + return [ + // Flaps extended stall range + { + width: AirspeedIndicatorColorRangeWidth.Full, + color: AirspeedIndicatorColorRangeColor.Red, + minimum: () => SubscribableUtils.isSubscribable(tapeScaleOptions.minimum) + ? tapeScaleOptions.minimum.map(SubscribableMapFunctions.identity()) + : tapeScaleOptions.minimum, + maximum: () => Simplane.getDesignSpeeds().VS0 + }, + + // Flaps extended operating range + { + width: AirspeedIndicatorColorRangeWidth.Full, + color: AirspeedIndicatorColorRangeColor.White, + minimum: () => Simplane.getDesignSpeeds().VS0, + maximum: () => Simplane.getDesignSpeeds().VFe + }, + + // Flaps retracted/extended operating range + { + width: AirspeedIndicatorColorRangeWidth.Half, + color: AirspeedIndicatorColorRangeColor.Green, + minimum: () => Simplane.getDesignSpeeds().VS1, + maximum: () => Simplane.getDesignSpeeds().VFe + }, + + // Flaps retracted operating range + { + width: AirspeedIndicatorColorRangeWidth.Full, + color: AirspeedIndicatorColorRangeColor.Green, + minimum: () => Simplane.getDesignSpeeds().VFe, + maximum: () => Simplane.getDesignSpeeds().VNo + }, + + // Overspeed caution range + { + width: AirspeedIndicatorColorRangeWidth.Full, + color: AirspeedIndicatorColorRangeColor.Yellow, + minimum: () => Simplane.getDesignSpeeds().VNo, + maximum: () => Simplane.getDesignSpeeds().VNe + }, + + // Barber pole + { + width: AirspeedIndicatorColorRangeWidth.Full, + color: AirspeedIndicatorColorRangeColor.BarberPole, + minimum: () => Simplane.getDesignSpeeds().VNe, + maximum: () => SubscribableUtils.isSubscribable(tapeScaleOptions.maximum) + ? tapeScaleOptions.maximum.map(SubscribableMapFunctions.identity()) + : tapeScaleOptions.maximum + } + ]; + } + + /** + * Parses bottom display box options from a configuration document element. + * @param element A configuration document element. + * @returns Bottom display box options defined by the specified element. + * @throws Error if the specified element has an invalid format. + */ + private parseBottomDisplayOptions(element: Element): AirspeedIndicatorBottomDisplayOptions { + const bottomDisplay = element.querySelector(':scope>BottomDisplay'); + + if (bottomDisplay === null) { + return { ...AirspeedIndicatorConfig.DEFAULT_BOTTOM_OPTIONS }; + } else { + let mode = bottomDisplay.getAttribute('mode'); + switch (mode) { + case AirspeedIndicatorBottomDisplayMode.TrueAirspeed: + case AirspeedIndicatorBottomDisplayMode.Mach: + break; + case null: + mode = AirspeedIndicatorBottomDisplayMode.TrueAirspeed; + break; + default: + console.warn(`Invalid AirspeedIndicatorConfig definition: unrecognized bottom display mode '${mode}'. Defaulting to 'Tas'.`); + mode = AirspeedIndicatorBottomDisplayMode.TrueAirspeed; + } + + let machThreshold: number | undefined; + const machThresholdAttr = bottomDisplay.getAttribute('mach-threshold'); + if (machThresholdAttr !== null) { + machThreshold = Number(machThresholdAttr); + if (isNaN(machThreshold)) { + console.warn('Invalid AirspeedIndicatorConfig definition: invalid bottom display mach threshold option. Discarding value.'); + machThreshold = undefined; + } + } + + return { + mode: mode as AirspeedIndicatorBottomDisplayMode, + machThreshold + }; + } + } + + /** + * Parses reference V-speed bug configuration objects from a configuration document element. + * @param element A configuration document element. + * @returns Reference V-speed bug configuration objects defined by the specified element. + */ + private parseVSpeedBugOptions(element: Element): VSpeedBugConfig[] { + const vSpeedBugs = element.querySelector(':scope>VSpeedBugs'); + if (vSpeedBugs === null) { + return this.getDefaultVSpeedBugOptions(); + } else { + return Array.from(vSpeedBugs.querySelectorAll(':scope>Bug')).map(vSpeedBugElement => { + try { + return new VSpeedBugConfig(vSpeedBugElement); + } catch (e) { + console.warn(e); + return null; + } + }).filter(def => def !== null) as VSpeedBugConfig[]; + } + } + + /** + * Gets a default set of V-speed bug configuration objects. The set includes configurations for the following bugs + * (in order): + * 1. V-speed name: `glide`, Bug label: `G`. + * 2. V-speed name: `r`, Bug label: `R`. + * 3. V-speed name: `x`, Bug label: `X`. + * 4. V-speed name: `y`, Bug label: `Y`. + * @returns A array containing a default set of V-speed bug configuration objects. + */ + private getDefaultVSpeedBugOptions(): VSpeedBugConfig[] { + return [ + new VSpeedBugConfig('glide', 'G'), + new VSpeedBugConfig('r', 'R'), + new VSpeedBugConfig('x', 'X'), + new VSpeedBugConfig('y', 'Y') + ]; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/ColorRangeConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/ColorRangeConfig.ts new file mode 100644 index 000000000..87879a419 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/ColorRangeConfig.ts @@ -0,0 +1,103 @@ +import { AirspeedIndicatorColorRange, AirspeedIndicatorColorRangeColor, AirspeedIndicatorColorRangeWidth } from '@microsoft/msfs-garminsdk'; + +import { ConfigFactory, ResolvableConfig } from '../../Config/Config'; +import { NumericConfig } from '../../Config/NumericConfig'; + + +/** + * A configuration object which defines an airspeed tape color range. + */ +export class ColorRangeConfig implements ResolvableConfig { + public readonly isResolvableConfig = true; + + /** The width of this config's color range. */ + public readonly width: AirspeedIndicatorColorRangeWidth; + + /** The color of this config's color range. */ + public readonly color: AirspeedIndicatorColorRangeColor; + + /** The config which defines the minimum airspeed value of this config's color range. */ + public readonly minimum: NumericConfig; + + /** The config which defines the maximum airspeed value of this config's color range. */ + public readonly maximum: NumericConfig; + + /** + * Creates a new ColorRangeConfig from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + */ + constructor(element: Element, factory: ConfigFactory) { + if (element.tagName !== 'ColorRange') { + throw new Error(`Invalid ColorRangeConfig definition: expected tag name 'ColorRange' but was '${element.tagName}'`); + } + + const width = element.getAttribute('width'); + switch (width) { + case AirspeedIndicatorColorRangeWidth.Full: + case AirspeedIndicatorColorRangeWidth.Half: + this.width = width; + break; + default: + throw new Error(`Invalid ColorRangeConfig definition: unrecognized width '${width}'`); + } + + const color = element.getAttribute('color'); + switch (color) { + case AirspeedIndicatorColorRangeColor.Red: + case AirspeedIndicatorColorRangeColor.Yellow: + case AirspeedIndicatorColorRangeColor.White: + case AirspeedIndicatorColorRangeColor.Green: + case AirspeedIndicatorColorRangeColor.BarberPole: + this.color = color; + break; + default: + throw new Error(`Invalid ColorRangeConfig definition: unrecognized color '${color}'`); + } + + const minimum = this.parseEndpoint(element.querySelector(':scope>Minimum'), factory); + const maximum = this.parseEndpoint(element.querySelector(':scope>Maximum'), factory); + + if (minimum === undefined) { + throw new Error('Invalid ColorRangeConfig definition: minimum endpoint is not defined or is not numeric'); + } + if (maximum === undefined) { + throw new Error('Invalid ColorRangeConfig definition: maximum endpoint is not defined or is not numeric'); + } + + this.minimum = minimum; + this.maximum = maximum; + } + + /** + * Parses an endpoint numeric config from a configuration document element. + * @param element A configuration document element. + * @param factory A configuration object factory to use to create child configuration objects. + * @returns The numeric config defined by the specified element, or `undefined` if one could not be created. + */ + private parseEndpoint(element: Element | null, factory: ConfigFactory): NumericConfig | undefined { + const firstChild = element?.children[0]; + + if (firstChild === undefined) { + return undefined; + } + + const config = factory.create(firstChild); + + if (config === undefined || !('isNumericConfig' in config)) { + return undefined; + } + + return config as NumericConfig; + } + + /** @inheritdoc */ + public resolve(): AirspeedIndicatorColorRange { + return { + width: this.width, + color: this.color, + minimum: this.minimum.resolve(), + maximum: this.maximum.resolve() + }; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/VSpeedBugConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/VSpeedBugConfig.ts new file mode 100644 index 000000000..d147f3840 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/VSpeedBugConfig.ts @@ -0,0 +1,73 @@ +import { VSpeedBugDefinition } from '@microsoft/msfs-garminsdk'; + +import { ResolvableConfig } from '../../Config/Config'; +import { VSpeedDefinition } from '../../VSpeed/VSpeed'; + +/** + * A configuration object which defines an airspeed reference V-speed bug. + */ +export class VSpeedBugConfig implements ResolvableConfig<(vSpeedDefs: Iterable) => VSpeedBugDefinition | undefined> { + public readonly isResolvableConfig = true; + + /** The name of the reference V-speed associated with this config's speed bug. */ + public readonly name: string; + + /** The label of this config's speed bug. */ + public readonly label: string; + + /** + * Creates a new VSpeedBugConfig from a configuration document element. + * @param element A configuration document element. + */ + public constructor(element: Element); + /** + * Creates a new VSpeedBugConfig using a specified V-speed name and bug label. + * @param name The name of the V-speed. + * @param label The label of the V-speed bug. + */ + public constructor(name: string, label: string); + // eslint-disable-next-line jsdoc/require-jsdoc + public constructor(arg1: Element | string, arg2?: string) { + if (typeof arg1 === 'object') { + const element = arg1; + + if (element.tagName !== 'Bug') { + throw new Error(`Invalid VSpeedBugConfig definition: expected tag name 'Bug' but was '${element.tagName}'`); + } + + const name = element.getAttribute('name'); + if (name === null) { + throw new Error('Invalid VSpeedBugConfig definition: undefined name'); + } + this.name = name; + + const label = element.getAttribute('label'); + if (label === null) { + throw new Error('Invalid VSpeedBugConfig definition: undefined label'); + } + this.label = label; + } else { + this.name = arg1; + this.label = arg2 as string; + } + } + + /** @inheritdoc */ + public resolve(): (vSpeedDefs: Iterable) => VSpeedBugDefinition | undefined { + + return (vSpeedDefs: Iterable): VSpeedBugDefinition | undefined => { + for (const def of vSpeedDefs) { + if (def.name === this.name) { + return { + name: this.name, + label: this.label, + showOffscale: true, + showLegend: false + }; + } + } + + return undefined; + }; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/index.ts new file mode 100644 index 000000000..543f5b87c --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/AirspeedIndicator/index.ts @@ -0,0 +1,3 @@ +export * from './AirspeedIndicatorConfig'; +export * from './ColorRangeConfig'; +export * from './VSpeedBugConfig'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/AutopilotConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/AutopilotConfig.ts new file mode 100644 index 000000000..9db823e93 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/AutopilotConfig.ts @@ -0,0 +1,266 @@ +import { Config } from '../../Config/Config'; + +/** + * Options for the autopilot ROL director. + */ +export type AutopilotRollOptions = { + /** The minimum supported bank angle, in degrees. */ + minBankAngle: number; + + /** The maximum supported bank angle, in degrees. */ + maxBankAngle: number; +}; + +/** + * Options for the autopilot HDG director. + */ +export type AutopilotHdgOptions = { + /** The maximum supported bank angle, in degrees. */ + maxBankAngle: number; +}; + +/** + * Options for the autopilot VOR director. + */ +export type AutopilotVorOptions = { + /** The maximum supported bank angle, in degrees. */ + maxBankAngle: number; +}; + +/** + * Options for the autopilot LOC director. + */ +export type AutopilotLocOptions = { + /** The maximum supported bank angle, in degrees. */ + maxBankAngle: number; +}; + +/** + * Options for the autopilot LNAV director. + */ +export type AutopilotLNavOptions = { + /** The maximum supported bank angle, in degrees. */ + maxBankAngle: number; +}; + +/** + * Options for the autopilot Low Bank Mode. + */ +export type AutopilotLowBankOptions = { + /** The maximum supported bank angle, in degrees. */ + maxBankAngle: number; +}; + +/** + * A configuration object which defines options related to the autopilot. + */ +export class AutopilotConfig implements Config { + private static readonly DEFAULT_ROLL_MIN_BANK_ANGLE = 6; + private static readonly DEFAULT_MAX_BANK_ANGLE = 25; + private static readonly DEFAULT_LOW_BANK_ANGLE = 15; + + /** + * Whether `AP_ALT_VAR_SET` events should be treated as `AP_ALT_VAR_INC`/`AP_ALT_VAR_DEC` events for compatibility + * with ModelBehaviors that transform the latter into the former. + */ + public readonly supportAltSelCompatibility: boolean; + + /** Options for the autopilot ROL director. */ + public readonly rollOptions: AutopilotRollOptions; + + /** Options for the autopilot HDG director. */ + public readonly hdgOptions: AutopilotHdgOptions; + + /** Options for the autopilot VOR director. */ + public readonly vorOptions: AutopilotVorOptions; + + /** Options for the autopilot LOC director. */ + public readonly locOptions: AutopilotLocOptions; + + /** Options for the autopilot GPS/FMS director. */ + public readonly lnavOptions: AutopilotLNavOptions; + + /** Options for the autopilot Low Bank Mode. */ + public readonly lowBankOptions: AutopilotLowBankOptions; + + /** Whether HDG sync mode is supported. */ + public readonly isHdgSyncModeSupported: boolean; + + /** + * Creates a new AutopilotConfig from a configuration document element. + * @param element A configuration document element. + */ + public constructor(element: Element | undefined) { + if (element === undefined) { + this.supportAltSelCompatibility = true; + + this.rollOptions = { minBankAngle: AutopilotConfig.DEFAULT_ROLL_MIN_BANK_ANGLE, maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + this.hdgOptions = { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + this.vorOptions = { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + this.locOptions = { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + this.lnavOptions = { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + this.lowBankOptions = { maxBankAngle: AutopilotConfig.DEFAULT_LOW_BANK_ANGLE }; + + this.isHdgSyncModeSupported = false; + } else { + if (element.tagName !== 'Autopilot') { + throw new Error(`Invalid AutopilotConfig definition: expected tag name 'Autopilot' but was '${element.tagName}'`); + } + + const supportAltSelCompatibility = element.getAttribute('alt-sel-compat')?.toLowerCase(); + switch (supportAltSelCompatibility) { + case 'true': + case undefined: + this.supportAltSelCompatibility = true; + break; + case 'false': + this.supportAltSelCompatibility = false; + break; + default: + console.warn(`Invalid AutopilotConfig definition: unrecognized alt-sel-compat option "${supportAltSelCompatibility}" (expected "true" or "false"). Defaulting to "false".`); + this.supportAltSelCompatibility = false; + } + + this.rollOptions = this.parseRollOptions(element.querySelector(':scope>ROL')); + this.hdgOptions = this.parseHdgOptions(element.querySelector(':scope>HDG')); + this.vorOptions = this.parseVorOptions(element.querySelector(':scope>VOR')); + this.locOptions = this.parseLocOptions(element.querySelector(':scope>LOC')); + this.lnavOptions = this.parseLNavOptions(element.querySelector(':scope>FMS')); + this.lowBankOptions = this.parseLowBankOptions(element.querySelector(':scope>LowBank')); + + const isHdgSyncModeSupported = element.getAttribute('hdg-sync-mode')?.toLowerCase(); + switch (isHdgSyncModeSupported) { + case 'true': + this.isHdgSyncModeSupported = true; + break; + case 'false': + case undefined: + this.isHdgSyncModeSupported = false; + break; + default: + console.warn(`Invalid AutopilotConfig definition: unrecognized hdg-sync-mode option "${isHdgSyncModeSupported}" (expected "true" or "false"). Defaulting to "false".`); + this.isHdgSyncModeSupported = false; + } + } + } + + /** + * Parses ROL director options from a configuration document element. + * @param element A configuration document element. + * @returns The ROL director options defined by the configuration document element. + */ + private parseRollOptions(element: Element | null): AutopilotRollOptions { + if (element !== null) { + let minBankAngle = Number(element.getAttribute('min-bank') ?? undefined); + if (isNaN(minBankAngle) || minBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized min-bank value (expected a non-negative number)'); + minBankAngle = AutopilotConfig.DEFAULT_ROLL_MIN_BANK_ANGLE; + } + + let maxBankAngle = Number(element.getAttribute('max-bank') ?? undefined); + if (isNaN(maxBankAngle) || maxBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized max-bank value (expected a non-negative number)'); + maxBankAngle = AutopilotConfig.DEFAULT_MAX_BANK_ANGLE; + } + + return { minBankAngle, maxBankAngle }; + } + + return { minBankAngle: AutopilotConfig.DEFAULT_ROLL_MIN_BANK_ANGLE, maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + } + + /** + * Parses HDG director options from a configuration document element. + * @param element A configuration document element. + * @returns The HDG director options defined by the configuration document element. + */ + private parseHdgOptions(element: Element | null): AutopilotHdgOptions { + if (element !== null) { + let maxBankAngle = Number(element.getAttribute('max-bank') ?? undefined); + if (isNaN(maxBankAngle) || maxBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized max-bank value (expected a non-negative number)'); + maxBankAngle = AutopilotConfig.DEFAULT_MAX_BANK_ANGLE; + } + + return { maxBankAngle }; + } + + return { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + } + + /** + * Parses VOR director options from a configuration document element. + * @param element A configuration document element. + * @returns The VOR director options defined by the configuration document element. + */ + private parseVorOptions(element: Element | null): AutopilotVorOptions { + if (element !== null) { + let maxBankAngle = Number(element.getAttribute('max-bank') ?? undefined); + if (isNaN(maxBankAngle) || maxBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized max-bank value (expected a non-negative number)'); + maxBankAngle = AutopilotConfig.DEFAULT_MAX_BANK_ANGLE; + } + + return { maxBankAngle }; + } + + return { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + } + + /** + * Parses LOC director options from a configuration document element. + * @param element A configuration document element. + * @returns The LOC director options defined by the configuration document element. + */ + private parseLocOptions(element: Element | null): AutopilotLocOptions { + if (element !== null) { + let maxBankAngle = Number(element.getAttribute('max-bank') ?? undefined); + if (isNaN(maxBankAngle) || maxBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized max-bank value (expected a non-negative number)'); + maxBankAngle = AutopilotConfig.DEFAULT_MAX_BANK_ANGLE; + } + + return { maxBankAngle }; + } + + return { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + } + + /** + * Parses HDG director options from a configuration document element. + * @param element A configuration document element. + * @returns The HDG director options defined by the configuration document element. + */ + private parseLNavOptions(element: Element | null): AutopilotLNavOptions { + if (element !== null) { + let maxBankAngle = Number(element.getAttribute('max-bank') ?? undefined); + if (isNaN(maxBankAngle) || maxBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized max-bank value (expected a non-negative number)'); + maxBankAngle = AutopilotConfig.DEFAULT_MAX_BANK_ANGLE; + } + + return { maxBankAngle }; + } + + return { maxBankAngle: AutopilotConfig.DEFAULT_MAX_BANK_ANGLE }; + } + + /** + * Parses Low Bank Mode options from a configuration document element. + * @param element A configuration document element. + * @returns The Low Bank Mode options defined by the configuration document element. + */ + private parseLowBankOptions(element: Element | null): AutopilotLowBankOptions { + if (element !== null) { + let maxBankAngle = Number(element.getAttribute('max-bank') ?? undefined); + if (isNaN(maxBankAngle) || maxBankAngle < 0) { + console.warn('Invalid AutopilotConfig definition: missing or unrecognized max-bank value (expected a non-negative number)'); + maxBankAngle = AutopilotConfig.DEFAULT_MAX_BANK_ANGLE; + } + + return { maxBankAngle }; + } + + return { maxBankAngle: AutopilotConfig.DEFAULT_LOW_BANK_ANGLE }; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/index.ts new file mode 100644 index 000000000..ab571a279 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/Autopilot/index.ts @@ -0,0 +1 @@ +export * from './AutopilotConfig'; \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000AirframeOptionsManager.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000AirframeOptionsManager.ts index 181df2b95..0af022a58 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000AirframeOptionsManager.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000AirframeOptionsManager.ts @@ -2,10 +2,18 @@ import { Annunciation, EventBus, Warning, XMLAnnunciationFactory, XMLExtendedGaugeConfig, XMLFunction, XMLGaugeConfigFactory, XMLWarningFactory } from '@microsoft/msfs-sdk'; +import { DefaultConfigFactory } from '../Config/DefaultConfigFactory'; +import { VSpeedGroup } from '../VSpeed/VSpeed'; +import { VSpeedGroupConfig } from '../VSpeed/VSpeedGroupConfig'; +import { AirspeedIndicatorConfig } from './AirspeedIndicator/AirspeedIndicatorConfig'; +import { AutopilotConfig } from './Autopilot/AutopilotConfig'; + /** * A manager for G1000 airframe options. */ export class G1000AirframeOptionsManager { + private readonly configFactory = new DefaultConfigFactory(); + private _hasRadioAltimeter = false; private _hasWeatherRadar = true; private _gaugeConfig: XMLExtendedGaugeConfig = { @@ -73,6 +81,36 @@ export class G1000AirframeOptionsManager { return this._warningConfig; } + private _autopilotConfig?: AutopilotConfig; + // eslint-disable-next-line jsdoc/require-returns + /** A config which defines options for the autopilot. */ + public get autopilotConfig(): AutopilotConfig { + if (!this._autopilotConfig) { + throw new Error('G1000AirframeOptionsManager: cannot access config before it has been parsed.'); + } + return this._autopilotConfig; + } + + private _vSpeedGroups?: ReadonlyMap; + // eslint-disable-next-line jsdoc/require-returns + /** Definitions for reference V-speeds. */ + public get vSpeedGroups(): ReadonlyMap { + if (!this._vSpeedGroups) { + throw new Error('G1000AirframeOptionsManager: cannot access config before it has been parsed.'); + } + return this._vSpeedGroups; + } + + private _airspeedIndicatorConfig?: AirspeedIndicatorConfig; + // eslint-disable-next-line jsdoc/require-returns + /** A config which defines options for the airspeed indicator. */ + public get airspeedIndicatorConfig(): AirspeedIndicatorConfig { + if (!this._airspeedIndicatorConfig) { + throw new Error('G1000AirframeOptionsManager: cannot access config before it has been parsed.'); + } + return this._airspeedIndicatorConfig; + } + /** * Parse the plane's EIS configuation. * @param document The configuration as an XML document. @@ -103,6 +141,8 @@ export class G1000AirframeOptionsManager { * Parse the panel.xml for airframe specific options. */ public parseConfig(): void { + const rootElement = this.instrument.xmlConfig.getElementsByTagName('PlaneHTMLConfig')[0]; + const instruments = this.instrument.xmlConfig.getElementsByTagName('Instrument'); for (const instrument of instruments) { const instrumentId = instrument.getElementsByTagName('Name'); @@ -123,5 +163,118 @@ export class G1000AirframeOptionsManager { this._gaugeConfig = this.parseGaugeConfig(this.instrument.xmlConfig); this._annunciationConfig = this.parseAnnunciationConfig(this.instrument.xmlConfig); this._warningConfig = this.parseWarningConfig(this.instrument.xmlConfig); + + this._autopilotConfig = this.parseAutopilotConfig(rootElement); + + this._vSpeedGroups = this.parseVSpeedGroups(rootElement); + + this._airspeedIndicatorConfig = this.parseAirspeedIndicatorConfig(rootElement); + } + + /** + * Parses an autopilot configuration object from a configuration document. If none can be found or parsed without + * error, then this method will return a default configuration object. + * @param config The root of the configuration document. + * @returns The autopilot configuration defined by the configuration document, or a default version if the document + * does not define a valid configuration. + */ + private parseAutopilotConfig(config: Element): AutopilotConfig { + try { + const autopilot = config.querySelector(':scope>Autopilot'); + if (autopilot !== null) { + return new AutopilotConfig(autopilot); + } + } catch (e) { + console.warn(e); + } + + return new AutopilotConfig(undefined); + } + + /** + * Parses reference V-speed definitions from a configuration document. If none can be found or parsed without error, + * then this method will return a default set of V-speed definitions. + * @param config The root of the configuration document. + * @returns Reference V-speed definitions defined by the configuration document, or a default version if the document + * does not define a valid configuration. + */ + private parseVSpeedGroups(config: Element): Map { + const element = config.querySelector(':scope>VSpeeds'); + + const map = new Map(); + + if (element === null) { + return this.getDefaultVSpeedGroups(); + } + + const children = Array.from(element.querySelectorAll(':scope>Group')); + const groups = children.map(child => { + try { + return new VSpeedGroupConfig(child).resolve(); + } catch (e) { + console.warn(e); + return null; + } + }); + + // Pick the first group of each type. + for (const group of groups) { + if (group === null) { + continue; + } + + if (!map.has(group.name)) { + map.set(group.name, group); + } + } + + return map; + } + + /** + * Gets a set of default reference V-speed definitions. The set contains definitions for the following V-speeds (in + * order): + * + * 1. V-speed name: `glide`, label: `GLIDE` + * 2. V-speed name: `r`, label: `Vr` + * 3. V-speed name: `x`, label: `Vx` + * 4. V-speed name: `y`, label: `Vy` + * + * The default values for the V-speeds are derived from the corresponding entries in the aircraft configuration + * files. + * @returns An array containing a set of default reference V-speed definitions. + */ + private getDefaultVSpeedGroups(): Map { + return new Map([ + ['', { + name: '', + vSpeedDefinitions: [ + { name: 'glide', defaultValue: Math.round(Simplane.getDesignSpeeds().BestGlide), label: 'GLIDE' }, + { name: 'r', defaultValue: Math.round(Simplane.getDesignSpeeds().Vr), label: 'Vr' }, + { name: 'x', defaultValue: Math.round(Simplane.getDesignSpeeds().Vx), label: 'Vx' }, + { name: 'y', defaultValue: Math.round(Simplane.getDesignSpeeds().Vy), label: 'Vy' } + ] + }] + ]); + } + + /** + * Parses an airspeed indicator configuration object from a configuration document. If none can be found or parsed + * without error, then this method will return a default configuration object. + * @param config The root of the configuration document. + * @returns The airspeed indicator configuration defined by the configuration document, or a default version if the + * document does not define a valid configuration. + */ + private parseAirspeedIndicatorConfig(config: Element): AirspeedIndicatorConfig { + try { + const airspeedIndicator = config.querySelector(':scope>AirspeedIndicator'); + if (airspeedIndicator !== null) { + return new AirspeedIndicatorConfig(airspeedIndicator, this.configFactory); + } + } catch (e) { + console.warn(e); + } + + return new AirspeedIndicatorConfig(undefined, this.configFactory); } } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000SettingSaveManager.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000SettingSaveManager.ts index 3af4d25eb..614f5dd47 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000SettingSaveManager.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/G1000SettingSaveManager.ts @@ -32,7 +32,7 @@ export class G1000SettingSaveManager extends UserSettingSaveManager { const settings = [ ...backlightSettingManager.getAllSettings(), ...pfdSettingManager.getAllSettings(), - ...mapSettingManager.getAllSettings(), + ...mapSettingManager.getAllSettings().filter(setting => setting.definition.name !== 'mapGroundNorthUpActive'), ...trafficSettingManager.getAllSettings().filter(setting => setting.definition.name !== 'trafficOperatingMode'), ...mfdNavDataBarSettingManager.getAllSettings(), ...unitsSettingManager.getAllSettings(), diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/index.ts index b3be30c8c..b2c2a8540 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/index.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Profiles/index.ts @@ -1,2 +1,5 @@ +export * from './AirspeedIndicator'; +export * from './Autopilot'; + export * from './G1000AirframeOptionsManager'; export * from './G1000SettingSaveManager'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/StartupLogo.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/StartupLogo.tsx index 09a9a25b1..6071d29e5 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/StartupLogo.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/StartupLogo.tsx @@ -66,7 +66,7 @@ export class StartupLogo extends DisplayComponent { * @param evt The event that arrived. */ private handleHEvent = (evt: string): void => { - if (evt === `${this.props.eventPrefix}_ENT_Push` || evt === `${this.props.eventPrefix}_SOFTKEYS_12`) { + if (evt === `${this.props.eventPrefix}_ENT_Push` || evt === `${this.props.eventPrefix}_SOFTKEYS_12` || evt === 'AS1000_CONTROL_PAD_ENT_Push') { this.props.onConfirmation && this.props.onConfirmation(); this.props.bus.off('hEvent', this.handleHEvent); } @@ -94,7 +94,7 @@ export class StartupLogo extends DisplayComponent { - System WT1.2.7 + System WT1.3.3

@@ -116,4 +116,4 @@ export class StartupLogo extends DisplayComponent {

); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Common/g1k_common.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Common/g1k_common.css index 3ca59e5d4..247886860 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Common/g1k_common.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Common/g1k_common.css @@ -15,8 +15,8 @@ html { } html body { - font-family: Roboto-Regular; - font-size: 12; + font-family: Roboto; + font-size: 12px; color: white; height: 100%; width: 100%; @@ -83,6 +83,13 @@ html body { font-weight: normal; font-style: normal; } */ +@font-face { + font-family: "DejaVuSans-SemiBold"; + src: url("/Pages/VCockpit/Instruments/NavSystems/WTG1000/Assets/Fonts/DejaVuSans-SemiBold.ttf") format("truetype"); + font-weight: normal; + font-style: normal; +} + #Mainframe { --refWidth: 1024; --refHeight: 768; @@ -124,6 +131,10 @@ html body { font-size: 20px; } +.size24 { + font-size: 24px; +} + .roboto-font { font-family: Roboto; } @@ -162,10 +173,6 @@ html body { .failed-box { display: none; -} - -.failed-instr .failed-box { - display: block; position: absolute; top: 0; left: 0; @@ -177,4 +184,8 @@ html body { --fail-fg-color: rgba(244, 0, 0, 1); background: linear-gradient(to top right, var(--fail-bg-color) calc(50% - 1.4px), var(--fail-fg-color), var(--fail-bg-color) calc(50% + 1.4px)), linear-gradient(to top left, var(--fail-bg-color) calc(50% - 1.4px), var(--fail-fg-color), var(--fail-bg-color) calc(50% + 1.4px)) !important; +} + +.failed-instr .failed-box { + display: block; } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/ControlpadInputController.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/ControlpadInputController.ts new file mode 100644 index 000000000..01dd6bfc0 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/ControlpadInputController.ts @@ -0,0 +1,434 @@ +import { ConsumerSubject, DebounceTimer, EventBus, Radio, RadioEvents, RadioType, SimVarValueType, Subject } from '@microsoft/msfs-sdk'; + +import { NavComRadio } from '../../NavCom'; +import { FmsHEvent } from '../FmsHEvent'; +import { XpdrInputController } from './XpdrInputController'; + +/** + * Event published by the MFD view service to inhibit generic controlpad use. + */ +export interface MFDViewServiceEvents { + /** True, if the the generic handling of controlpad input (frequency, xpdr) shall be inhibited. + * The condition, which triggers true, is MFD's activeViewKey = 'NavMapPage', for all other active views th event is false. + */ + inhibitGenericControlpadUse: boolean; +} + +export enum ControlpadTargetInstrument { + MFD = 0, + PFD = 1 +} + +export enum GenericControlpadHandlingStates { + comInputArmed, // Default state, entering a '1' is directly considered as the first digit of a com frequency input + navInputArmed, // Enabled by the NAV key. After 10s without input -> fallback to default state + xpdrInputArmed, // Enabled by the XPDR key. After 10s without input -> fallback to default state + comInputStarted, // Entering a com frequency has been started. After 10s without input -> fallback to default state + navInputStarted, // Entering a nav frequency has been started. After 10s without input -> fallback to default state + crsInputArmed, // Not for digit entering, but after 10s without input -> fallback to default state + genericHandlingInhibited, // Whenever the view type on the MFD is not navmap. +} + +/** Simvar which indicates the control pad target instrument. */ +export enum ControlPadSimVars { + ControlPadTargetView = 'L:WT1000_ControlPad_Targetview', // 0: MFD, 1: PFD +} + +/** + * Controller that handles control pad input for the view service. + */ +export class ControlpadInputController { + + static readonly controlPadEventMap: Map = new Map([ + // For the controlpad keyboard input: + ['AS1000_CONTROL_PAD_A', FmsHEvent.A], + ['AS1000_CONTROL_PAD_B', FmsHEvent.B], + ['AS1000_CONTROL_PAD_C', FmsHEvent.C], + ['AS1000_CONTROL_PAD_D', FmsHEvent.D], + ['AS1000_CONTROL_PAD_E', FmsHEvent.E], + ['AS1000_CONTROL_PAD_F', FmsHEvent.F], + ['AS1000_CONTROL_PAD_G', FmsHEvent.G], + ['AS1000_CONTROL_PAD_H', FmsHEvent.H], + ['AS1000_CONTROL_PAD_I', FmsHEvent.I], + ['AS1000_CONTROL_PAD_J', FmsHEvent.J], + ['AS1000_CONTROL_PAD_K', FmsHEvent.K], + ['AS1000_CONTROL_PAD_L', FmsHEvent.L], + ['AS1000_CONTROL_PAD_M', FmsHEvent.M], + ['AS1000_CONTROL_PAD_N', FmsHEvent.N], + ['AS1000_CONTROL_PAD_O', FmsHEvent.O], + ['AS1000_CONTROL_PAD_P', FmsHEvent.P], + ['AS1000_CONTROL_PAD_Q', FmsHEvent.Q], + ['AS1000_CONTROL_PAD_R', FmsHEvent.R], + ['AS1000_CONTROL_PAD_S', FmsHEvent.S], + ['AS1000_CONTROL_PAD_T', FmsHEvent.T], + ['AS1000_CONTROL_PAD_U', FmsHEvent.U], + ['AS1000_CONTROL_PAD_V', FmsHEvent.V], + ['AS1000_CONTROL_PAD_W', FmsHEvent.W], + ['AS1000_CONTROL_PAD_X', FmsHEvent.X], + ['AS1000_CONTROL_PAD_Y', FmsHEvent.Y], + ['AS1000_CONTROL_PAD_Z', FmsHEvent.Z], + ['AS1000_CONTROL_PAD_SPC', FmsHEvent.SPC], + ['AS1000_CONTROL_PAD_0', FmsHEvent.D0], + ['AS1000_CONTROL_PAD_1', FmsHEvent.D1], + ['AS1000_CONTROL_PAD_2', FmsHEvent.D2], + ['AS1000_CONTROL_PAD_3', FmsHEvent.D3], + ['AS1000_CONTROL_PAD_4', FmsHEvent.D4], + ['AS1000_CONTROL_PAD_5', FmsHEvent.D5], + ['AS1000_CONTROL_PAD_6', FmsHEvent.D6], + ['AS1000_CONTROL_PAD_7', FmsHEvent.D7], + ['AS1000_CONTROL_PAD_8', FmsHEvent.D8], + ['AS1000_CONTROL_PAD_9', FmsHEvent.D9], + ['AS1000_CONTROL_PAD_Dot', FmsHEvent.Dot], + ['AS1000_CONTROL_PAD_BKSP', FmsHEvent.BKSP], + ['AS1000_CONTROL_PAD_PlusMinus', FmsHEvent.PlusMinus], + + // These common events can also be received from the control pad: + ['AS1000_CONTROL_PAD_FMS_Upper_INC', FmsHEvent.UPPER_INC], + ['AS1000_CONTROL_PAD_FMS_Upper_DEC', FmsHEvent.UPPER_DEC], + ['AS1000_CONTROL_PAD_FMS_Lower_INC', FmsHEvent.LOWER_INC], + ['AS1000_CONTROL_PAD_FMS_Lower_DEC', FmsHEvent.LOWER_DEC], + ['AS1000_CONTROL_PAD_MENU_Push', FmsHEvent.MENU], + ['AS1000_CONTROL_PAD_CLR', FmsHEvent.CLR], + ['AS1000_CONTROL_PAD_ENT_Push', FmsHEvent.ENT], + ['AS1000_CONTROL_PAD_FMS_Upper_PUSH', FmsHEvent.UPPER_PUSH], + ['AS1000_CONTROL_PAD_DIRECTTO', FmsHEvent.DIRECTTO], + ['AS1000_CONTROL_PAD_FPL_Push', FmsHEvent.FPL], + ['AS1000_CONTROL_PAD_PROC_Push', FmsHEvent.PROC], + ['AS1000_CONTROL_PAD_RANGE_INC', FmsHEvent.RANGE_INC], + ['AS1000_CONTROL_PAD_RANGE_DEC', FmsHEvent.RANGE_DEC], + ['AS1000_CONTROL_PAD_COM', FmsHEvent.COM], + ['AS1000_CONTROL_PAD_NAV', FmsHEvent.NAV], + ['AS1000_CONTROL_PAD_XPDR', FmsHEvent.XPDR], + ['AS1000_CONTROL_PAD_CRS', FmsHEvent.CRS], + ['AS1000_CONTROL_PAD_Home', FmsHEvent.HOME], + ]); + + protected readonly controlPadAcceptingEvents: string[] = ['AS1000_CONTROL_PAD_ENT_Push', 'AS1000_PFD_ENT_Push', 'AS1000_MFD_ENT_Push']; + + private readonly sub = this.bus.getSubscriber(); + private readonly inhibitGenericControlpadUseConsumer = ConsumerSubject.create(this.sub.on('inhibitGenericControlpadUse'), false); + private readonly stateFallbackTimer = new DebounceTimer(); + private controlpadState = Subject.create(GenericControlpadHandlingStates.comInputArmed); + + private readonly xpdrHandler = new XpdrInputController(this.bus, this.targetDisplay === ControlpadTargetInstrument.PFD); + + private radio1: Radio = ({ + index: 1, + activeFrequency: 0, + standbyFrequency: 0, + ident: null, + signal: 0, + radioType: (this.targetDisplay === ControlpadTargetInstrument.PFD) ? RadioType.Com : RadioType.Nav, + selected: true + }); + private radio2: Radio = ({ + index: 2, + activeFrequency: 0, + standbyFrequency: 0, + ident: null, + signal: 0, + radioType: (this.targetDisplay === ControlpadTargetInstrument.PFD) ? RadioType.Com : RadioType.Nav, + selected: false + }); + // private selectedRadio: Radio = this.radio1; + + private comRadio: NavComRadio | undefined; + private navRadio: NavComRadio | undefined; + + /** + * Constructs the controller. Each PFD and MFD have seperate instances of this controllers. The PFD controller maintains + * the COM frequencies and the MFD controller the NAV frequencies. + * @param bus The event bus. + * @param targetDisplay Enum that indicates for which instrument (PFD or MFD) this handler is running. + */ + constructor( + private readonly bus: EventBus, + private readonly targetDisplay: ControlpadTargetInstrument) { + this.sub.on('set_radio_state').handle((state) => { + if ((targetDisplay === ControlpadTargetInstrument.PFD) && (state.radioType === RadioType.Com)) { + if (state.index === 1) { + this.radio1 = state; + } else if (state.index === 2) { + this.radio2 = state; + } + } else if ((targetDisplay === ControlpadTargetInstrument.MFD) && (state.radioType === RadioType.Nav)) { + if (state.index === 1) { + this.radio1 = state; + } else if (state.index === 2) { + this.radio2 = state; + } + } + }, false); + + // Block controlpad use if the MFD is showing any other view than the nav map: + this.inhibitGenericControlpadUseConsumer.sub((genericUseInhibited) => { + if (genericUseInhibited) { + // Clear any running fallback timer and set the inhibit state: + this.stateFallbackTimer.clear(); + this.controlpadState.set(GenericControlpadHandlingStates.genericHandlingInhibited); + SimVar.SetSimVarValue('L:WT1000_ControlPad_ModeInput_Inhibited', SimVarValueType.Bool, true); + } else { + // After an inhibit phase, we always return to default state: + this.controlpadState.set(GenericControlpadHandlingStates.comInputArmed); + SimVar.SetSimVarValue('L:WT1000_ControlPad_ModeInput_Inhibited', SimVarValueType.Bool, false); + SimVar.SetSimVarValue('L:WT1000_ControlPad_Mode', SimVarValueType.Enum, 0); + } + }, true); + + this.controlpadState.sub((state) => { + this.armRadio(state); + }, true); + } + + /** + * Setter for the radio refs. + * @param comRadio com radio ref + * @param navRadio nav radio ref + */ + public setFrequencyElementRefs(comRadio: NavComRadio, navRadio: NavComRadio): void { + this.comRadio = comRadio; + this.navRadio = navRadio; + } + + /** + * This abstract method returns true, if the current instrument shall handle control pad events: + * @returns translated event as string + */ + private isControlpadTargetInstrument(): boolean { + const controlPadTarget = SimVar.GetSimVarValue(ControlPadSimVars.ControlPadTargetView, 'number'); + if (controlPadTarget !== undefined) { + // If the simvar is telling the target instrument, use it as discriminator: + return controlPadTarget === this.targetDisplay; + } else { + // we return true only for the MFD if the simvar does not exist: + return this.targetDisplay === ControlpadTargetInstrument.MFD; + } + } + + /** + * Handler for all control pad input. + * @param hEvent received hEvent. + * @returns true if the event is handled + */ + public handleControlPadEventInput(hEvent: string): boolean { + let isHandled = false; + + // We only continue, if the event is coming from controlpad: + if (ControlpadInputController.controlPadEventMap.has(hEvent)) { + // For the frequency and transponder input, we need a state event machine here: + switch (this.controlpadState.get()) { + case GenericControlpadHandlingStates.comInputArmed: + isHandled = this.handleComInputArmedState(hEvent); + break; + + case GenericControlpadHandlingStates.comInputStarted: + isHandled = this.handleComInputStartedState(hEvent); + this.scheduleDefaultStateFallback(); + break; + + case GenericControlpadHandlingStates.navInputArmed: + isHandled = this.handleNavInputArmedState(hEvent); + this.scheduleDefaultStateFallback(); + break; + + case GenericControlpadHandlingStates.navInputStarted: + isHandled = this.handleNavInputStartedState(hEvent); + this.scheduleDefaultStateFallback(); + break; + + case GenericControlpadHandlingStates.xpdrInputArmed: + // The XPDR is handled entirely in armed mode: + isHandled = this.xpdrHandler.handleXpdrEntry(hEvent); + if (isHandled) { + this.scheduleDefaultStateFallback(); + } else { + // Any unexpected event that isn't changing to another mode causes the return to default mode com input armed: + if (!['AS1000_CONTROL_PAD_NAV', 'AS1000_CONTROL_PAD_CRS'].includes(hEvent)) { + this.controlpadState.set(GenericControlpadHandlingStates.comInputArmed); + SimVar.SetSimVarValue('L:WT1000_ControlPad_Mode', SimVarValueType.Enum, 0); + } + } + break; + + case GenericControlpadHandlingStates.crsInputArmed: + if (['AS1000_PFD_CRS_INC', 'AS1000_PFD_CRS_DEC'].includes(hEvent)) { + this.scheduleDefaultStateFallback(); + } + break; + } + + // If the event is not yet handled, we run the generic state determination: + if (!isHandled) { + isHandled = this.genericNewStateDetermination(hEvent); + } + + // If the event is still not yet handled, we consider the event as handled, if the current instrument + // is not target for control pad input. This will e.g. prevent the PFD to receive control pad events, if + // the MFD is target instrument: + if (!isHandled) { + isHandled = this.isControlpadTargetInstrument() === false; + } + + } + return isHandled; + } + + /** + * Check for state changing events, which are state agnostic + * @param hEvent H event as string + * @returns if event was handled + */ + private genericNewStateDetermination(hEvent: string): boolean { + let isHandled = false; + // Don't allow any other mode activation while generic handling is inhibited: + if (this.controlpadState.get() !== GenericControlpadHandlingStates.genericHandlingInhibited) { + switch (hEvent) { + case 'AS1000_CONTROL_PAD_COM': + this.controlpadState.set(GenericControlpadHandlingStates.comInputArmed); + this.stateFallbackTimer.clear(); + isHandled = true; + break; + case 'AS1000_CONTROL_PAD_NAV': + this.controlpadState.set(GenericControlpadHandlingStates.navInputArmed); + this.scheduleDefaultStateFallback(); + isHandled = true; + break; + case 'AS1000_CONTROL_PAD_XPDR': + this.controlpadState.set(GenericControlpadHandlingStates.xpdrInputArmed); + this.scheduleDefaultStateFallback(); + this.xpdrHandler.startXpdrEntry(); + isHandled = true; + break; + case 'AS1000_CONTROL_PAD_CRS': + this.controlpadState.set(GenericControlpadHandlingStates.crsInputArmed); + if (this.targetDisplay === ControlpadTargetInstrument.PFD) { + this.scheduleDefaultStateFallback(); + isHandled = true; + } + break; + } + } + return isHandled; + } + + /** + * Handle comInputArmed state. + * + * @param hEvent H event as string + * @returns if event was handled + */ + private handleComInputArmedState(hEvent: string): boolean { + let isHandled = false; + // Check for the event(s) that trigger the comInputStarted state: + if ((this.targetDisplay === ControlpadTargetInstrument.PFD) && (hEvent === 'AS1000_CONTROL_PAD_1')) { + // As the first digit of a COM frequency always is a '1', checking for that is enough! + if (this.comRadio?.onInteractionEvent(FmsHEvent.D1)) { + isHandled = true; + } + } + if (isHandled) { this.controlpadState.set(GenericControlpadHandlingStates.comInputStarted); } + return isHandled; + } + + /** + * Handle comInputStarted state. + * + * @param hEvent H event as string + * @returns if event was handled + */ + private handleComInputStartedState(hEvent: string): boolean { + let isHandled = false; + const evt = ControlpadInputController.controlPadEventMap.get(hEvent); + if (evt !== undefined) { + isHandled = this.comRadio?.onInteractionEvent(evt) ?? false; + if (isHandled === false) { + // If event was not handled, fall back to default mode: + this.controlpadState.set(GenericControlpadHandlingStates.comInputArmed); + } + } + return isHandled; + } + + /** + * Handle navInputArmed state. + * + * @param hEvent H event as string + * @returns if event was handled + */ + private handleNavInputArmedState(hEvent: string): boolean { + let isHandled = false; + // Check for the event(s) that trigger the navInputStarted state: + if ((this.targetDisplay === ControlpadTargetInstrument.MFD) && (hEvent === 'AS1000_CONTROL_PAD_1')) { + // As the first digit of a NAV frequency always is a '1', checking for that is enough! + if (this.navRadio !== undefined) { + if (this.navRadio.onInteractionEvent(FmsHEvent.D1)) { + isHandled = true; + } + } + } + if (isHandled) { this.controlpadState.set(GenericControlpadHandlingStates.navInputStarted); } + return isHandled; + } + + /** + * Handle navInputStarted state. + * + * @param hEvent H event as string + * @returns if event was handled + */ + private handleNavInputStartedState(hEvent: string): boolean { + let isHandled = false; + const evt = ControlpadInputController.controlPadEventMap.get(hEvent); + if (evt !== undefined) { + isHandled = this.navRadio?.onInteractionEvent(evt) ?? false; + if (isHandled === false) { + // If event was not handled, fall back to default mode: + this.controlpadState.set(GenericControlpadHandlingStates.navInputArmed); + } + } + return isHandled; + } + + /** + * This method schedules a 10 second period, after which a fallback to the default generic handling state occurs (comInputArmed). + */ + private scheduleDefaultStateFallback(): void { + this.stateFallbackTimer.schedule(() => { + // Clean up where ever we stand: + switch (this.controlpadState.get()) { + case GenericControlpadHandlingStates.comInputStarted: + this.comRadio?.onInteractionEvent(FmsHEvent.CLR); + break; + case GenericControlpadHandlingStates.navInputStarted: + this.navRadio?.onInteractionEvent(FmsHEvent.CLR); + break; + case GenericControlpadHandlingStates.xpdrInputArmed: + this.xpdrHandler.handleXpdrEntry('AS1000_CONTROL_PAD_CLR'); + break; + } + this.controlpadState.set(GenericControlpadHandlingStates.comInputArmed); + SimVar.SetSimVarValue('L:WT1000_ControlPad_Mode', SimVarValueType.Enum, 0); + }, 10000); + } + + /** Handle changes in control pad state and arm the appropriate radio box. + * @param controlpadState the state of the control pad + */ + private armRadio(controlpadState: GenericControlpadHandlingStates): void { + switch (controlpadState) { + case GenericControlpadHandlingStates.comInputArmed: + case GenericControlpadHandlingStates.comInputStarted: + if (this.targetDisplay === ControlpadTargetInstrument.PFD) { this.comRadio?.setArmed(true); } + if (this.targetDisplay === ControlpadTargetInstrument.MFD) { this.navRadio?.setArmed(false); } + break; + case GenericControlpadHandlingStates.navInputArmed: + case GenericControlpadHandlingStates.navInputStarted: + if (this.targetDisplay === ControlpadTargetInstrument.PFD) { this.comRadio?.setArmed(false); } + if (this.targetDisplay === ControlpadTargetInstrument.MFD) { this.navRadio?.setArmed(true); } + break; + default: + if (this.targetDisplay === ControlpadTargetInstrument.PFD) { this.comRadio?.setArmed(false); } + if (this.targetDisplay === ControlpadTargetInstrument.MFD) { this.navRadio?.setArmed(false); } + } + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/XpdrInputController.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/XpdrInputController.ts new file mode 100644 index 000000000..79de868a2 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Controllers/XpdrInputController.ts @@ -0,0 +1,81 @@ +import { EventBus } from '@microsoft/msfs-sdk'; + +import { G1000ControlEvents, G1000ControlPublisher } from '../../G1000Events'; + +/** + * Controller that maps control pad input to the xpdr bus events. + */ +export class XpdrInputController { + private readonly controlPadXpdrInputMap: Map = new Map([ + ['AS1000_CONTROL_PAD_0', 0], + ['AS1000_CONTROL_PAD_1', 1], + ['AS1000_CONTROL_PAD_2', 2], + ['AS1000_CONTROL_PAD_3', 3], + ['AS1000_CONTROL_PAD_4', 4], + ['AS1000_CONTROL_PAD_5', 5], + ['AS1000_CONTROL_PAD_6', 6], + ['AS1000_CONTROL_PAD_7', 7], + ['AS1000_CONTROL_PAD_8', 8], + ['AS1000_CONTROL_PAD_9', 9], + ]); + private readonly validXpdrDigits = [0, 1, 2, 3, 4, 5, 6, 7]; + + private digitPosition = 0; + private readonly g1000ControlPublisher = new G1000ControlPublisher(this.bus); + + /** + * Constructs the controller. + * @param bus The event bus. + * @param isPfd true if the controller is for the PFD, false if for the MFD + */ + constructor(private readonly bus: EventBus, private readonly isPfd: boolean) { + this.g1000ControlPublisher.startPublish(); + } + /** + * Enters XPDR Entry mode + */ + public startXpdrEntry(): void { + this.digitPosition = 0; + this.publishEvent('xpdr_code_push', true); + } + + /** + * Handles the XPDR input event + * @param hEvent received hEvent + * @returns true if handled, false if the not + */ + public handleXpdrEntry(hEvent: string): boolean { + let isHandled = true; + const digit = this.controlPadXpdrInputMap.get(hEvent); + if (digit !== undefined) { + if (this.validXpdrDigits.includes(digit)) { + // We received a valid input for xpdr input: + this.publishEvent('xpdr_code_digit', digit); + this.digitPosition++; + if (this.digitPosition > 3) { + this.publishEvent('xpdr_code_push', false); + isHandled = false; + } + } + } else { + // we ignore XPDR button press when handling XPDR input + if (hEvent !== 'AS1000_CONTROL_PAD_XPDR') { + this.digitPosition = 0; + this.publishEvent('xpdr_code_push', false); + isHandled = false; + } + } + return isHandled; + } + + /** + * Publishes the event to the bus if the controller is for the PFD. + * @param event the event to publish + * @param value the value to publish + */ + private publishEvent(event: keyof G1000ControlEvents, value: number | boolean): void { + if (this.isPfd) { + this.g1000ControlPublisher.publishEvent(event, value); + } + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/DirectTo/DirectTo.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/DirectTo/DirectTo.tsx index 9dcaf46b0..9aa7cb31b 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/DirectTo/DirectTo.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/DirectTo/DirectTo.tsx @@ -10,7 +10,7 @@ import { NumberInput } from '../UIControls/NumberInput'; import { WaypointInput } from '../UIControls/WaypointInput'; import { DigitInput } from '../UiControls2/DigitInput'; import { G1000UiControlWrapper } from '../UiControls2/G1000UiControlWrapper'; -import { GenericNumberInput } from '../UiControls2/GenericNumberInput'; +import { CourseNumberInput } from '../UiControls2/CourseNumberInput'; import { UiView, UiViewProps } from '../UiView'; import { DirectToController } from './DirectToController'; import { DirectToStore } from './DirectToStore'; @@ -201,7 +201,7 @@ export abstract class DirectTo extends UiView - { digitValues[0].set(Math.floor(value / 10) * 10); @@ -216,7 +216,7 @@ export abstract class DirectTo extends UiView ones === 0 ? 37 : 36)} increment={1} scale={10} formatter={(value): string => value.toFixed().padStart(2, '0')} wrap /> tens === 360 ? 1 : 10)} increment={1} scale={1} wrap /> ° - + ); } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/FmsHEvent.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/FmsHEvent.ts index 963434123..e8e7acbbd 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/FmsHEvent.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/FmsHEvent.ts @@ -17,5 +17,50 @@ export enum FmsHEvent { JOYSTICK_UP = 'JoystickUp', JOYSTICK_RIGHT = 'JoystickRight', JOYSTICK_DOWN = 'JoystickDown', - CLR_LONG = 'ClrLong' -} \ No newline at end of file + CLR_LONG = 'ClrLong', + A = 'A', + B = 'B', + C = 'C', + D = 'D', + E = 'E', + F = 'F', + G = 'G', + H = 'H', + I = 'I', + J = 'J', + K = 'K', + L = 'L', + M = 'M', + N = 'N', + O = 'O', + P = 'P', + Q = 'Q', + R = 'R', + S = 'S', + T = 'T', + U = 'U', + V = 'V', + W = 'W', + X = 'X', + Y = 'Y', + Z = 'Z', + SPC = 'SPC', + D0 = '0', + D1 = '1', + D2 = '2', + D3 = '3', + D4 = '4', + D5 = '5', + D6 = '6', + D7 = '7', + D8 = '8', + D9 = '9', + Dot = 'Dot', + BKSP = 'BKSP', + PlusMinus = 'PlusMinus', + HOME = 'Home', + COM = 'Com', + NAV = 'Nav', + XPDR = 'Xpdr', + CRS = 'Crs', +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/G1000UiControl.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/G1000UiControl.tsx index 1b049ef62..121647d2b 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/G1000UiControl.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/G1000UiControl.tsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ import { FSComponent, HardwareControlListProps, HardwareUiControl, HardwareUiControlList, HardwareUiControlProps, UiControlEventHandler, UiControlEventHandlers, UiControlPropEventHandlers, VNode @@ -216,214 +217,1048 @@ export class G1000UiControl

public onJoystickDown(source: G1000UiControl): boolean { return this.props.onJoystickDown ? this.props.onJoystickDown(source) : false; } + + /** + * Handles the A key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onA(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.A); + } + + /** + * Handles the B key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onB(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.B); + } + + /** + * Handles the C key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onC(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.C); + } + + /** + * Handles the D key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onD(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D); + } + + /** + * Handles the E key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onE(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.E); + } + + /** + * Handles the F key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onF(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.F); + } + + /** + * Handles the G key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onG(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.G); + } + + /** + * Handles the H key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onH(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.H); + } + + /** + * Handles the I key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onI(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.I); + } + + /** + * Handles the J key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onJ(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.J); + } + + /** + * Handles the K key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onK(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.K); + } + + /** + * Handles the L key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onL(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.L); + } + + /** + * Handles the M key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onM(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.M); + } + + /** + * Handles the N key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onN(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.N); + } + + /** + * Handles the O key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onO(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.O); + } + + /** + * Handles the P key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onP(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.P); + } + + /** + * Handles the Q key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onQ(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Q); + } + + /** + * Handles the R key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onR(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.R); + } + + /** + * Handles the S key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onS(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.S); + } + + /** + * Handles the T key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onT(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.T); + } + + /** + * Handles the U key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onU(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.U); + } + + /** + * Handles the V key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onV(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.V); + } + + /** + * Handles the W key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onW(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.W); + } + + /** + * Handles the X key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onX(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.X); + } + + /** + * Handles the Y key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onY(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Y); + } + + /** + * Handles the Z key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onZ(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Z); + } + + /** + * Handles the key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onSPC(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.SPC); + } + + /** + * Handles the 0 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on0(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D0); + } + + /** + * Handles the 1 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on1(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D1); + } + + /** + * Handles the 2 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on2(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D2); + } + + /** + * Handles the 3 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on3(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D3); + } + + /** + * Handles the 4 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on4(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D4); + } + + /** + * Handles the 5 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on5(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D5); + } + + /** + * Handles the 6 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on6(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D6); + } + + /** + * Handles the 7 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on7(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D7); + } + + /** + * Handles the 8 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on8(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D8); + } + + /** + * Handles the 9 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on9(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D9); + } + + /** + * Handles the Dot key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onDot(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Dot); + } + + /** + * Handles the BKSP key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onBKSP(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.BKSP); + } + + /** + * Handles the +/- key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onPlusMinus(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.PlusMinus); + } + + /** + * Handles the Home key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onHome(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.HOME); + } + + /** + * Handles the COM key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onCom(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.COM); + } + + /** + * Handles the NAV key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onNav(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.NAV); + } + + /** + * Handles the XPDR key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onXpdr(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.XPDR); + } + + /** + * Handles the CRS key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onCrs(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.CRS); + } + + /** + * Consolidates all key events and allows sub classes to override and implement specific keyboard input behaviors. + * @param source The source of the event. + * @param evt FmsHEvent of the keyboard event. + * @returns always false for the top level version of the method. + */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + return false; + } + +} + +/** Properties on the GarminControlList component. */ +export interface GarminControlListProps extends UiControlPropEventHandlers, HardwareUiControlProps, HardwareControlListProps { } -/** Properties on the GarminControlList component. */ -export interface GarminControlListProps extends UiControlPropEventHandlers, HardwareUiControlProps, HardwareControlListProps { -} +/** + * A component that holds lists of G1000UiControls. + */ +export class G1000ControlList + extends HardwareUiControlList> + implements UiControlEventHandlers { + + /** @inheritdoc */ + public onInteractionEvent(evt: FmsHEvent): boolean { + switch (evt) { + case FmsHEvent.UPPER_INC: + if (this.props.innerKnobScroll) { + return this.scroll('forward'); + } + break; + case FmsHEvent.UPPER_DEC: + if (this.props.innerKnobScroll) { + return this.scroll('backward'); + } + break; + case FmsHEvent.LOWER_INC: + return this.scroll('forward'); + case FmsHEvent.LOWER_DEC: + return this.scroll('backward'); + } + + return this.triggerEvent(evt, this); + } + + /** + * Handles FMS upper knob increase events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onUpperKnobInc(source: G1000UiControl): boolean { + return this.props.onUpperKnobInc ? this.props.onUpperKnobInc(source) : false; + } + + /** + * Handles FMS upper knob decrease events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onUpperKnobDec(source: G1000UiControl): boolean { + return this.props.onUpperKnobDec ? this.props.onUpperKnobDec(source) : false; + } + + /** + * Handles FMS lower knob increase events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onLowerKnobInc(source: G1000UiControl): boolean { + return this.props.onLowerKnobInc ? this.props.onLowerKnobInc(source) : false; + } + + /** + * Handles FMS lower knob decrease events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onLowerKnobDec(source: G1000UiControl): boolean { + return this.props.onLowerKnobDec ? this.props.onLowerKnobDec(source) : false; + } + + /** + * Handles FMS upper knob push events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onUpperKnobPush(source: G1000UiControl): boolean { + return this.props.onUpperKnobPush ? this.props.onUpperKnobPush(source) : false; + } + + /** + * Handles MENU button press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onMenu(source: G1000UiControl): boolean { + return this.props.onMenu ? this.props.onMenu(source) : false; + } + + /** + * Handles ENTER button press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onEnter(source: G1000UiControl): boolean { + return this.props.onEnter ? this.props.onEnter(source) : false; + } + + /** + * Handles CLR button press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onClr(source: G1000UiControl): boolean { + return this.props.onClr ? this.props.onClr(source) : false; + } + + /** + * Handles CLR button long press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onClrLong(source: G1000UiControl): boolean { + return this.props.onClrLong ? this.props.onClrLong(source) : false; + } + + /** + * Handles DRCT button press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onDirectTo(source: G1000UiControl): boolean { + return this.props.onDirectTo ? this.props.onDirectTo(source) : false; + } + + /** + * Handles FPL button press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onFPL(source: G1000UiControl): boolean { + return this.props.onFPL ? this.props.onFPL(source) : false; + } + + /** + * Handles PROC button press events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onProc(source: G1000UiControl): boolean { + return this.props.onProc ? this.props.onProc(source) : false; + } + + /** + * Handles range joystick increase events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onRangeInc(source: G1000UiControl): boolean { + return this.props.onRangeInc ? this.props.onRangeInc(source) : false; + } + + /** + * Handles range joystick decrease events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onRangeDec(source: G1000UiControl): boolean { + return this.props.onRangeDec ? this.props.onRangeDec(source) : false; + } + + /** + * Handles range joystick push events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onJoystickPush(source: G1000UiControl): boolean { + return this.props.onJoystickPush ? this.props.onJoystickPush(source) : false; + } + + /** + * Handles range joystick left deflection events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onJoystickLeft(source: G1000UiControl): boolean { + return this.props.onJoystickLeft ? this.props.onJoystickLeft(source) : false; + } + + /** + * Handles range joystick up deflection events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onJoystickUp(source: G1000UiControl): boolean { + return this.props.onJoystickUp ? this.props.onJoystickUp(source) : false; + } + + /** + * Handles range joystick right deflection events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onJoystickRight(source: G1000UiControl): boolean { + return this.props.onJoystickRight ? this.props.onJoystickRight(source) : false; + } + + /** + * Handles range joystick down deflection events. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onJoystickDown(source: G1000UiControl): boolean { + return this.props.onJoystickDown ? this.props.onJoystickDown(source) : false; + } -/** - * A component that holds lists of G1000UiControls. - */ -export class G1000ControlList - extends HardwareUiControlList> - implements UiControlEventHandlers { + /** + * Handles the A key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onA(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.A); + } - /** @inheritdoc */ - public onInteractionEvent(evt: FmsHEvent): boolean { - switch (evt) { - case FmsHEvent.UPPER_INC: - if (this.props.innerKnobScroll) { - return this.scroll('forward'); - } - break; - case FmsHEvent.UPPER_DEC: - if (this.props.innerKnobScroll) { - return this.scroll('backward'); - } - break; - case FmsHEvent.LOWER_INC: - return this.scroll('forward'); - case FmsHEvent.LOWER_DEC: - return this.scroll('backward'); - } + /** + * Handles the B key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onB(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.B); + } - return this.triggerEvent(evt, this); + /** + * Handles the C key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onC(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.C); } /** - * Handles FMS upper knob increase events. + * Handles the D key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onUpperKnobInc(source: G1000UiControl): boolean { - return this.props.onUpperKnobInc ? this.props.onUpperKnobInc(source) : false; + public onD(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D); } /** - * Handles FMS upper knob decrease events. + * Handles the E key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onUpperKnobDec(source: G1000UiControl): boolean { - return this.props.onUpperKnobDec ? this.props.onUpperKnobDec(source) : false; + public onE(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.E); } /** - * Handles FMS lower knob increase events. + * Handles the F key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onLowerKnobInc(source: G1000UiControl): boolean { - return this.props.onLowerKnobInc ? this.props.onLowerKnobInc(source) : false; + public onF(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.F); } /** - * Handles FMS lower knob decrease events. + * Handles the G key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onLowerKnobDec(source: G1000UiControl): boolean { - return this.props.onLowerKnobDec ? this.props.onLowerKnobDec(source) : false; + public onG(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.G); } /** - * Handles FMS upper knob push events. + * Handles the H key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onUpperKnobPush(source: G1000UiControl): boolean { - return this.props.onUpperKnobPush ? this.props.onUpperKnobPush(source) : false; + public onH(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.H); } /** - * Handles MENU button press events. + * Handles the I key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onMenu(source: G1000UiControl): boolean { - return this.props.onMenu ? this.props.onMenu(source) : false; + public onI(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.I); } /** - * Handles ENTER button press events. + * Handles the J key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onEnter(source: G1000UiControl): boolean { - return this.props.onEnter ? this.props.onEnter(source) : false; + public onJ(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.J); } /** - * Handles CLR button press events. + * Handles the K key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onClr(source: G1000UiControl): boolean { - return this.props.onClr ? this.props.onClr(source) : false; + public onK(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.K); } /** - * Handles CLR button long press events. + * Handles the L key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onClrLong(source: G1000UiControl): boolean { - return this.props.onClrLong ? this.props.onClrLong(source) : false; + public onL(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.L); } /** - * Handles DRCT button press events. + * Handles the M key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onDirectTo(source: G1000UiControl): boolean { - return this.props.onDirectTo ? this.props.onDirectTo(source) : false; + public onM(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.M); } /** - * Handles FPL button press events. + * Handles the N key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onFPL(source: G1000UiControl): boolean { - return this.props.onFPL ? this.props.onFPL(source) : false; + public onN(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.N); } /** - * Handles PROC button press events. + * Handles the O key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onProc(source: G1000UiControl): boolean { - return this.props.onProc ? this.props.onProc(source) : false; + public onO(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.O); } /** - * Handles range joystick increase events. + * Handles the P key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onRangeInc(source: G1000UiControl): boolean { - return this.props.onRangeInc ? this.props.onRangeInc(source) : false; + public onP(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.P); } /** - * Handles range joystick decrease events. + * Handles the Q key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onRangeDec(source: G1000UiControl): boolean { - return this.props.onRangeDec ? this.props.onRangeDec(source) : false; + public onQ(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Q); } /** - * Handles range joystick push events. + * Handles the R key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onJoystickPush(source: G1000UiControl): boolean { - return this.props.onJoystickPush ? this.props.onJoystickPush(source) : false; + public onR(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.R); } /** - * Handles range joystick left deflection events. + * Handles the S key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onJoystickLeft(source: G1000UiControl): boolean { - return this.props.onJoystickLeft ? this.props.onJoystickLeft(source) : false; + public onS(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.S); } /** - * Handles range joystick up deflection events. + * Handles the T key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onJoystickUp(source: G1000UiControl): boolean { - return this.props.onJoystickUp ? this.props.onJoystickUp(source) : false; + public onT(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.T); } /** - * Handles range joystick right deflection events. + * Handles the U key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onJoystickRight(source: G1000UiControl): boolean { - return this.props.onJoystickRight ? this.props.onJoystickRight(source) : false; + public onU(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.U); } /** - * Handles range joystick down deflection events. + * Handles the V key. * @param source The source of the event. * @returns Whether the event was handled. */ - public onJoystickDown(source: G1000UiControl): boolean { - return this.props.onJoystickDown ? this.props.onJoystickDown(source) : false; + public onV(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.V); + } + + /** + * Handles the W key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onW(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.W); + } + + /** + * Handles the X key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onX(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.X); + } + + /** + * Handles the Y key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onY(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Y); + } + + /** + * Handles the Z key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onZ(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Z); + } + + /** + * Handles the key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onSPC(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.SPC); + } + + /** + * Handles the 0 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on0(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D0); + } + + /** + * Handles the 1 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on1(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D1); + } + + /** + * Handles the 2 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on2(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D2); + } + + /** + * Handles the 3 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on3(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D3); + } + + /** + * Handles the 4 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on4(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D4); + } + + /** + * Handles the 5 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on5(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D5); + } + + /** + * Handles the 6 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on6(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D6); + } + + /** + * Handles the 7 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on7(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D7); + } + + /** + * Handles the 8 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on8(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D8); + } + + /** + * Handles the 9 key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public on9(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.D9); + } + + /** + * Handles the Dot key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onDot(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.Dot); + } + + /** + * Handles the BKSP key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onBKSP(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.BKSP); + } + + /** + * Handles the +/- key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onPlusMinus(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.PlusMinus); + } + + /** + * Handles the Home key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onHome(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.HOME); + } + + /** + * Handles the COM key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onCom(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.COM); + } + + /** + * Handles the NAV key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onNav(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.NAV); + } + + /** + * Handles the XPDR key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onXpdr(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.XPDR); + } + + /** + * Handles the CRS key. + * @param source The source of the event. + * @returns Whether the event was handled. + */ + public onCrs(source: G1000UiControl): boolean { + return this.consolidateKeyboardHEvent(source, FmsHEvent.CRS); + } + + /** + * Consolidates all key events and allows sub classes to override and implement specific keyboard input behaviors. + * @param source The source of the event. + * @param evt FmsHEvent of the keyboard event. + * @returns always false for the top level version of the method. + */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + return false; } + + + /** @inheritdoc */ protected renderScrollbar(): VNode { return (); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/MFD/LeanMenu.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/MFD/LeanMenu.ts index 67b549be1..0e6104abd 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/MFD/LeanMenu.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/MFD/LeanMenu.ts @@ -11,7 +11,6 @@ import { SoftKeyMenu } from '../SoftKeyMenu'; export class LeanMenu extends SoftKeyMenu { private publisher: G1000ControlPublisher; private leanAssistActive = false; - private cylSlctActive = false; /** * Creates an instance of the MFD engine lean menu. diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/RootMenu.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/RootMenu.ts index 58ab3a57a..0580edd7c 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/RootMenu.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/RootMenu.ts @@ -1,11 +1,14 @@ -import { ComputedSubject, ConsumerSubject, ControlPublisher, EventBus, InstrumentEvents, LNavEvents, MappedSubject, NavEvents } from '@microsoft/msfs-sdk'; +import { + ComputedSubject, ConsumerSubject, ControlPublisher, DebounceTimer, EventBus, InstrumentEvents, LNavEvents, MappedSubject, NavEvents +} from '@microsoft/msfs-sdk'; import { GarminControlEvents, ObsSuspModes } from '@microsoft/msfs-garminsdk'; +import { G1000AlertsLevel, G1000CasEvents } from '../../../PFD/Components/FlightInstruments'; import { AlertMessageEvents } from '../../../PFD/Components/UI/Alerts/AlertsSubject'; import { G1000ControlPublisher } from '../../G1000Events'; -import { SoftKeyMenuSystem } from './SoftKeyMenuSystem'; import { SoftKeyMenu } from './SoftKeyMenu'; +import { SoftKeyMenuSystem } from './SoftKeyMenuSystem'; /** * The root PFD softkey menu. @@ -27,6 +30,8 @@ export class RootMenu extends SoftKeyMenu { }); private mfdPoweredOn = false; + private currentAlertsLevel = G1000AlertsLevel.None; + private readonly alertStylingDebounceTimer = new DebounceTimer(); /** * Creates an instance of the root PFD softkey menu. @@ -76,7 +81,7 @@ export class RootMenu extends SoftKeyMenu { g1000Publisher.publishEvent('pfd_alert_push', true); }, undefined, false); - const sub = bus.getSubscriber(); + const sub = bus.getSubscriber(); this.isLNavSuspended = ConsumerSubject.create(sub.on('lnav_is_suspended'), false); this.isObsActive = ConsumerSubject.create(sub.on('gps_obs_active'), false); @@ -134,6 +139,18 @@ export class RootMenu extends SoftKeyMenu { sub.on('alerts_available') .handle(available => this.getItem(11).highlighted.set(available)); + + sub.on('cas_unacknowledged_alerts_level').handle(v => { + this.currentAlertsLevel = v; + this.getItem(11).additionalClasses.clear(); + + //We have a debounce here so we can reset and re-add the CSS animations to restart + //their timing. This ensures that the Alerts button flashes in sync with any CAS + //alerts + if (!this.alertStylingDebounceTimer.isPending()) { + this.alertStylingDebounceTimer.schedule(this.updateAlertsStyle, 0); + } + }); } /** @@ -150,4 +167,30 @@ export class RootMenu extends SoftKeyMenu { }, 1000); } }; + + /** + * Updates the Alerts button style. + */ + private updateAlertsStyle = (): void => { + const item = this.getItem(11); + + switch (this.currentAlertsLevel) { + case G1000AlertsLevel.None: + item.label.set('Alerts'); + item.additionalClasses.clear(); + break; + case G1000AlertsLevel.Advisory: + item.label.set('Advisory'); + item.additionalClasses.set(['advisory']); + break; + case G1000AlertsLevel.Caution: + item.label.set('Caution'); + item.additionalClasses.set(['caution']); + break; + case G1000AlertsLevel.Warning: + item.label.set('Warning'); + item.additionalClasses.set(['warning']); + break; + } + }; } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.css index 292935a09..a80d249ee 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.css +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.css @@ -12,7 +12,7 @@ --value-color: cyan; } -.softkey-tab.text-disabled{ +.softkey-tab.text-disabled { --value-color: rgb(18, 95, 95); } @@ -21,6 +21,84 @@ color: black; } +@keyframes warning-softkey-animation { + 0% { + background: linear-gradient(to bottom, #ef3524 40%, #911); + color: white; + } + + 66% { + background: linear-gradient(to bottom, #ef3524 40%, #911); + color: white; + } + + 66.1% { + background: unset; + color: white; + } + + 99.9% { + background: unset; + color: white; + } +} + +@keyframes caution-softkey-animation { + 0% { + background: linear-gradient(to bottom, #df0 40%, #890); + color: black; + } + + 66% { + background: linear-gradient(to bottom, #df0 40%, #890); + color: black; + } + + 66.1% { + background: unset; + color: white; + } + + 99.9% { + background: unset; + color: white; + } +} + +@keyframes advisory-softkey-animation { + 0% { + background: rgb(160, 160, 160); + color: black; + } + + 66% { + background: rgb(160, 160, 160); + color: black; + } + + 66.1% { + background: unset; + color: white; + } + + 99.9% { + background: unset; + color: white; + } +} + +.softkey-tab.warning { + animation: warning-softkey-animation 1s linear 0s infinite normal; +} + +.softkey-tab.caution { + animation: caution-softkey-animation 1s linear 0s infinite normal; +} + +.softkey-tab.advisory { + animation: advisory-softkey-animation 1s linear 0s infinite normal; +} + .softkey-tab.pressed { background: linear-gradient(to top, #091429 60%, #1b303f 80%, #36576e); } @@ -42,7 +120,7 @@ .softkey-tab-borders { border-width: 1px; - border-image: linear-gradient( to bottom, #3f3f3f 0%, #080808 50%) 1 100%; + border-image: linear-gradient(to bottom, #3f3f3f 0%, #080808 50%) 1 100%; position: absolute; left: -1px; width: calc(100% + 2px); diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.tsx index 9a52057a0..35bf8b7fc 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKey.tsx @@ -1,4 +1,4 @@ -import { ComponentProps, DisplayComponent, FSComponent, NodeReference, VNode } from '@microsoft/msfs-sdk'; +import { ComponentProps, DisplayComponent, FSComponent, NodeReference, SetSubject, SubscribableSetEventType, VNode } from '@microsoft/msfs-sdk'; import { MenuItem, SoftKeyMenu } from './SoftKeyMenu'; @@ -22,6 +22,7 @@ export class SoftKey extends DisplayComponent { private readonly labelEl = new NodeReference(); private readonly indicatorEl = new NodeReference(); private readonly valueEl = new NodeReference(); + private readonly classList = SetSubject.create(['softkey-tab']); /** @inheritdoc */ onAfterRender(node: VNode): void { @@ -54,6 +55,9 @@ export class SoftKey extends DisplayComponent { this.setHighlighted(item.highlighted.get()); item.highlighted.sub(this.setHighlighted); + + item.additionalClasses.get().forEach(v => this.classList.add(v)); + item.additionalClasses.sub(this.setAdditionalClasses); } /** @@ -66,6 +70,8 @@ export class SoftKey extends DisplayComponent { item.pressed.off(this.setPressed); item.label.unsub(this.setLabel); item.highlighted.unsub(this.setHighlighted); + + item.additionalClasses.get().forEach(v => this.classList.delete(v)); } /** @@ -164,9 +170,23 @@ export class SoftKey extends DisplayComponent { */ private setHighlighted = (isHighlighted: boolean): void => { if (isHighlighted) { - this.rootEl.instance.classList.add('highlighted'); + this.classList.add('highlighted'); + } else { + this.classList.delete('highlighted'); + } + }; + + /** + * Sets additional classes on the soft key item. + * @param set The full current set of additional classes. + * @param type The type of event. + * @param key The key that was changed. + */ + private setAdditionalClasses = (set: ReadonlySet, type: SubscribableSetEventType, key: string): void => { + if (type === SubscribableSetEventType.Added) { + this.classList.add(key); } else { - this.rootEl.instance.classList.remove('highlighted'); + this.classList.delete(key); } }; @@ -176,7 +196,7 @@ export class SoftKey extends DisplayComponent { */ public render(): VNode { return ( -

+
diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKeyMenu.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKeyMenu.ts index 882444e58..069169ea4 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKeyMenu.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/SoftKeyMenu.ts @@ -1,4 +1,4 @@ -import { SubEvent, Subject } from '@microsoft/msfs-sdk'; +import { SetSubject, SubEvent, Subject } from '@microsoft/msfs-sdk'; import { SoftKeyMenuSystem } from './SoftKeyMenuSystem'; @@ -24,6 +24,9 @@ export interface MenuItem { /** Whether or not the menu item is highlighted. */ highlighted: Subject; + + /** Additional CSS classes to add to the menu item display. */ + additionalClasses: SetSubject; } /** @@ -58,7 +61,8 @@ export class SoftKeyMenu { value: Subject.create(value), pressed: new SubEvent(), disabled: Subject.create(handler === undefined || disabled), - highlighted: Subject.create(false) + highlighted: Subject.create(false), + additionalClasses: SetSubject.create() }; } @@ -116,6 +120,7 @@ export class SoftKeyMenu { disabled: Subject.create(true), pressed: new SubEvent(), value: Subject.create(undefined), - highlighted: Subject.create(false) + highlighted: Subject.create(false), + additionalClasses: SetSubject.create() }; } \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRCodeMenu.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRCodeMenu.ts index 643155aa0..69eae6182 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRCodeMenu.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRCodeMenu.ts @@ -8,7 +8,7 @@ import { SoftKeyMenu } from './SoftKeyMenu'; * The XPDR softkey menu. */ export class XPDRCodeMenu extends SoftKeyMenu { - + public xpdrCodeMenuActive = false; /** * Creates an instance of the transponder code menu. @@ -16,7 +16,7 @@ export class XPDRCodeMenu extends SoftKeyMenu { * @param bus is the event bus * @param g1000Publisher the G1000 control events publisher */ - constructor(menuSystem: SoftKeyMenuSystem, bus: EventBus, g1000Publisher: G1000ControlPublisher) { + constructor(menuSystem: SoftKeyMenuSystem, bus: EventBus, private readonly g1000Publisher: G1000ControlPublisher) { super(menuSystem); this.addItem(0, '0', () => { @@ -64,7 +64,11 @@ export class XPDRCodeMenu extends SoftKeyMenu { private onNewCodeFromSim(bus: EventBus, menuSystem: SoftKeyMenuSystem): void { const controlPublisher = bus.getSubscriber(); controlPublisher.on('publish_xpdr_code_1').handle(() => { - menuSystem.back(); + if (this.xpdrCodeMenuActive) { + this.xpdrCodeMenuActive = false; + this.g1000Publisher.publishEvent('xpdr_code_push', false); + menuSystem.back(); + } }); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRMenu.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRMenu.ts index deab332d7..efb4d1f01 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRMenu.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/Menus/XPDRMenu.ts @@ -3,6 +3,7 @@ import { ControlPublisher, EventBus, Subject, XPDRMode, XPDRSimVarEvents } from import { G1000ControlPublisher } from '../../G1000Events'; import { SoftKeyMenuSystem } from './SoftKeyMenuSystem'; import { SoftKeyMenu } from './SoftKeyMenu'; +import { XPDRCodeMenu } from './XPDRCodeMenu'; /** * The XPDR softkey menu. @@ -40,6 +41,8 @@ export class XPDRMenu extends SoftKeyMenu { controlPublisher.publishEvent('publish_xpdr_code_1', this.getVfrCode()); }, this.isVfr.get()); this.addItem(7, 'Code', () => { + const xpdrCodeMenu = this.menuSystem.getMenu('xpdr-code') as XPDRCodeMenu; + xpdrCodeMenu.xpdrCodeMenuActive = true; menuSystem.pushMenu('xpdr-code'); g1000Publisher.publishEvent('xpdr_code_push', true); }, false); @@ -97,4 +100,4 @@ export class XPDRMenu extends SoftKeyMenu { return 7000; } } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/ArrowToggle.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/ArrowToggle.tsx index 31d55e693..c162893a6 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/ArrowToggle.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/ArrowToggle.tsx @@ -1,4 +1,7 @@ -import { ArraySubject, ComponentProps, ComputedSubject, DisplayComponent, EventBus, FSComponent, Subject, SubscribableArrayEventType, VNode } from '@microsoft/msfs-sdk'; +import { + ArraySubject, ComponentProps, ComputedSubject, DisplayComponent, EventBus, FSComponent, MutableSubscribable, Subject, + SubscribableArrayEventType, VNode +} from '@microsoft/msfs-sdk'; import { UiControl, UiControlProps } from '../UiControl'; @@ -15,7 +18,7 @@ interface ArrowToggleComponentProps extends UiControlProps { onOptionSelected?(optionIndex: number): void; /** Data binding for the selected option */ - dataref?: Subject; + dataref?: MutableSubscribable; } /** diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/InputComponent.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/InputComponent.tsx index c7c77f72b..e2d14a18f 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/InputComponent.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/InputComponent.tsx @@ -1,13 +1,18 @@ -import { FSComponent, Subject, VNode } from '@microsoft/msfs-sdk'; +import { EventBus, FSComponent, Subject, VNode } from '@microsoft/msfs-sdk'; import { UiControl, UiControlProps } from '../UiControl'; import './InputComponent.css'; +import { ControlPadKeyOperations, ControlpadHEventHandler } from '../../Input/ControlpadHEventHandler'; +import { FmsHEvent } from '../FmsHEvent'; /** * @interface InputComponentProps */ interface InputComponentProps extends UiControlProps { + /** The event bus */ + bus: EventBus; + /** The max char length of this input field. */ maxLength: number; @@ -24,7 +29,7 @@ export class InputComponent extends UiControl { private readonly inputValueContainerRef = FSComponent.createRef(); private readonly selectedSpanRef = FSComponent.createRef(); - private keyboardInputHandler = this.handleTextboxInput.bind(this); + private readonly keyboardInputHandler = this.handleTextboxInput.bind(this); private readonly dataEntry = { text: '', @@ -39,9 +44,39 @@ export class InputComponent extends UiControl { private isKeyboardActive = false; private inputCharacterIndex = 0; private previousValue = ''; - private readonly inputId = this.genGuid(); + /** @inheritdoc */ + public onInteractionEvent(evt: FmsHEvent): boolean { + let isHandled = false; + const keyInputEvaluationResult = ControlpadHEventHandler.evaluateKeyboardInput(evt); + switch (keyInputEvaluationResult.KeyboardOperation) { + case ControlPadKeyOperations.InsertCharacter: + // Insert a character received from the controlPad keyboard. + if (!this.getIsActivated()) { + this.activate(); + } + if (keyInputEvaluationResult.ReceivedKey !== null) { + this.updateDataEntryElement(keyInputEvaluationResult.ReceivedKey); + this.dataEntry.highlightIndex++; + isHandled = true; + } + break; + + case ControlPadKeyOperations.ApplyBackSpace: + // Handle backspace keys received from the controlPad keyboard. + this.leftDeleteCharacter(); + isHandled = true; + break; + + default: + // For all other events we pass the event on: + isHandled = super.onInteractionEvent(evt); + break; + } + return isHandled; + } + /** * Method to set the initial text value when the component is made active. * @param value is a string containing the start text value @@ -139,6 +174,39 @@ export class InputComponent extends UiControl { this.dataEntry.afterSelected.set(afterText); } + /** + * Method to delete the character to the left of the selected index in the entry field (bkspc function). + * @param [emitEvent] A boolean indicating if a text changed event should be emitted. + */ + private leftDeleteCharacter(emitEvent = true): void { + if (this.dataEntry.highlightIndex !== undefined) { + const newSelectedIndex = Math.max(0, this.dataEntry.highlightIndex - 1); + + const text = this.dataEntry.text; + const blankFill = this.props.maxLength - this.dataEntry.highlightIndex; + + const beforeText = text.substr(0, newSelectedIndex); + const newSelectedChar = '_'; + const afterText = ''.padStart(blankFill, '_'); + + this.dataEntry.text = beforeText + newSelectedChar + afterText; + + if (emitEvent) { + this.props.onTextChanged(this.dataEntry.text.replace(/_/g, ' ').trim()); + } + + // We move the index one to the left and fetch the new selected char: + if (this.dataEntry.highlightIndex > 0) { + this.dataEntry.highlightIndex--; + } + + this.dataEntry.beforeSelected.set(beforeText); + this.dataEntry.selected.set(newSelectedChar); + this.dataEntry.afterSelected.set(afterText); + } + } + + /** * Handles the input from the hidden textbox */ @@ -219,6 +287,7 @@ export class InputComponent extends UiControl { * Method to handle on input blur */ private onInputBlur = (): void => { + ControlpadHEventHandler.clearPrefetchedCharacter(); this.textBoxRef.instance.disabled = true; this.textBoxRef.instance.value = ''; Coherent.off('SetInputTextFromOS', this.setValueFromOS); @@ -284,6 +353,7 @@ export class InputComponent extends UiControl { /** @inheritdoc */ public onEnter(): boolean { + ControlpadHEventHandler.clearPrefetchedCharacter(); if (this.getIsActivated()) { this.deactivate(); if (this.props.onEnter) { @@ -300,6 +370,7 @@ export class InputComponent extends UiControl { /** @inheritdoc */ public onClr(): boolean { + ControlpadHEventHandler.clearPrefetchedCharacter(); if (this.getIsActivated()) { this.setText(this.previousValue); this.deactivate(); @@ -324,8 +395,24 @@ export class InputComponent extends UiControl { this.textBoxRef.instance.onblur = this.onInputBlur; this.textBoxRef.instance.blur(); - // Make sure we deactivate ourselves if we lose focus. - this.focusSubject.sub((v, rv) => { !rv && this.isActivated && this.deactivate(); }); + this.focusSubject.sub((v, rv) => { + // Make sure we deactivate ourselves if we lose focus. + if (!rv && this.isActivated) { + this.deactivate(); + ControlpadHEventHandler.clearPrefetchedCharacter(); + } else if (rv === true) { + // In case the component has focus, check for the existences of a prefetched character: + const prefetchedCharacter = ControlpadHEventHandler.getPrefetchedCharacter(); + if (prefetchedCharacter !== undefined) { + this.dataEntry.highlightIndex = 0; + if (!this.getIsActivated()) { + this.activate(); + } + this.updateDataEntryElement(prefetchedCharacter, true); + this.dataEntry.highlightIndex++; + } + } + }); } /** @inheritdoc */ diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/NumberInput.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/NumberInput.tsx index 023b7095f..8b0c2d7ab 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/NumberInput.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/NumberInput.tsx @@ -1,4 +1,4 @@ -import { FSComponent, Subject, VNode } from '@microsoft/msfs-sdk'; +import { FSComponent, MutableSubscribable, Subject, VNode } from '@microsoft/msfs-sdk'; import { UiControl, UiControlProps } from '../UiControl'; @@ -17,7 +17,7 @@ interface NumberInputProps extends UiControlProps { /** Whether to wrap values from maxValue to minValue and vice versa. */ wrap: boolean; /** The value to increment or decrement with each inner knob input. */ - dataSubject: Subject; + dataSubject: MutableSubscribable; /** The optional default text value for when the dataSubject = 0. */ defaultDisplayValue?: string; /** An optional formatter for the display value */ diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/SelectControl.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/SelectControl.tsx index c2b6507a2..97f2fefa7 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/SelectControl.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/SelectControl.tsx @@ -164,4 +164,4 @@ export class SelectControl extends UiControl> { ); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/WaypointInput.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/WaypointInput.tsx index e1cbd3bcd..1c6b31e44 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/WaypointInput.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UIControls/WaypointInput.tsx @@ -90,7 +90,7 @@ export class WaypointInput extends UiControlGroup { public render(): VNode { return (
-
{this.store.displayWaypoint.city}
diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.css b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.css new file mode 100644 index 000000000..5d479c180 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.css @@ -0,0 +1,27 @@ +.arrow-control { + position: relative; + display: flex; + align-items: baseline; + flex-direction: row; +} + +.arrow-control-arrow { + height: var(--arrow-control-arrow-height, 0.75em); + transform-origin: 50% 50%; + transform: scale(var(--arrow-control-arrow-scale, 0.85)); + fill: rgb(50, 50, 50); +} + +.arrow-control-arrow.arrow-control-arrow-enabled { + fill: rgb(0, 255, 0); +} + +.arrow-control-value { + color: var(--arrow-control-value-color, cyan); + margin-left: 4px; + margin-right: 4px; +} + +.arrow-control-value.highlight-active { + color: black; +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.tsx new file mode 100644 index 000000000..e8a40e45b --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/ArrowControl.tsx @@ -0,0 +1,201 @@ +import { DebounceTimer, FSComponent, MutableSubscribable, Subscribable, SubscribableUtils, VNode } from '@microsoft/msfs-sdk'; + +import { G1000UiControl, G1000UiControlProps } from '../G1000UiControl'; + +import './ArrowControl.css'; + +/** + * Base component props for ArrowControl. + */ +interface BaseArrowControlProps extends G1000UiControlProps { + /** The options that can be selected using the control. */ + options: Iterable; + + /** + * A function which renders selected values. If not defined, then selected values will be rendered using the default + * `toString()` method. + */ + renderValue?: (value: T) => string; + + /** + * The duration, in milliseconds, of the applied solid highlight when the control is focused or edited. Defaults to + * 1000. + */ + solidHighlightDuration?: number; + + /** CSS class(es) to apply to the root of the component. */ + class?: string; +} + +/** + * Component props for a ArrowControl that is bound to a subscribable value. + */ +interface SubscribableArrowControlProps extends BaseArrowControlProps { + /** The value to bind to the control. */ + value: Subscribable; + + /** + * A function which is called when a user selects an option using the control. + */ + onOptionSelected: (option: T) => void; +} + +/** + * Component props for a ArrowControl that is bound to a mutable subscribable value. + */ +interface MutableSubscribableArrowControlProps extends BaseArrowControlProps { + /** The value to bind to the control. */ + value: MutableSubscribable; + + /** + * A function which is called when a user selects an option using the control. If not defined, then the selected + * value will be written to the mutable subscribable bound to the control. + */ + onOptionSelected?: (option: T) => void; +} + +/** + * Component props for ArrowControl. + */ +export type ArrowControlProps = SubscribableArrowControlProps | MutableSubscribableArrowControlProps; + +/** + * A control which allows the user to select a value by scrolling left and right through a virtual list of options. + * The control displays the currently selected value and arrows to the left and right that depict whether the user can + * scroll left and/or right. + */ +export class ArrowControl extends G1000UiControl> { + private static readonly DEFAULT_SOLID_HIGHLIGHT_DURATION = 1000; // milliseconds + + private readonly valueRef = FSComponent.createRef(); + + private readonly options = Array.from(this.props.options); + private readonly selectedIndex = this.props.value.map(value => this.options.indexOf(value)); + + private readonly selectedValueDisplay = this.props.value.map(value => { + return this.props.renderValue ? this.props.renderValue(value) : `${value}`; + }); + + protected readonly solidHighlightTimer = new DebounceTimer(); + + /** @inheritDoc */ + protected onFocused(source: G1000UiControl): void { + super.onFocused(source); + + this.applySolidHighlight(this.props.solidHighlightDuration ?? ArrowControl.DEFAULT_SOLID_HIGHLIGHT_DURATION); + } + + /** @inheritDoc */ + protected onBlurred(source: G1000UiControl): void { + super.onBlurred(source); + + this.valueRef.instance.classList.remove('highlight-active'); + this.valueRef.instance.classList.remove('highlight-select'); + this.solidHighlightTimer.clear(); + } + + /** @inheritDoc */ + protected onEnabled(source: G1000UiControl): void { + super.onEnabled(source); + + this.valueRef.instance.classList.remove('input-disabled'); + } + + /** @inheritDoc */ + protected onDisabled(source: G1000UiControl): void { + super.onDisabled(source); + + this.valueRef.instance.classList.add('input-disabled'); + } + + /** + * Applies a solid highlight to this control's value display. + * @param duration The duration, in milliseconds, of the highlight. + */ + protected applySolidHighlight(duration: number): void { + this.valueRef.instance.classList.remove('highlight-select'); + this.valueRef.instance.classList.add('highlight-active'); + + this.solidHighlightTimer.schedule(() => { + this.valueRef.instance.classList.remove('highlight-active'); + if (this.isFocused) { + this.valueRef.instance.classList.add('highlight-select'); + } + }, duration); + } + + /** @inheritDoc */ + public onUpperKnobInc(): boolean { + this.changeOption(1); + return true; + } + + /** @inheritDoc */ + public onUpperKnobDec(): boolean { + this.changeOption(-1); + return true; + } + + /** + * Changes this control's selected option. + * @param direction The direction in which to change the selected option. + */ + private changeOption(direction: 1 | -1): void { + if (this.options.length > 0) { + let index = this.selectedIndex.get(); + + if (index < 0) { + index = direction === 1 ? -1 : this.options.length; + } + + const newIndex = index + direction; + if (newIndex >= 0 && newIndex < this.options.length) { + const selected = this.options[newIndex]; + + if (this.props.onOptionSelected) { + this.props.onOptionSelected(selected); + } else if (SubscribableUtils.isMutableSubscribable(this.props.value)) { + this.props.value.set(selected); + } + } + } + + this.applySolidHighlight(this.props.solidHighlightDuration ?? ArrowControl.DEFAULT_SOLID_HIGHLIGHT_DURATION); + } + + /** @inheritDoc */ + public render(): VNode { + return ( +
+ index < 0 || index > 0) + }} + > + + +
{this.selectedValueDisplay}
+ index < this.options.length - 1) + }} + > + + +
+ ); + } + + /** @inheritDoc */ + public destroy(): void { + this.solidHighlightTimer.clear(); + this.selectedIndex.destroy(); + this.selectedValueDisplay.destroy(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/CourseNumberInput.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/CourseNumberInput.tsx new file mode 100644 index 000000000..7d35e634a --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/CourseNumberInput.tsx @@ -0,0 +1,58 @@ +import { FocusPosition } from '@microsoft/msfs-sdk'; + +import { GenericNumberInput } from './GenericNumberInput'; + +/** + * A component for course number inputs. + * A variation of {@link GenericNumberInput} that is used for course inputs. + * Differs from {@link GenericNumberInput} in the keypad entry logic. + **/ +export class CourseNumberInput extends GenericNumberInput { + /** @inheritDoc */ + protected handleDigitInput(digit: number): void { + if (!this.isEditing) { + this.activateEditing(undefined, FocusPosition.First); + this.inputValue = digit * 10; + this.digitValues[0].set(digit * 10); + this.digitValues[1].set(0); + // if we entered a number that couldn't be a valid first digit of a course, we scroll to the second input + if (digit > 3) { + this.inputGroupRef.instance.scroll('forward'); + } + } else { + const focusedIndex = this.inputGroupRef.instance.getFocusedIndex(); + if (focusedIndex < 1) { + // the first input is a double digit input, + // so if its scaled value is 30 or less, if the value would be valid as the first digit of a course, + // we can set the current value to the hundreds place and set the digit as the tens place + // and scroll to the next input + const currentDigitValue = this.digitValues[0].get(); + if ((currentDigitValue === 30 && digit <= 6) || currentDigitValue < 30) { + this.digitValues[0].set((this.digitValues[0].get() + digit) * 10); + this.inputGroupRef.instance.scroll('forward'); + } else { // we reset the value the digit value + this.digitValues[0].set(digit * 10); + this.inputValue = digit * 10 + this.digitValues[1].get(); + // if we entered a number that couldn't be a valid first digit of a course, we scroll to the second input + if (digit > 3) { + this.inputGroupRef.instance.scroll('forward'); + } + } + } else { + // when editing the last digit: + // if current value starts with 36, if we enter a number that's not zero, we need to set the first digit to 0 + // and the second digit to the number we entered + // otherwise, we just set the second digit to the number we entered + if (this.digitValues[0].get() === 360 && digit !== 0) { + this.digitValues[0].set(0); + this.digitValues[1].set(digit); + } else { + this.digitValues[1].set(digit); + } + this.inputValue = this.digitValues[0].get() + digit; + this.deactivateEditing(true); + } + } + } + +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/G1000UiControlWrapper.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/G1000UiControlWrapper.tsx index 821ea01dc..e76f5feda 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/G1000UiControlWrapper.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/G1000UiControlWrapper.tsx @@ -1,7 +1,7 @@ import { FocusPosition, FSComponent, VNode } from '@microsoft/msfs-sdk'; import { FmsHEvent } from '../FmsHEvent'; -import { G1000UiControl } from '../G1000UiControl'; +import { G1000ControlList, G1000UiControl } from '../G1000UiControl'; import { EntryDirection, UiControlGroup } from '../UiControlGroup'; /** @@ -14,7 +14,7 @@ export class G1000UiControlWrapper extends UiControlGroup { /** @inheritdoc */ public onAfterRender(thisNode: VNode): void { FSComponent.visitNodes(thisNode, (node) => { - if (node.instance instanceof G1000UiControl) { + if (node.instance instanceof G1000UiControl || node.instance instanceof G1000ControlList) { this.control = node.instance; return true; } diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/GenericNumberInput.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/GenericNumberInput.tsx index a3ba5ce39..364d75c14 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/GenericNumberInput.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/GenericNumberInput.tsx @@ -53,6 +53,9 @@ export interface GenericNumberInputProps extends G1000UiControlProps { /** CSS class(es) to apply to the root of the component. */ class?: string; + + /** Whether keyboard entry should be disabled. */ + keyboardEntryDisabled?: boolean; } /** @@ -64,15 +67,15 @@ export class GenericNumberInput extends G1000UiControl private static readonly DEFAULT_SOLID_HIGHLIGHT_DURATION = 1000; // milliseconds private readonly rootRef = FSComponent.createRef(); - private readonly inputGroupRef = FSComponent.createRef(); + protected readonly inputGroupRef = FSComponent.createRef(); private readonly activeRef = FSComponent.createRef(); private readonly inactiveRef = FSComponent.createRef(); - private readonly signValues: Subject<1 | -1>[] = []; - private readonly digitValues: Subject[] = []; + protected readonly signValues: Subject<1 | -1>[] = []; + protected readonly digitValues: Subject[] = []; - private isEditing = false; - private inputValue = 0; + protected isEditing = false; + protected inputValue = 0; private renderedInactiveValue: string | VNode | null = null; private readonly solidHighlightTimer = new DebounceTimer(); @@ -268,11 +271,88 @@ export class GenericNumberInput extends G1000UiControl return handled || !!(this.props.onClr && this.props.onClr(source)); } + /** + * Consolidates a keyboard event into a digit input event. + * @param source The source of the event. + * @param evt The event. + * @returns Whether the event was handled. + */ + public consolidateKeyboardHEvent(source: G1000UiControl, evt: FmsHEvent): boolean { + const digit = parseInt(evt); + if (isNaN(digit)) { + return false; + } + + if (this.props.keyboardEntryDisabled) { + return true; + } + + this.handleDigitInput(digit); + return true; + } + + /** + * Responds to a digit input event. + * @param digit The digit that was input. + */ + protected handleDigitInput(digit: number): void { + if (!this.isEditing) { + this.activateEditing(undefined, FocusPosition.Last); + this.inputValue = digit; + this.digitValues.forEach((value, index) => { + if (index === this.digitValues.length - 1) { + value.set(digit); + } else { + value.set(0); + } + }); + } else { + const focusedIndex = this.inputGroupRef.instance.getFocusedIndex(); + if (focusedIndex < this.digitValues.length - 1) { + // subtract the scaled value of the old digit from the total value and add the scaled value of the new digit + // to keep the input value up-to-date + this.inputValue = this.inputValue + - this.calculateScaledValue(this.digitValues[focusedIndex].get(), focusedIndex, this.digitValues.length) + + this.calculateScaledValue(digit, focusedIndex, this.digitValues.length); + this.digitValues[focusedIndex].set(this.calculateScaledValue(digit, focusedIndex, this.digitValues.length)); + this.inputGroupRef.instance.scroll('forward'); + } else { + // if the current value already uses all digits, only reset the last digit + if (this.inputValue > (10 ** (this.digitValues.length - 1))) { + this.digitValues[focusedIndex].set(this.calculateScaledValue(digit, focusedIndex, this.digitValues.length)); + } else { + // otherwise, shift all digits to the left and add the digit to the value + this.inputValue = this.inputValue * 10 + digit; + this.digitValues.forEach((value, index) => { + // set the digit to the value of the input if it's the last digit, otherwise set it to the next digit's current value + if (index === this.digitValues.length - 1) { + value.set(digit); + } else { + value.set(this.digitValues[index + 1].get() * 10); + } + }); + } + } + } + } + + /** + * Calculates the scaled value of a digit. + * @param digit The digit. + * @param index The index of the digit. + * @param length The total number of digits. + * @returns The scaled value of the digit. + */ + protected calculateScaledValue(digit: number, index: number, length: number): number { + return digit * (10 ** (length - index - 1)); + } + /** * Activates editing for this component. * @param activatingEvent The event that triggered activation of editing, if any. + * @param focusPosition The position to focus when editing is activated. Defaults to First. */ - private activateEditing(activatingEvent?: FmsHEvent.UPPER_INC | FmsHEvent.UPPER_DEC): void { + protected activateEditing(activatingEvent?: FmsHEvent.UPPER_INC | FmsHEvent.UPPER_DEC, focusPosition?: FocusPosition): void { if (this.isEditing) { return; } @@ -285,7 +365,7 @@ export class GenericNumberInput extends G1000UiControl this.activeRef.instance.style.display = ''; this.inputGroupRef.instance.setDisabled(false); - this.inputGroupRef.instance.focus(FocusPosition.First); + this.inputGroupRef.instance.focus(focusPosition ?? FocusPosition.First); if (activatingEvent !== undefined && this.props.editOnActivate) { this.inputGroupRef.instance.onInteractionEvent(activatingEvent); @@ -298,7 +378,7 @@ export class GenericNumberInput extends G1000UiControl * Deactivates editing for this component. * @param saveValue Whether to save the current edited input value to this component's bound value. */ - private deactivateEditing(saveValue: boolean): void { + protected deactivateEditing(saveValue: boolean): void { if (!this.isEditing) { return; } @@ -363,4 +443,4 @@ export class GenericNumberInput extends G1000UiControl this.digitValues.forEach(value => value.unsub(this.inputChangedHandler)); this.cleanUpRenderedInactiveValue(); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/TimeNumberInput.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/TimeNumberInput.tsx new file mode 100644 index 000000000..a11051780 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/TimeNumberInput.tsx @@ -0,0 +1,59 @@ +import { FocusPosition, UnitType } from '@microsoft/msfs-sdk'; + +import { GenericNumberInput } from './GenericNumberInput'; + +/** + * A component for time number inputs. + * A variation of {@link GenericNumberInput} that is used for time inputs. + * Differs from {@link GenericNumberInput} in the keypad entry logic. + **/ +export class TimeNumberInput extends GenericNumberInput { + private static readonly HR_TO_MS = UnitType.HOUR.convertTo(1, UnitType.MILLISECOND); + private static readonly MIN_TO_MS = UnitType.MINUTE.convertTo(1, UnitType.MILLISECOND); + + /** @inheritDoc */ + protected handleDigitInput(digit: number): void { + if (!this.isEditing) { + this.activateEditing(undefined, FocusPosition.First); + if (this.signValues.length > 0) { + // if we have a sign value, we need to scroll to the first digit input (assuming that any sign values are first) + this.inputGroupRef.instance.setFocusedIndex(this.signValues.length + (digit > 2 ? 1 : 0)); + } + this.digitValues[0].set(digit * TimeNumberInput.HR_TO_MS); + this.digitValues[1].set(0); + this.digitValues[2].set(0); + } else { + const focusedIndex = this.inputGroupRef.instance.getFocusedIndex(); + if (focusedIndex <= 1) { + // sign input or hours input + // if the sign is focused, we treat the digit input as hours input and set focus there + if (focusedIndex === 0) { + this.inputGroupRef.instance.setFocusedIndex(this.signValues.length); + } + // the hour input is a double-digit input, max value 23 + // if the current value is 1 or 2, we insert the input as the second digit of this value + const hoursValue = this.digitValues[0].get() / TimeNumberInput.HR_TO_MS; + if (hoursValue < 2 || hoursValue < 3 && digit < 4) { + this.digitValues[0].set((hoursValue * 10 + digit) * TimeNumberInput.HR_TO_MS); + this.inputGroupRef.instance.scroll('forward'); + } else { + this.digitValues[0].set(digit * TimeNumberInput.HR_TO_MS); + if (digit > 2) { + this.inputGroupRef.instance.scroll('forward'); + } + } + } else if (focusedIndex === 2) { + // minutes tens input + if (digit < 6) { + this.digitValues[1].set(digit * 10 * TimeNumberInput.MIN_TO_MS); + this.inputGroupRef.instance.scroll('forward'); + } + } else { + // minutes ones input + this.digitValues[2].set(digit * TimeNumberInput.MIN_TO_MS); + this.deactivateEditing(true); + } + this.inputValue = this.digitValues[0].get() + this.digitValues[1].get() + this.digitValues[2].get(); + } + } +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/index.ts index 323d041a5..e5a32854a 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/index.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UiControls2/index.ts @@ -1,5 +1,8 @@ +export * from './ArrowControl'; +export * from './CourseNumberInput'; export * from './DigitInput'; export * from './G1000UiControlWrapper'; export * from './GenericNumberInput'; export * from './SelectControl'; export * from './SignInput'; +export * from './TimeNumberInput'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UserSettings/UserSettingSelectControl.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UserSettings/UserSettingSelectControl.tsx index 3115288cb..635e7b4f3 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UserSettings/UserSettingSelectControl.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/UserSettings/UserSettingSelectControl.tsx @@ -89,4 +89,4 @@ export class UserSettingSelectControl< /> ); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/ViewService.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/ViewService.ts index 30e251d5f..31d9039fe 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/ViewService.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/ViewService.ts @@ -1,5 +1,6 @@ import { EventBus, FSComponent, HEvent, NodeReference, Subject, Subscribable, VNode } from '@microsoft/msfs-sdk'; +import { ControlpadInputController } from './Controllers/ControlpadInputController'; import { FmsHEvent } from './FmsHEvent'; import { UiPage } from './UiPage'; import { UiView } from './UiView'; @@ -17,7 +18,6 @@ type ViewEntry = { * A service to manage views. */ export abstract class ViewService { - private readonly registeredViews: Map VNode> = new Map(); private readonly refsMap: Map = new Map(); @@ -59,14 +59,17 @@ export abstract class ViewService { /** * Routes the HEvents to the views. * @param hEvent The event identifier. + * @returns whether the event was handled */ - protected onInteractionEvent(hEvent: string): void { - // console.log(hEvent); - - const evt = this.fmsEventMap.get(hEvent); + protected onInteractionEvent(hEvent: string): boolean { + let evt = ControlpadInputController.controlPadEventMap.get(hEvent); + if (evt === undefined) { + evt = this.fmsEventMap.get(hEvent); + } if (evt !== undefined) { - this.routeInteractionEventToViews(evt); + return this.routeInteractionEventToViews(evt); } + return false; } /** @@ -80,7 +83,6 @@ export abstract class ViewService { if (activeView) { return activeView.processHEvent(evt); } - return false; } @@ -265,4 +267,4 @@ export abstract class ViewService { this.openViews.length = 0; } } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/WptInfo/WptInfo.tsx b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/WptInfo/WptInfo.tsx index 209640d9f..371cbc088 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/WptInfo/WptInfo.tsx +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/UI/WptInfo/WptInfo.tsx @@ -97,6 +97,7 @@ export abstract class WptInfo extends UiV protected onViewClosed(): void { this.planePosConsumer.off(this.planePosHandler); this.planeHeadingConsumer.off(this.planeHeadingHandler); + this.inputSelectedIcao.set(''); // Clean up the icao subject, otherwise the subject's subscriptions are notified when the view opens the next time. } /** diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Units/UnitsUserSettings.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Units/UnitsUserSettings.ts index b9a5c689a..bff64b43b 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Units/UnitsUserSettings.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/Units/UnitsUserSettings.ts @@ -5,5 +5,5 @@ import { export { UnitsAltitudeSettingMode, UnitsDistanceSettingMode, UnitsNavAngleSettingMode, UnitsTemperatureSettingMode, - UnitsUserSettings, UnitsUserSettingManager, type UnitsUserSettingTypes, UnitsWeightSettingMode + UnitsUserSettings, type UnitsUserSettingManager, type UnitsUserSettingTypes, UnitsWeightSettingMode }; \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeed.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeed.ts new file mode 100644 index 000000000..3881c3787 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeed.ts @@ -0,0 +1,44 @@ +/** + * A definition for a reference V-speed. + */ +export type VSpeedDefinition = { + /** The name of the V-speed. */ + readonly name: string; + + /** The default value of the V-speed, in knots. */ + readonly defaultValue: number; + + /** The label text to display for the V-speed in the TimerRef menu. */ + readonly label: string; +} + +/** + * Base type for V-speed groups. + */ +export type VSpeedGroup = { + /** This group's name. */ + readonly name: string; + + /** Definitions for each reference V-speed contained in this group. */ + readonly vSpeedDefinitions: readonly VSpeedDefinition[]; +}; + +/** + * Keys for reference V-speed values derived from aircraft configuration files. + */ +export enum VSpeedValueKey { + StallLanding = 'VS0', + StallCruise = 'VS1', + FlapsExtended = 'VFe', + NeverExceed = 'VNe', + NormalOperation = 'VNo', + Minimum = 'VMin', + Maximum = 'VMax', + Rotation = 'Vr', + BestClimbAngle = 'Vx', + BestClimbRate = 'Vy', + Approach = 'Vapp', + BestGlide = 'BestGlide', + BestClimbRateSingleEngine = 'Vyse', + MinimumControl = 'Vmc' +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedConfig.ts new file mode 100644 index 000000000..513b8c4c4 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedConfig.ts @@ -0,0 +1,61 @@ +import { ResolvableConfig } from '../Config/Config'; +import { VSpeedDefinition, VSpeedValueKey } from './VSpeed'; + +/** + * A configuration object which defines a reference V-speed. + */ +export class VSpeedConfig implements ResolvableConfig { + public readonly isResolvableConfig = true; + + /** The name of this config's reference V-speed. */ + public readonly name: string; + + /** The default value of this config's reference V-speed. */ + public readonly defaultValue: number | VSpeedValueKey; + + /** The label text of this config's reference V-speed. */ + public readonly label: string; + + /** + * Creates a new VSpeedConfig from a configuration document element. + * @param element A configuration document element. + */ + public constructor(element: Element) { + if (element.tagName !== 'VSpeed') { + throw new Error(`Invalid VSpeedConfig definition: expected tag name 'VSpeed' but was '${element.tagName}'`); + } + + const name = element.getAttribute('name'); + if (name === null) { + throw new Error('Invalid VSpeedConfig definition: undefined name'); + } + this.name = name; + + const value = element.textContent; + if (value === null) { + throw new Error('Invalid VSpeedConfig definition: undefined value'); + } + + const numberValue = Number(value); + if (!isNaN(numberValue)) { + this.defaultValue = numberValue < 1 ? -1 : Math.round(numberValue); + } else if (Object.values(VSpeedValueKey).includes(value as any)) { + this.defaultValue = value as VSpeedValueKey; + } else { + throw new Error(`Invalid VSpeedConfig definition: unrecognized value ${value} (value must be a number or a valid reference speed key)`); + } + + this.label = element.getAttribute('label') ?? `V${name}`; + } + + /** @inheritdoc */ + public resolve(): VSpeedDefinition { + return { + name: this.name, + defaultValue: typeof this.defaultValue === 'number' + ? this.defaultValue + : Math.round(Simplane.getDesignSpeeds()[this.defaultValue]), + label: this.label + }; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedGroupConfig.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedGroupConfig.ts new file mode 100644 index 000000000..496cc79ed --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedGroupConfig.ts @@ -0,0 +1,47 @@ +import { ResolvableConfig } from '../Config/Config'; +import { VSpeedDefinition, VSpeedGroup } from './VSpeed'; +import { VSpeedConfig } from './VSpeedConfig'; + +/** + * A configuration object which defines an airspeed tape color range. + */ +export class VSpeedGroupConfig implements ResolvableConfig { + /** @inheritdoc */ + public readonly isResolvableConfig = true; + + /** The name of the group defined by this configuration object. */ + public readonly name: string; + + /** The V-speeds included in the group defined by this configuration object. */ + public readonly vSpeedDefinitions: readonly VSpeedDefinition[]; + + /** + * Creates a new VSpeedGroupConfig from a configuration document element. + * @param element A configuration document element. + */ + constructor(element: Element) { + if (element.tagName !== 'Group') { + throw new Error(`Invalid VSpeedGroupConfig definition: expected tag name 'Group' but was '${element.tagName}'`); + } + + this.name = element.getAttribute('name') ?? ''; + + const children = Array.from(element.querySelectorAll(':scope>VSpeed')); + this.vSpeedDefinitions = children.map(child => { + try { + return new VSpeedConfig(child).resolve(); + } catch (e) { + console.warn(e); + return null; + } + }).filter(val => val !== null) as VSpeedDefinition[]; + } + + /** @inheritdoc */ + public resolve(): VSpeedGroup { + return { + name: this.name, + vSpeedDefinitions: Array.from(this.vSpeedDefinitions) + }; + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedUserSettings.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedUserSettings.ts new file mode 100644 index 000000000..f94de207f --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/VSpeedUserSettings.ts @@ -0,0 +1,87 @@ +import { + Consumer, DefaultUserSettingManager, EventBus, UserSetting, UserSettingDefinition, UserSettingManager, + UserSettingMap, UserSettingRecord, UserSettingValue +} from '@microsoft/msfs-sdk'; + +import { VSpeedUserSettingTypes } from '@microsoft/msfs-garminsdk'; +import { VSpeedGroup } from './VSpeed'; + +/** + * A manager for reference V-speed user settings. + */ +export class VSpeedUserSettingManager implements UserSettingManager { + /** An map of groups (keyed on group type) containing the reference V-speeds for which this manager contains settings. */ + public readonly vSpeedGroups: ReadonlyMap; + + private readonly manager: DefaultUserSettingManager; + + /** + * Creates a new instance of VSpeedUserSettingManager. + * @param bus The event bus. + * @param vSpeedGroups Definitions for each reference V-speed for which to create settings, organized into groups. + */ + public constructor(bus: EventBus, vSpeedGroups: ReadonlyMap) { + const groupsCopy = new Map(); + const settingDefs: UserSettingDefinition[] = []; + + for (const group of vSpeedGroups.values()) { + groupsCopy.set(group.name, { + name: group.name, + vSpeedDefinitions: Array.from(group.vSpeedDefinitions) + }); + + for (const vSpeed of group.vSpeedDefinitions) { + settingDefs.push( + { + name: `vSpeedShow_${vSpeed.name}`, + defaultValue: true + }, + { + name: `vSpeedDefaultValue_${vSpeed.name}`, + defaultValue: vSpeed.defaultValue + }, + { + name: `vSpeedUserValue_${vSpeed.name}`, + defaultValue: -1 + }, + { + name: `vSpeedFmsValue_${vSpeed.name}`, + defaultValue: -1 + }, + { + name: `vSpeedFmsConfigMiscompare_${vSpeed.name}`, + defaultValue: false + } + ); + } + } + + this.vSpeedGroups = groupsCopy; + this.manager = new DefaultUserSettingManager(bus, settingDefs); + } + + /** @inheritdoc */ + public tryGetSetting(name: K): K extends keyof VSpeedUserSettingTypes ? UserSetting : undefined { + return this.manager.tryGetSetting(name) as any; + } + + /** @inheritdoc */ + public getSetting(name: K): UserSetting> { + return this.manager.getSetting(name); + } + + /** @inheritdoc */ + public whenSettingChanged(name: K): Consumer> { + return this.manager.whenSettingChanged(name); + } + + /** @inheritdoc */ + public getAllSettings(): UserSetting[] { + return this.manager.getAllSettings(); + } + + /** @inheritdoc */ + public mapTo(map: UserSettingMap): UserSettingManager { + return this.manager.mapTo(map); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/index.ts new file mode 100644 index 000000000..633b10219 --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/VSpeed/index.ts @@ -0,0 +1,3 @@ +export * from './VSpeed'; +export * from './VSpeedConfig'; +export * from './VSpeedUserSettings'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/index.ts b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/index.ts index e3dd16996..50bfac701 100644 --- a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/index.ts +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/Shared/index.ts @@ -1,5 +1,6 @@ export * from './Autopilot'; export * from './Backlight'; +export * from './Config'; export * from './DateTime'; export * from './Input'; export * from './Instruments'; @@ -11,9 +12,12 @@ export * from './Systems'; export * from './Traffic'; export * from './UI'; export * from './Units'; +export * from './VSpeed'; + export * from './FlightPlanAsoboSync'; export * from './FuelComputer'; export * from './G1000Events'; +export * from './G1000PfdPlugin'; export * from './G1000Plugin'; export * from './NavComConfig'; export * from './NavProcessorConfig'; diff --git a/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/package.json b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/package.json new file mode 100644 index 000000000..a1994f86a --- /dev/null +++ b/src/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/package.json @@ -0,0 +1,18 @@ +{ + "name": "@microsoft/msfs-wtg1000", + "version": "1.2.2", + "description": "Garmin G1000 NXi", + "main": "../html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/index.ts", + "scripts": {}, + "repository": { + "type": "git", + "url": "https://workingtitlesim@dev.azure.com/workingtitlesim/KittyHawk/_git/ProjectGolf" + }, + "author": "Working Title Simulations, LLC", + "license": "Modified MIT", + "devDependencies": { + "@microsoft/msfs-sdk": "*", + "@microsoft/msfs-types": "*", + "@microsoft/msfs-garminsdk": "*" + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g1000/package.json b/src/workingtitle-instruments-g1000/package.json index 26510916b..d01bf0d08 100644 --- a/src/workingtitle-instruments-g1000/package.json +++ b/src/workingtitle-instruments-g1000/package.json @@ -1,6 +1,6 @@ { "name": "workingtitle-instruments-g1000", - "version": "1.2.7", + "version": "1.3.3", "description": "Working Title Garmin G1000 NXi", "main": "index.ts", "scripts": { @@ -28,4 +28,4 @@ "rollup-plugin-import-css": "^3.1.0", "typescript": "4.5.5" } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-g1000/rollup-defs.config.js b/src/workingtitle-instruments-g1000/rollup-defs.config.js deleted file mode 100644 index b7e9b34f7..000000000 --- a/src/workingtitle-instruments-g1000/rollup-defs.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import dts from 'rollup-plugin-dts' -import css from 'rollup-plugin-import-css'; -import resolve from '@rollup/plugin-node-resolve'; - -const config = [ - { - input: 'build/workingtitle-instruments-g1000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG1000/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'es' }], - plugins: [dts(), resolve(), css({ output: 'ignoreme.css' })], - } -] -export default config \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Assets/Fonts/DejaVuSans-SemiBold.ttf b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Assets/Fonts/DejaVuSans-SemiBold.ttf index 037389173c31394f7d9d4cd8915c00c845283c17..a95e6e903ba20cc41c8e7a6741c002a2cbd13585 100644 GIT binary patch delta 18544 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 U^8@cfz0Lnu9A{WY)Ij6^0JK?|Jpcdz delta 18578 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 + + /** The character index to initially select with the cursor when editing is activated. Defaults to `0`. */ + initialEditIndex?: number; + + /** + * A function or {@link VNode} which renders the input's value when editing is not active. If defined, the rendered + * inactive value replaces all rendered child components when editing is not active. + */ + renderInactiveValue?: VNode | ((value: string) => string | VNode); + + /** CSS class(es) to apply to the root of the component. */ + class?: string | SubscribableSet | ToggleableClassNameRecord; +} + +/** + * An input with a scrolling cursor that allows users to select an arbitrary string. The composite value bound to the + * input is derived from the in-order concatenation of the values of all child `CharInputSlot` components. + */ +export class CharInput extends DisplayComponent { + private static readonly LAST_NON_EMPTY_SLOT_INDEX = (lastIndex: number, value: string, index: number): number => value !== '' ? index : lastIndex; + + private readonly inputRef = FSComponent.createRef>>(); + + private readonly value = Subject.create(''); + + private readonly slots: CharInputSlot[] = []; + + // eslint-disable-next-line jsdoc/require-returns + /** The index of the character position currently selected by this input's cursor. */ + public get cursorPosition(): Subscribable { + return this.inputRef.instance.cursorPosition; + } + + // eslint-disable-next-line jsdoc/require-returns + /** Whether editing is active for this input. */ + public get isEditingActive(): Subscribable { + return this.inputRef.instance.isEditingActive; + } + + // eslint-disable-next-line jsdoc/require-returns + /** Whether this input's cursor selection mode is per-slot. */ + public get isSelectionPerSlot(): Subscribable { + return this.inputRef.instance.isSelectionPerSlot; + } + + private isInit = false; + + private valuePipeOut?: Subscription; + + /** @inheritdoc */ + public onAfterRender(thisNode: VNode): void { + FSComponent.visitNodes(thisNode, node => { + if (node.instance instanceof CharInputSlot) { + this.slots.push(node.instance); + return true; + } + + return false; + }); + + this.valuePipeOut = this.value.pipe(this.props.value); + + MappedSubject.create( + values => values.reduce(CharInput.LAST_NON_EMPTY_SLOT_INDEX, -1), + ...this.slots.map(slot => slot.value) + ).sub(this.updateAllowEmptySlotValues.bind(this), true); + + this.isInit = true; + } + + /** + * Updates whether each of this input's slots should allow empty values. + * @param lastNonEmptySlotIndex The index of the last slot with a non-empty value. + */ + private updateAllowEmptySlotValues(lastNonEmptySlotIndex: number): void { + for (let i = 0; i < this.slots.length; i++) { + this.slots[i].setAllowEmptyValue(i >= lastNonEmptySlotIndex); + } + } + + /** + * Checks whether this input is initialized. + * @returns Whether this input is initialized. + */ + public isInitialized(): boolean { + return this.isInit; + } + + /** + * Sets the composite value of this input. As part of the operation, all of this input's child slots will have their + * values set according to this input's value digitizer, and all slot characters will be set to non-null + * representations of their slot's value, if possible. The composite value of this input after the operation is + * complete may differ from the requested value depending on whether the requested value can be accurately + * represented by this input. + * @param value The new composite value. + * @returns The composite value of this input after the operation is complete. + * @throws Error if this input is not initialized. + */ + public setValue(value: string): string { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + return this.inputRef.instance.setValue(value); + } + + /** + * Activates editing for this input. + * @param isSelectionPerSlot Whether cursor selection should be initialized to per-slot mode. If `false`, cursor + * selection will be initialized to per-character mode instead. + * @throws Error if this input is not initialized. + */ + public activateEditing(isSelectionPerSlot: boolean): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + this.inputRef.instance.activateEditing(isSelectionPerSlot); + } + + /** + * Deactivates editing for this input. + * @throws Error if this input is not initialized. + */ + public deactivateEditing(): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + this.inputRef.instance.deactivateEditing(); + } + + /** + * Moves the cursor. + * @param direction The direction in which to move (`1` = to the right, `-1` = to the left). + * @param forceSelectionPerSlot Whether to force cursor selection to per slot mode. + * @throws Error if this input is not initialized. + */ + public moveCursor(direction: 1 | -1, forceSelectionPerSlot: boolean): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + // Do not allow the cursor to move to the right of any slots that have null or empty string values. + if (direction === 1) { + // All slots are guaranteed to only have one character, so character position is the same as slot index. + const cursorPosition = this.inputRef.instance.cursorPosition.get(); + for (let i = cursorPosition; i >= 0; i--) { + if (!this.slots[i].value.get()) { + return; + } + } + } + + this.inputRef.instance.moveCursor(direction, forceSelectionPerSlot); + } + + /** + * Places the cursor at a specific character position. + * @param index The index of the character position at which to place the cursor. + * @param forceSelectionPerSlot Whether to force cursor selection to per slot mode. + * @throws Error if this input is not initialized. + * @throws RangeError if `index` does not point to a valid character position. + */ + public placeCursor(index: number, forceSelectionPerSlot: boolean): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + this.inputRef.instance.placeCursor(index, forceSelectionPerSlot); + } + + /** + * Increments or decrements the value of the slot currently selected by the cursor. If editing is not active, then it + * will be activated instead of changing any slot value. If cursor selection is in per-character mode, it will be + * forced to per-slot mode. If the cursor is past the last slot, then this method does nothing. + * @param direction The direction in which to change the slot value (`1` = increment, `-1` = decrement). + * @param eraseCharsToRightOnEdit Whether to erase (set to `null`) all characters to the right of the edited + * character. Defaults to `false`. + * @throws Error if this input is not initialized. + */ + public changeSlotValue(direction: 1 | -1, eraseCharsToRightOnEdit = false): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + const wasChanged = this.inputRef.instance.changeSlotValue(direction); + + if (wasChanged && eraseCharsToRightOnEdit) { + const cursorPosition = this.inputRef.instance.cursorPosition.get(); + + for (let i = this.slots.length - 1; i > cursorPosition; i--) { + this.slots[i].setChar(null); + } + } + } + + /** + * Sets the value of the slot character currently selected by the cursor. If editing is not active, then it will be + * activated before setting the value. If the cursor is past the last slot, then this method does nothing. + * @param value The value to set. + * @param eraseCharsToRightOnEdit Whether to erase (set to `null`) all characters to the right of the edited + * character. Defaults to `false`. + * @throws Error if this input is not initialized. + */ + public setSlotCharacterValue(value: string, eraseCharsToRightOnEdit = false): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + const wasChanged = this.inputRef.instance.setSlotCharacterValue(value); + + if (wasChanged && eraseCharsToRightOnEdit) { + // All slots are guaranteed to only have one character, so character position is the same as slot index. + const cursorPosition = this.inputRef.instance.cursorPosition.get(); + // Setting the slot character value will move the cursor one position to the right, so we need to empty all slots + // from the end to the current cursor position, inclusive. + for (let i = this.slots.length - 1; i >= cursorPosition; i--) { + this.slots[i].setChar(null); + } + } + } + + /** + * Removes the character at the cursor's current position and shifts the cursor one position to the left after the + * character is removed. + * @throws Error if this input is not initialized. + */ + public backspace(): void { + if (!this.isInitialized()) { + throw new Error('CharInput: attempted to manipulate input before it was initialized'); + } + + this.inputRef.instance.backspace(); + } + + /** + * Populates all of this input's character positions with non-empty values, if possible, using this input's value + * digitizer function and the current composite value as a template. + */ + public populateCharsFromValue(): void { + this.inputRef.getOrDefault()?.populateCharsFromValue(); + } + + /** + * Refreshes this input, updating the size and position of the cursor. + */ + public refresh(): void { + this.inputRef.getOrDefault()?.refresh(); + } + + /** + * Parses a composite value from this input's individual slots. + * @returns The composite value represented by this input's individual slots. + */ + private parseValue(): string { + return this.slots.reduce((prev, curr) => prev + curr.value.get(), ''); + } + + /** + * Digitizes a composite value into individual slot values to assign to this input's slots. + * @param value The value to digitize. + */ + private digitizeValue(value: string): void { + for (let i = 0; i < this.slots.length; i++) { + const char = value[i]; + if (char) { + this.slots[i].setChar(char); + } else { + this.slots[i].setChar(null); + } + } + } + + /** @inheritdoc */ + public render(): VNode { + return ( + + {this.props.children} + + ); + } + + /** @inheritdoc */ + public destroy(): void { + this.inputRef.getOrDefault()?.destroy(); + + this.valuePipeOut?.destroy(); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/CharInputSlot.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/CharInputSlot.tsx new file mode 100644 index 000000000..a0e178a34 --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/CharInputSlot.tsx @@ -0,0 +1,267 @@ +import { + ComponentProps, DisplayComponent, FSComponent, MutableSubscribable, SetSubject, Subscribable, + SubscribableSet, SubscribableUtils, Subscription, ToggleableClassNameRecord, VNode, +} from '@microsoft/msfs-sdk'; + +import { GenericCursorInputSlot } from '../CursorInput/CursorInputSlot'; + +/** + * Component props for CharInputSlot. + */ +export interface CharInputSlotProps extends ComponentProps { + /** + * An array of valid character values for the slot. The order of characters in the array determines the order in + * which the slot will cycle through characters when incrementing/decrementing its value. + */ + charArray: readonly string[]; + + /** + * Whether the slot should wrap from the last valid character to the first valid character and vice-versa when + * incrementing/decrementing its value. + */ + wrap: boolean | Subscribable; + + /** The default character value for the slot when the character value is `null`. */ + defaultCharValue: string | Subscribable; + + /** + * A function which renders slot characters into string. If not defined, non-null characters will be rendered as-is, + * and null characters will be rendered according to the default value assigned to that character. + */ + renderChar?: (character: string | null, index: number) => string; + + /** CSS class(es) to apply to the slot's root element. */ + class?: string | SubscribableSet | ToggleableClassNameRecord; +} + +/** + * A cursor input slot which allows the user to select a single arbitrary character. + */ +export class CharInputSlot extends DisplayComponent { + private static readonly RESERVED_CSS_CLASSES = ['char-input-slot']; + + private readonly slotRef = FSComponent.createRef>(); + + private readonly defaultCharValue = SubscribableUtils.toSubscribable(this.props.defaultCharValue, true); + + private readonly parseValue = (characters: readonly (string | null)[]): string => { + return characters[0] ?? ''; + }; + + private readonly digitizeValue = (value: string, setCharacters: readonly ((char: string | null) => void)[]): void => { + if (value === '' || !this.props.charArray.includes(value)) { + setCharacters[0](null); + } else { + setCharacters[0](value); + } + }; + + private readonly renderChar = this.props.renderChar ?? ( + (character: string | null): string => { + const characterToRender = character === null ? this.defaultCharValue.get() : character; + return characterToRender === '' + ? '_' + : characterToRender === '0' + ? '0̸' + : characterToRender; + } + ); + + private readonly wrap = SubscribableUtils.toSubscribable(this.props.wrap, true); + + // eslint-disable-next-line jsdoc/require-returns + /** The value bound to this slot. */ + public get value(): Subscribable { + return this.slotRef.instance.value; + } + + private allowEmptyValue = true; + + private readonly subscriptions: Subscription[] = []; + + /** @inheritdoc */ + public onAfterRender(): void { + this.subscriptions.push( + this.defaultCharValue.sub(() => { + this.slotRef.instance.refreshFromChars(); + }, true) + ); + } + + /** + * Sets whether this slot should allow its value to be set to the empty string. Disallowing empty string values will + * not cause this slot's current value to change, even if the current value is the empty string. + * @param allow Whether this slot should allow its value to be set to the empty string. + */ + public setAllowEmptyValue(allow: boolean): void { + this.allowEmptyValue = allow; + } + + /** + * Sets the value of this slot. As part of the operation, this slot's character will be set to a non-null + * representation of the new value, if possible. The value of this slot after the operation is complete may differ + * from the requested value depending on whether the requested value can be accurately represented by this slot. + * @param value The new value. + * @returns The value of this slot after the operation is complete. + */ + public setValue(value: string): string { + return this.slotRef.instance.setValue(value); + } + + /** + * Increments this slot's value. + * @returns Whether the increment operation was accepted. + */ + public incrementValue(): boolean { + return this.slotRef.instance.incrementValue(); + } + + /** + * Decrements this slot's value. + * @returns Whether the decrement operation was accepted. + */ + public decrementValue(): boolean { + return this.slotRef.instance.decrementValue(); + } + + /** + * Sets the value of this slot's character. + * @param char The value to set. + * @param force Whether to force the character to accept a value that would normally be invalid. Defaults to `false`. + * @returns Whether the operation was accepted. + */ + public setChar(char: string | null, force?: boolean): boolean { + return this.slotRef.instance.setChar(0, char, force); + } + + /** + * Changes this slot's value in a specified direction. + * @param direction The direction in which to change the value. + * @param value This slot's current value. + * @param setValue A function which sets this slot's value. + * @returns Whether the value was successfully changed. + */ + private changeValue(direction: 1 | -1, value: string, setValue: (value: string) => void): boolean { + if (this.props.charArray.length === 0) { + return false; + } + + let currentIndex = this.props.charArray.indexOf(value); + + if (currentIndex < 0) { + currentIndex = direction === 1 ? -1 : this.props.charArray.length; + } + + let newIndex: number | undefined = undefined; + + for (let i = 0; i < this.props.charArray.length; i++) { + currentIndex += direction; + + if (currentIndex < 0 || currentIndex >= this.props.charArray.length) { + if (this.wrap.get()) { + if (currentIndex < 0) { + currentIndex = this.props.charArray.length - 1; + } else { + currentIndex = 0; + } + } else { + break; + } + } + + if (this.allowEmptyValue || this.props.charArray[currentIndex] !== '') { + newIndex = currentIndex; + break; + } + } + + if (newIndex !== undefined) { + setValue(this.props.charArray[newIndex]); + return true; + } else { + return false; + } + } + + /** + * Sets the value of one of this slot's characters. + * @param characters An array of characters. + * @param index The index of the character to set. + * @param charToSet The value to set. + * @param force Whether to force the character to accept a value that would normally be invalid. Defaults to `false`. + * @returns Whether the operation was accepted. + */ + private _setChar(characters: readonly MutableSubscribable[], index: number, charToSet: string | null, force?: boolean): boolean { + if (this.canSetChar(index, charToSet, force)) { + characters[index].set(charToSet); + return true; + } else { + return false; + } + } + + /** + * Checks whether one of this slot's characters can be set to a given value. + * @param index The index of the character to set. + * @param character The value to set. + * @param force Whether the character should accept a value that would normally be invalid. + * @returns Whether the specified character can be set to the specified value. + */ + private canSetChar(index: number, character: string | null, force?: boolean): boolean { + if (character === null || force) { + return true; + } + + return this.props.charArray.includes(character) && (this.allowEmptyValue || character !== ''); + } + + /** @inheritdoc */ + public render(): VNode { + let cssClass: string | SetSubject; + + if (typeof this.props.class === 'object') { + cssClass = SetSubject.create(); + cssClass.add('char-input-slot'); + + const sub = FSComponent.bindCssClassSet(cssClass, this.props.class, CharInputSlot.RESERVED_CSS_CLASSES); + if (Array.isArray(sub)) { + this.subscriptions.push(...sub); + } else { + this.subscriptions.push(sub); + } + } else { + cssClass = 'char-input-slot'; + + if (this.props.class !== undefined && this.props.class.length > 0) { + cssClass += ' ' + FSComponent.parseCssClassesFromString(this.props.class, classToAdd => !CharInputSlot.RESERVED_CSS_CLASSES.includes(classToAdd)).join(' '); + } + } + + return ( + + ref={this.slotRef} + allowBackfill={false} + characterCount={1} + parseValue={this.parseValue} + digitizeValue={this.digitizeValue} + renderChar={this.renderChar} + incrementValue={this.changeValue.bind(this, 1)} + decrementValue={this.changeValue.bind(this, -1)} + setChar={this._setChar.bind(this)} + canSetChar={(characters, index, charToSet, force): boolean => this.canSetChar(index, charToSet, force)} + class={cssClass} + /> + ); + } + + /** @inheritdoc */ + public destroy(): void { + this.slotRef.getOrDefault()?.destroy(); + + for (const sub of this.subscriptions) { + sub.destroy(); + } + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/index.ts b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/index.ts new file mode 100644 index 000000000..2918ced69 --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CharInput/index.ts @@ -0,0 +1,2 @@ +export * from './CharInput'; +export * from './CharInputSlot'; \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.css index 703f8074a..4cb07b0a6 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.css +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.css @@ -18,6 +18,7 @@ html { } .cursor-input { + position: relative; background: var(--cursor-input-background); border-radius: var(--cursor-input-border-radius); line-height: var(--cursor-input-slots-line-height); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.tsx index 782e86a6f..1a65ce789 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInput.tsx @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { ComponentProps, DebounceTimer, DisplayComponent, FSComponent, MappedSubject, MappedSubscribable, MathUtils, MutableSubscribable, ObjectSubject, - SetSubject, Subject, Subscribable, SubscribableSet, SubscribableType, SubscribableUtils, Subscription, VNode + SetSubject, Subject, Subscribable, SubscribableSet, SubscribableType, SubscribableUtils, Subscription, ToggleableClassNameRecord, VNode } from '@microsoft/msfs-sdk'; import { CursorInputSlot } from './CursorInputSlot'; @@ -73,7 +73,7 @@ export interface CursorInputProps> extends Co renderInactiveValue?: VNode | ((value: SubscribableType) => string | VNode); /** CSS class(es) to apply to the component's root element. */ - class?: string | SubscribableSet; + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** @@ -170,7 +170,7 @@ export class CursorInput> extends DisplayComp private isInit = false; - private cssClassSub?: Subscription; + private cssClassSub?: Subscription | Subscription[]; private valuePipeOut?: Subscription; private inactiveValueSub?: Subscription; @@ -587,16 +587,17 @@ export class CursorInput> extends DisplayComp * will be activated instead of changing any slot value. If cursor selection is in per-character mode, it will be * forced to per-slot mode. If the cursor is past the last slot, this method does nothing. * @param direction The direction in which to change the slot value (`1` = increment, `-1` = decrement). + * @returns Whether the value of the slot was changed. * @throws Error if this input is not initialized. */ - public changeSlotValue(direction: 1 | -1): void { + public changeSlotValue(direction: 1 | -1): boolean { if (!this.isInitialized()) { throw new Error('CursorInput: attempted to manipulate input before it was initialized'); } if (!this._isEditingActive.get()) { this.activateEditing(true); - return; + return false; } this._isSelectionPerSlot.set(true); @@ -606,14 +607,14 @@ export class CursorInput> extends DisplayComp const cursorPosition = this._cursorPosition.get(); if (cursorPosition >= this.charPositions.length) { - return; + return false; } const slot = this.charPositions[cursorPosition].slot; if (direction === 1) { - slot.incrementValue(); + return slot.incrementValue(); } else { - slot.decrementValue(); + return slot.decrementValue(); } } @@ -1006,7 +1007,16 @@ export class CursorInput> extends DisplayComp this.cleanUpRenderedInactiveValue(); - this.cssClassSub?.destroy(); + if (this.cssClassSub) { + if (Array.isArray(this.cssClassSub)) { + for (const sub of this.cssClassSub) { + sub.destroy(); + } + } else { + this.cssClassSub.destroy(); + } + } + this.valuePipeOut?.destroy(); this.inactiveValueSub?.destroy(); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.css index 52052b3e3..52d5debc9 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.css +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.css @@ -4,6 +4,7 @@ justify-content: flex-start; align-items: baseline; color: var(--g3000-color-cyan); + white-space: pre; } @keyframes cursor-input-slot-blink { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.tsx index 287a437ba..e55191b12 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/CursorInput/CursorInputSlot.tsx @@ -1,6 +1,6 @@ import { ComponentProps, DisplayComponent, FSComponent, MappedSubject, MutableSubscribable, SetSubject, Subject, - Subscribable, SubscribableSet, SubscribableUtils, Subscription, VNode + Subscribable, SubscribableSet, SubscribableUtils, Subscription, ToggleableClassNameRecord, VNode } from '@microsoft/msfs-sdk'; import './CursorInputSlot.css'; @@ -244,7 +244,7 @@ export interface GenericCursorInputSlotProps extends ComponentProps { canSetChar: (characters: readonly (string | null)[], index: number, charToSet: string | null, force: boolean) => boolean; /** CSS class(es) to apply to the component's root element. */ - class?: string | SubscribableSet; + class?: string | SubscribableSet | ToggleableClassNameRecord; } /** @@ -290,7 +290,7 @@ export class GenericCursorInputSlot protected readonly setValueFunc = this.setValue.bind(this); - private cssClassSub?: Subscription; + private cssClassSub?: Subscription | Subscription[]; /** @inheritdoc */ public onAfterRender(): void { @@ -482,6 +482,16 @@ export class GenericCursorInputSlot /** @inheritdoc */ public destroy(): void { - this.cssClassSub?.destroy(); + if (this.cssClassSub) { + if (Array.isArray(this.cssClassSub)) { + for (const sub of this.cssClassSub) { + sub.destroy(); + } + } else { + this.cssClassSub.destroy(); + } + } + + super.destroy(); } } \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.css new file mode 100644 index 000000000..71d62bc1f --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.css @@ -0,0 +1,191 @@ +.keyboard-container { + position: relative; +} + +.gtc-horizontal .keyboard-container { + width: 867px; + height: 675px; + font-size: 55px; + + --keyboard-numpad-top: 138px; + + --keyboard-row-gap: 15px; + --keyboard-column-gap: 24px; + + --keyboard-numpad-group-left: 222px; + + --keyboard-numpad-space-key-right: 3px; + + --keyboard-button-width: 124px; + --keyboard-button-wide-width: 198px; + --keyboard-button-height: 123px; + + --keyboard-space-key-font-size: 45px; + + --keyboard-backspace-font-size: 32px; + --keyboard-backspace-icon-left: 45px; + --keyboard-backspace-icon-top: 68px; + --keyboard-backspace-icon-width: 95px; + --keyboard-backspace-label-top: 25px; + + --keyboard-find-font-size: 34px; + --keyboard-find-icon-left: 8px; + --keyboard-find-icon-top: 10px; + --keyboard-find-icon-width: 90px; + --keyboard-find-label-top: 75px; +} + +.gtc-vertical .keyboard-container { + width: 467px; + height: 362px; + font-size: 28px; + + --keyboard-numpad-top: 74px; + + --keyboard-row-gap: 8px; + --keyboard-column-gap: 13px; + + --keyboard-numpad-group-left: 120px; + + --keyboard-numpad-space-key-right: 0px; + + --keyboard-button-width: 67px; + --keyboard-button-wide-width: 107px; + --keyboard-button-height: 66px; + + --keyboard-space-key-font-size: 25px; + + --keyboard-backspace-font-size: 17px; + --keyboard-backspace-icon-left: 23px; + --keyboard-backspace-icon-top: 36px; + --keyboard-backspace-icon-width: 50px; + --keyboard-backspace-label-top: 13px; + + --keyboard-find-font-size: 18px; + --keyboard-find-icon-left: 3px; + --keyboard-find-icon-top: 4px; + --keyboard-find-icon-width: 50px; + --keyboard-find-label-top: 41px; +} + +.keyboard-container-mode { + position: absolute; + left: 0px; + width: 100%; + display: flex; + flex-flow: column nowrap; + pointer-events: none; +} + +.keyboard-alpha { + top: 0px; +} + +.keyboard-numpad { + top: var(--keyboard-numpad-top); +} + +.keyboard-container-mode .touch-button { + pointer-events: auto; +} + +.keyboard-alpha-key, +.keyboard-numpad-key { + opacity: 1; + transition: opacity 250ms; +} + +.keyboard-container-alpha .keyboard-container-mode .keyboard-numpad-key, +.keyboard-container-numpad .keyboard-container-mode .keyboard-alpha-key { + opacity: 0; + pointer-events: none; +} + +.keyboard-numpad .keyboard-space-key { + position: absolute; + right: var(--keyboard-numpad-space-key-right); + bottom: 0px; +} + +.keyboard-row { + display: flex; + flex-flow: row nowrap; + margin-bottom: var(--keyboard-row-gap); +} + +.keyboard-row>.touch-button+.touch-button { + margin-left: var(--keyboard-column-gap); +} + +.keyboard-numpad-column { + display: flex; + flex-flow: column nowrap; +} + +.keyboard-numpad-column>.touch-button+.touch-button { + margin-top: var(--keyboard-row-gap); +} + +.keyboard-numpad-group { + position: absolute; + left: var(--keyboard-numpad-group-left); + top: 0px; +} + +.keyboard-numpad-group .keyboard-row { + width: 100%; + justify-content: space-around; +} + +.keyboard-container .touch-button { + width: var(--keyboard-button-width); + height: var(--keyboard-button-height); +} + +.keyboard-container .touch-button.keyboard-button-wide { + width: var(--keyboard-button-wide-width); +} + +.keyboard-space-key { + font-size: var(--keyboard-space-key-font-size); +} + +.keyboard-backspace, +.keyboard-find { + display: flex; + flex-flow: column nowrap; + justify-content: center; + align-items: center; +} + +.keyboard-backspace { + font-size: var(--keyboard-backspace-font-size); +} + +.keyboard-backspace-icon { + position: absolute; + left: var(--keyboard-backspace-icon-left); + top: var(--keyboard-backspace-icon-top); + width: var(--keyboard-backspace-icon-width); +} + +.keyboard-backspace-label { + position: absolute; + top: var(--keyboard-backspace-label-top); +} + +.keyboard-find { + font-size: var(--keyboard-find-font-size); +} + +.keyboard-find-icon { + position: absolute; + left: var(--keyboard-find-icon-left); + top: var(--keyboard-find-icon-top); + width: var(--keyboard-find-icon-width); +} + +.keyboard-find-label { + position: absolute; + top: var(--keyboard-find-label-top); +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.tsx new file mode 100644 index 000000000..2b9f975b0 --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/Keyboard.tsx @@ -0,0 +1,239 @@ +import { + ComponentProps, DisplayComponent, FSComponent, SetSubject, Subject, SubscribableSet, Subscription, + ToggleableClassNameRecord, VNode +} from '@microsoft/msfs-sdk'; + +import { TouchButton } from '@microsoft/msfs-garminsdk'; + +import './Keyboard.css'; + +/** + * Component props for Keyboard. + */ +export interface KeyboardProps extends ComponentProps { + /** + * Whether to show the "Find" button. If `true`, then the "Find" button will replace the space button while the + * keyboard is displaying letters, and the space button will instead be shown while the keyboard is displaying + * numerals. + */ + showFindButton: boolean; + + /** Whether the space button is enabled. */ + isSpaceButtonEnabled: boolean; + + /** A callback function which is called when a character key button is pressed. */ + onKeyPressed?: (char: string) => void; + + /** A callback function which is called when the backspace button is pressed. */ + onBackspacePressed?: () => void; + + /** A callback function which is called when the "Find" button is pressed. */ + onFindPressed?: () => void; + + /** CSS class(es) to apply to the number pad's root element. */ + class?: string | SubscribableSet | ToggleableClassNameRecord; +} + +/** + * A keyboard with buttons for all alphanumeric characters and the space character, a backspace button, and an optional + * "Find" button. The display of letters and numerals is mutually exclusive, and the keyboard can be toggled between + * the two states. The letters are ordered alphabetically. + */ +export class Keyboard extends DisplayComponent { + private static readonly RESERVED_CSS_CLASSES = [ + 'keyboard-container', + 'keyboard-container-alpha', + 'keyboard-container-numpad' + ]; + + private thisNode?: VNode; + + private readonly rootRef = FSComponent.createRef(); + + private readonly rootCssClass = SetSubject.create(['keyboard-container']); + + private readonly showNumpad = Subject.create(false); + + private cssClassSub?: Subscription | Subscription[]; + + /** @inheritDoc */ + public onAfterRender(thisNode: VNode): void { + this.thisNode = thisNode; + + this.showNumpad.sub(showNumpad => { + this.rootCssClass.toggle('keyboard-container-alpha', !showNumpad); + this.rootCssClass.toggle('keyboard-container-numpad', showNumpad); + }, true); + } + + /** + * Sets whether the keyboard shows the numpad keys instead of the alphabet keys. + * @param show Whether to show the numpad keys. + */ + public setShowNumpad(show: boolean): void { + this.showNumpad.set(show); + } + + /** + * Responds to when this keyboard's mode button is pressed. + */ + private onModePressed(): void { + this.showNumpad.set(!this.showNumpad.get()); + } + + /** + * Responds to when one of this keyboard's character keys is pressed. + * @param char The character of the key that was pressed. + */ + private onKeyPressed(char: string): void { + this.props.onKeyPressed && this.props.onKeyPressed(char); + } + + /** + * Responds to when this keyboard's backspace button is pressed. + */ + private onBackspacePressed(): void { + this.props.onBackspacePressed && this.props.onBackspacePressed(); + } + + /** + * Responds to when this keyboard's find button is pressed. + */ + private onFindPressed(): void { + this.props.onFindPressed && this.props.onFindPressed(); + } + + /** @inheritdoc */ + public render(): VNode { + if (typeof this.props.class === 'object') { + this.cssClassSub = FSComponent.bindCssClassSet(this.rootCssClass, this.props.class, Keyboard.RESERVED_CSS_CLASSES); + } else if (this.props.class) { + for (const classToAdd of FSComponent.parseCssClassesFromString(this.props.class, classToFilter => !Keyboard.RESERVED_CSS_CLASSES.includes(classToFilter))) { + this.rootCssClass.add(classToAdd); + } + } + + const renderAlphaKey = (char: string): VNode => this.renderKey('keyboard-alpha-key', char); + const renderNumpadKey = (char: string): VNode => this.renderKey('keyboard-numpad-key', char); + + return ( +
+
+
+ {['A', 'B'].map(renderAlphaKey)} + { + this.props.showFindButton + ? ( + + +
Find
+ + ) : ( + + ) + } + x ? 'ABC...' : '123...')} + onPressed={this.onModePressed.bind(this)} + /> + +
Backspace
+ + +
+
+ {['C', 'D', 'E', 'F', 'G', 'H'].map(renderAlphaKey)} +
+
+ {['I', 'J', 'K', 'L', 'M', 'N'].map(renderAlphaKey)} +
+
+ {['O', 'P', 'Q', 'R', 'S', 'T'].map(renderAlphaKey)} +
+
+ {['U', 'V', 'W', 'X', 'Y', 'Z'].map(renderAlphaKey)} +
+
+
+
+ {['N', 'S', 'E', 'W'].map(renderNumpadKey)} +
+
+
+ {['1', '2', '3'].map(renderNumpadKey)} +
+
+ {['4', '5', '6'].map(renderNumpadKey)} +
+
+ {['7', '8', '9'].map(renderNumpadKey)} +
+
+ {this.renderKey('keyboard-numpad-key', '0', '0̸')} +
+
+ {this.props.showFindButton && ( + + )} +
+
+ ); + } + + /** + * Renders a character key. + * @param cssClass CSS class(es) to apply to the key's root element. + * @param char The character for which to render the key. + * @param label The key's label text. Defaults to the same value as `char`. + * @returns A key for the specified character, as a VNode. + */ + protected renderKey(cssClass: string, char: string, label = char): VNode { + return ( + + ); + } + + /** @inheritdoc */ + public destroy(): void { + this.thisNode && FSComponent.shallowDestroy(this.thisNode); + + if (this.cssClassSub) { + if (Array.isArray(this.cssClassSub)) { + for (const sub of this.cssClassSub) { + sub.destroy(); + } + } else { + this.cssClassSub.destroy(); + } + } + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/index.ts b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/index.ts new file mode 100644 index 000000000..34d310cc6 --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Keyboard/index.ts @@ -0,0 +1 @@ +export * from './Keyboard'; \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/LatLonInput/LatLonInput.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/LatLonInput/LatLonInput.tsx index 1394b8a97..26397fde9 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/LatLonInput/LatLonInput.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/LatLonInput/LatLonInput.tsx @@ -3,19 +3,26 @@ import { SetSubject, Subject, Subscribable, SubscribableSet, Subscription, VNode } from '@microsoft/msfs-sdk'; + import { LatLonDisplay, LatLonDisplayFormat } from '@microsoft/msfs-garminsdk'; + import { CursorInput } from '../CursorInput/CursorInput'; import { SignInputSlot } from '../NumberInput'; import { DigitInputSlot } from '../NumberInput/DigitInputSlot'; import './LatLonInput.css'; +/** + * Display formats for {@link LatLonInput} supported by the G3000. + */ +export type G3000LatLonDisplayFormat = LatLonDisplayFormat.HDDD_MMmm | LatLonDisplayFormat.HDDD_MM_SSs; + /** * Component props for LatLonInput. */ export interface LatLonInputProps extends ComponentProps { /** The format supported by the input. */ - format: LatLonDisplayFormat; + format: G3000LatLonDisplayFormat; /** * A mutable subscribable to bind to the input's latitude/longitude value. The binding is one-way: changes in the @@ -37,13 +44,19 @@ export class LatLonInput extends DisplayComponent { degreeFactor: 6000, latDigitFactors: [60000, 6000, 1000, 100, 10, 1], lonDigitFactors: [600000, 60000, 6000, 1000, 100, 10, 1], - lonStartIndex: 7 + lonStartIndex: 7, + }, + [LatLonDisplayFormat.HDDD_MMmmm]: { + degreeFactor: 60000, + latDigitFactors: [600000, 60000, 6000, 1000, 100, 10, 1], + lonDigitFactors: [6000000, 600000, 60000, 6000, 1000, 100, 10, 1], + lonStartIndex: 8 }, [LatLonDisplayFormat.HDDD_MM_SSs]: { degreeFactor: 36000, latDigitFactors: [360000, 36000, 6000, 600, 100, 10, 1], lonDigitFactors: [3600000, 360000, 36000, 6000, 600, 100, 10, 1], - lonStartIndex: 8 + lonStartIndex: 8, } }; diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcListSelectTouchButton.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcListSelectTouchButton.tsx index 6b9f8c10b..61f523928 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcListSelectTouchButton.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcListSelectTouchButton.tsx @@ -1,7 +1,7 @@ import { - DisplayComponent, FSComponent, MutableSubscribable, - MutableSubscribableInputType, Subject, SubscribableType, VNode, + DisplayComponent, FSComponent, MutableSubscribable, MutableSubscribableInputType, Subject, VNode, } from '@microsoft/msfs-sdk'; + import { GtcService, GtcViewOcclusionType } from '../../GtcService/GtcService'; import { GtcListDialog, GtcListDialogParams } from '../../Dialog/GtcListDialog'; import { ValueTouchButton } from './ValueTouchButton'; @@ -35,7 +35,7 @@ export interface GtcListSelectTouchButtonProps> | ((state: S) => GtcListDialogParams>); + listParams: GtcListDialogParams> | ((state: S) => GtcListDialogParams>); /** * A callback function which will be called every time a value is selected from the list. If not defined, selecting diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcWaypointSelectButton.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcWaypointSelectButton.tsx index 22bd1b382..a702e3741 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcWaypointSelectButton.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchButton/GtcWaypointSelectButton.tsx @@ -1,12 +1,14 @@ import { - DisplayComponent, Facility, FacilitySearchType, FacilityWaypoint, FSComponent, ICAO, IntersectionFacility, NdbFacility, Subscribable, - SubscribableSet, SubscribableUtils, UserFacility, VNode, VorFacility, + DisplayComponent, Facility, FacilitySearchType, FacilityWaypoint, FSComponent, IntersectionFacility, NdbFacility, SearchTypeMap, Subscribable, + SubscribableSet, SubscribableUtils, UserFacility, VNode, VorFacility } from '@microsoft/msfs-sdk'; + import { AirportWaypoint, GarminFacilityWaypointCache } from '@microsoft/msfs-garminsdk'; + import { GtcService } from '../../GtcService/GtcService'; import { GtcViewKeys } from '../../GtcService/GtcViewKeys'; import { GtcWaypointButton, GtcWaypointButtonProps } from './GtcWaypointButton'; -import { GtcKeyboardDialog } from '../../Dialog/GtcKeyboardDialog'; +import { GtcWaypointDialog } from '../../Dialog/GtcWaypointDialog'; /** * Waypoint search types supported by {@link GtcWaypointSelectButton}. @@ -131,14 +133,11 @@ export class GtcWaypointSelectButton => { const initialWaypoint = this.props.waypoint.get(); - const initialInputText = initialWaypoint === null ? undefined : ICAO.getIdent(initialWaypoint.facility.get().icao); - const result = await this.props.gtcService.openPopup>(GtcViewKeys.KeyboardDialog, 'normal', 'hide') + const result = await this.props.gtcService.openPopup(GtcViewKeys.WaypointDialog, 'normal', 'hide') .ref.request({ - facilitySearchType: this.props.type, - label: GtcWaypointSelectButton.DIALOG_LABEL_TEXT[this.props.type], - allowSpaces: false, - maxLength: 6, - initialInputText + searchType: this.props.type, + emptyLabelText: GtcWaypointSelectButton.DIALOG_LABEL_TEXT[this.props.type], + initialValue: initialWaypoint?.facility.get() as SearchTypeMap[T] }); if (result.wasCancelled) { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchSlider/TouchSlider.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchSlider/TouchSlider.css index 44a1b8074..f08bc7218 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchSlider/TouchSlider.css +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/TouchSlider/TouchSlider.css @@ -1,7 +1,7 @@ html { --touch-slider-background: linear-gradient(#506b85 3px, #2a3947 8px, #141b23 12px, #030405 20px, black 30px); /* The last time I tried ridge borders, it caused some graphical artifacts... */ - --touch-slider-border: 3px ridge #d3d3d3; + --touch-slider-border: 2px solid #ffffff; --touch-slider-border-radius: 4px; --touch-slider-text-color: var(--g3000-color-white); @@ -15,12 +15,16 @@ html { --touch-slider-thumb-justify: 0.5; } +.gtc-vertical { + --touch-slider-border-radius: 3px; +} + .touch-slider { position: relative; - background: var(--touch-button-background); - border: var(--touch-button-border); - border-radius: var(--touch-button-border-radius); - color: var(--touch-button-text-color); + background: var(--touch-slider-background); + border: var(--touch-slider-border); + border-radius: var(--touch-slider-border-radius); + color: var(--touch-slider-text-color); overflow: hidden; display: flex; } diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Waypoint/GtcWaypointDisplay.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Waypoint/GtcWaypointDisplay.tsx index b88c298b9..65a42c06d 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Waypoint/GtcWaypointDisplay.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Components/Waypoint/GtcWaypointDisplay.tsx @@ -3,6 +3,7 @@ import { ICAO, MappedSubject, SetSubject, StringUtils, Subject, Subscribable, SubscribableSet, SubscribableUtils, Subscription, VNode, ComponentProps, } from '@microsoft/msfs-sdk'; + import { GtcWaypointIcon } from '../GtcWaypointIcon/GtcWaypointIcon'; import './GtcWaypointDisplay.css'; @@ -68,21 +69,26 @@ export class GtcWaypointDisplay extends DisplayComponent { - this.facilityPipe?.destroy(); - - if (waypoint === null) { - this.facility.set(null); - } else { - this.facilityPipe = waypoint.facility.pipe(this.facility); - } - }, true); + this.subscriptions.push( + this.waypoint.sub(waypoint => { + this.facilityPipe?.destroy(); + + if (waypoint === null) { + this.facility.set(null); + } else { + this.facilityPipe = waypoint.facility.pipe(this.facility); + } + }, true) + ); } /** @inheritdoc */ @@ -90,8 +96,15 @@ export class GtcWaypointDisplay extends DisplayComponent; if (typeof this.props.class === 'object') { - cssClass = SetSubject.create(['gtc-wpt-display']); - this.cssClassSub = FSComponent.bindCssClassSet(cssClass, this.props.class, GtcWaypointDisplay.RESERVED_CSS_CLASSES); + cssClass = SetSubject.create(); + cssClass.add('gtc-wpt-display'); + + const sub = FSComponent.bindCssClassSet(cssClass, this.props.class, GtcWaypointDisplay.RESERVED_CSS_CLASSES); + if (Array.isArray(sub)) { + this.subscriptions.push(...sub); + } else { + this.subscriptions.push(sub); + } } else { cssClass = 'gtc-wpt-display'; if (this.props.class !== undefined && this.props.class.length > 0) { @@ -115,8 +128,10 @@ export class GtcWaypointDisplay extends DisplayComponent { cssClass.toggle('hidden', !val); }, true); - const maxValue = Math.pow(10, digitCount) - 1; + const maxValue = Math.pow(10, digitCount) * 10 - 1; const valueText = value.map(currentValue => MathUtils.clamp(currentValue / 10, 0, maxValue / 10).toFixed(1)); const leadingZeroes = valueText.map(text => ('').padStart(digitCount - text.length + 2, '0')); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcFrequencyDialog.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcFrequencyDialog.css index 221e78623..f6a5df7c1 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcFrequencyDialog.css +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcFrequencyDialog.css @@ -132,7 +132,7 @@ font-size: var(--frequency-dialog-active-freq-font-size); } -.frequency-dialog-input { +.cursor-input.frequency-dialog-input { position: absolute; left: calc(50% - var(--frequency-dialog-input-width) / 2); top: var(--frequency-dialog-input-top); @@ -143,7 +143,7 @@ --cursor-input-slots-justify: center; } -.frequency-dialog-input.cursor-input-edit-inactive { +.cursor-input.frequency-dialog-input.cursor-input-edit-inactive { color: var(--g3000-color-black); } diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcKeyboardDialog.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcKeyboardDialog.tsx index 29d3f8f3b..4a1dcc25b 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcKeyboardDialog.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcKeyboardDialog.tsx @@ -2,10 +2,9 @@ import { DebounceTimer, Facility, FacilityType, FSComponent, ICAO, IntersectionFacilityUtils, StringUtils, Subject, VNode } from '@microsoft/msfs-sdk'; import { Fms, GarminFacilityWaypointCache, Regions, TouchButton } from '@microsoft/msfs-garminsdk'; -import { ControllableDisplayPaneIndex, G3000WaypointSearchType } from '@microsoft/msfs-wtg3000-common'; +import { G3000WaypointSearchType } from '@microsoft/msfs-wtg3000-common'; import { GtcWaypointIcon } from '../Components/GtcWaypointIcon/GtcWaypointIcon'; -import { GtcControlMode, GtcService, GtcViewLifecyclePolicy } from '../GtcService/GtcService'; import { GtcHardwareControlEvent, GtcInteractionEvent } from '../GtcService/GtcInteractionEvent'; import { GtcView, GtcViewProps } from '../GtcService/GtcView'; import { GtcViewKeys } from '../GtcService/GtcViewKeys'; @@ -61,14 +60,6 @@ export interface GtcKeyboardDialogProps extends GtcViewProps { posHeadingDataProvider: GtcPositionHeadingDataProvider; } -/** - * GTC view keys for popups owned by the keyboard dialog. - */ -enum GtcKeyboardDialogPopupKeys { - FindWaypoint = 'FindWaypoint', - DuplicateWaypoint = 'DuplicateWaypoint' -} - /** Allows user to input text using an alphanumeric keyboard. */ export class GtcKeyboardDialog extends GtcView implements GtcDialogView { @@ -127,14 +118,6 @@ export class GtcKeyboardDialog extends GtcView extends GtcView { const result = await this.props.gtcService - .openPopup(GtcKeyboardDialogPopupKeys.DuplicateWaypoint, 'normal', 'hide') + .openPopup(GtcViewKeys.DuplicateWaypointDialog, 'normal', 'hide') .ref.request({ ident: matches[0].ident, duplicates: matches.map(match => match.facility) }); if (!result.wasCancelled) { @@ -761,24 +744,6 @@ export class GtcKeyboardDialog extends GtcView - ); - } - /** @inheritdoc */ public destroy(): void { this.cleanupRequest(); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.css index 2b5b82c82..5992a0e9e 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.css +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.css @@ -77,7 +77,7 @@ --latlon-dialog-prefix-button-font-size: 42px; } -.latlon-dialog-input { +.cursor-input.latlon-dialog-input { position: absolute; left: calc(var(--latlon-dialog-input-center-x) - var(--latlon-dialog-input-width) / 2); top: var(--latlon-dialog-input-top); @@ -88,7 +88,7 @@ --cursor-input-slots-justify: center; } -.latlon-dialog-input.cursor-input-edit-inactive { +.cursor-input.latlon-dialog-input.cursor-input-edit-inactive { color: var(--g3000-color-black); } diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.tsx index 418a374b3..ce8b8235e 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcLatLonDialog.tsx @@ -5,7 +5,7 @@ import { GtcImgTouchButton } from '../Components/TouchButton/GtcImgTouchButton'; import { GtcInteractionEvent } from '../GtcService/GtcInteractionEvent'; import { GtcView } from '../GtcService/GtcView'; import { GtcDialogResult, GtcDialogView } from './GtcDialogView'; -import { LatLonInput } from '../Components/LatLonInput/LatLonInput'; +import { G3000LatLonDisplayFormat, LatLonInput } from '../Components/LatLonInput/LatLonInput'; import { GtcDialogs } from './GtcDialogs'; import { GtcTouchButton } from '../Components'; @@ -16,7 +16,7 @@ import './GtcLatLonDialog.css'; */ export type GtcLatLonDialogInput = { /** The input format type to use. */ - format: LatLonDisplayFormat; + format: G3000LatLonDisplayFormat; /** The latitude/longitude coordinates initially loaded into the dialog at the start of the request. */ initialValue: LatLonInterface; @@ -61,7 +61,7 @@ export class GtcLatLonDialog extends GtcView implements GtcDialogView = { + private readonly contexts: Record = { [LatLonDisplayFormat.HDDD_MMmm]: { inputRef: FSComponent.createRef(), cssClass: SetSubject.create(['latlon-dialog-input', 'latlon-dialog-input-dddmm', 'hidden']), @@ -102,7 +102,7 @@ export class GtcLatLonDialog extends GtcView implements GtcDialogView { this.onEditingActiveChanged(isActive); }); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcMessageDialog.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcMessageDialog.tsx index 3af158714..280b6e399 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcMessageDialog.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcMessageDialog.tsx @@ -97,7 +97,7 @@ export class GtcMessageDialog extends GtcView implements GtcDialogView cssClass !== 'gtc-message-dialog'); + this.cssClassesToAdd = FSComponent.parseCssClassesFromString(cssClassesToAdd).filter(cssClass => cssClass !== 'message-dialog'); for (const cssClass of this.cssClassesToAdd) { this.rootCssClass.add(cssClass); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcUserWaypointDialog.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcUserWaypointDialog.tsx index e69e6b397..43b708a24 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcUserWaypointDialog.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcUserWaypointDialog.tsx @@ -3,9 +3,11 @@ import { FSComponent, GeoPointSubject, ICAO, LatLonInterface, MagVar, NearestSubscription, NumberFormatter, NumberUnitSubject, SetSubject, Subject, UnitFamily, UnitType, UserFacility, UserFacilityUtils, VNode, VorFacility, } from '@microsoft/msfs-sdk'; + import { BearingDisplay, LatLonDisplay, LatLonDisplayFormat, NumberUnitDisplay, UnitsDistanceSettingMode, UnitsUserSettings, } from '@microsoft/msfs-garminsdk'; + import { G3000NearestContext } from '@microsoft/msfs-wtg3000-common'; import { GtcListSelectTouchButton } from '../Components/TouchButton/GtcListSelectTouchButton'; import { GtcToggleTouchButton } from '../Components/TouchButton/GtcToggleTouchButton'; @@ -16,13 +18,14 @@ import { GtcView, GtcViewProps } from '../GtcService/GtcView'; import { GtcViewKeys } from '../GtcService/GtcViewKeys'; import { GtcPositionHeadingDataProvider } from '../Navigation/GtcPositionHeadingDataProvider'; import { GtcUserWaypointEditController, UserWaypointFlightPlanStatus } from '../Navigation/GtcUserWaypointEditController'; -import { GtcKeyboardDialog } from './GtcKeyboardDialog'; import { GtcCourseDialog } from './GtcCourseDialog'; import { GtcDialogs } from './GtcDialogs'; import { GtcDialogResult, GtcDialogView } from './GtcDialogView'; import { GtcDistanceDialog } from './GtcDistanceDialog'; +import { GtcKeyboardDialog } from './GtcKeyboardDialog'; import { GtcLatLonDialog } from './GtcLatLonDialog'; import { GtcUserWaypointDialogStore, GtcUserWaypointType } from './GtcUserWaypointDialogStore'; +import { GtcWaypointDialog } from './GtcWaypointDialog'; import './GtcUserWaypointDialog.css'; @@ -390,13 +393,11 @@ export class GtcUserWaypointDialog extends GtcView i private async selectReference(subject: Subject): Promise { const initialValue = subject.get(); - const result = await this.props.gtcService.openPopup>(GtcViewKeys.KeyboardDialog, 'normal', 'hide') + const result = await this.props.gtcService.openPopup(GtcViewKeys.WaypointDialog, 'normal', 'hide') .ref.request({ - facilitySearchType: FacilitySearchType.AllExceptVisual, - initialInputText: initialValue === null ? undefined : ICAO.getIdent(initialValue.icao), - label: 'Waypoint Identifier Lookup', - maxLength: 6, - allowSpaces: false + searchType: FacilitySearchType.AllExceptVisual, + emptyLabelText: 'Waypoint Identifier Lookup', + initialValue: initialValue ?? undefined }); if (!result.wasCancelled) { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.css new file mode 100644 index 000000000..a8194f45a --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.css @@ -0,0 +1,126 @@ +.wpt-dialog { + position: absolute; + left: 0px; + top: 0px; + width: 100%; + height: 100%; + color: var(--g3000-color-white); +} + +.gtc-horizontal .wpt-dialog { + --cursor-input-slots-padding: 0px 12px; + + --wpt-dialog-top-section-width: 893px; + --wpt-dialog-top-section-height: 78px; + + --wpt-dialog-input-width: 297px; + --wpt-dialog-input-height: 62px; + --wpt-dialog-input-margin: 0px 0px 0px 16px; + --wpt-dialog-input-font-size: 48px; + + --wpt-dialog-input-label-margin: 0px 10px 0px 22px; + --wpt-dialog-input-label-font-size: 33px; + + --wpt-dialog-input-icon-margin: 0px 57px 0px 0px; + --wpt-dialog-input-icon-scale: 1.8; + + --wpt-dialog-keyboard-left: 61px; + --wpt-dialog-keyboard-top: 81px; +} + +.gtc-vertical .wpt-dialog { + --cursor-input-slots-padding: 0px 7px; + + --wpt-dialog-top-section-width: 100%; + --wpt-dialog-top-section-height: 42px; + + --wpt-dialog-input-width: 160px; + --wpt-dialog-input-height: 34px; + --wpt-dialog-input-margin: 0px 0px 0px 8px; + --wpt-dialog-input-font-size: 27px; + + --wpt-dialog-input-label-margin: 0px 3px 0px 11px; + --wpt-dialog-input-label-font-size: 18px; + + --wpt-dialog-input-icon-margin: 0px 13px 0px 0px; + --wpt-dialog-input-icon-scale: 1; + + --wpt-dialog-keyboard-left: 7px; + --wpt-dialog-keyboard-top: 44px; +} + +.wpt-dialog-top-section { + position: absolute; + left: 50%; + top: 0px; + width: var(--wpt-dialog-top-section-width); + height: var(--wpt-dialog-top-section-height); + transform: translateX(-50%); + background-color: var(--g3000-color-black); + display: flex; + flex-flow: row nowrap; + align-items: center; +} + +.wpt-dialog-input { + flex-shrink: 0; + width: var(--wpt-dialog-input-width); + height: var(--wpt-dialog-input-height); + margin: var(--wpt-dialog-input-margin); + color: var(--g3000-color-cyan); + font-size: var(--wpt-dialog-input-font-size); +} + +.wpt-dialog-input.cursor-input-edit-inactive { + color: #003333; +} + +.wpt-dialog-input .cursor-input-inactive { + position: absolute; + left: 0px; + top: 50%; + width: 100%; + height: auto; + padding: var(--cursor-input-slots-padding); + transform: translateY(-50%); + display: flex; + flex-flow: row nowrap; + justify-content: flex-start; +} + +.wpt-dialog-input-inactive-value-text { + background: var(--g3000-color-cyan); +} + +.wpt-dialog-input-inactive-value-text-empty { + color: var(--g3000-color-black); +} + +.wpt-dialog-input-slot-autocomplete .cursor-input-slot-character.cursor-input-slot-character-empty { + color: #003333; + animation: none; +} + +.wpt-dialog-input-label { + flex-grow: 1; + height: 1.2em; + margin: var(--wpt-dialog-input-label-margin); + font-size: var(--wpt-dialog-input-label-font-size); + line-height: 1.2em; + overflow: hidden; + /* This makes it so the text doesn't get clipped in the middle of a character. */ + word-break: break-all; +} + +.wpt-dialog-input-icon { + flex-shrink: 0; + margin: var(--wpt-dialog-input-icon-margin); + transform: scale(var(--wpt-dialog-input-icon-scale)); + transform-origin: 0% 50%; +} + +.wpt-dialog .wpt-dialog-keyboard { + position: absolute; + left: var(--wpt-dialog-keyboard-left); + top: var(--wpt-dialog-keyboard-top); +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.tsx new file mode 100644 index 000000000..6896953e7 --- /dev/null +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/GtcWaypointDialog.tsx @@ -0,0 +1,549 @@ +import { + ArrayUtils, DebounceTimer, Facility, FacilityType, FSComponent, ICAO, IntersectionFacilityUtils, MappedSubject, + NodeReference, SearchTypeMap, Subject, VNode +} from '@microsoft/msfs-sdk'; + +import { Fms, GarminFacilityWaypointCache, Regions } from '@microsoft/msfs-garminsdk'; + +import { G3000WaypointSearchType } from '@microsoft/msfs-wtg3000-common'; + +import { CharInput } from '../Components/CharInput/CharInput'; +import { CharInputSlot } from '../Components/CharInput/CharInputSlot'; +import { GtcWaypointIcon } from '../Components/GtcWaypointIcon/GtcWaypointIcon'; +import { Keyboard } from '../Components/Keyboard/Keyboard'; +import { GtcHardwareControlEvent, GtcInteractionEvent } from '../GtcService/GtcInteractionEvent'; +import { GtcView, GtcViewProps } from '../GtcService/GtcView'; +import { GtcViewKeys } from '../GtcService/GtcViewKeys'; +import { GtcDialogResult, GtcDialogView } from './GtcDialogView'; +import { GtcDuplicateWaypointDialog } from './GtcDuplicateWaypointDialog'; +import { GtcFindWaypointDialog } from './GtcFindWaypointDialog'; + +import './GtcWaypointDialog.css'; + +/** + * A request input for {@link GtcWaypointDialog}. + */ +export interface GtcWaypointDialogInput { + /** The type of waypoint to search for. */ + searchType: T; + + /** The initial label text to display when the dialog's identifier input is empty. */ + emptyLabelText: string; + + /** The waypoint value initially loaded into the dialog at the start of the request. */ + initialValue?: SearchTypeMap[T] | null; +} + +/** + * Component props for GtcWaypointDialog. + */ +export interface GtcWaypointDialogProps extends GtcViewProps { + /** The Fms instance to use. */ + fms: Fms; +} + +/** + * An entry for a single character input slot. + */ +type CharInputSlotEntry = { + /** A reference to the input slot. */ + ref: NodeReference; + + /** The input slot's default character value. */ + defaultCharValue: Subject; +}; + +/** + * A search result. + */ +interface SearchResult { + /** The ICAO. */ + readonly icao: string; + + /** The ident. */ + readonly ident: string; +} + +/** + * A search result, also with a facility. + */ +interface SearchResultWithFacility extends SearchResult { + /** The facility. */ + readonly facility: Facility; +} + +/** + * Results of a facility search. + */ +interface SearchResults { + /** Matches where the ident exactly matches the current user input. */ + readonly exactMatches?: readonly SearchResultWithFacility[]; + + /** The first suggested partial match given the current user input. */ + readonly suggestedMatch?: SearchResultWithFacility; +} + +/** + * A dialog which allows the user to select a waypoint. + */ +export class GtcWaypointDialog extends GtcView + implements GtcDialogView, Facility> { + + private static readonly CHAR_ARRAY = [ + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', + 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '' + ]; + + private thisNode?: VNode; + + private readonly inputRef = FSComponent.createRef(); + private readonly keyboardRef = FSComponent.createRef(); + + private readonly inputSlotEntries: CharInputSlotEntry[] = ArrayUtils.create(6, () => { + return { + ref: FSComponent.createRef(), + defaultCharValue: Subject.create('') + }; + }); + + private readonly inputText = Subject.create(''); + private readonly inputTextSub = this.inputText.sub(this.onInputTextChanged.bind(this, true), false, true); + + private readonly autocompleteText = Subject.create(''); + private readonly autocompleteTextSub = MappedSubject.create( + this.inputText, + this.autocompleteText + ).sub(this.updateAutocomplete.bind(this), false, true); + + private readonly inputLabelText = Subject.create(''); + + private readonly selectedFacility = Subject.create(null); + private readonly waypoint = this.selectedFacility + .map(x => x ? GarminFacilityWaypointCache.getCache(this.bus).get(x) : null); + + private facilityMatches?: readonly SearchResultWithFacility[]; + + private readonly searchDebounce = new DebounceTimer(); + + private searchOpId = 0; + + private facilitySearchType?: G3000WaypointSearchType; + + private resolveFunction?: (value: any) => void; + private resultObject: GtcDialogResult = { + wasCancelled: true, + }; + + /** @inheritDoc */ + public onAfterRender(thisNode: VNode): void { + this.thisNode = thisNode; + + this._sidebarState.slot5.set('enterEnabled'); + this._sidebarState.dualConcentricKnobLabel.set('dataEntryPushEnter'); + } + + /** @inheritDoc */ + public request(input: GtcWaypointDialogInput): Promise> { + return new Promise>(resolve => { + this.cleanupRequest(); + + this.resolveFunction = resolve; + this.resultObject = { + wasCancelled: true, + }; + + this.facilitySearchType = input.searchType; + + if (input.initialValue) { + this.inputRef.instance.setValue(ICAO.getIdent(input.initialValue.icao)); + this.selectedFacility.set(input.initialValue); + this.inputLabelText.set(this.getFacilityLabel(input.initialValue)); + } else { + this.inputRef.instance.setValue(''); + this.selectedFacility.set(null); + this.inputLabelText.set(input.emptyLabelText); + } + + this.autocompleteText.set(''); + + this.inputRef.instance.deactivateEditing(); + this.inputRef.instance.refresh(); + + this._sidebarState.slot1.set(null); + this.keyboardRef.instance.setShowNumpad(false); + + this.inputTextSub.resume(); + this.autocompleteTextSub.resume(true); + }); + } + + /** @inheritdoc */ + public onClose(): void { + this.cleanupRequest(); + } + + /** @inheritdoc */ + public onGtcInteractionEvent(event: GtcInteractionEvent): boolean { + switch (event) { + case GtcHardwareControlEvent.InnerKnobInc: + this.inputRef.instance.changeSlotValue(1, true); + return true; + case GtcHardwareControlEvent.InnerKnobDec: + this.inputRef.instance.changeSlotValue(-1, true); + return true; + case GtcHardwareControlEvent.OuterKnobInc: + this.inputRef.instance.moveCursor(1, true); + return true; + case GtcHardwareControlEvent.OuterKnobDec: + this.inputRef.instance.moveCursor(-1, true); + return true; + case GtcHardwareControlEvent.InnerKnobPush: + case GtcHardwareControlEvent.InnerKnobPushLong: + case GtcInteractionEvent.ButtonBarEnterPressed: + this.resolve(); + return true; + default: + return false; + } + } + + private readonly updateSearchHandler = this.updateSearch.bind(this); + + /** + * A callback called when the search input box is updated. + * @param debounce Whether to debounce the call to update autocomplete. + */ + private onInputTextChanged(debounce = false): void { + this._sidebarState.slot1.set('cancel'); + + if (this.facilitySearchType === undefined) { + return; + } + + this.searchDebounce.clear(); + + if (this.inputText.get() === '') { + this.inputLabelText.set('No matches found'); + this.selectedFacility.set(null); + this.autocompleteText.set(''); + } else { + if (debounce) { + this.searchDebounce.schedule(this.updateSearchHandler, 250); + } else { + this.updateSearch(); + } + } + } + + /** + * Checks for matches with current input, and updates the label and suggested text. + */ + private async updateSearch(): Promise { + const opId = ++this.searchOpId; + + const { exactMatches, suggestedMatch } = await this.searchFacilities(this.inputText.get(), opId); + + if (opId !== this.searchOpId) { + return; + } + + if (exactMatches) { + this.facilityMatches = exactMatches; + + if (exactMatches.length === 1) { + this.inputLabelText.set(this.getFacilityLabel(exactMatches[0].facility)); + this.selectedFacility.set(exactMatches[0].facility); + } else if (exactMatches.length > 1) { + this.inputLabelText.set('Duplicates found'); + this.selectedFacility.set(null); + } + + this.autocompleteText.set(''); + + } else if (suggestedMatch) { + this.facilityMatches = undefined; + + this.inputLabelText.set(this.getFacilityLabel(suggestedMatch.facility)); + this.selectedFacility.set(suggestedMatch.facility); + this.autocompleteText.set(suggestedMatch.ident); + } else { + this.inputLabelText.set('No matches found'); + this.selectedFacility.set(null); + this.autocompleteText.set(''); + } + } + + /** + * Searches facilities with a given ident and returns matches. + * @param searchString The ident to search. + * @param opId The search operation ID. + * @returns A Promise which will be fulfilled with the results of the facility search. + */ + private async searchFacilities(searchString: string, opId: number): Promise { + if (this.facilitySearchType === undefined) { + throw new Error('facility search type is required keyboard param when searching facilities.'); + } + + const allMatches = await this.props.fms.facLoader.searchByIdent(this.facilitySearchType, searchString, 20); + + if (opId !== this.searchOpId) { + return {}; + } + + const exactMatches = allMatches.filter(match => ICAO.getIdent(match) === searchString); + if (exactMatches.length > 0) { + return { + exactMatches: await Promise.all( + // Filter out any terminal intersections that are duplicates of non-terminal intersection matches. + IntersectionFacilityUtils.filterDuplicates(exactMatches) + .map>(async match => { + return { + icao: match, + ident: ICAO.getIdent(match), + facility: await this.props.fms.facLoader.getFacility(ICAO.getFacilityType(match), match) as Facility, + }; + }) + ) + }; + } else if (allMatches.length > 0) { + let firstMatch = allMatches[0]; + + // Check if the first match is a terminal duplicate of a non-terminal intersection match. If it is, replace it + // with the non-terminal version. + if (ICAO.isFacility(firstMatch, FacilityType.Intersection) && IntersectionFacilityUtils.isTerminal(firstMatch)) { + const nonTerminalIcao = IntersectionFacilityUtils.getNonTerminalICAO(firstMatch); + if (allMatches.includes(nonTerminalIcao)) { + firstMatch = nonTerminalIcao; + } + } + + return { + suggestedMatch: { + icao: firstMatch, + ident: ICAO.getIdent(firstMatch), + facility: await this.props.fms.facLoader.getFacility(ICAO.getFacilityType(firstMatch), firstMatch) as Facility, + } + }; + } else { + return {}; + } + } + + /** + * Get the label text to display for a facility. + * @param facility The facility for which to get label text. + * @returns The label text to display for the specified facility. + */ + private getFacilityLabel(facility: Facility): string { + const facilityType = ICAO.getFacilityType(facility.icao); + + if (facilityType === FacilityType.Airport) { + return Utils.Translate(facility.name); + } else { + if (facility.city.length > 0) { + const separatedCity = facility.city.split(', '); + const city = separatedCity.length > 1 ? Utils.Translate(separatedCity[0]) + ', ' + Utils.Translate(separatedCity[1]) : Utils.Translate(facility.city); + if (city) { + return city; + } + } + + const regionCode = ICAO.getRegionCode(facility.icao); + if (regionCode) { + return Regions.getName(regionCode); + } + + const name = Utils.Translate(facility.name); + if (name) { + return name; + } + + return `${facility.lat.toFixed(4)}, ${facility.lon.toFixed(4)}`; + } + } + + /** + * Updates the default character values of this dialog's character input to match the current autocomplete state. + * @param root0 The current autocomplete state. + * @param root0."0" The current input text. + * @param root0."1" The current autocomplete text. + */ + private updateAutocomplete([inputText, autocompleteText]: readonly [string, string]): void { + let endIndex = autocompleteText.length; + + if (autocompleteText === '' || autocompleteText.length < inputText.length || !autocompleteText.startsWith(inputText)) { + endIndex = 0; + } + + for (let i = 0; i < this.inputSlotEntries.length; i++) { + if (i < endIndex) { + this.inputSlotEntries[i].defaultCharValue.set(autocompleteText[i]); + } else { + this.inputSlotEntries[i].defaultCharValue.set(''); + } + } + } + + /** + * Attempts to resolve the current request. + * + * If this dialog searches for facilities, then the currently selected facility will be returned if one exists. If + * there is no selected facility, duplicate matches will attempted to be resolved if they exist. If neither a + * selected facility or duplicate matches exist, the request will be cancelled. + * + * If this dialog does not search for facilities, the current input text is returned. + */ + private resolve(): void { + if (this.facilitySearchType === undefined) { + return; + } + + const facility = this.selectedFacility.get(); + if (facility) { + this.resultObject = { + wasCancelled: false, + payload: facility + }; + + this.props.gtcService.goBack(); + } else if (this.facilityMatches !== undefined) { + this.resolveDuplicates(this.facilityMatches); + } else { + this.props.gtcService.goBack(); + } + } + + /** + * Attempts to resolve duplicate matched facilities. Opens the duplicate waypoint dialog to allow the user to + * select one of the duplicates. If the user selects a duplicate, the current request will be resolved with the + * selected facility and this dialog will be closed. If the user does not select a duplicate, the current request + * will remain unresolved and this dialog will remain open. + * @param matches The search results of the duplicate matched facilities. + */ + private async resolveDuplicates(matches: readonly SearchResultWithFacility[]): Promise { + const result = await this.props.gtcService + .openPopup(GtcViewKeys.DuplicateWaypointDialog, 'normal', 'hide') + .ref.request({ ident: matches[0].ident, duplicates: matches.map(match => match.facility) }); + + if (!result.wasCancelled) { + this.resultObject = { + wasCancelled: false, + payload: result.payload + }; + + this.props.gtcService.goBack(); + } + } + + /** + * Clears this dialog's pending request and fulfills the pending request Promise if one exists. + */ + private cleanupRequest(): void { + this.inputTextSub.pause(); + this.autocompleteTextSub.pause(); + this.facilitySearchType = undefined; + this.facilityMatches = undefined; + + const resolve = this.resolveFunction; + this.resolveFunction = undefined; + resolve && resolve(this.resultObject); + } + + /** + * Responds to when one of this dialog's character keys is pressed. + * @param char The character of the key that was pressed. + */ + private onKeyPressed(char: string): void { + this.inputRef.instance.setSlotCharacterValue(char); + } + + /** + * Responds to when this dialog's backspace button is pressed. + */ + private onBackspacePressed(): void { + this.inputRef.instance.backspace(); + } + + /** + * Responds to when this dialog's Find button is pressed. + */ + private async onFindPressed(): Promise { + if (this.facilitySearchType === undefined) { + return; + } + + const result = await this.gtcService.openPopup(GtcViewKeys.FindWaypointDialog) + .ref.request(this.facilitySearchType); + + if (!result.wasCancelled) { + this.selectedFacility.set(result.payload.facility.get()); + this.resolve(); + } + } + + /** @inheritdoc */ + public render(): VNode { + return ( +
+
+ text === '') + }} + > + {this.inputText.map(text => text === '' ? '______' : text)} +
+ } + class='wpt-dialog-input' + > + {this.inputSlotEntries.map(entry => { + return ( + value !== '') + }} + /> + ); + })} + +
+ {this.inputLabelText} +
+
waypoint === null) }}> + +
+
+ +
+ ); + } + + /** @inheritdoc */ + public destroy(): void { + this.cleanupRequest(); + + this.searchDebounce.clear(); + + this.thisNode && FSComponent.shallowDestroy(this.thisNode); + + super.destroy(); + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/index.ts b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/index.ts index 36166bd0f..eff95c65c 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/index.ts +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Dialog/index.ts @@ -30,4 +30,5 @@ export * from './GtcTemperatureDialog'; export * from './GtcUserWaypointDialog'; export * from './GtcVnavAltitudeDialog'; export * from './GtcVnavFlightPathAngleDialog'; +export * from './GtcWaypointDialog'; export * from './GtcWeightDialog'; \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/GtcService/GtcViewKeys.ts b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/GtcService/GtcViewKeys.ts index 8742137b0..8e9c18b3d 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/GtcService/GtcViewKeys.ts +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/GtcService/GtcViewKeys.ts @@ -77,5 +77,7 @@ export enum GtcViewKeys { FmsSpeedDialog = 'FmsSpeedDialog', MinuteDurationDialog = 'MinuteDurationDialog', ToldFactorDialog = 'ToldFactorDialog', - FindWaypointDialog = 'FindWaypointDialog' + WaypointDialog = 'WaypointDialog', + FindWaypointDialog = 'FindWaypointDialog', + DuplicateWaypointDialog = 'DuplicateWaypointDialog' } \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/AvionicsSettingsPage/GtcAvionicsSettingsPageMfdFieldsList.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/AvionicsSettingsPage/GtcAvionicsSettingsPageMfdFieldsList.tsx index a77155037..b88323271 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/AvionicsSettingsPage/GtcAvionicsSettingsPageMfdFieldsList.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/AvionicsSettingsPage/GtcAvionicsSettingsPageMfdFieldsList.tsx @@ -35,7 +35,7 @@ export interface GtcAvionicsSettingsPageMfdFieldsListProps extends ComponentProp * A GTC avionics setting page MFD fields settings list. */ export class GtcAvionicsSettingsPageMfdFieldsList extends DisplayComponent implements GtcAvionicsSettingsPageTabContent { - private static readonly LONG_NAMES: Record = { + private static readonly LONG_NAMES: Partial> = { [NavDataFieldType.BearingToWaypoint]: 'Bearing', [NavDataFieldType.Destination]: 'Destination Airport', [NavDataFieldType.DistanceToWaypoint]: 'Distance', @@ -54,12 +54,10 @@ export class GtcAvionicsSettingsPageMfdFieldsList extends DisplayComponent fieldType !== NavDataFieldType.Waypoint) .map(fieldType => { return { value: fieldType as NavDataFieldType, diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/FlightPlanPage/GtcFlightPlanDialogs.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/FlightPlanPage/GtcFlightPlanDialogs.tsx index 09ef9daf1..deaa77a98 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/FlightPlanPage/GtcFlightPlanDialogs.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/FlightPlanPage/GtcFlightPlanDialogs.tsx @@ -6,32 +6,40 @@ import { import { ApproachNameDisplay, Fms, FmsUtils } from '@microsoft/msfs-garminsdk'; import { FlightPlanListManager, FlightPlanStore } from '@microsoft/msfs-wtg3000-common'; + import { GtcAirwaySelectionDialog } from '../../Dialog/GtcAirwaySelectionDialog'; import { GtcDialogs } from '../../Dialog/GtcDialogs'; import { GtcDialogResult } from '../../Dialog/GtcDialogView'; -import { GtcKeyboardDialog } from '../../Dialog/GtcKeyboardDialog'; import { GtcListDialog, ListDialogItemDefinition } from '../../Dialog/GtcListDialog'; +import { GtcWaypointDialog } from '../../Dialog/GtcWaypointDialog'; import { GtcService } from '../../GtcService/GtcService'; import { GtcViewKeys } from '../../GtcService/GtcViewKeys'; - /** Collection of utility functions to open different flight plan related dialogs. */ export class GtcFlightPlanDialogs { /** - * Opens an Airport Identifier Lookup keyboard dialog. + * Opens an Airport Identifier Lookup waypoint dialog. + * @param gtcService The GtcService. + * @param initialValue The airport value initially loaded into the dialog at the start of the request. + * @returns The selected airport, if one was selected. + */ + public static openAirportDialog(gtcService: GtcService, initialValue?: AirportFacility): Promise>; + /** + * Opens an Airport Identifier Lookup waypoint dialog. * @param gtcService The GtcService. - * @param initialInputText Initial input text, if it should show an airport as already beign typed out. + * @param initialValue This parameter is ignored. * @returns The selected airport, if one was selected. + * @deprecated */ - public static openAirportDialog(gtcService: GtcService, initialInputText?: string): Promise> { + public static openAirportDialog(gtcService: GtcService, initialValue?: string): Promise>; + // eslint-disable-next-line jsdoc/require-jsdoc + public static openAirportDialog(gtcService: GtcService, initialValue?: AirportFacility | string): Promise> { return gtcService - .openPopup>(GtcViewKeys.KeyboardDialog, 'normal', 'hide') + .openPopup(GtcViewKeys.WaypointDialog, 'normal', 'hide') .ref.request({ - facilitySearchType: FacilitySearchType.Airport, - label: 'Airport Identifier Lookup', - allowSpaces: false, - maxLength: 6, - initialInputText, + searchType: FacilitySearchType.Airport, + emptyLabelText: 'Airport Identifier Lookup', + initialValue: typeof initialValue === 'object' ? initialValue : undefined, }); } @@ -267,12 +275,11 @@ export class GtcFlightPlanDialogs { * @returns The result of the keyboard dialog request. */ public static async openWaypointIdentifierLookup(gtcService: GtcService): Promise> { - return gtcService.openPopup>( - GtcViewKeys.KeyboardDialog, 'normal', 'hide').ref.request({ - facilitySearchType: FacilitySearchType.AllExceptVisual, - label: 'Waypoint Identifier Lookup', - allowSpaces: false, - maxLength: 6, + return gtcService + .openPopup(GtcViewKeys.WaypointDialog, 'normal', 'hide') + .ref.request({ + searchType: FacilitySearchType.AllExceptVisual, + emptyLabelText: 'Waypoint Identifier Lookup' }); } diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/NavComHome/GtcAudioRadiosPopup.css b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/NavComHome/GtcAudioRadiosPopup.css index 43116fc6c..b7ee29fc1 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/NavComHome/GtcAudioRadiosPopup.css +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/NavComHome/GtcAudioRadiosPopup.css @@ -1,5 +1,6 @@ .audio-radios-popup { --touch-button-border: 1px solid #d3d3d3; + --touch-slider-border: 1px solid #d3d3d3; } .gtc-horizontal .audio-radios-popup { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/Procedures/GtcProcedureSelectionPage.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/Procedures/GtcProcedureSelectionPage.tsx index 33cdccc33..1a5a98893 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/Procedures/GtcProcedureSelectionPage.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/Pages/Procedures/GtcProcedureSelectionPage.tsx @@ -176,8 +176,7 @@ export abstract class GtcProcedureSelectionPage

=> { const airport = this.selectedAirport.get(); - const initialText = airport ? ICAO.getIdent(airport.icao) : undefined; - const result = await GtcFlightPlanDialogs.openAirportDialog(this.gtcService, initialText); + const result = await GtcFlightPlanDialogs.openAirportDialog(this.gtcService, airport); if (!result.wasCancelled) { this.selectedAirport.set(result.payload); onAirportSelected(); diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/WTG3000GtcInstrument.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/WTG3000GtcInstrument.tsx index e9a8b6dea..82ee18739 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/WTG3000GtcInstrument.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/WTG3000GtcInstrument.tsx @@ -1,12 +1,16 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ +import { + DefaultObsSuspDataProvider, DefaultVNavDataProvider, Fms, GarminFacilityWaypointCache, GpsNavSource, + NavRadioNavSource, + NavReferenceIndicatorsCollection, + NavReferenceSource, + NavReferenceSourceCollection, + TrafficSystemType, +} from '@microsoft/msfs-garminsdk'; import { ClockEvents, FacilityWaypoint, FSComponent, IntersectionFacility, NdbFacility, PluginSystem, SetSubject, Subject, UserFacility, VNode, VorFacility, Wait, XPDRSimVarPublisher, } from '@microsoft/msfs-sdk'; -import { - DefaultObsSuspDataProvider, DefaultVNavDataProvider, Fms, GarminFacilityWaypointCache, GpsNavSource, - NavReferenceIndicatorsCollection, NavRadioNavSource, NavReferenceSource, TrafficSystemType, NavReferenceSourceCollection, -} from '@microsoft/msfs-garminsdk'; import { AvionicsConfig, AvionicsStatus, AvionicsStatusChangeEvent, DefaultFmsSpeedTargetDataProvider, ExistingUserWaypointsArray, FlightPlanListManager, FlightPlanStore, G3000ActiveSourceNavIndicator, G3000FilePaths, G3000NavIndicator, G3000NavIndicatorName, G3000NavIndicators, G3000NavSourceName, @@ -16,10 +20,11 @@ import { import { LabelBarPluginHandlers } from './Components'; import { GtcConfig } from './Config'; import { - GtcAirwaySelectionDialog, GtcAltitudeDialog, GtcBaroPressureDialog, GtcCourseDialog, GtcDistanceDialog, GtcDurationDialog, + GtcAirwaySelectionDialog, GtcAltitudeDialog, GtcBaroPressureDialog, GtcCourseDialog, GtcDistanceDialog, GtcDuplicateWaypointDialog, GtcDurationDialog, GtcDurationDialogMSS, GtcFindWaypointDialog, GtcFmsSpeedDialog, GtcFrequencyDialog, GtcIntegerDialog, GtcKeyboardDialog, GtcLatLonDialog, GtcListDialog, GtcLoadFrequencyDialog, GtcLocalTimeOffsetDialog, GtcMessageDialog, GtcMinimumsSourceDialog, GtcMinuteDurationDialog, GtcRunwayLengthDialog, - GtcSpeedConstraintDialog, GtcSpeedDialog, GtcTemperatureDialog, GtcUserWaypointDialog, GtcVnavAltitudeDialog, GtcVnavFlightPathAngleDialog, GtcWeightDialog, + GtcSpeedConstraintDialog, GtcSpeedDialog, GtcTemperatureDialog, GtcUserWaypointDialog, GtcVnavAltitudeDialog, GtcVnavFlightPathAngleDialog, + GtcWaypointDialog, GtcWeightDialog } from './Dialog'; import { G3000GtcPlugin, G3000GtcPluginBinder } from './G3000GTCPlugin'; import { G3000GtcViewContext } from './G3000GtcViewContext'; @@ -140,7 +145,9 @@ export class WTG3000GtcInstrument extends WTG3000FsInstrument { this.backplane.addPublisher(InstrumentBackplaneNames.Xpdr, this.xpdrSimVarPublisher); - this.doInit(); + this.doInit().catch(e => { + console.error(e); + }); } /** @@ -1016,6 +1023,22 @@ export class WTG3000GtcInstrument extends WTG3000FsInstrument { ); } ); + + this.gtcService.registerView( + GtcViewLifecyclePolicy.Transient, + GtcViewKeys.WaypointDialog, 'MFD', + (gtcService, controlMode, displayPaneIndex) => { + return ( + + ); + } + ); + this.gtcService.registerView( GtcViewLifecyclePolicy.Persistent, GtcViewKeys.FindWaypointDialog, 'MFD', @@ -1029,6 +1052,21 @@ export class WTG3000GtcInstrument extends WTG3000FsInstrument { ) ); + this.gtcService.registerView( + GtcViewLifecyclePolicy.Transient, + GtcViewKeys.DuplicateWaypointDialog, 'MFD', + (gtcService, controlMode, displayPaneIndex) => { + return ( + + ); + } + ); + this.gtcService.registerView( GtcViewLifecyclePolicy.Transient, GtcViewKeys.FrequencyDialog, 'NAV_COM', diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package-defs-only.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package-defs-only.json index fbcebbbe7..4c927f774 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package-defs-only.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package-defs-only.json @@ -1,6 +1,6 @@ { "name": "@microsoft/msfs-wtg3000-gtc", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 GTC Definitions", "typings": "index.d.ts", "repository": { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package.json index f577630a6..e01a67cbe 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/package.json @@ -1,18 +1,15 @@ { "name": "@microsoft/msfs-wtg3000-gtc", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 GTC Definitions", "typings": "index.d.ts", "scripts": { - "build:defs": "tsc & robocopy . *.css build /s & rollup -c rollup-defs.config.js & cp package-defs-only.json dist/package.json & rm dist/ignoreme.css" + "build:defs": "tsc && cp package-defs-only.json build/package.json" }, "repository": { "type": "git", "url": "https://github.com/microsoft/msfs-avionics-mirror/" }, "author": "Working Title Simulations, LLC", - "license": "Modified MIT", - "dependencies": { - "rollup": "^2.79.1" - } -} + "license": "Modified MIT" +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/rollup-defs.config.js b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/rollup-defs.config.js deleted file mode 100644 index 9cb07a430..000000000 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/rollup-defs.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import dts from 'rollup-plugin-dts' -import css from 'rollup-plugin-import-css'; -import resolve from '@rollup/plugin-node-resolve'; - -const config = [ - { - input: 'build/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'es' }], - plugins: [dts(), resolve(), css({ output: 'ignoreme.css' })], - } -] -export default config \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/tsconfig.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/tsconfig.json index 410204972..1afd04606 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/tsconfig.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/GTC/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../../../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "build", - "emitDeclarationOnly": false + "emitDeclarationOnly": true }, "exclude": [ "Gulpfile.ts", diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/WTG3000MfdInstrument.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/WTG3000MfdInstrument.tsx index 4774aee09..abf64cf01 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/WTG3000MfdInstrument.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/WTG3000MfdInstrument.tsx @@ -1,9 +1,3 @@ -import { - APRadioNavInstrument, ArrayUtils, AuralAlertSystem, AuralAlertSystemWarningAdapter, AuralAlertSystemXmlAdapter, CasSystem, CasSystemLegacyAdapter, ClockEvents, - CompositeLogicXMLHost, ControlEvents, DefaultXmlAuralAlertParser, FlightPlanCalculatedEvent, FlightPlannerEvents, FlightTimerInstrument, FlightTimerMode, - FSComponent, GameStateProvider, GpsSynchronizer, GPSSystemState, MinimumsManager, NavComInstrument, NavSourceType, PluginSystem, - SetSubject, SimVarValueType, SoundServer, Subject, TrafficInstrument, UserSetting, Vec2Math, VNode, Wait, XMLWarningFactory, XPDRInstrument -} from '@microsoft/msfs-sdk'; import { ComRadioSpacingManager, DateTimeUserSettings, DefaultGpsIntegrityDataProvider, DefaultRadarAltimeterDataProvider, DefaultVNavDataProvider, DefaultWindDataProvider, DmeUserSettings, FlightPathCalculatorManager, FlightPlanSimSyncManager, Fms, FmsPositionSystemSelector, GarminAPConfig, @@ -11,6 +5,12 @@ import { MinimumsUnitsManager, NavdataComputer, TrafficOperatingModeManager, TrafficOperatingModeSetting, TrafficSystemType, TrafficUserSettings, UnitsUserSettings } from '@microsoft/msfs-garminsdk'; +import { + APRadioNavInstrument, ArrayUtils, AuralAlertSystem, AuralAlertSystemWarningAdapter, AuralAlertSystemXmlAdapter, CasSystem, CasSystemLegacyAdapter, ClockEvents, + CompositeLogicXMLHost, ControlEvents, DefaultXmlAuralAlertParser, FlightPlanCalculatedEvent, FlightPlannerEvents, FlightTimerInstrument, FlightTimerMode, + FSComponent, GameStateProvider, GpsSynchronizer, GPSSystemState, MinimumsManager, NavComInstrument, NavSourceType, PluginSystem, + SetSubject, SimVarValueType, SoundServer, Subject, TrafficInstrument, UserSetting, Vec2Math, VNode, Wait, XMLWarningFactory, XPDRInstrument +} from '@microsoft/msfs-sdk'; import { AuralAlertUserSettings, AuralAlertVoiceSetting, AvionicsConfig, AvionicsStatus, AvionicsStatusChangeEvent, AvionicsStatusEvents, AvionicsStatusGlobalPowerEvent, AvionicsStatusManager, ConnextWeatherPaneView, DisplayPaneContainer, DisplayPaneIndex, DisplayPanesController, DisplayPaneViewFactory, DisplayPaneViewKeys, @@ -26,6 +26,7 @@ import { StartupScreen } from './Components/Startup/StartupScreen'; import { StartupScreenPrebuiltRow, StartupScreenRowFactory } from './Components/Startup/StartupScreenRow'; import { MfdConfig } from './Config/MfdConfig'; import { FmsSpeedManager } from './FmsSpeed/FmsSpeedManager'; +import { G3000MfdPlugin, G3000MfdPluginBinder } from './G3000MFDPlugin'; import { AltimeterBaroKeyEventHandler } from './Input/AltimeterBaroKeyEventHandler'; import { ActiveNavSourceManager } from './Navigation/ActiveNavSourceManager'; import { FmsVSpeedManager } from './Performance/TOLD/FmsVSpeedManager'; @@ -38,7 +39,6 @@ import { Taws } from './TAWS/Taws'; import { TouchdownCalloutModule } from './TAWS/TouchdownCalloutModule'; import { VSpeedBugManager } from './VSpeed/VSpeedBugManager'; import { WeatherRadarManager } from './WeatherRadar/WeatherRadarManager'; -import { G3000MfdPlugin, G3000MfdPluginBinder } from './G3000MFDPlugin'; import './WTG3000_MFD.css'; @@ -126,6 +126,7 @@ export class WTG3000MfdInstrument extends WTG3000FsInstrument { private readonly gps2DataProvider = new GpsStatusDataProvider(this.bus, 2); private readonly apConfig = new GarminAPConfig(this.bus, this.flightPlanner, this.verticalPathCalculator, { + useIndicatedMach: true, vnavOptions: { allowApproachBaroVNav: true, allowPlusVWithoutSbas: true, @@ -286,7 +287,9 @@ export class WTG3000MfdInstrument extends WTG3000FsInstrument { this.initAuralAlertUserSettings(); this.initTouchdownCalloutUserSettings(); - this.doInit(); + this.doInit().catch(e => { + console.error(e); + }); } /** @inheritdoc */ diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package-defs-only.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package-defs-only.json index 2cd78b971..f810e9f2d 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package-defs-only.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package-defs-only.json @@ -1,6 +1,6 @@ { "name": "@microsoft/msfs-wtg3000-mfd", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 MFD Definitions", "typings": "index.d.ts", "repository": { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package.json index e14e2cf9b..342a26818 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/package.json @@ -1,18 +1,15 @@ { "name": "@microsoft/msfs-wtg3000-mfd", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 MFD Definitions", "typings": "index.d.ts", "scripts": { - "build:defs": "tsc & robocopy . *.css build /s & rollup -c rollup-defs.config.js & cp package-defs-only.json dist/package.json & rm dist/ignoreme.css" + "build:defs": "tsc && cp package-defs-only.json build/package.json" }, "repository": { "type": "git", "url": "https://github.com/microsoft/msfs-avionics-mirror/" }, "author": "Working Title Simulations, LLC", - "license": "Modified MIT", - "dependencies": { - "rollup": "^2.79.1" - } -} + "license": "Modified MIT" +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/rollup-defs.config.js b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/rollup-defs.config.js deleted file mode 100644 index 9cb07a430..000000000 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/rollup-defs.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import dts from 'rollup-plugin-dts' -import css from 'rollup-plugin-import-css'; -import resolve from '@rollup/plugin-node-resolve'; - -const config = [ - { - input: 'build/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'es' }], - plugins: [dts(), resolve(), css({ output: 'ignoreme.css' })], - } -] -export default config \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/tsconfig.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/tsconfig.json index 410204972..1afd04606 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/tsconfig.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/MFD/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../../../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "build", - "emitDeclarationOnly": false + "emitDeclarationOnly": true }, "exclude": [ "Gulpfile.ts", diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Airspeed/AirspeedIndicator.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Airspeed/AirspeedIndicator.tsx index e79145522..a27dc5958 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Airspeed/AirspeedIndicator.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Airspeed/AirspeedIndicator.tsx @@ -143,7 +143,6 @@ export class AirspeedIndicator extends DisplayComponent return ( { return 'GP'; case APVerticalModes.PITCH: return 'PIT'; + case APVerticalModes.LEVEL: + return 'LVL'; case APVerticalModes.TO: return 'TO'; case APVerticalModes.GA: diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Horizon/HorizonDisplay.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Horizon/HorizonDisplay.tsx index 853f07c5a..94e9602aa 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Horizon/HorizonDisplay.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/Components/Horizon/HorizonDisplay.tsx @@ -76,11 +76,8 @@ export class HorizonDisplay extends DisplayComponent { /** @inheritdoc */ public render(): VNode { const articialHorizonOptions: ArtificialHorizonOptions = { - groundColor: '#3a2400', - skyColors: [ - [0, '#284be4'], - [50, '#0033e6'] - ] + groundColors: [[0, '#a15f02'], [156, '#54350a']], + skyColors: [[0, '#6182e8'], [156, '#0033ff']] }; const horizonLineOptions: HorizonLineOptions = { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/WTG3000PfdInstrument.tsx b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/WTG3000PfdInstrument.tsx index 7daf6038e..870252dab 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/WTG3000PfdInstrument.tsx +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/WTG3000PfdInstrument.tsx @@ -2,7 +2,9 @@ import { CasSystem, CompositeLogicXMLHost, FSComponent, PluginSystem, SetSubject import { AdfRadioNavSource, DefaultAltimeterDataProvider, DefaultGpsIntegrityDataProvider, DefaultRadarAltimeterDataProvider, - DefaultVNavDataProvider, DefaultWindDataProvider, Fms, GpsNavSource, NavReferenceIndicatorsCollection, NavRadioNavSource, + DefaultVNavDataProvider, DefaultWindDataProvider, Fms, GpsNavSource, + NavRadioNavSource, + NavReferenceIndicatorsCollection, NavReferenceSource, NavReferenceSourceCollection } from '@microsoft/msfs-garminsdk'; @@ -16,11 +18,11 @@ import { import { PfdInstrumentContainer } from './Components/InstrumentContainer/PfdInstrumentContainer'; import { PfdConfig } from './Config/PfdConfig'; +import { G3000PfdPlugin, G3000PfdPluginBinder } from './G3000PFDPlugin'; import { PfdBaroKnobInputHandler } from './Input/PfdBaroKnobInputHandler'; import { PfdCourseKnobInputHandler } from './Input/PfdCourseKnobInputHandler'; import { PfdMapJoystickInputHandler } from './Input/PfdMapJoystickInputHandler'; import { TrafficAuralAlertManager } from './Traffic/TrafficAuralAlertManager'; -import { G3000PfdPlugin, G3000PfdPluginBinder } from './G3000PFDPlugin'; import './WTG3000_PFD.css'; @@ -165,7 +167,9 @@ export class WTG3000PfdInstrument extends WTG3000FsInstrument { this.backplane.addInstrument(InstrumentBackplaneNames.Traffic, this.trafficInstrument); - this.doInit(); + this.doInit().catch(e => { + console.error(e); + }); } /** @inheritdoc */ diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package-defs-only.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package-defs-only.json index 644f4dd12..73ff4895c 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package-defs-only.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package-defs-only.json @@ -1,6 +1,6 @@ { "name": "@microsoft/msfs-wtg3000-pfd", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 PFD Definitions", "typings": "index.d.ts", "repository": { diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package.json index 83b98bf94..5553527ab 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/package.json @@ -1,18 +1,15 @@ { "name": "@microsoft/msfs-wtg3000-pfd", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 PFD Definitions", "typings": "index.d.ts", "scripts": { - "build:defs": "tsc & robocopy . *.css build /s & rollup -c rollup-defs.config.js & cp package-defs-only.json dist/package.json & rm dist/ignoreme.css" + "build:defs": "tsc && cp package-defs-only.json build/package.json" }, "repository": { "type": "git", "url": "https://github.com/microsoft/msfs-avionics-mirror/" }, "author": "Working Title Simulations, LLC", - "license": "Modified MIT", - "dependencies": { - "rollup": "^2.79.1" - } -} + "license": "Modified MIT" +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/rollup-defs.config.js b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/rollup-defs.config.js deleted file mode 100644 index 9cb07a430..000000000 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/rollup-defs.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import dts from 'rollup-plugin-dts' -import css from 'rollup-plugin-import-css'; -import resolve from '@rollup/plugin-node-resolve'; - -const config = [ - { - input: 'build/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'es' }], - plugins: [dts(), resolve(), css({ output: 'ignoreme.css' })], - } -] -export default config \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/tsconfig.json b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/tsconfig.json index 410204972..1afd04606 100644 --- a/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/tsconfig.json +++ b/src/workingtitle-instruments-g3000/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/PFD/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../../../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "build", - "emitDeclarationOnly": false + "emitDeclarationOnly": true }, "exclude": [ "Gulpfile.ts", diff --git a/src/workingtitle-instruments-g3000/package.json b/src/workingtitle-instruments-g3000/package.json index ca43bbd94..f372a9045 100644 --- a/src/workingtitle-instruments-g3000/package.json +++ b/src/workingtitle-instruments-g3000/package.json @@ -1,6 +1,6 @@ { "name": "workingtitle-instruments-g3000", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000", "main": "wtg3000.js", "scripts": { diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Autopilot/G3000Autopilot.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Autopilot/G3000Autopilot.ts index 7fe95dcdc..120411745 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Autopilot/G3000Autopilot.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Autopilot/G3000Autopilot.ts @@ -1,5 +1,5 @@ -import { APConfig, APStateManager, EventBus, FlightPlanner, MetricAltitudeSettingsManager } from '@microsoft/msfs-sdk'; -import { GarminAutopilot, MinimumsDataProvider } from '@microsoft/msfs-garminsdk'; +import { APStateManager, EventBus, FlightPlanner, MetricAltitudeSettingsManager } from '@microsoft/msfs-sdk'; +import { GarminAPConfigInterface, GarminAutopilot, MinimumsDataProvider } from '@microsoft/msfs-garminsdk'; /** * A G3000 autopilot. @@ -18,7 +18,7 @@ export class G3000Autopilot extends GarminAutopilot { constructor( bus: EventBus, flightPlanner: FlightPlanner, - config: APConfig, + config: GarminAPConfigInterface, stateManager: APStateManager, metricAltSettingsManager: MetricAltitudeSettingsManager, minimumsDataProvider: MinimumsDataProvider diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/Map/Indicators/MapRelativeTerrainStatusIndicator.css b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/Map/Indicators/MapRelativeTerrainStatusIndicator.css index aadeafcee..4b24e432c 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/Map/Indicators/MapRelativeTerrainStatusIndicator.css +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/Map/Indicators/MapRelativeTerrainStatusIndicator.css @@ -9,6 +9,7 @@ position: relative; width: var(--map-rel-terrain-status-icon-width, 1.3em); height: var(--map-rel-terrain-status-icon-height, 1.2em); + overflow: hidden; } .map-rel-terrain-status-icon { @@ -25,6 +26,7 @@ top: 0px; width: 100%; height: 100%; + overflow: visible; } .map-rel-terrain-status-failed-cross { diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/NavigationMap/FlightPlanTextInset/FlightPlanTextRow.tsx b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/NavigationMap/FlightPlanTextInset/FlightPlanTextRow.tsx index 4d1ad88d3..9ecf9e8be 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/NavigationMap/FlightPlanTextInset/FlightPlanTextRow.tsx +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Components/NavigationMap/FlightPlanTextInset/FlightPlanTextRow.tsx @@ -1,8 +1,8 @@ import { AirportFacility, AltitudeRestrictionType, ApproachProcedure, BasicNavAngleSubject, BasicNavAngleUnit, ComponentProps, - DefaultUserSettingManager, DisplayComponent, DurationDisplay, DurationDisplayDelim, DurationDisplayFormat, EventBus, + DisplayComponent, DurationDisplay, DurationDisplayDelim, DurationDisplayFormat, EventBus, FSComponent, FlightPlanSegmentType, LegType, MappedSubject, NumberFormatter, NumberUnitSubject, SetSubject, - Subject, Subscribable, Subscription, UnitType, VNode, + Subject, Subscribable, Subscription, UnitType, UserSettingManager, VNode, } from '@microsoft/msfs-sdk'; import { @@ -30,7 +30,7 @@ export interface FlightPlanTextRowProps extends ComponentProps { /** The units settings manager. */ unitsSettingManager: UnitsUserSettingManager; /** The date time user settings. */ - dateTimeSettingManager: DefaultUserSettingManager; + dateTimeSettingManager: UserSettingManager; /** The flight plan text data. */ data: Subscribable; /** The selected row. */ diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/NumericConfig.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/NumericConfig.ts index 4a29f4c81..9e0e335ce 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/NumericConfig.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/NumericConfig.ts @@ -188,6 +188,8 @@ class ChainedMappedSubscribable implements MappedSubscribable { /** @inheritdoc */ public readonly isSubscribable = true; + /** @inheritdoc */ + public readonly canInitialNotify = true; /** @inheritdoc */ public get isAlive(): boolean { diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/SpeedConfig.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/SpeedConfig.ts index 9620ef4a7..77337c028 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/SpeedConfig.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Config/SpeedConfig.ts @@ -12,6 +12,7 @@ import { VSpeedValueKey } from '../VSpeed/VSpeed'; export enum SpeedConfigType { Ias = 'Ias', Mach = 'Mach', + Tas = 'Tas', Aoa = 'Aoa', Reference = 'Reference' } @@ -19,9 +20,9 @@ export enum SpeedConfigType { /** * A configuration object which defines a factory for an airspeed value presented as knots indicated airspeed. * - * The airspeed value can be defined from a specific indicated airspeed, mach number, or angle-of-attack value, from - * a one-dimensional lookup table of any of the previous value types keyed on pressure altitude, or from an aircraft - * reference speed. + * The airspeed value can be defined from a specific indicated airspeed, mach number, true airspeed, or angle-of-attack + * value, from a one-dimensional lookup table of any of the previous value types keyed on pressure altitude, or from an + * aircraft reference speed. */ export class SpeedConfig implements NumericConfig { public readonly isResolvableConfig = true; @@ -46,6 +47,7 @@ export class SpeedConfig implements NumericConfig { switch (type) { case SpeedConfigType.Ias: case SpeedConfigType.Mach: + case SpeedConfigType.Tas: case SpeedConfigType.Aoa: case SpeedConfigType.Reference: this.type = type; @@ -93,6 +95,8 @@ export class SpeedConfig implements NumericConfig { return this.resolveIas(); case SpeedConfigType.Mach: return this.resolveMach(); + case SpeedConfigType.Tas: + return this.resolveTas(); case SpeedConfigType.Aoa: return this.resolveAoa(); case SpeedConfigType.Reference: @@ -142,6 +146,30 @@ export class SpeedConfig implements NumericConfig { }; } + /** + * Resolves this config as a factory for an airspeed value defined from true airspeed. + * @returns A factory for an airspeed value defined from true airspeed. + */ + private resolveTas(): (context: AirspeedDefinitionContext) => number | MappedSubscribable { + const value = this.value as number | LookupTableConfig; + + return (context: AirspeedDefinitionContext) => { + if (typeof value === 'number') { + return context.tasToIas.map(tasToIas => tasToIas * value); + } else { + const table = value.resolve(); + + return MappedSubject.create( + ([indicatedAlt, tasToIas]): number => { + return table.get(indicatedAlt) * tasToIas; + }, + context.pressureAlt, + context.tasToIas + ); + } + }; + } + /** * Resolves this config as a factory for an airspeed value defined from angle of attack. * @returns A factory for an airspeed value defined from angle of attack. diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/G3000Version.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/G3000Version.ts index 6efb78946..aec862fd1 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/G3000Version.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/G3000Version.ts @@ -3,8 +3,8 @@ */ export class G3000Version { /** The current version string. */ - public static readonly VERSION = 'WT1.1.10'; + public static readonly VERSION = 'WT1.1.14'; /** The release date of the current version, as a UNIX timestamp in milliseconds. */ - public static readonly VERSION_DATE = Date.parse('2023-08-14'); + public static readonly VERSION_DATE = Date.parse('2023-11-13'); } \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/NavReference/G3000NavReference.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/NavReference/G3000NavReference.ts index c81567afd..697e9c910 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/NavReference/G3000NavReference.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/NavReference/G3000NavReference.ts @@ -109,7 +109,8 @@ export class G3000ApproachPreviewDataProvider { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }, FmsUtils.approachDetailsEquals); private readonly flightPhase = ConsumerSubject.create>(null, { diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/G3000UserSettingSaveManager.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/G3000UserSettingSaveManager.ts index b4b159fc8..f44a08288 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/G3000UserSettingSaveManager.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/G3000UserSettingSaveManager.ts @@ -87,7 +87,9 @@ export class G3000UserSettingSaveManager extends UserSettingSaveManager { ...PfdUserSettings.getMasterManager(bus).getAllSettings().filter(setting => { return G3000UserSettingSaveManager.PFD_SETTINGS.some(value => setting.definition.name.startsWith(value)); }), - ...MapUserSettings.getMasterManager(bus).getAllSettings(), + ...MapUserSettings.getMasterManager(bus).getAllSettings().filter(setting => { + return !setting.definition.name.startsWith('mapGroundNorthUpActive'); + }), ...MapSettingSyncUserSettings.getManager(bus).getAllSettings(), ...WeatherMapUserSettings.getMasterManager(bus).getAllSettings(), ...ConnextMapUserSettings.getMasterManager(bus).getAllSettings(), diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/MapUserSettings.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/MapUserSettings.ts index 4ec18cd21..c8c25abb1 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/MapUserSettings.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/Settings/MapUserSettings.ts @@ -156,6 +156,7 @@ export class MapUserSettings { ['mapOrientation']: MapOrientationSettingMode.HeadingUp, ['mapAutoNorthUpActive']: true, ['mapAutoNorthUpRangeIndex']: 27, // 1000 NM/2000 km + ['mapGroundNorthUpActive']: false, ['mapDeclutter']: MapDeclutterSettingMode.All, ['mapTerrainMode']: MapTerrainSettingMode.Absolute, ['mapTerrainRangeIndex']: 27, // 1000 NM/2000 km @@ -316,6 +317,7 @@ export class G3000MapUserSettingUtils { 'mapOrientation', 'mapAutoNorthUpActive', 'mapAutoNorthUpRangeIndex', + 'mapGroundNorthUpActive', 'mapDeclutter', 'mapTerrainMode', 'mapTerrainRangeIndex', diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/WTG3000FsInstrument.ts b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/WTG3000FsInstrument.ts index 90aaa7a16..c570a9176 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/WTG3000FsInstrument.ts +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/WTG3000FsInstrument.ts @@ -226,7 +226,13 @@ export abstract class WTG3000FsInstrument implements FsInstrument { 'coui://html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Assets/Data/gps_sbas.json', 5000, Object.values(SBASGroupName), - this.instrumentType === 'MFD' ? 'primary' : 'replica' + this.instrumentType === 'MFD' ? 'primary' : 'replica', + { + channelCount: 15, + satInUseMaxCount: 15, + satInUsePdopTarget: 2, + satInUseOptimumCount: 5 + } ), iau.gpsDefinition.electricity )); diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json index ebeca5c82..330b9f390 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json @@ -1,11 +1,11 @@ { "name": "@microsoft/msfs-wtg3000-common", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 Common Library", "main": "index.ts", "scripts": { "build:gulp": "esbuild Gulpfile.ts --bundle --outfile=gulpfile.js --platform=node --target=node16 --packages=external", - "build:defs": "tsc & robocopy . *.css build /s & rollup -c rollup-defs.config.js & cp package-defs-only.json dist/package.json & rm dist/ignoreme.css", + "build:defs": "tsc -p tsconfig-defs-only.json && cp package-defs-only.json build/package.json", "build": "gulp build", "copy": "gulp dist", "clean": "gulp clean" @@ -17,11 +17,8 @@ "author": "Working Title Simulations, LLC", "license": "Modified MIT", "devDependencies": { - "@microsoft/msfs-garminsdk": "*", "@microsoft/msfs-sdk": "*", - "@microsoft/msfs-types": "*" - }, - "dependencies": { - "rollup": "^2.79.1" + "@microsoft/msfs-types": "*", + "@microsoft/msfs-garminsdk": "*" } -} +} \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json.src b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json.src index 39a1ac3f4..5c7100477 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json.src +++ b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/package.json.src @@ -1,6 +1,6 @@ { "name": "wtg3000common", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 Common Library", "main": "wtg3000common.js", "files": ["wtg3000common.js", "wtg3000common.d.ts", "wtg3000common.css"], diff --git a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/rollup-defs.config.js b/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/rollup-defs.config.js deleted file mode 100644 index 9cb07a430..000000000 --- a/src/workingtitle-instruments-g3000/wtg3000common/html_ui/Pages/VCockpit/Instruments/NavSystems/WTG3000/Shared/rollup-defs.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import dts from 'rollup-plugin-dts' -import css from 'rollup-plugin-import-css'; -import resolve from '@rollup/plugin-node-resolve'; - -const config = [ - { - input: 'build/index.d.ts', - output: [{ file: 'dist/index.d.ts', format: 'es' }], - plugins: [dts(), resolve(), css({ output: 'ignoreme.css' })], - } -] -export default config \ No newline at end of file diff --git a/src/workingtitle-instruments-g3000/wtg3000common/package.json b/src/workingtitle-instruments-g3000/wtg3000common/package.json index ac9e4669e..9f3fa99b0 100644 --- a/src/workingtitle-instruments-g3000/wtg3000common/package.json +++ b/src/workingtitle-instruments-g3000/wtg3000common/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/msfs-wtg3000-common", - "version": "1.1.10", + "version": "1.1.14", "description": "Working Title MSFS G3000 Common Library", "main": "index.ts", "scripts": { diff --git a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/Autopilot/GNSVNavManager.ts b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/Autopilot/GNSVNavManager.ts index 73410efcb..f872cf2b8 100644 --- a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/Autopilot/GNSVNavManager.ts +++ b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/Autopilot/GNSVNavManager.ts @@ -58,7 +58,8 @@ export class GNSVNavManager implements VNavManager { rnavTypeFlags: RnavTypeFlags.None, isCircling: false, isVtf: false, - referenceFacility: null + referenceFacility: null, + runway: null }, FmsUtils.approachDetailsEquals); public options: GarminVNavGuidanceOptions = { diff --git a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/MainScreen.tsx b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/MainScreen.tsx index b98097a93..a0711342f 100644 --- a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/MainScreen.tsx +++ b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/MainScreen.tsx @@ -185,7 +185,14 @@ export class MainScreen extends DisplayComponent { 'coui://html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/Assets/gps_ephemeris.json', 'coui://html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/Assets/gps_sbas.json', 5000, - this.enabledSbasGroups + this.enabledSbasGroups, + 'none', + { + channelCount: 15, + satInUseMaxCount: 15, + satInUsePdopTarget: 2, + satInUseOptimumCount: 5 + } ); this.adcPublisher = new AdcPublisher(this.props.bus); this.ahrsPublisher = new GnsAhrsPublisher(this.props.bus); @@ -347,6 +354,7 @@ export class MainScreen extends DisplayComponent { private onPowerStateChanged(state: PowerState): void { this.currentPowerState = state; if (state === PowerState.OnSkipInit) { + this.gpsSatComputer.acquireAndUseSatellites(); this.pageContainer.instance.openPageGroup('NAV', true, 1); } diff --git a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/StartupScreen.tsx b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/StartupScreen.tsx index 2547d3ffa..968b5831d 100644 --- a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/StartupScreen.tsx +++ b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/StartupScreen.tsx @@ -153,7 +153,7 @@ export class StartupScreen extends DisplayComponent { Garmin Ltd. or its subs

- Main SW Version 5.40 - WT 1.1.9
+ Main SW Version 5.40 - WT 1.1.10
GPS SW Version 5.0
@@ -194,4 +194,4 @@ export class StartupScreen extends DisplayComponent {
); } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/UI/DataFields/GNSDataFieldRenderer.tsx b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/UI/DataFields/GNSDataFieldRenderer.tsx index 0c6b3582b..f319c4b26 100644 --- a/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/UI/DataFields/GNSDataFieldRenderer.tsx +++ b/src/workingtitle-instruments-gns/html_ui/Pages/VCockpit/Instruments/NavSystems/GPS/Shared/UI/DataFields/GNSDataFieldRenderer.tsx @@ -1,5 +1,5 @@ import { - ConsumerSubject, DurationDisplay, DurationDisplayDelim, DurationDisplayFormat, FSComponent, NavAngleUnitFamily, NumberFormatter, NumberUnitInterface, + ConsumerSubject, DurationDisplay, DurationDisplayDelim, DurationDisplayFormat, FSComponent, NavAngleUnit, NavAngleUnitFamily, NumberFormatter, NumberUnitInterface, UnitFamily, UserSettingManager, VNode } from '@microsoft/msfs-sdk'; @@ -174,7 +174,7 @@ export class GNSFieldVerticalSpeedRenderer extends GNSDataFieldTypeRenderer { /** @inheritdoc */ - public render(model: NavDataBarFieldModel>): VNode { + public render(model: NavDataBarFieldModel>): VNode { return ( { const airport = this.props.selectedAirport.get(); if (airport !== undefined && this.selectedDeparture !== undefined) { - this.props.fms.insertDeparture(airport, this.selectedDeparture, this.selectedRunway ?? -1, this.selectedTransition ?? -1); + let oneWayRunway: OneWayRunway | undefined = undefined; + if (this.selectedRunway !== undefined) { + const departure = airport.departures[this.selectedDeparture]; + if (departure !== undefined) { + const runwayTransition = departure.runwayTransitions[this.selectedRunway]; + + if (runwayTransition !== undefined) { + oneWayRunway = RunwayUtils.matchOneWayRunway(airport, runwayTransition.runwayNumber, runwayTransition.runwayDesignation); + } + } + + } + + this.props.fms.insertDeparture(airport, this.selectedDeparture, this.selectedRunway ?? -1, this.selectedTransition ?? -1, oneWayRunway); ViewService.back(); ViewService.open('FPL', false, 0); diff --git a/src/workingtitle-instruments-gns/package.json b/src/workingtitle-instruments-gns/package.json index 095aeea13..b7fd8b4f2 100644 --- a/src/workingtitle-instruments-gns/package.json +++ b/src/workingtitle-instruments-gns/package.json @@ -1,6 +1,6 @@ { "name": "workingtitle-instruments-gns", - "version": "1.1.9", + "version": "1.1.10", "description": "Working Title MSFS GNS430/530", "main": "index.ts", "scripts": { @@ -28,4 +28,4 @@ "rollup-plugin-import-css": "^3.1.0", "typescript": "4.5.5" } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/ApproachRefPage.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/ApproachRefPage.ts index 39b61e0ea..a677e0a89 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/ApproachRefPage.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/ApproachRefPage.ts @@ -297,8 +297,8 @@ export class ApproachRefPage extends FmcPage { */ private bindVSpeedManualSetting(type: VSpeedType, field: DisplayField): void { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.addBinding(new Binding(this.vspeedSettings.getSettings(type).get('manual')!, (v) => { - if (v === true) { + this.addBinding(new Binding(this.vspeedSettings.getSettings(type).manual, (v) => { + if (v) { field.getOptions().style = '[white]'; this.invalidate(); } @@ -336,9 +336,9 @@ export class ApproachRefPage extends FmcPage { */ private setVSpeedSetting(type: VSpeedType, value: number): void { const setting = this.vspeedSettings.getSettings(type); - setting.get('value')?.set(Math.trunc(value)); - setting.get('manual')?.set(false); - setting.get('show')?.set(true); + setting.value.set(Math.trunc(value)); + setting.manual.set(false); + setting.show.set(true); } /** @inheritDoc */ diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/TakeoffRefPage.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/TakeoffRefPage.ts index 966297a8b..87eb482bf 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/TakeoffRefPage.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/FMC/Pages/TakeoffRefPage.ts @@ -341,8 +341,8 @@ export class TakeoffRefPage extends FmcPage { */ private bindVSpeedManualSetting(type: VSpeedType, field: DisplayField): void { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.addBinding(new Binding(this.vspeedSettings.getSettings(type).get('manual')!, (v) => { - if (v === true) { + this.addBinding(new Binding(this.vspeedSettings.getSettings(type).manual, (v) => { + if (v) { field.getOptions().style = '[white]'; this.invalidate(); } @@ -389,9 +389,9 @@ export class TakeoffRefPage extends FmcPage { */ private setVSpeedSetting(type: VSpeedType, value: number): void { const setting = this.vspeedSettings.getSettings(type); - setting.get('value')?.set(Math.trunc(value)); - setting.get('manual')?.set(false); - setting.get('show')?.set(true); + setting.value.set(Math.trunc(value)); + setting.manual.set(false); + setting.show.set(true); } /** @inheritDoc */ diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/MFDUserSettings.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/MFDUserSettings.tsx index 874e8201a..cf7238794 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/MFDUserSettings.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/MFDUserSettings.tsx @@ -100,6 +100,14 @@ const mfdSettings = [ name: 'mfdSelectedTextPage_2', defaultValue: WT21MfdTextPage.TakeoffRef as WT21MfdTextPage, }, + { + name: 'mfdSoftkeyFormatChangeActive_1', + defaultValue: false as boolean, + }, + { + name: 'mfdSoftkeyFormatChangeActive_2', + defaultValue: false as boolean, + }, { name: 'memButton1_1', defaultValue: JSON.stringify(mem1defaultValue), @@ -147,6 +155,10 @@ const mfdSettingsAliased = [ name: 'mfdSelectedTextPage', defaultValue: WT21MfdTextPage.TakeoffRef as WT21MfdTextPage, }, + { + name: 'mfdSoftkeyFormatChangeActive', + defaultValue: false as boolean, + }, { name: 'memButton1', defaultValue: JSON.stringify(mem1defaultValue), @@ -203,6 +215,7 @@ export class MFDUserSettings { mfdUpperFmsTextVNavShow: `mfdUpperFmsTextVNavShow_${index}`, mfdDisplayMode: `mfdDisplayMode_${index}`, mfdSelectedTextPage: `mfdSelectedTextPage_${index}`, + mfdSoftkeyFormatChangeActive: `mfdSoftkeyFormatChangeActive_${index}`, memButton1: `memButton1_${index}`, memButton2: `memButton2_${index}`, memButton3: `memButton3_${index}`, diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdLwrMenuViewService.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdLwrMenuViewService.ts index 2722812ef..a50b62e89 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdLwrMenuViewService.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdLwrMenuViewService.ts @@ -1,13 +1,32 @@ +import { EventBus } from '@microsoft/msfs-sdk'; + +import { DisplayUnitConfigInterface, DisplayUnitLayout } from '../../Shared/Config/DisplayUnitConfig'; +import { MapUserSettings } from '../../Shared/Map/MapUserSettings'; import { GuiHEvent } from '../../Shared/UI/GuiHEvent'; import { MenuViewService } from '../../Shared/UI/MenuViewService'; +import { CcpEvent } from '../CCP/CcpEvent'; +import { CcpEventPublisherType } from '../CCP/CcpEventPublisher'; +import { MFDUpperWindowState, MFDUserSettings } from '../MFDUserSettings'; import { MfdLwrMenu } from './MfdLwrMenu'; -const WT21_H_EVENT_MFD_REGEX = /Generic_Lwr_([12])_(.*)/; +/** + * MFD lower view keys + */ +export interface MfdLwrMenuViewKeys { + /** MFD lower menu */ + 'MfdLwrMenu': void, + + /** MFD lower overlays menu */ + 'MfdLwrOverlaysMenu': void, + + /** MFD lower map symbols menu */ + 'MfdLwrMapSymbolsMenu': void, +} /** * A service to manage mfd lower menu views. */ -export class MfdLwrMenuViewService extends MenuViewService { +export class MfdLwrMenuViewService extends MenuViewService { protected readonly guiEventMap: Map = new Map([ ['MENU_ADV_INC', GuiHEvent.LOWER_INC], ['MENU_ADV_DEC', GuiHEvent.LOWER_DEC], @@ -15,38 +34,156 @@ export class MfdLwrMenuViewService extends MenuViewService { ['DATA_DEC', GuiHEvent.UPPER_DEC], ['DATA_PUSH', GuiHEvent.UPPER_PUSH], ['Push_LWR_MENU', GuiHEvent.LWR_MENU_PUSH], - ['Push_ESC', GuiHEvent.MFD_ESC] + ['Push_ESC', GuiHEvent.MFD_ESC], + ['Push_1L', GuiHEvent.SOFTKEY_1L], + ['Push_2L', GuiHEvent.SOFTKEY_2L], + ['Push_3L', GuiHEvent.SOFTKEY_3L], + ['Push_4L', GuiHEvent.SOFTKEY_4L], + ['Push_1R', GuiHEvent.SOFTKEY_1R], + ['Push_2R', GuiHEvent.SOFTKEY_2R], + ['Push_3R', GuiHEvent.SOFTKEY_3R], + ['Push_4R', GuiHEvent.SOFTKEY_4R], ]); - /** MfdLwrMenuViewService constructor + private readonly mapSettingsManagerMfd = MapUserSettings.getAliasedManager(this.bus, 'MFD'); + private readonly userSettingsManagerMfd = MFDUserSettings.getAliasedManager(this.bus); + + private readonly mfdSoftkeyFormatChangeActiveSetting = this.userSettingsManagerMfd.getSetting('mfdSoftkeyFormatChangeActive'); + private readonly mfdLowerFormatSetting = this.mapSettingsManagerMfd.getSetting('hsiFormat'); + private readonly mfdUpperFormatSetting = this.userSettingsManagerMfd.getSetting('mfdUpperWindowState'); + + private mfdSoftkeyFormatChangeActiveTimeout: NodeJS.Timer | undefined = undefined; + + /** + * MfdLwrMenuViewService constructor + * @param bus the event bus + * @param displayUnitConfig the display unit config * @param otherMenuServices Other menus on this screen that should be closed when this menu is opened */ - public constructor(public readonly otherMenuServices: MenuViewService[] = []) { + public constructor( + private readonly bus: EventBus, + private readonly displayUnitConfig: DisplayUnitConfigInterface, + public readonly otherMenuServices: MenuViewService[] = [], + ) { super(); } + private readonly isUsingSoftkeys = this.displayUnitConfig.displayUnitLayout === DisplayUnitLayout.Softkeys; + /** @inheritdoc */ public onInteractionEvent(hEvent: string, instrumentIndex: number): boolean { - const hEventWithoutPrefix = WT21_H_EVENT_MFD_REGEX[Symbol.match](hEvent); - if (hEventWithoutPrefix !== null) { - const evtIndex = hEventWithoutPrefix[1]; - if (Number(evtIndex) === instrumentIndex) { - const evt = this.guiEventMap.get(hEventWithoutPrefix[2]); - if (evt !== undefined) { - this.startInteractionTimeout(); - if (evt === GuiHEvent.LWR_MENU_PUSH) { - this.otherMenuServices.forEach(x => x.activeView.get()?.close()); - (this.activeView.get() instanceof MfdLwrMenu) ? this.activeView.get()?.close() : this.open('MfdLwrMenu'); - return true; - } else if (evt == GuiHEvent.MFD_ESC) { - const isInSubmenu = (this.activeView.get() && !(this.activeView.get() instanceof MfdLwrMenu)); - this.activeView.get()?.close(); - if (isInSubmenu) { - this.open('MfdLwrMenu'); + if (hEvent.startsWith('Generic_Lwr_')) { + const hEventWithoutPrefix = /Generic_Lwr_([12])_(.*)/[Symbol.match](hEvent); + + if (hEventWithoutPrefix !== null) { + const evtIndex = hEventWithoutPrefix[1]; + + if (Number(evtIndex) === instrumentIndex) { + const evt = this.guiEventMap.get(hEventWithoutPrefix[2]); + + if (evt !== undefined) { + this.startInteractionTimeout(); + + if (evt === GuiHEvent.LWR_MENU_PUSH) { + this.otherMenuServices.forEach(x => x.activeView.get()?.close()); + (this.activeView.get() instanceof MfdLwrMenu) ? this.activeView.get()?.close() : this.open('MfdLwrMenu'); + return true; + } else if (evt == GuiHEvent.MFD_ESC) { + const isInSubmenu = (this.activeView.get() && !(this.activeView.get() instanceof MfdLwrMenu)); + this.activeView.get()?.close(); + if (isInSubmenu) { + this.open('MfdLwrMenu'); + } + return true; + } else { + return this.routeInteractionEventToViews(evt); + } + } + } + } + } else if (this.isUsingSoftkeys && hEvent.startsWith('Generic_Display_')) { + const hEventWithoutPrefix = /Generic_Display_MFD([12])_(.*)/[Symbol.match](hEvent); + + if (hEventWithoutPrefix !== null) { + const evtIndex = hEventWithoutPrefix[1]; + + if (Number(evtIndex) === instrumentIndex) { + const evt = this.guiEventMap.get(hEventWithoutPrefix[2]); + + if (evt !== undefined) { + this.startInteractionTimeout(); + + switch (evt) { + case GuiHEvent.SOFTKEY_1L: { + if (this.mfdSoftkeyFormatChangeActiveTimeout !== undefined) { + clearTimeout(this.mfdSoftkeyFormatChangeActiveTimeout); + } + + this.mfdSoftkeyFormatChangeActiveTimeout = setTimeout(() => this.mfdSoftkeyFormatChangeActiveSetting.set(false), 10_000); + + if (!this.mfdSoftkeyFormatChangeActiveSetting.get()) { + this.mfdSoftkeyFormatChangeActiveSetting.set(true); + return true; + } + + const currentFormat = this.mfdUpperFormatSetting.get(); + + let nextFormat; + switch (currentFormat) { + default: + case MFDUpperWindowState.Off: + nextFormat = MFDUpperWindowState.FmsText; + break; + case MFDUpperWindowState.FmsText: + nextFormat = MFDUpperWindowState.Checklist; + break; + // case MFDUpperWindowState.Checklist: nextFormatIndex = MFDUpperWindowState.PassBrief; break; + case MFDUpperWindowState.Checklist: + nextFormat = MFDUpperWindowState.Systems; + break; + } + + this.mfdUpperFormatSetting.set(nextFormat); + break; + } + case GuiHEvent.SOFTKEY_1R: { + if (this.mfdSoftkeyFormatChangeActiveTimeout !== undefined) { + clearTimeout(this.mfdSoftkeyFormatChangeActiveTimeout); + } + + this.mfdSoftkeyFormatChangeActiveTimeout = setTimeout(() => this.mfdSoftkeyFormatChangeActiveSetting.set(false), 10_000); + + if (!this.mfdSoftkeyFormatChangeActiveSetting.get()) { + this.mfdSoftkeyFormatChangeActiveSetting.set(true); + return true; + } + + const lowerFormats = MapUserSettings.hsiFormatsMFD; + const currentFormatIndex = lowerFormats.indexOf(this.mfdLowerFormatSetting.get()); + const nextFormatIndex = (currentFormatIndex + 1) % (lowerFormats.length - 1); + + this.mfdLowerFormatSetting.set(lowerFormats[nextFormatIndex]); + break; + } + case GuiHEvent.SOFTKEY_2R: { + // OVERLAYS + // TODO this is not super great - ideally, the HSI container would be a view, and it would transmit events to components. + // But this requires a larger refactor. + // For now, we transmit the corresponding DCP event instead. + this.bus.getPublisher().pub('ccpEvent', CcpEvent.CCP_TERR_WX); + return true; + } + case GuiHEvent.SOFTKEY_3R: { + // TFC + // TODO this is not super great - ideally, the HSI container would be a view, and it would transmit events to components. + // But this requires a larger refactor. + // For now, we transmit the corresponding DCP event instead. + this.bus.getPublisher().pub('ccpEvent', CcpEvent.CCP_TFC); + return false; + } + default: + return this.routeInteractionEventToViews(evt); } - return true; - } else { - return this.routeInteractionEventToViews(evt); } } } diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdUprMenuViewService.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdUprMenuViewService.ts index 6ca973aac..b929a9782 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdUprMenuViewService.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/Menus/MfdUprMenuViewService.ts @@ -4,10 +4,18 @@ import { MfdUprMenu } from './MfdUprMenu'; const WT21_H_EVENT_MFD_REGEX = /Generic_Lwr_([12])_(.*)/; +/** + * MFD upper view keys + */ +export interface MfdUprMenuViewKeys { + /** MFD upper menu */ + 'MfdUprMenu': void, +} + /** * A service to manage mfd upper menu views. */ -export class MfdUprMenuViewService extends MenuViewService { +export class MfdUprMenuViewService extends MenuViewService { protected readonly guiEventMap: Map = new Map([ ['MENU_ADV_INC', GuiHEvent.LOWER_INC], ['MENU_ADV_DEC', GuiHEvent.LOWER_DEC], diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/WT21_MFD_Instrument.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/WT21_MFD_Instrument.tsx index a25748522..19d3be4a5 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/WT21_MFD_Instrument.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/MFD/WT21_MFD_Instrument.tsx @@ -4,19 +4,10 @@ /// import { - AdcPublisher, AhrsPublisher, AutopilotInstrument, BaseInstrumentPublisher, BasicAvionicsSystem, Clock, - ClockEvents, CompositeLogicXMLHost, ConsumerSubject, - DebounceTimer, - ElectricalEvents, EventBus, FacilityLoader, FacilityRepository, FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, - FlightPlanPredictor, FSComponent, - FsInstrument, - GNSSPublisher, HEventPublisher, InstrumentBackplane, InstrumentEvents, LNavSimVarPublisher, MinimumsSimVarPublisher, NavComSimVarPublisher, - PressurizationPublisher, SimVarValueType, - SoundServer, - StallWarningEvents, - StallWarningPublisher, - Subject, TrafficInstrument, UserSettingSaveManager, - VNavSimVarPublisher, Wait, XPDRSimVarPublisher, + AdcPublisher, AhrsPublisher, AutopilotInstrument, BaseInstrumentPublisher, BasicAvionicsSystem, Clock, ClockEvents, CompositeLogicXMLHost, ConsumerSubject, + DebounceTimer, ElectricalEvents, EventBus, FacilityLoader, FacilityRepository, FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, FlightPlanPredictor, FSComponent, + GNSSPublisher, HEventPublisher, InstrumentBackplane, InstrumentEvents, LNavSimVarPublisher, MinimumsSimVarPublisher, NavComSimVarPublisher, PressurizationPublisher, + SimVarValueType, SoundServer, StallWarningEvents, StallWarningPublisher, Subject, TrafficInstrument, UserSettingSaveManager, VNavSimVarPublisher, Wait, XPDRSimVarPublisher, } from '@microsoft/msfs-sdk'; import { WT21LNavDataEvents, WT21LNavDataSimVarPublisher } from '../FMC/Autopilot/WT21LNavDataEvents'; @@ -51,17 +42,18 @@ import { MfdLwrMapSymbolsMenu } from './Menus/MfdLwrMapSymbolsMenu'; import { WT21FlightPlanPredictorConfiguration } from '../Shared/WT21FlightPlanPredictorConfiguration'; import { WT21Fms } from '../Shared/FlightPlan/WT21Fms'; import { WT21ElectricalSetup } from '../Shared/Systems/WT21ElectricalSetup'; - -import '../Shared/WT21_Common.css'; -import './WT21_MFD.css'; import { WT21XmlAuralsConfig } from '../Shared/WT21XmlAuralsConfig'; import { WT21FixInfoManager } from '../FMC/Systems/WT21FixInfoManager'; import { WT21FixInfoConfig } from '../FMC/Systems/WT21FixInfoConfig'; +import { WT21DisplayUnitFsInstrument, WT21DisplayUnitType } from '../Shared/WT21DisplayUnitFsInstrument'; + +import '../Shared/WT21_Common.css'; +import './WT21_MFD.css'; /** * The WT21 MFD Instrument */ -export class WT21_MFD_Instrument implements FsInstrument { +export class WT21_MFD_Instrument extends WT21DisplayUnitFsInstrument { private readonly backplane: InstrumentBackplane; private readonly baseInstrumentPublisher: BaseInstrumentPublisher; private readonly hEventPublisher: HEventPublisher; @@ -121,6 +113,8 @@ export class WT21_MFD_Instrument implements FsInstrument { * @param instrument The base instrument. */ constructor(readonly instrument: BaseInstrument) { + super(instrument, WT21DisplayUnitType.Mfd, instrument.instrumentIndex === 1 ? 1 : 2); + RegisterViewListener('JS_LISTENER_INSTRUMENTS'); this.bus = new EventBus(); @@ -223,7 +217,7 @@ export class WT21_MFD_Instrument implements FsInstrument { // TODO Deduplicate this code against PFD code this.navIndicators = new NavIndicators(new Map([ - ['courseNeedle', new WT21CourseNeedleNavIndicator(this.navSources, this.bus, 'MFD')], + ['courseNeedle', new WT21CourseNeedleNavIndicator(this.navSources, this, this.bus)], ['bearingPointer1', new WT21BearingPointerNavIndicator(this.navSources, this.bus, 1, 'NAV1')], ['bearingPointer2', new WT21BearingPointerNavIndicator(this.navSources, this.bus, 2, 'NAV2')], ])); @@ -251,7 +245,7 @@ export class WT21_MFD_Instrument implements FsInstrument { this.fixInfoManager = new WT21FixInfoManager(this.bus, this.facLoader, WT21Fms.PRIMARY_ACT_PLAN_INDEX, this.planner, WT21FixInfoConfig /*, this.activeRoutePredictor*/); this.uprMenuViewService = new MfdUprMenuViewService(); - this.lwrMenuViewService = new MfdLwrMenuViewService(); + this.lwrMenuViewService = new MfdLwrMenuViewService(this.bus, this.displayUnitConfig); this.uprMenuViewService.otherMenuServices.push(this.lwrMenuViewService); this.lwrMenuViewService.otherMenuServices.push(this.uprMenuViewService); @@ -288,8 +282,14 @@ export class WT21_MFD_Instrument implements FsInstrument { FSComponent.render( , document.getElementById('HSIMap') diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Components/FlightInstruments/AirspeedIndicator.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Components/FlightInstruments/AirspeedIndicator.tsx index 957fb7eea..56e11213a 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Components/FlightInstruments/AirspeedIndicator.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Components/FlightInstruments/AirspeedIndicator.tsx @@ -295,19 +295,19 @@ export class AirspeedIndicator extends DisplayComponent const type = (vspeed as VSpeedType); const setting = this.vspeedSettings.getSettings(type); - setting.get('value')?.sub((v) => { + setting.value.sub((v) => { this.SpeedBugsMap.get(type)?.instance.setBugSpeed(v as number); this.SpeedValuesMap.get(type)?.instance.setVSpeed(v as number); this.updateAllBugsAndRanges(Simplane.getIndicatedSpeed()); }, true); - setting.get('manual')?.sub((v) => { + setting.manual.sub((v) => { this.SpeedBugsMap.get(type)?.instance.setIsModified(v as boolean); this.SpeedValuesMap.get(type)?.instance.setIsModified(v as boolean); this.updateAllBugsAndRanges(Simplane.getIndicatedSpeed()); }, true); - setting.get('show')?.sub((v) => { + setting.show.sub((v) => { this.SpeedBugsMap.get(type)?.instance.setIsVisible(v as boolean); this.SpeedValuesMap.get(type)?.instance.setIsVisible(v as boolean); this.updateAllBugsAndRanges(Simplane.getIndicatedSpeed()); @@ -335,8 +335,8 @@ export class AirspeedIndicator extends DisplayComponent */ private setVSpeedState = (type: VSpeedType, enabled: boolean): void => { const setting = this.vspeedSettings.getSettings(type); - setting.get('show')?.set(enabled); - setting.get('manual')?.set(true); + setting.show.set(enabled); + setting.manual.set(true); }; diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenu.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenu.tsx index 55d5b7fda..fbbf2ea9f 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenu.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenu.tsx @@ -26,9 +26,9 @@ export class PfdMenu extends GuiDialog { private readonly rangeOption = Subject.create(0); private readonly mapSettingsManager = MapUserSettings.getAliasedManager(this.props.bus, 'PFD'); - public readonly navSourcesOrder = ['FMS1', 'NAV1', 'NAV2'] as const; - public readonly navSources = ArraySubject.create(['FMS1', 'VOR1', 'VOR2']); - public readonly ranges = ArraySubject.create(['5', '10', '25', '50', '100', '200', '300', '600']); + private readonly navSourcesOrder = ['FMS1', 'NAV1', 'NAV2'] as const; + private readonly navSources = ArraySubject.create(['FMS1', 'VOR1', 'VOR2']); + private readonly ranges = ArraySubject.create(['5', '10', '25', '50', '100', '200', '300', '600']); /** @inheritdoc */ public onAfterRender(node: VNode): void { diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenuViewService.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenuViewService.ts index 14e7c5025..80399736d 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenuViewService.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdMenuViewService.ts @@ -1,12 +1,84 @@ +import { EventBus } from '@microsoft/msfs-sdk'; + +import { DisplayUnitConfigInterface, DisplayUnitLayout } from '../../Shared/Config/DisplayUnitConfig'; import { GuiHEvent } from '../../Shared/UI/GuiHEvent'; import { MenuViewService } from '../../Shared/UI/MenuViewService'; import { PfdMenu } from './PfdMenu'; import { PfdRefsMenu } from './PfdRefsMenu'; +import { PfdSideButtonsRefs2Menu } from './PfdSideButtonsRefs2Menu'; +import { PfdSideButtonsRefs1Menu } from './PfdSideButtonsRefs1Menu'; +import { DcpEventPublisherType } from '../DCP/DcpEventPublisher'; +import { DcpEvent } from '../DCP/DcpEvent'; +import { WT21CourseNeedleNavIndicator } from '../../Shared/Navigation/WT21NavIndicators'; + +/** + * PFD view keys + */ +export interface PfdMenuViewKeys { + /** PFD menu */ + 'PfdMenu': void, + + /** BRG SRC menu */ + 'BrgSrcMenu': void, + + /** PFD config menu */ + 'PfdConfigMenu': void, + + /** PFD refs menu */ + 'PfdRefsMenu': void, + + /** PFD overlays menu */ + 'PfdOverlaysMenu': void, + + /** PFD baro set menu */ + 'PfdBaroSetMenu': void, + + /** PFD (side button layout) NAV/BRG SRC menu */ + 'PfdSideButtonsNavBrgSrcMenu': void, + + /** PFD (side button layout) REFS 1/2 menu */ + 'PfdSideButtonsRefs1Menu': void, + + /** PFD (side button layout) REFS 2/2 menu */ + 'PfdSideButtonsRefs2Menu': void, +} /** * A service to manage pfd menu views. */ -export class PfdMenuViewService extends MenuViewService { +export class PfdMenuViewService extends MenuViewService { + /** + * Ctor + * @param bus the event bus + * @param displayUnitConfig the display unit config for the PFD + * @param courseNeedleNavIndicator the course needle nav indicator, used to perform nav swap on PRESET LSK press + */ + constructor( + private readonly bus: EventBus, + private readonly displayUnitConfig: DisplayUnitConfigInterface, + private readonly courseNeedleNavIndicator: WT21CourseNeedleNavIndicator, + ) { + super(); + + const dcpSubscriber = bus.getSubscriber(); + + if (displayUnitConfig.displayUnitLayout === DisplayUnitLayout.Softkeys) { + dcpSubscriber.on('dcpEvent').handle((event) => { + if (event === DcpEvent.DCP_NAV) { + const activeView = this.activeViewKey.get(); + + if (activeView === 'PfdSideButtonsNavBrgSrcMenu') { + this.activeView.get()?.close(); + } else { + this.open('PfdSideButtonsNavBrgSrcMenu'); + } + } + }); + } + } + + private readonly isUsingSoftkeys = this.displayUnitConfig.displayUnitLayout === DisplayUnitLayout.Softkeys; + protected readonly guiEventMap: Map = new Map([ ['MENU_ADV_INC', GuiHEvent.LOWER_INC], ['MENU_ADV_DEC', GuiHEvent.LOWER_DEC], @@ -15,35 +87,125 @@ export class PfdMenuViewService extends MenuViewService { ['DATA_PUSH', GuiHEvent.UPPER_PUSH], ['Push_PFD_MENU', GuiHEvent.PFD_MENU_PUSH], ['Push_REFS_MENU', GuiHEvent.REFS_MENU_PUSH], - ['Push_ESC', GuiHEvent.PFD_ESC] + ['Push_ESC', GuiHEvent.PFD_ESC], + ['Push_1L', GuiHEvent.SOFTKEY_1L], + ['Push_2L', GuiHEvent.SOFTKEY_2L], + ['Push_3L', GuiHEvent.SOFTKEY_3L], + ['Push_4L', GuiHEvent.SOFTKEY_4L], + ['Push_1R', GuiHEvent.SOFTKEY_1R], + ['Push_2R', GuiHEvent.SOFTKEY_2R], + ['Push_3R', GuiHEvent.SOFTKEY_3R], + ['Push_4R', GuiHEvent.SOFTKEY_4R], ]); /** @inheritdoc */ public onInteractionEvent(hEvent: string): boolean { - const evt = this.guiEventMap.get(hEvent.replace(/Generic_Upr_([12])_/, '')); - - if (evt !== undefined) { - this.startInteractionTimeout(); - if (evt === GuiHEvent.PFD_MENU_PUSH) { - (this.activeView.get() instanceof PfdMenu) ? this.activeView.get()?.close() : this.open('PfdMenu'); - return true; - } else if (evt == GuiHEvent.PFD_ESC) { - const isInSubmenu = (this.activeView.get() && !(this.activeView.get() instanceof PfdMenu)); - this.activeView.get()?.close(); - if (isInSubmenu) { - this.open('PfdMenu'); - } - - return true; - } else if (evt === GuiHEvent.REFS_MENU_PUSH) { - // TODO check if Refs menu is already open - (this.activeView.get() instanceof PfdRefsMenu) ? this.activeView.get()?.close() : this.open('PfdRefsMenu'); - return true; - } else { + const activeView = this.activeView.get(); + + if (hEvent.startsWith('Generic_Upr')) { + const evt = this.guiEventMap.get(hEvent.replace(/Generic_Upr_([12])_/, '')); + + if (evt !== undefined) { + this.startInteractionTimeout(); + + switch (evt) { + case GuiHEvent.PFD_MENU_PUSH: { + (activeView instanceof PfdMenu) ? activeView?.close() : this.open('PfdMenu'); + return true; + } + case GuiHEvent.PFD_ESC: { + const isInSubmenu = (activeView && !(activeView instanceof PfdMenu)); + + activeView?.close(); + + if (isInSubmenu) { + this.open('PfdMenu'); + } + + return true; + } + case GuiHEvent.REFS_MENU_PUSH: { + // TODO check if Refs menu is already open + if (this.isUsingSoftkeys) { + if (activeView instanceof PfdSideButtonsRefs1Menu) { + this.open('PfdSideButtonsRefs2Menu'); + } else if (activeView instanceof PfdSideButtonsRefs2Menu) { + activeView.close(); + } else { + this.open('PfdSideButtonsRefs1Menu'); + return true; + } + return true; + } else { + (activeView instanceof PfdRefsMenu) ? activeView?.close() : this.open('PfdRefsMenu'); + return true; + } + } + default: + return this.routeInteractionEventToViews(evt); + } + } + + return false; + } else if (this.isUsingSoftkeys && hEvent.startsWith('Generic_Display_')) { + const evt = this.guiEventMap.get(hEvent.replace(/Generic_Display_PFD([12])_/, '')) as GuiHEvent; + + if (activeView) { return this.routeInteractionEventToViews(evt); } + + switch (evt) { + case GuiHEvent.SOFTKEY_1L: { + // noop + return false; + } + case GuiHEvent.SOFTKEY_2L: { + // PRESET TODO noop + this.courseNeedleNavIndicator.navSwap(); + return false; + } + case GuiHEvent.SOFTKEY_3L: { + // noop + return false; + } + case GuiHEvent.SOFTKEY_4L: { + // ET + this.bus.getPublisher().pub('dcpEvent', DcpEvent.DCP_ET); + return false; + } + case GuiHEvent.SOFTKEY_1R: { + // FORMAT + // TODO this is not super great - ideally, the HSI container would be a view, and it would transmit events to components. + // But this requires a larger refactor. + // For now, we transmit the corresponding DCP event instead. + this.bus.getPublisher().pub('dcpEvent', DcpEvent.DCP_FRMT); + return true; + } + case GuiHEvent.SOFTKEY_2R: { + // OVERLAYS + // TODO this is not super great - ideally, the HSI container would be a view, and it would transmit events to components. + // But this requires a larger refactor. + // For now, we transmit the corresponding DCP event instead. + this.bus.getPublisher().pub('dcpEvent', DcpEvent.DCP_TERR_WX); + return true; + } + case GuiHEvent.SOFTKEY_3R: { + // TFC + // TODO this is not super great - ideally, the HSI container would be a view, and it would transmit events to components. + // But this requires a larger refactor. + // For now, we transmit the corresponding DCP event instead. + this.bus.getPublisher().pub('dcpEvent', DcpEvent.DCP_TFC); + return false; + } + case GuiHEvent.SOFTKEY_4R: { + // ??? TODO noop + return false; + } + } + + return false; } return false; } -} \ No newline at end of file +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdRefsMenu.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdRefsMenu.tsx index 473a76804..aadb324e6 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdRefsMenu.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdRefsMenu.tsx @@ -42,21 +42,21 @@ export class PfdRefsMenu extends GuiDialog { ]); private readonly VSpeedValues = new Map>([ - [VSpeedType.V1, this.vSpeedSettings.getSettings(VSpeedType.V1).get('value')! as MutableSubscribable], - [VSpeedType.V2, this.vSpeedSettings.getSettings(VSpeedType.V2).get('value')! as MutableSubscribable], - [VSpeedType.Vr, this.vSpeedSettings.getSettings(VSpeedType.Vr).get('value')! as MutableSubscribable], - [VSpeedType.Venr, this.vSpeedSettings.getSettings(VSpeedType.Venr).get('value')! as MutableSubscribable], - [VSpeedType.Vapp, this.vSpeedSettings.getSettings(VSpeedType.Vapp).get('value')! as MutableSubscribable], - [VSpeedType.Vref, this.vSpeedSettings.getSettings(VSpeedType.Vref).get('value')! as MutableSubscribable], + [VSpeedType.V1, this.vSpeedSettings.getSettings(VSpeedType.V1).value as MutableSubscribable], + [VSpeedType.V2, this.vSpeedSettings.getSettings(VSpeedType.V2).value as MutableSubscribable], + [VSpeedType.Vr, this.vSpeedSettings.getSettings(VSpeedType.Vr).value as MutableSubscribable], + [VSpeedType.Venr, this.vSpeedSettings.getSettings(VSpeedType.Venr).value as MutableSubscribable], + [VSpeedType.Vapp, this.vSpeedSettings.getSettings(VSpeedType.Vapp).value as MutableSubscribable], + [VSpeedType.Vref, this.vSpeedSettings.getSettings(VSpeedType.Vref).value as MutableSubscribable], ]); private readonly VSpeedStates = new Map>([ - [VSpeedType.V1, this.vSpeedSettings.getSettings(VSpeedType.V1).get('show')! as MutableSubscribable], - [VSpeedType.V2, this.vSpeedSettings.getSettings(VSpeedType.V2).get('show')! as MutableSubscribable], - [VSpeedType.Vr, this.vSpeedSettings.getSettings(VSpeedType.Vr).get('show')! as MutableSubscribable], - [VSpeedType.Venr, this.vSpeedSettings.getSettings(VSpeedType.Venr).get('show')! as MutableSubscribable], - [VSpeedType.Vapp, this.vSpeedSettings.getSettings(VSpeedType.Vapp).get('show')! as MutableSubscribable], - [VSpeedType.Vref, this.vSpeedSettings.getSettings(VSpeedType.Vref).get('show')! as MutableSubscribable], + [VSpeedType.V1, this.vSpeedSettings.getSettings(VSpeedType.V1).show as MutableSubscribable], + [VSpeedType.V2, this.vSpeedSettings.getSettings(VSpeedType.V2).show as MutableSubscribable], + [VSpeedType.Vr, this.vSpeedSettings.getSettings(VSpeedType.Vr).show as MutableSubscribable], + [VSpeedType.Venr, this.vSpeedSettings.getSettings(VSpeedType.Venr).show as MutableSubscribable], + [VSpeedType.Vapp, this.vSpeedSettings.getSettings(VSpeedType.Vapp).show as MutableSubscribable], + [VSpeedType.Vref, this.vSpeedSettings.getSettings(VSpeedType.Vref).show as MutableSubscribable], ]); private readonly VSpeedCssClasses = new Map>([ @@ -89,10 +89,10 @@ export class PfdRefsMenu extends GuiDialog { for (const [type, uiRef] of this.VSpeedUiRefs.entries()) { const settings = this.vSpeedSettings.getSettings(type); uiRef.instance.props.onValueChanged = () => { - settings.get('manual')?.set(true); + settings.manual.set(true); }; - settings.get('manual')?.sub((v) => { - this.VSpeedCssClasses.get(type)?.set((v as boolean) === true ? '' : 'magenta'); + settings.manual.sub((v) => { + this.VSpeedCssClasses.get(type)?.set((v as boolean) ? '' : 'magenta'); }, true); } @@ -178,22 +178,6 @@ export class PfdRefsMenu extends GuiDialog { } } - - /** - * A callback called when a VSpeed value needs to be published - * @param type The VSpeed type. - * @param value The VSpeed value. - * @param enabled The VSpeed state. - */ - private publishVSpeed = (type: VSpeedType, value: number, enabled: boolean): void => { - // const publisher = this.props.bus.getPublisher(); - // publisher.pub('vspeed', { type: type, value: value, enabled: enabled, modified: true }, true, true); - const setting = this.vSpeedSettings.getSettings(type); - setting.get('value')?.set(value); - setting.get('manual')?.set(value); - setting.get('show')?.set(enabled); - }; - /** @inheritdoc */ public render(): VNode { return ( diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.css new file mode 100644 index 000000000..ceb3485c8 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.css @@ -0,0 +1,32 @@ +.pfd-popup-nav-src-overlay { + width: 100px; + + top: 646px; + left: 0; +} + +.pfd-popup-nav-src-overlay .popup-menu-title { + color: var(--wt21-colors-white); + background-color: var(--wt21-colors-blue); +} + +.pfd-popup-brg-src-overlay { + width: 100px; + + top: 646px; + right: 0; +} + +.pfd-popup-brg-src-overlay .popup-menu-title { + color: var(--wt21-colors-white); + background-color: var(--wt21-colors-blue); +} + +.pfd-popup-brg-src-overlay-bottom { + margin-top: 48px; +} + +.pfd-popup-brg-src-arrow { + position: absolute; + overflow: visible; +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.tsx new file mode 100644 index 000000000..b1c6f97bf --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsNavBrgSrcMenu.tsx @@ -0,0 +1,205 @@ +import { ArraySubject, EventBus, FSComponent, Subject, VNode } from '@microsoft/msfs-sdk'; + +import { FloatingRadioList } from '../../Shared/Menus/Components/FloatingRadioList'; +import { FloatingRadioItem } from '../../Shared/Menus/Components/FloatingRadioItem'; +import { PopupSubMenu } from '../../Shared/Menus/Components/PopupSubMenu'; +import { GuiDialog, GuiDialogProps } from '../../Shared/UI/GuiDialog'; +import { WT21BearingPointerControlEvents, WT21CourseNeedleNavIndicator, WT21NavIndicator, WT21NavSource } from '../../Shared/Navigation/WT21NavIndicators'; + +import './PfdSideButtonsNavBrgSrcMenu.css'; + +/** + * Props for {@link PfdSideButtonsNavBrgSrcMenu} + */ +export interface PfdSideButtonsNavBrgSrcMenuProps extends GuiDialogProps { + /** The event bus */ + bus: EventBus, + + /** Used to sync bearing pointer indicator. */ + bearingPointerIndicator1: WT21NavIndicator, + + /** Used to sync bearing pointer indicator. */ + bearingPointerIndicator2: WT21NavIndicator, + + /** Used to sync if isLocalizer. */ + nav1Source: WT21NavSource, + + /** Used to sync if isLocalizer. */ + nav2Source: WT21NavSource, + + /** Used to sync ADF frequency. */ + adfSource: WT21NavSource, + + /** Used to sync active nav source. */ + courseNeedle: WT21CourseNeedleNavIndicator; +} + +/** + * PFD (side button layout) NAV/BRG SRC menu + */ +export class PfdSideButtonsNavBrgSrcMenu extends GuiDialog { + private static readonly BEARING_POINTER_1_PATH = 'M -8 5 L 0 -9 L 8 5 M 0 -16.335 L 0 8'; + + private static readonly BEARING_POINTER_2_PATH = 'M -8.0438 3.7125 L 0 -6.1875 L 8.0438 3.7125 L 0 -6.1875 M -4.3313 -0.6188 L -4.3313 12.1375 M 4.3313 -0.6188 L 4.3313 12.1375'; + + private readonly nav1RadioBox = FSComponent.createRef(); + private readonly nav2RadioBox = FSComponent.createRef(); + private readonly bearingPointer1Option = Subject.create(0); + private readonly bearingPointer2Option = Subject.create(0); + private readonly sources1 = [null, 'FMS1', 'NAV1', 'ADF'] as const; + private readonly sources2 = [null, 'FMS2', 'NAV2', 'ADF'] as const; + private readonly nav1Label = Subject.create(''); + private readonly nav2Label = Subject.create(''); + private readonly adfLabel = Subject.create(''); + + private readonly navSourcesOrder = ['FMS1', 'NAV1', 'NAV2'] as const; + private readonly navSources = ArraySubject.create(['FMS1', 'VOR1', 'VOR2']); + private readonly navSrcOption = Subject.create(0); + /** @inheritdoc */ + public onAfterRender(node: VNode): void { + super.onAfterRender(node); + + this.linkNavIndicators(); + this.linkNavSource(); + } + + // eslint-disable-next-line jsdoc/require-jsdoc + private linkNavIndicators(): void { + this.bearingPointer1Option.sub(x => { + const newSourceName = this.sources1[x]; + this.props.bus.getPublisher() + .pub('nav_ind_bearingPointer1_set_source', newSourceName, true); + }); + this.bearingPointer2Option.sub(x => { + const newSourceName = this.sources2[x]; + this.props.bus.getPublisher() + .pub('nav_ind_bearingPointer2_set_source', newSourceName, true); + }); + + this.props.bearingPointerIndicator1.source.sub(x => { + this.bearingPointer1Option.set(x === null ? 0 : this.sources1.indexOf(x.name as typeof this.sources1[number])); + }, true); + this.props.bearingPointerIndicator2.source.sub(x => { + this.bearingPointer2Option.set(x === null ? 0 : this.sources2.indexOf(x.name as typeof this.sources2[number])); + }, true); + + this.props.nav1Source.isLocalizer.sub(this.updateNav1Label, true); + this.props.nav1Source.isLocalizer.sub(x => this.nav1RadioBox.instance.setIsEnabled(!x), true); + this.props.nav1Source.activeFrequency.sub(this.updateNav1Label, true); + + this.props.nav2Source.isLocalizer.sub(this.updateNav2Label, true); + this.props.nav2Source.isLocalizer.sub(x => this.nav2RadioBox.instance.setIsEnabled(!x), true); + this.props.nav2Source.activeFrequency.sub(this.updateNav2Label, true); + + this.props.adfSource.activeFrequency.sub(this.updateAdfLabel, true); + } + + // eslint-disable-next-line jsdoc/require-jsdoc + private linkNavSource(): void { + this.navSrcOption.sub(x => { + const newSourceName = this.navSourcesOrder[x]; + this.props.courseNeedle.setNewSource(newSourceName); + }); + + this.props.courseNeedle.source.sub(x => { + if (!x) { + return; + } + + this.navSrcOption.set(this.navSourcesOrder.indexOf(x.name as typeof this.navSourcesOrder[number])); + }, true); + + this.props.courseNeedle.isLocalizer.sub(x => { + if (x) { + this.navSources.set(['FMS1', 'LOC1', 'LOC2']); + } else { + this.navSources.set(['FMS1', 'VOR1', 'VOR2']); + } + }, true); + } + + private readonly updateNavLabel = (index: 1 | 2, source: WT21NavSource, label: Subject) => (): void => { + const name = source.isLocalizer.get() ? `LOC${index}` : `VOR${index}`; + const freq = source.activeFrequency.get()?.toFixed(2); + const newLabel = `${name} ${freq}`; + label.set(newLabel); + }; + private readonly updateNav1Label = this.updateNavLabel(1, this.props.nav1Source, this.nav1Label); + private readonly updateNav2Label = this.updateNavLabel(2, this.props.nav2Source, this.nav2Label); + + private readonly updateAdfLabel = (): void => { + const freq = this.props.adfSource.activeFrequency.get()?.toFixed(1); + const newLabel = `ADF~~${freq}`; + this.adfLabel.set(newLabel); + }; + + /** @inheritDoc */ + public onSoftkey1L(): boolean { + this.navSrcOption.set((this.navSrcOption.get() + 1) % 3); + return true; + } + + /** @inheritDoc */ + public onSoftkey1R(): boolean { + this.bearingPointer1Option.set((this.bearingPointer1Option.get() + 1) % 3); + return true; + } + + /** @inheritDoc */ + public onSoftkey3R(): boolean { + this.bearingPointer2Option.set((this.bearingPointer2Option.get() + 1) % 2); + return true; + } + + /** @inheritDoc */ + public override render(): VNode { + return ( +
+ + + FMS + VOR1 + VOR2 + + + + + + + + + + + + + + OFF + FMS + VOR1 + ADF1 + + + + OFF + FMS + VOR2 + + +
+ ); + } +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs1Menu.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs1Menu.tsx new file mode 100644 index 000000000..fd7484aa1 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs1Menu.tsx @@ -0,0 +1,265 @@ +import { + ClockEvents, EventBus, FlightPlanner, FocusPosition, FSComponent, MinimumsEvents, MinimumsMode, MutableSubscribable, NodeReference, Subject, VNode, +} from '@microsoft/msfs-sdk'; + +import { PopupSubMenu } from '../../Shared/Menus/Components/PopupSubMenu'; +import { GuiDialog, GuiDialogProps } from '../../Shared/UI/GuiDialog'; +import { VSpeedUserSettings } from '../../Shared/Profiles/VSpeedUserSettings'; +import { VSpeedType } from '../../Shared/ReferenceSpeeds'; +import { CheckBoxNumeric, CheckBoxNumericStyle } from '../../Shared/Menus/Components/CheckboxNumeric'; +import { RefsUserSettings } from '../../Shared/Profiles/RefsUserSettings'; +import { GuiHEvent } from '../../Shared/UI/GuiHEvent'; + +import './PfdSideButtonsRefsMenu.css'; + +/** + * Props for {@link PfdSideButtonsRefs1Menu} + */ +export interface PfdSideButtonsRefs1MenuProps extends GuiDialogProps { + /** The event bus */ + bus: EventBus, + + /** An instance of the flight planner. */ + planner: FlightPlanner; +} + +/** + * PFD (side button layout) REFS menu + */ +export class PfdSideButtonsRefs1Menu extends GuiDialog { + private readonly vSpeedSettings = new VSpeedUserSettings(this.props.bus); + + private readonly VSpeedUiRefs = new Map>([ + [VSpeedType.V1, new NodeReference()], + [VSpeedType.V2, new NodeReference()], + [VSpeedType.Vr, new NodeReference()], + [VSpeedType.Venr, new NodeReference()], + [VSpeedType.Vapp, new NodeReference()], + [VSpeedType.Vref, new NodeReference()], + ]); + + private readonly raMinRef = FSComponent.createRef(); + + private readonly baroMinRef = FSComponent.createRef(); + + private readonly VSpeedValues: Record> = { + [VSpeedType.V1]: this.vSpeedSettings.getSettings(VSpeedType.V1).value, + [VSpeedType.V2]: this.vSpeedSettings.getSettings(VSpeedType.V2).value, + [VSpeedType.Vr]: this.vSpeedSettings.getSettings(VSpeedType.Vr).value, + [VSpeedType.Venr]: this.vSpeedSettings.getSettings(VSpeedType.Venr).value, + [VSpeedType.Vapp]: this.vSpeedSettings.getSettings(VSpeedType.Vapp).value, + [VSpeedType.Vref]: this.vSpeedSettings.getSettings(VSpeedType.Vref).value, + }; + + private readonly VSpeedStates: Record> = { + [VSpeedType.V1]: this.vSpeedSettings.getSettings(VSpeedType.V1).show, + [VSpeedType.V2]: this.vSpeedSettings.getSettings(VSpeedType.V2).show, + [VSpeedType.Vr]: this.vSpeedSettings.getSettings(VSpeedType.Vr).show, + [VSpeedType.Venr]: this.vSpeedSettings.getSettings(VSpeedType.Venr).show, + [VSpeedType.Vapp]: this.vSpeedSettings.getSettings(VSpeedType.Vapp).show, + [VSpeedType.Vref]: this.vSpeedSettings.getSettings(VSpeedType.Vref).show, + }; + + private readonly VSpeedCssClasses = new Map>([ + [VSpeedType.V1, Subject.create('')], + [VSpeedType.Vr, Subject.create('')], + [VSpeedType.V2, Subject.create('')], + [VSpeedType.Venr, Subject.create('')], + [VSpeedType.Vapp, Subject.create('')], + [VSpeedType.Vref, Subject.create('')] + ]); + + private readonly rs = RefsUserSettings.getManager(this.props.bus); + + private readonly minimumsSelectedIndex = Subject.create(MinimumsMode.OFF); + private readonly baroMinimums = Subject.create(-1); + private readonly raMinimums = Subject.create(-1); + private _now = 0; + private debounceTimer = 0; + private isBusy = false; + + /** @inheritdoc */ + public onAfterRender(node: VNode): void { + super.onAfterRender(node); + + for (const [type, uiRef] of this.VSpeedUiRefs.entries()) { + const settings = this.vSpeedSettings.getSettings(type); + uiRef.instance.props.onValueChanged = () => { + settings.manual.set(true); + }; + settings.manual.sub((v) => { + this.VSpeedCssClasses.get(type)?.set((v as boolean) ? '' : 'magenta'); + }, true); + } + + this.props.bus.getSubscriber().on('realTime').whenChangedBy(100).handle(this.onClock.bind(this)); + + const mins = this.props.bus.getSubscriber(); + mins.on('minimums_mode').handle((v) => { + if (this.isBusy) { return; } + this.minimumsSelectedIndex.set(v); + this.rs.getSetting('minsmode').value = v; + }); + mins.on('decision_altitude_feet').handle((v) => { + if (this.isBusy) { return; } + this.baroMinimums.set(v); + if (v > 0) { + this.rs.getSetting('baromins').value = v; + } + }); + mins.on('decision_height_feet').handle((v) => { + if (this.isBusy) { return; } + this.raMinimums.set(v); + if (v > 0) { + this.rs.getSetting('radiomins').value = v; + } + }); + + const minsPub = this.props.bus.getPublisher(); + this.minimumsSelectedIndex.sub(v => { + this.isBusy = true; + this.debounceTimer = this._now; + minsPub.pub('set_minimums_mode', v, false, true); + }); + this.baroMinimums.sub(v => { + this.isBusy = true; + this.debounceTimer = this._now; + minsPub.pub('set_decision_altitude_feet', v, true, true); + }); + this.raMinimums.sub(v => { + this.isBusy = true; + this.debounceTimer = this._now; + minsPub.pub('set_decision_height_feet', v, true, true); + }); + + // set saved setting values on load + this.minimumsSelectedIndex.set(this.rs.getSetting('minsmode').value); + this.baroMinimums.set(this.rs.getSetting('baromins').value); + this.raMinimums.set(this.rs.getSetting('radiomins').value); + } + + /** @inheritDoc */ + public onInteractionEvent(evt: GuiHEvent): boolean { + switch (evt) { + case GuiHEvent.SOFTKEY_1L: return this.VSpeedUiRefs.get(VSpeedType.Venr)?.instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_2L: return this.VSpeedUiRefs.get(VSpeedType.V2)?.instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_3L: return this.VSpeedUiRefs.get(VSpeedType.Vr)?.instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_4L: return this.VSpeedUiRefs.get(VSpeedType.V1)?.instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_1R: return this.raMinRef.instance.focus(FocusPosition.None); + case GuiHEvent.SOFTKEY_2R: return this.baroMinRef.instance.focus(FocusPosition.None); + case GuiHEvent.SOFTKEY_3R: return this.VSpeedUiRefs.get(VSpeedType.Vapp)?.instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_4R: return this.VSpeedUiRefs.get(VSpeedType.Vref)?.instance.focus(FocusPosition.None) ?? false; + } + + return super.onInteractionEvent(evt); + } + + /** + * Updates the time; resets the isBusy flag. + * @param time The real time. + */ + private onClock(time: number): void { + this._now = time; + if (this._now - this.debounceTimer > 500) { + this.isBusy = false; + } + } + + /** @inheritdoc */ + public render(): VNode { + return ( +
+ + + + + + + + + index === MinimumsMode.RA)} + onCheckedChanged={(newValue) => this.minimumsSelectedIndex.set(newValue ? MinimumsMode.RA : MinimumsMode.OFF)} + dataRef={this.raMinimums} + max={2500} + style={CheckBoxNumericStyle.SideButtonBound} + orientation="right" + /> + + index === MinimumsMode.BARO)} + onCheckedChanged={(newValue) => this.minimumsSelectedIndex.set(newValue ? MinimumsMode.BARO : MinimumsMode.OFF)} + dataRef={this.baroMinimums} + increments={10} + style={CheckBoxNumericStyle.SideButtonBound} + orientation="right" + /> + + + + + +
+ ); + } +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.css new file mode 100644 index 000000000..c4abc11f7 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.css @@ -0,0 +1,11 @@ +.pfd-popup-refs-2 { + height: 350px; +} + +.pfd-popup-refs-1 .popup-menu-radio[data-label="PRESSURE"] { + margin-top: 6px; +} + +.pfd-popup-refs-1 .popup-menu-radio:not([data-label="PRESSURE"]) { + margin-top: 36px; +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.tsx new file mode 100644 index 000000000..c61e89a61 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefs2Menu.tsx @@ -0,0 +1,137 @@ +import { EventBus, FlightPlanner, FocusPosition, FSComponent, Subject, VNode } from '@microsoft/msfs-sdk'; + +import { PopupSubMenu } from '../../Shared/Menus/Components/PopupSubMenu'; +import { GuiDialog, GuiDialogProps } from '../../Shared/UI/GuiDialog'; +import { GuiHEvent } from '../../Shared/UI/GuiHEvent'; +import { RadioList, RadioListStyle } from '../../Shared/Menus/Components/RadioList'; +import { RadioBox } from '../../Shared/Menus/Components/Radiobox'; +import { PFDUserSettings } from '../PFDUserSettings'; + +import './PfdSideButtonsRefs2Menu.css'; + +/** + * Props for {@link PfdSideButtonsRefsMenu} + */ +export interface PfdSideButtonsRefs2MenuProps extends GuiDialogProps { + /** The event bus */ + bus: EventBus, + + /** An instance of the flight planner. */ + planner: FlightPlanner; +} + +/** + * PFD (side button layout) REFS menu + */ +export class PfdSideButtonsRefs2Menu extends GuiDialog { + private readonly elementRefs = [ + FSComponent.createRef(), + FSComponent.createRef(), + FSComponent.createRef(), + FSComponent.createRef(), + ]; + + private readonly pressureOption = Subject.create(0); + private readonly fltDirOption = Subject.create(0); + private readonly metricOption = Subject.create(0); + private readonly flAlertOption = Subject.create(0); + + private readonly pfdSettingsManager = PFDUserSettings.getManager(this.props.bus); + + /** @inheritDoc */ + public onAfterRender(node: VNode): void { + super.onAfterRender(node); + + this.linkPressureOption(); + this.linkMetricSetting(); + this.linkFlAlertSetting(); + this.linkFDStyle(); + } + + /** @inheritDoc */ + public onInteractionEvent(evt: GuiHEvent): boolean { + switch (evt) { + case GuiHEvent.SOFTKEY_1L: return this.elementRefs[0].instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_2L: return this.elementRefs[1].instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_3L: return this.elementRefs[2].instance.focus(FocusPosition.None) ?? false; + case GuiHEvent.SOFTKEY_4L: return this.elementRefs[3].instance.focus(FocusPosition.None) ?? false; + } + + return super.onInteractionEvent(evt); + } + + // eslint-disable-next-line jsdoc/require-jsdoc + private linkPressureOption(): void { + const fltDirStyle = this.pfdSettingsManager.getSetting('pressureUnitHPA'); + this.pressureOption.sub(x => { + fltDirStyle.value = !!x; + }); + this.pfdSettingsManager.whenSettingChanged('pressureUnitHPA').handle(x => { + this.pressureOption.set(x ? 1 : 0); + }); + } + + // eslint-disable-next-line jsdoc/require-jsdoc + private linkMetricSetting(): void { + const metricSetting = this.pfdSettingsManager.getSetting('altMetric'); + this.metricOption.sub(x => { + metricSetting.value = !!x; + }); + this.pfdSettingsManager.whenSettingChanged('altMetric').handle(x => { + this.metricOption.set(x ? 1 : 0); + }); + } + + // eslint-disable-next-line jsdoc/require-jsdoc + private linkFlAlertSetting(): void { + const flAlertSetting = this.pfdSettingsManager.getSetting('flightLevelAlert'); + this.flAlertOption.sub(x => { + flAlertSetting.value = !!x; + }); + this.pfdSettingsManager.whenSettingChanged('flightLevelAlert').handle(x => { + this.flAlertOption.set(x ? 1 : 0); + }); + } + + // eslint-disable-next-line jsdoc/require-jsdoc + private linkFDStyle(): void { + const fltDirStyle = this.pfdSettingsManager.getSetting('fltDirStyle'); + this.fltDirOption.sub(x => { + fltDirStyle.value = !!x; + }); + this.pfdSettingsManager.whenSettingChanged('fltDirStyle').handle(x => { + this.fltDirOption.set(x ? 1 : 0); + }); + } + + /** @inheritdoc */ + public render(): VNode { + return ( +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ ); + } +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefsMenu.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefsMenu.css new file mode 100644 index 000000000..f01cce174 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/Menus/PfdSideButtonsRefsMenu.css @@ -0,0 +1,35 @@ +.pfd-popup-refs-1 { + top: 646px; + left: 0; +} + +.pfd-popup-refs-1 .popup-menu-title { + width: 112px; + + color: var(--wt21-colors-white); + background-color: var(--wt21-colors-blue); +} + +.pfd-popup-refs-2 { + top: 646px; + right: 0; +} + +.pfd-popup-refs-2 .popup-menu-title { + width: 112px; + + margin-left: auto; + + color: var(--wt21-colors-white); + background-color: var(--wt21-colors-blue); +} + +.pfd-popup-refs-1 .popup-menu-checkbox-side-button[data-label="VT"], +.pfd-popup-refs-2 .popup-menu-checkbox-side-button[data-label="RA MIN"] { + margin-top: 6px; +} + +.pfd-popup-refs-1 .popup-menu-checkbox-side-button:not([data-label="VT"]), +.pfd-popup-refs-2 .popup-menu-checkbox-side-button:not([data-label="RA MIN"]) { + margin-top: 36px; +} \ No newline at end of file diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/WT21_PFD_Instrument.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/WT21_PFD_Instrument.tsx index fa779aa28..ba463ea45 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/WT21_PFD_Instrument.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/PFD/WT21_PFD_Instrument.tsx @@ -6,13 +6,10 @@ /// import { - AdcPublisher, AhrsPublisher, AutopilotInstrument, BaseInstrumentPublisher, BasicAvionicsSystem, Clock, ControlPublisher, - ControlSurfacesPublisher, DefaultUserSettingManager, ElectricalPublisher, EventBus, FacilityLoader, FacilityRepository, - FlightPathAirplaneSpeedMode, - FlightPathCalculator, FlightPlanner, FSComponent, FsInstrument, GNSSPublisher, HEventPublisher, InstrumentBackplane, LNavSimVarPublisher, - MinimumsEvents, MinimumsManager, MinimumsSimVarPublisher, NavComSimVarPublisher, - SimVarValueType, TrafficInstrument, UserSettingSaveManager, VNavSimVarPublisher, Wait, - XPDRSimVarPublisher + AdcPublisher, AhrsPublisher, AutopilotInstrument, BaseInstrumentPublisher, BasicAvionicsSystem, Clock, ControlPublisher, ControlSurfacesPublisher, DefaultUserSettingManager, + ElectricalPublisher, EventBus, FacilityLoader, FacilityRepository, FlightPathAirplaneSpeedMode, FlightPathCalculator, FlightPlanner, FSComponent, GNSSPublisher, HEventPublisher, + InstrumentBackplane, LNavSimVarPublisher, MinimumsEvents, MinimumsManager, MinimumsSimVarPublisher, NavComSimVarPublisher, SimVarValueType, TrafficInstrument, + UserSettingSaveManager, VNavSimVarPublisher, Wait, XPDRSimVarPublisher, } from '@microsoft/msfs-sdk'; import { WT21LNavDataSimVarPublisher } from '../FMC/Autopilot/WT21LNavDataEvents'; @@ -24,8 +21,8 @@ import { LowerSectionContainer } from '../Shared/LowerSection/LowerSectionContai import { MenuContainer } from '../Shared/Menus/MenuContainer'; import { AdfRadioSource, GpsSource, initNavIndicatorContext, NavIndicatorContext, NavIndicators, NavRadioNavSource, NavSources } from '../Shared/Navigation'; import { - WT21BearingPointerNavIndicator, WT21CourseNeedleNavIndicator, WT21GhostNeedleNavIndicator, WT21NavIndicator, WT21NavIndicatorName, WT21NavIndicators, - WT21NavSourceNames, WT21NavSources + WT21BearingPointerNavIndicator, WT21CourseNeedleNavIndicator, WT21GhostNeedleNavIndicator, WT21NavIndicator, WT21NavIndicatorName, WT21NavIndicators, WT21NavSourceNames, + WT21NavSources, } from '../Shared/Navigation/WT21NavIndicators'; import { PerformancePlanRepository } from '../Shared/Performance/PerformancePlanRepository'; import { WT21ControlPublisher } from '../Shared/WT21ControlEvents'; @@ -49,17 +46,21 @@ import { PfdRefsMenu } from './Menus/PfdRefsMenu'; import { AOASystemEvents, WT21ElectricalSetup } from '../Shared/Systems'; import { Gpws } from '../Shared/Systems/gpws/Gpws'; import { CJ4CabinLightsSystem } from '../Shared/Systems/CJ4CabinLightsSystem'; - -import '../Shared/WT21_Common.css'; -import './WT21_PFD.css'; import { WT21FixInfoManager } from '../FMC/Systems/WT21FixInfoManager'; import { WT21Fms } from '../Shared/FlightPlan/WT21Fms'; import { WT21FixInfoConfig } from '../FMC/Systems/WT21FixInfoConfig'; +import { WT21DisplayUnitFsInstrument, WT21DisplayUnitType } from '../Shared/WT21DisplayUnitFsInstrument'; +import { PfdSideButtonsNavBrgSrcMenu } from './Menus/PfdSideButtonsNavBrgSrcMenu'; +import { PfdSideButtonsRefs1Menu } from './Menus/PfdSideButtonsRefs1Menu'; +import { PfdSideButtonsRefs2Menu } from './Menus/PfdSideButtonsRefs2Menu'; + +import '../Shared/WT21_Common.css'; +import './WT21_PFD.css'; /** * The WT21 PFD Instrument */ -export class WT21_PFD_Instrument implements FsInstrument { +export class WT21_PFD_Instrument extends WT21DisplayUnitFsInstrument { private readonly bus: EventBus; private readonly baseInstrumentPublisher: BaseInstrumentPublisher; private readonly hEventPublisher: HEventPublisher; @@ -109,6 +110,8 @@ export class WT21_PFD_Instrument implements FsInstrument { * @param instrument The base instrument. */ constructor(readonly instrument: BaseInstrument) { + super(instrument, WT21DisplayUnitType.Pfd, 1); // TODO if we add support for multiple PFDs, adapt this + SimVar.SetSimVarValue('L:WT21_BETA_VERSION', 'number', 15); RegisterViewListener('JS_LISTENER_INSTRUMENTS'); @@ -215,8 +218,10 @@ export class WT21_PFD_Instrument implements FsInstrument { ); this.backplane.addInstrument('navSources', this.navSources); + const courseNeedleNavIndicator = new WT21CourseNeedleNavIndicator(this.navSources, this, this.bus); + this.navIndicators = new NavIndicators(new Map([ - ['courseNeedle', new WT21CourseNeedleNavIndicator(this.navSources, this.bus, 'PFD')], + ['courseNeedle', courseNeedleNavIndicator], ['ghostNeedle', new WT21GhostNeedleNavIndicator(this.navSources, this.bus)], ['bearingPointer1', new WT21BearingPointerNavIndicator(this.navSources, this.bus, 1, 'NAV1')], ['bearingPointer2', new WT21BearingPointerNavIndicator(this.navSources, this.bus, 2, 'NAV2')], @@ -232,7 +237,7 @@ export class WT21_PFD_Instrument implements FsInstrument { this.minimumsAlertController = new MinimumsAlertController(this.bus); - this.pfdMenuViewService = new PfdMenuViewService(); + this.pfdMenuViewService = new PfdMenuViewService(this.bus, this.displayUnitConfig, courseNeedleNavIndicator); // FIXME Add route predictor when FlightPlanPredictor refactored to implement FlightPlanPredictionsProvider this.fixInfoManager = new WT21FixInfoManager(this.bus, this.facLoader, WT21Fms.PRIMARY_ACT_PLAN_INDEX, this.planner, WT21FixInfoConfig /*, this.activeRoutePredictor*/); @@ -269,6 +274,7 @@ export class WT21_PFD_Instrument implements FsInstrument { ); this.pfdMenuViewService.registerView('PfdOverlaysMenu', () => ); this.pfdMenuViewService.registerView('PfdBaroSetMenu', () => ); + this.pfdMenuViewService.registerView( + 'PfdSideButtonsNavBrgSrcMenu', + () => + + ); + this.pfdMenuViewService.registerView( + 'PfdSideButtonsRefs1Menu', + () => + + ); + this.pfdMenuViewService.registerView( + 'PfdSideButtonsRefs2Menu', + () => + + ); SimVar.SetSimVarValue('L:AS3000_Brightness', 'number', 0.85); this.clock.init(); diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Config/DisplayUnitConfig.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Config/DisplayUnitConfig.ts new file mode 100644 index 000000000..06e5189b6 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Config/DisplayUnitConfig.ts @@ -0,0 +1,56 @@ +export enum DisplayUnitLayout { + /** Traditional layout, without softkeys */ + Traditional = 'Traditional', + + /** Layout with 4 softkeys on each side */ + Softkeys = 'Softkeys', +} + +/** + * WT21 Display Unit configuration + */ +export interface DisplayUnitConfigInterface { + /** The layout of the display unit */ + displayUnitLayout: DisplayUnitLayout; +} + +/** + * WT21 Display Unit configuration + */ +export class DisplayUnitConfig implements DisplayUnitConfigInterface { + public static readonly DEFAULT: DisplayUnitConfigInterface = { + displayUnitLayout: DisplayUnitLayout.Traditional, + }; + + public displayUnitLayout = DisplayUnitLayout.Traditional; + + /** + * Constructs a DisplayUnitConfig from an element + * @param element the XML element + */ + constructor(element: Element) { + if (element.tagName != 'DisplayUnitConfig') { + throw new Error(`Invalid DisplayUnitConfig definition: expected tag name 'DisplayUnitConfig' but was '${element.tagName}'`); + } + + const displayUnitLayoutTags = element.querySelectorAll(':scope > Layout'); + + if (displayUnitLayoutTags.length > 0) { + if (displayUnitLayoutTags.length > 1) { + console.warn('Invalid DisplayUnitConfig definition: Multiple \'Layout\' tags inside \'DisplayUnitConfig\'. Only the first one will be taken into account'); + } + + const layout = displayUnitLayoutTags.item(0).textContent; + + if (layout === null) { + throw new Error('Invalid Layout definition: content is mandatory'); + } + + if (!(layout in DisplayUnitLayout)) { + throw new Error('Invalid Layout definition: content must be a valid DisplayUnitLayout value'); + } + + this.displayUnitLayout = (DisplayUnitLayout as Record)[layout]; + } + } +} \ No newline at end of file diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21Fms.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21Fms.ts index d4633892d..aaa550359 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21Fms.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21Fms.ts @@ -1461,38 +1461,116 @@ export class WT21Fms { this.setApproachDetails(false, ApproachType.APPROACH_TYPE_UNKNOWN, RnavTypeFlags.None, false, false, null); plan.calculate(0); } - /** - * Checks whether the procedure being modified contains the currently active from and to legs and, if so, - * returns those two legs. If the active leg is a direct to, this returns the entire direct to sequence (3 legs) - * @param plan The flight plan. - * @param segmentIndex The Segment Index. - * @returns The array of active legs. + * Gets an array of legs in a flight plan segment ending with the active leg that are to be displaced if the segment + * is deleted. + * @param plan The flight plan containing the segment for which to get the array. + * @param segmentIndex The index of the segment for which to get the array. + * @returns An array of legs in the specified flight plan segment ending with the active leg that are to be + * displaced if the segment is deleted, or `undefined` if the segment does not contain the active leg. */ - private getActiveLegsInCurrentProcedure(plan: FlightPlan, segmentIndex: number): FlightPlanLeg[] | undefined { + private getSegmentActiveLegsToDisplace(plan: FlightPlan, segmentIndex: number): LegDefinition[] | undefined { + const segment = plan.getSegment(segmentIndex); + const activeLeg = segment.legs[plan.activeLateralLeg - segment.offset] as LegDefinition | undefined; - if (plan.getSegmentIndex(plan.activeLateralLeg) === segmentIndex) { + // If active leg is not in the segment to be deleted, then nothing needs to be displaced + if (!activeLeg) { + return undefined; + } - const currentToLeg = plan.tryGetLeg(plan.activeLateralLeg); - const currentFromLeg = plan.tryGetLeg(plan.activeLateralLeg - 1); + if (BitFlags.isAll(activeLeg.flags, LegDefinitionFlags.DirectTo)) { + // Active leg is part of a direct-to. - if (!currentToLeg || !currentFromLeg) { + if (plan.directToData.segmentIndex !== segmentIndex || plan.directToData.segmentLegIndex + WT21FmsUtils.DTO_LEG_OFFSET >= segment.legs.length) { + // If the plan's direct to data does not match what we would expect given the active leg, then something has + // gone wrong with the flight plan's state and we will just bail. return undefined; } - const newToLeg = Object.assign({}, currentToLeg.leg); - const newFromLeg = Object.assign({}, currentFromLeg.leg); + return segment.legs.slice(0, plan.directToData.segmentLegIndex + WT21FmsUtils.DTO_LEG_OFFSET + 1); + } else { + // Active leg is not part of a direct-to. In this case we return every leg in the active segment prior to and + // including the active leg. - if (BitFlags.isAll(currentToLeg.flags, WT21LegDefinitionFlags.DirectTo)) { - const discoLeg = Object.assign({}, plan.getLeg(plan.activeLateralLeg - 2).leg); - return [discoLeg, newFromLeg, newToLeg]; - } else { - return [newFromLeg, newToLeg]; + return segment.legs.slice(0, plan.activeLateralLeg - segment.offset + 1); + } + } + + /** + * Displaces a sequence of flight plan legs contained in a now-removed segment ending with the active leg into a new + * flight plan segment. If the displaced active leg was a direct-to leg, then a new direct-to will be created to the + * displaced target leg. Otherwise, the active leg is set to the displaced active leg. + * @param plan The flight plan into which to displace the legs. + * @param segmentIndex The index of the flight plan segment into which to displace the legs. + * @param activeLegArray The sequence of flight plan legs to displace. The sequence should contain all of the legs + * contained in the former active segment up to and including the active leg. + * @param insertAtEnd Whether to insert the displaced legs at the end of the segment instead of the beginning. + */ + private displaceActiveLegsIntoSegment(plan: FlightPlan, segmentIndex: number, activeLegArray: LegDefinition[], insertAtEnd: boolean): void { + WT21FmsUtils.removeDisplacedActiveLegs(plan); + + const segment = plan.getSegment(segmentIndex); + + const insertAtIndex = insertAtEnd ? segment.legs.length : 0; + + if (insertAtEnd) { + plan.addLeg(segmentIndex, FlightPlan.createLeg({ type: LegType.Discontinuity }), insertAtIndex, WT21LegDefinitionFlags.DisplacedActiveLeg); + } else { + const segmentFirstLeg = segment.legs[0]; + + // We don't want to insert duplicate discontinuities if there is already one at the start of the segment + const discontinuityAlreadyPresent = segmentFirstLeg && WT21FmsUtils.isDiscontinuityLeg(segmentFirstLeg.leg.type); + + if (!discontinuityAlreadyPresent) { + plan.addLeg(segmentIndex, FlightPlan.createLeg({ type: LegType.Discontinuity }), insertAtIndex, WT21LegDefinitionFlags.DisplacedActiveLeg); } + } + + // The active leg is guaranteed to be the last leg in the array. + const activeLeg = activeLegArray[activeLegArray.length - 1]; + const isActiveLegDto = BitFlags.isAll(activeLeg.flags, LegDefinitionFlags.DirectTo); + const dtoTargetLegIndex = isActiveLegDto ? activeLegArray.length - 1 - WT21FmsUtils.DTO_LEG_OFFSET : undefined; + const dtoTargetLeg = dtoTargetLegIndex !== undefined ? activeLegArray[dtoTargetLegIndex] : undefined; + let displacedDtoTargetLegIndex = undefined; + // Add all displaced legs to the segment, skipping any active direct-to legs. + for (let i = dtoTargetLegIndex ?? activeLegArray.length - 1; i >= 0; i--) { + const leg = activeLegArray[i]; + + const newLeg = FlightPlan.createLeg(leg.leg); + + // Displaced legs aren't a part of a procedure anymore, so we clear the fix type flags + newLeg.fixTypeFlags = 0; + + plan.addLeg(segmentIndex, newLeg, insertAtIndex, WT21LegDefinitionFlags.DisplacedActiveLeg); + + // Preserve altitude and speed restrictions on the active leg or direct-to target leg only. + if (leg === activeLeg || leg === dtoTargetLeg) { + plan.setLegVerticalData(segmentIndex, insertAtIndex, leg.verticalData); + } + + // Check if we are displacing an inactive direct-to leg. If so, mark the index of the corresponding displaced + // direct-to target leg so we can deal with it below. + if (displacedDtoTargetLegIndex === undefined && BitFlags.isAll(leg.flags, LegDefinitionFlags.DirectTo)) { + displacedDtoTargetLegIndex = i - WT21FmsUtils.DTO_LEG_OFFSET + insertAtIndex; + } + } + + // If we displaced an inactive direct-to sequence, then we need to update the plan's direct-to data to match the + // indexes of the now displaced direct-to target leg. + if (displacedDtoTargetLegIndex !== undefined) { + plan.setDirectToData(segmentIndex, displacedDtoTargetLegIndex); + } + + if (dtoTargetLegIndex !== undefined) { + const course = activeLeg.leg.type === LegType.CF ? activeLeg.leg.course : undefined; + this.createDirectTo(segmentIndex, dtoTargetLegIndex + insertAtIndex, undefined, course, undefined); + } else { + const newActiveLegIndex = segment.offset + insertAtIndex + activeLegArray.length - 1; + plan.setCalculatingLeg(newActiveLegIndex); + plan.setLateralLeg(newActiveLegIndex); } - return undefined; } /** @@ -1516,7 +1594,7 @@ export class WT21Fms { // Grabbing the active legs (if there are any) in the existing departure semgent, // so that we can put them somewhere after clearing the segment. - const activeLegArray = !Simplane.getIsGrounded() && plan.activeLateralLeg > 0 ? this.getActiveLegsInCurrentProcedure(plan, segmentIndex) : undefined; + const activeLegArray = !Simplane.getIsGrounded() && plan.activeLateralLeg > 0 ? this.getSegmentActiveLegsToDisplace(plan, segmentIndex) : undefined; this.planClearSegment(segmentIndex, FlightPlanSegmentType.Departure); @@ -1536,43 +1614,12 @@ export class WT21Fms { this.planRemoveDuplicateLeg(lastDepLeg, nextLeg); } - if (activeLegArray) { - WT21FmsUtils.removeDisplacedActiveLegs(plan); - - const segmentFirstLeg = plan.getSegment(segmentIndex).legs[0]; - - // We don't want to insert duplicate discontinuities if there is already one at the start of the approach - const discontinuityAlreadyPresent = segmentFirstLeg && WT21FmsUtils.isDiscontinuityLeg(segmentFirstLeg.leg.type); - - if (activeLegArray.length === 2) { - if (!discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, FlightPlan.createLeg({ type: LegType.Discontinuity }), 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[1].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[1], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } + this.generateSegmentVerticalData(plan, segmentIndex); - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[0].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[0], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - plan.setLateralLeg(depSegment.offset + 1); - } else if (activeLegArray.length === 3) { - if (!discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, FlightPlan.createLeg({ type: LegType.Discontinuity }), 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[2].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[2], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - this.createDirectTo(segmentIndex, 0); - } + if (activeLegArray) { + this.displaceActiveLegsIntoSegment(plan, segmentIndex, activeLegArray, false); } - this.setVerticalData(plan, segmentIndex); - plan.calculate(0); } @@ -1679,7 +1726,7 @@ export class WT21Fms { const segmentIndex = this.ensureOnlyOneSegmentOfType(FlightPlanSegmentType.Arrival); - const activeLegArray = this.getActiveLegsInCurrentProcedure(plan, segmentIndex); + const activeLegArray = this.getSegmentActiveLegsToDisplace(plan, segmentIndex); let arrivalActiveLegIcao: undefined | string; @@ -1716,8 +1763,11 @@ export class WT21Fms { const arrSegment = plan.getSegment(segmentIndex); const prevLeg = plan.getPrevLeg(segmentIndex, 0); const firstArrLeg = arrSegment.legs[0]; + + let deduplicatedEnrouteLeg: LegDefinition | null = null; + if (prevLeg && firstArrLeg && this.isDuplicateLeg(prevLeg.leg, firstArrLeg.leg)) { - this.planRemoveDuplicateLeg(prevLeg, firstArrLeg); + deduplicatedEnrouteLeg = this.planRemoveDuplicateLeg(prevLeg, firstArrLeg); } const nextLeg = plan.getNextLeg(segmentIndex, Infinity); @@ -1731,41 +1781,21 @@ export class WT21Fms { this.activateLeg(segmentIndex, arrSegment.legs.length - 1); } - this.tryInsertDiscontinuity(plan, segmentIndex); + // If we didn't remove a duplicate, insert a discontinuity at the start of the arrival + if (!deduplicatedEnrouteLeg && (!prevLeg || !WT21FmsUtils.isVectorsLeg(prevLeg.leg.type))) { + this.tryInsertDiscontinuity(plan, segmentIndex); + } + + this.generateSegmentVerticalData(plan, segmentIndex); const matchingActiveProcedureLegIndex = WT21FmsUtils.findIcaoInSegment(arrSegment, arrivalActiveLegIcao); if (activeLegArray && matchingActiveProcedureLegIndex === undefined) { - WT21FmsUtils.removeDisplacedActiveLegs(plan); - - const segmentFirstLeg = plan.getSegment(segmentIndex).legs[0]; - - // We don't want to insert duplicate discontinuities if there is already one at the start of the approach - const discontinuityAlreadyPresent = segmentFirstLeg && WT21FmsUtils.isDiscontinuityLeg(segmentFirstLeg.leg.type); - - if (activeLegArray.length === 2) { - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[1].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[1], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[0].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[0], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - plan.setLateralLeg(arrSegment.offset + 1); - } else if (activeLegArray.length === 3) { - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[2].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[2], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - this.createDirectTo(segmentIndex, 0); - } + this.displaceActiveLegsIntoSegment(plan, segmentIndex, activeLegArray, false); } else if (matchingActiveProcedureLegIndex !== undefined) { plan.setLateralLeg(arrSegment.offset + matchingActiveProcedureLegIndex); } - this.setVerticalData(plan, segmentIndex); - this.cleanupLegsAfterApproach(plan); this.tryConnectProcedures(plan); @@ -2073,7 +2103,7 @@ export class WT21Fms { const segmentIndex = this.ensureOnlyOneSegmentOfType(FlightPlanSegmentType.Approach); - const activeLegArray = this.getActiveLegsInCurrentProcedure(plan, segmentIndex); + const activeLegArray = this.getSegmentActiveLegsToDisplace(plan, segmentIndex); const apprSegment = plan.getSegment(segmentIndex); @@ -2087,6 +2117,8 @@ export class WT21Fms { if (insertProcedureObject.runway) { plan.setDestinationRunway(insertProcedureObject.runway); + } else { + plan.setDestinationRunway(undefined); } let haveAddedMap = false; @@ -2113,8 +2145,11 @@ export class WT21Fms { const prevLeg = plan.getPrevLeg(segmentIndex, 0); const firstAppLeg = apprSegment.legs[0]; + + let deduplicatedArrivalLeg: LegDefinition | null = null; + if (prevLeg && firstAppLeg && this.isDuplicateLeg(prevLeg.leg, firstAppLeg.leg)) { - this.planRemoveDuplicateLeg(prevLeg, firstAppLeg); + deduplicatedArrivalLeg = this.planRemoveDuplicateLeg(prevLeg, firstAppLeg); } // Adds missed approach legs @@ -2166,43 +2201,21 @@ export class WT21Fms { if (activeLegArray) { WT21FmsUtils.removeDisplacedActiveLegs(plan); - WT21FmsUtils.removeFixTypeFlags(activeLegArray); - - const segmentFirstLeg = plan.getSegment(segmentIndex).legs[0]; - - // We don't want to insert duplicate discontinuities if there is already one at the start of the approach - const discontinuityAlreadyPresent = segmentFirstLeg && WT21FmsUtils.isDiscontinuityLeg(segmentFirstLeg.leg.type); + // We don't need to do this anymore because the activeLegArray is an array of LegDefinition instead of FlightPlanLeg + // WT21FmsUtils.removeFixTypeFlags(activeLegArray); - if (activeLegArray.length === 2) { - if (!discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, FlightPlan.createLeg({ type: LegType.Discontinuity }), 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[1].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[1], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[0].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[0], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } + // If we didn't remove a duplicate, insert a discontinuity at the start of the approach + if (!deduplicatedArrivalLeg && (!prevLeg || !WT21FmsUtils.isVectorsLeg(prevLeg.leg.type))) { + this.tryInsertDiscontinuity(plan, segmentIndex); + } - plan.setLateralLeg(apprSegment.offset + 1); - } else if (activeLegArray.length === 3) { - if (!discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, FlightPlan.createLeg({ type: LegType.Discontinuity }), 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } + this.generateSegmentVerticalData(plan, segmentIndex); - // We should really never get into the scenario where this leg is a discontinuity, but let's be safe - if (!WT21FmsUtils.isDiscontinuityLeg(activeLegArray[2].type) || !discontinuityAlreadyPresent) { - plan.addLeg(segmentIndex, activeLegArray[2], 0, WT21LegDefinitionFlags.DisplacedActiveLeg); - } - - this.createDirectTo(segmentIndex, 0); + if (activeLegArray) { + this.displaceActiveLegsIntoSegment(plan, segmentIndex, activeLegArray, false); } } - this.setVerticalData(plan, segmentIndex); - this.cleanupLegsAfterApproach(plan); this.tryConnectProcedures(plan); @@ -2302,6 +2315,19 @@ export class WT21Fms { return insertProcedureObject; } + /** + * Manages the altitude constraints in a segment when adding a procedure by creating a VerticalData object for each leg. + * @param plan The Flight Plan. + * @param segmentIndex The segment index for the inserted procedure. + */ + private generateSegmentVerticalData(plan: FlightPlan, segmentIndex: number): void { + const segment = plan.getSegment(segmentIndex); + + for (let l = 0; l < segment.legs.length; l++) { + this.generateLegVerticalData(plan, segmentIndex, l); + } + } + /** * Inserts vectors-to-final legs into an insert procedure object. Vectors to final legs consist of a discontinuity * leg followed by a CF leg to the final approach fix. The course of the CF leg (the vectors-to-final course) is @@ -2395,31 +2421,34 @@ export class WT21Fms { } /** - * Manages the altitude constraints when adding a procedure by creating a VerticalData object for each leg. + * Manages the altitude constraints for a leg when adding a procedure by creating a VerticalData object for the leg. * @param plan The Flight Plan. - * @param segmentIndex The segment index for the inserted procedure. + * @param segmentIndex The segment index. + * @param localLegIndex The local leg index. + * @param forceVerticalFlightPhase The vertical flight phase to force on the vertical data. Otherwise, determined by the leg segment type. */ - private setVerticalData(plan: FlightPlan, segmentIndex: number): void { + private generateLegVerticalData(plan: FlightPlan, segmentIndex: number, localLegIndex: number, forceVerticalFlightPhase?: VerticalFlightPhase): void { const segment = plan.getSegment(segmentIndex); - for (let l = 0; l < segment.legs.length; l++) { - const leg = segment.legs[l]; - const altitude1 = leg.leg.altitude1; - const altitude2 = leg.leg.altitude2; - const altDesc = (BitFlags.isAll(leg.leg.fixTypeFlags, FixTypeFlags.MAP) && altitude1 !== 0) ? AltitudeRestrictionType.At : leg.leg.altDesc; - const speedRestriction = leg.leg.speedRestriction; - const verticalData: Partial = { - phase: segment.segmentType === FlightPlanSegmentType.Departure || BitFlags.isAll(leg.flags, LegDefinitionFlags.MissedApproach) - ? VerticalFlightPhase.Climb - : VerticalFlightPhase.Descent, - altDesc: altDesc, - altitude1: altitude1, - altitude2: altitude2, - speed: speedRestriction <= 0 ? 0 : speedRestriction, - speedDesc: speedRestriction <= 0 ? SpeedRestrictionType.Unused : SpeedRestrictionType.AtOrBelow, - speedUnit: SpeedUnit.IAS - }; - plan.setLegVerticalData(segmentIndex, l, verticalData); - } + const leg = segment.legs[localLegIndex]; + + const altitude1 = leg.leg.altitude1; + const altitude2 = leg.leg.altitude2; + const altDesc = (BitFlags.isAll(leg.leg.fixTypeFlags, FixTypeFlags.MAP) && altitude1 !== 0) ? AltitudeRestrictionType.At : leg.leg.altDesc; + const speedRestriction = leg.leg.speedRestriction; + + const verticalData: Partial = { + phase: forceVerticalFlightPhase ?? (segment.segmentType === FlightPlanSegmentType.Departure || BitFlags.isAll(leg.flags, LegDefinitionFlags.MissedApproach) + ? VerticalFlightPhase.Climb + : VerticalFlightPhase.Descent), + altDesc: altDesc, + altitude1: altitude1, + altitude2: altitude2, + speed: speedRestriction <= 0 ? 0 : speedRestriction, + speedDesc: speedRestriction <= 0 ? SpeedRestrictionType.Unused : SpeedRestrictionType.AtOrBelow, + speedUnit: SpeedUnit.IAS + }; + + plan.setLegVerticalData(segmentIndex, localLegIndex, verticalData); } /** @@ -2599,6 +2628,10 @@ export class WT21Fms { plan.setDeparture(); this.planClearSegment(segmentIndex, FlightPlanSegmentType.Departure); + + // Remove constraints from first enroute leg + this.clearFirstEnrouteLegVerticalData(plan); + if (plan.originAirport) { const airport = await this.facLoader.getFacility(FacilityType.Airport, plan.originAirport); const updatedSegmentIndex = this.ensureOnlyOneSegmentOfType(FlightPlanSegmentType.Departure); @@ -2623,20 +2656,23 @@ export class WT21Fms { plan.setArrival(); - const activeLegArray = this.getActiveLegsInCurrentProcedure(plan, segmentIndex); + const activeLegArray = this.getSegmentActiveLegsToDisplace(plan, segmentIndex); this.cleanupLegsAfterApproach(plan); this.planRemoveSegment(segmentIndex); + // Remove constraints from last enroute leg + this.clearLastEnrouteLegVerticalData(plan); + const prevLeg = plan.getPrevLeg(segmentIndex, 0); const nextLeg = plan.getNextLeg(segmentIndex, -1); if (prevLeg && nextLeg && this.isDuplicateLeg(prevLeg.leg, nextLeg.leg)) { this.planRemoveDuplicateLeg(prevLeg, nextLeg); } - if (activeLegArray && activeLegArray.length === 2) { - this.addActiveLegsToEnroute(plan, activeLegArray); + if (activeLegArray) { + this.displaceActiveLegsToEnroute(plan, activeLegArray); } plan.calculate(0); @@ -2655,7 +2691,7 @@ export class WT21Fms { const segmentIndex = this.ensureOnlyOneSegmentOfType(FlightPlanSegmentType.Approach); - const activeLegArray = this.getActiveLegsInCurrentProcedure(plan, segmentIndex); + const activeLegArray = this.getSegmentActiveLegsToDisplace(plan, segmentIndex); plan.procedureDetails.arrivalRunwayTransitionIndex = -1; plan.setDestinationRunway(undefined, false); @@ -2665,6 +2701,11 @@ export class WT21Fms { this.planRemoveSegment(segmentIndex); + // Remove constraints from last enroute leg if there wasn't an arrival + if (plan.procedureDetails.arrivalIndex === -1) { + this.clearLastEnrouteLegVerticalData(plan); + } + const prevLeg = plan.getPrevLeg(segmentIndex, 0); const nextLeg = plan.getNextLeg(segmentIndex, -1); if (prevLeg && nextLeg && this.isDuplicateLeg(prevLeg.leg, nextLeg.leg)) { @@ -2672,20 +2713,66 @@ export class WT21Fms { } if (activeLegArray) { - WT21FmsUtils.removeDisplacedActiveLegs(plan); - this.addActiveLegsToEnroute(plan, activeLegArray, true); + this.displaceActiveLegsToEnroute(plan, activeLegArray, true); } plan.calculate(0); } /** - * Adds active leg pair to the last enroute segment when a procedure is deleted and the current activeLateralLeg is in that procedure. - * @param plan The FlightPlan. - * @param activeLegArray The Active Leg Pair. + * Clears the vertical data of the last enroute leg, if applicable + * + * @param plan the lateral flight plan + */ + private clearFirstEnrouteLegVerticalData(plan: FlightPlan): void { + let firstEnrouteSegment: FlightPlanSegment | undefined; + for (let i = 0; i < plan.segmentCount; i++) { + const segment = plan.getSegment(i); + + if (segment.segmentType === FlightPlanSegmentType.Enroute && segment.legs.length > 0) { + firstEnrouteSegment = segment; + break; + } + } + + if (firstEnrouteSegment) { + plan.setLegVerticalData(firstEnrouteSegment.offset, { altDesc: AltitudeRestrictionType.Unused, speedDesc: SpeedRestrictionType.Unused }); + } + } + + /** + * Clears the vertical data of the last enroute leg, if applicable + * @param plan the lateral flight plan + */ + private clearLastEnrouteLegVerticalData(plan: FlightPlan): void { + let lastEnrouteSegment: FlightPlanSegment | undefined; + for (let i = plan.segmentCount - 1; i >= 0; i--) { + const segment = plan.getSegment(i); + + if (segment.segmentType === FlightPlanSegmentType.Enroute && segment.legs.length > 0) { + lastEnrouteSegment = segment; + break; + } + } + + if (lastEnrouteSegment) { + plan.setLegVerticalData( + lastEnrouteSegment.offset + (lastEnrouteSegment.legs.length - 1), + { altDesc: AltitudeRestrictionType.Unused, speedDesc: SpeedRestrictionType.Unused }, + ); + } + } + + /** + * Displaces a sequence of flight plan legs contained in a now-removed segment ending with the active leg into the + * end of the last enroute flight plan segment. If the displaced active leg was a direct-to leg, then a new direct-to + * will be created to the displaced target leg. Otherwise, the active leg is set to the displaced active leg. + * @param plan The flight plan into which to displace the legs. + * @param activeLegArray The sequence of flight plan legs to displace. The sequence should contain all of the legs + * contained in the former active segment up to and including the active leg. * @param checkForArrivalSegment Whether to check first for an arrival segment to add the legs to. */ - private addActiveLegsToEnroute(plan: FlightPlan, activeLegArray: FlightPlanLeg[], checkForArrivalSegment = false): void { + private displaceActiveLegsToEnroute(plan: FlightPlan, activeLegArray: LegDefinition[], checkForArrivalSegment = false): void { let segmentIndex = this.findLastEnrouteSegmentIndex(plan); if (checkForArrivalSegment && plan.procedureDetails.arrivalIndex > -1) { const arrivalSegmentIndex = this.ensureOnlyOneSegmentOfType(FlightPlanSegmentType.Arrival, false); @@ -2694,26 +2781,7 @@ export class WT21Fms { } } - const segment = plan.getSegment(segmentIndex); - - if (activeLegArray.length === 2) { - plan.addLeg(segmentIndex, activeLegArray[0], undefined, WT21LegDefinitionFlags.DisplacedActiveLeg); - plan.addLeg(segmentIndex, activeLegArray[1], undefined, WT21LegDefinitionFlags.DisplacedActiveLeg); - this.planAddLeg(segmentIndex, FlightPlan.createLeg({ - type: LegType.Discontinuity - }), undefined, WT21LegDefinitionFlags.DisplacedActiveLeg); - - plan.setLateralLeg(segment.offset + segment.legs.length - 2); - - } else if (activeLegArray.length === 3) { - plan.addLeg(segmentIndex, activeLegArray[1]); - plan.addLeg(segmentIndex, activeLegArray[2], WT21LegDefinitionFlags.DisplacedActiveLeg); - this.planAddLeg(segmentIndex, FlightPlan.createLeg({ - type: LegType.Discontinuity - })); - this.createDirectTo(segmentIndex, segment.legs.length - 2); - } - + this.displaceActiveLegsIntoSegment(plan, segmentIndex, activeLegArray, true); } /** @@ -3138,6 +3206,7 @@ export class WT21Fms { directLeg.type = legType; directLeg.course = course as number; directLeg.trueDegrees = false; + directLeg.turnDirection = LegTurnDirection.None; return directLeg; } else { return FlightPlan.createLeg({ @@ -3147,21 +3216,6 @@ export class WT21Fms { trueDegrees: false }); } - - - // const planeHeading = SimVar.GetSimVarValue('PLANE HEADING DEGREES TRUE', 'degrees'); - // if (leg) { - // const directLeg = Object.assign({}, leg); - // directLeg.type = LegType.DF; - // directLeg.course = planeHeading === 0 ? 360 : planeHeading; - // return directLeg; - // } else { - // return FlightPlan.createLeg({ - // type: LegType.DF, - // fixIcao: icao, - // course: planeHeading === 0 ? 360 : planeHeading - // }); - // } } /** @@ -3179,6 +3233,7 @@ export class WT21Fms { return; } // We need to recreate the DTO so that the proper events get sent and legs get recreated and what not + // We do not mark it as pending, because that is the decision of whatever created the original DTO this.createDirectTo(plan.directToData.segmentIndex, plan.directToData.segmentLegIndex, false); } @@ -3321,7 +3376,6 @@ export class WT21Fms { plan.addSegment(0, FlightPlanSegmentType.Departure); plan.addSegment(1, FlightPlanSegmentType.Enroute); - // plan.addSegment(2, FlightPlanSegmentType.Destination); plan.removeOriginAirport(); plan.removeDestinationAirport(); @@ -3887,18 +3941,6 @@ export class WT21Fms { const dtoLegIndex = plan.directToData.segmentLegIndex; const dtoSegmentIndex = plan.directToData.segmentIndex; - // TODO Removed the segmentIndex < dtoSegmentIndex from Garmin as it does not apply to WT21 (I think, but want to verify) - - // if ( - // dtoSegmentIndex >= 0 - // && ( - // segmentIndex < dtoSegmentIndex - // || (segmentIndex === dtoSegmentIndex && index !== undefined && index <= dtoLegIndex) - // ) - // ) { - // this.removeDirectToExisting(plan.planIndex); - // } - if ( dtoSegmentIndex >= 0 && (segmentIndex === dtoSegmentIndex && index !== undefined && index <= dtoLegIndex) @@ -4468,7 +4510,9 @@ export class WT21Fms { || leg1.type === LegType.TF || leg1.type === LegType.DF || leg1.type === LegType.CF) - && leg1.fixIcao === leg2.fixIcao; + && ICAO.getRegionCode(leg1.fixIcao) === ICAO.getRegionCode(leg2.fixIcao) + && ICAO.getIdent(leg1.fixIcao) === ICAO.getIdent(leg2.fixIcao) + && ICAO.getFacilityType(leg1.fixIcao) === ICAO.getFacilityType(leg2.fixIcao); } /** @@ -4493,7 +4537,9 @@ export class WT21Fms { return false; } - return leg1.fixIcao === leg2.fixIcao; + return ICAO.getRegionCode(leg1.fixIcao) === ICAO.getRegionCode(leg2.fixIcao) + && ICAO.getIdent(leg1.fixIcao) === ICAO.getIdent(leg2.fixIcao) + && ICAO.getFacilityType(leg1.fixIcao) === ICAO.getFacilityType(leg2.fixIcao); } /** diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21FmsUtils.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21FmsUtils.ts index 5cdc008a4..226eac8e7 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21FmsUtils.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlan/WT21FmsUtils.ts @@ -902,6 +902,15 @@ export class WT21FmsUtils { return discontinuityLegTypes.includes(legType); } + /** + * Checks if leg type is a "vectors" leg type. + * @param legType The LegType. + * @returns Whether the leg type is a "vectors" leg type. + */ + public static isVectorsLeg(legType: LegType): boolean { + return vectorsTypes.includes(legType); + } + /** * Checks if leg type is a course or heading leg, * which should have the leg course shown instead of the initial dtk. @@ -1396,3 +1405,6 @@ const discontinuityLegTypes = [LegType.Discontinuity, LegType.ThruDiscontinuity] /** Leg types where the leg course should be shown instead of the initial dtk. */ const showCourseLegTypes = [LegType.CA, LegType.CD, LegType.CF, LegType.CI, LegType.CR, LegType.FM, LegType.VA, LegType.VD, LegType.VI, LegType.VM, LegType.VR] as readonly LegType[]; + +/** Array of "vectors" leg types */ +const vectorsTypes = [LegType.FM, LegType.VM]; diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlanAsoboSync.ts b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlanAsoboSync.ts index 571f73302..f62147137 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlanAsoboSync.ts +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/FlightPlanAsoboSync.ts @@ -105,13 +105,6 @@ export class FlightPlanAsoboSync { FlightPlanAsoboSync.buildNonAirportDestLeg(data, plan, fms, lastEnrouteSegment); } - - // if (destinationSet && !originSet) { - // if (plan.length >= 1) { - // plan.getSegmentIndex(0) - // fms.createDirectToExisting() - // } - // } plan.calculate(0).then(() => { plan.setLateralLeg(0); }); @@ -199,6 +192,16 @@ export class FlightPlanAsoboSync { await Coherent.call('TRY_AUTOACTIVATE_APPROACH').catch((err: any) => console.log(JSON.stringify(err))); } + try { + const currCrzAlt: number = await Coherent.call('GET_CRUISE_ALTITUDE').catch((err: any) => console.log(JSON.stringify(err))); + const desiredCrzAlt: number = fms.activePerformancePlan.cruiseAltitude.get() ?? -1; + if (desiredCrzAlt > -1 && (currCrzAlt === -1 || currCrzAlt < desiredCrzAlt)) { + await Coherent.call('SET_CRUISE_ALTITUDE', desiredCrzAlt).catch((err: any) => console.log(JSON.stringify(err))); + } + } catch (error) { + console.warn('Error setting cruise altitude: ' + error); + } + Coherent.call('RECOMPUTE_ACTIVE_WAYPOINT_INDEX').catch((err: any) => console.log(JSON.stringify(err))); } catch (error) { console.error(`Error during fp sync: ${error}`); diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/HSI/MfdHsi.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/HSI/MfdHsi.tsx index dc7b6867f..fb8305b66 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/HSI/MfdHsi.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/HSI/MfdHsi.tsx @@ -1,23 +1,16 @@ -import { - CombinedSubject, - ComponentProps, - DisplayComponent, - EventBus, - FlightPlanner, - FSComponent, - Subject, - VNode -} from '@microsoft/msfs-sdk'; +import { ComponentProps, DisplayComponent, EventBus, FlightPlanner, FSComponent, MappedSubject, Subject, VNode } from '@microsoft/msfs-sdk'; + import { MfdDisplayMode, MFDUserSettings } from '../../../MFD/MFDUserSettings'; import { WT21TCAS } from '../../Traffic/WT21TCAS'; import { LeftInfoPanel } from '../LeftInfoPanel/LeftInfoPanel'; import { RightInfoPanel } from '../RightInfoPanel/RightInfoPanel'; import { WaypointAlerter } from '../WaypointAlerter'; import { HSIContainer } from './HSIContainer'; - -import './MfdHsi.css'; import { WT21FixInfoManager } from '../../../FMC/Systems/WT21FixInfoManager'; import { PerformancePlan } from '../../Performance/PerformancePlan'; +import { WT21DisplayUnitFsInstrument } from '../../WT21DisplayUnitFsInstrument'; + +import './MfdHsi.css'; /** * The properties for the MfdHsi component. @@ -26,6 +19,9 @@ interface MfdHsiProps extends ComponentProps { /** An instance of the event bus. */ bus: EventBus; + /** The display unit */ + displayUnit: WT21DisplayUnitFsInstrument; + /** An instance of the flight planner. */ flightPlanner: FlightPlanner; @@ -88,7 +84,7 @@ export class MfdHsi extends DisplayComponent { } }, true); - CombinedSubject.create(this.visibleForElectricity, this.visibleForMode).sub(([visibleForElectricity, visibleForMode]) => { + MappedSubject.create(this.visibleForElectricity, this.visibleForMode).sub(([visibleForElectricity, visibleForMode]) => { const shown = visibleForElectricity && visibleForMode; this.containerRef.instance.classList.toggle('hidden', !shown); @@ -101,7 +97,7 @@ export class MfdHsi extends DisplayComponent { <>
- +
{ />
- +
diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.css index 207509a9a..796de56d5 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.css +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.css @@ -1,11 +1,25 @@ .hsi-elapsed-time { position: absolute; top: 516px; + display: flex; flex-direction: row; + align-items: center; + font-size: 22px; } +.hsi-elapsed-time.hsi-elapsed-time-side-buttons { + top: 506px; +} + +.hsi-elapsed-time .hsi-et-arrow { + min-width: 10px; + height: 14px; + margin-bottom: 1px; + margin-right: 10px; +} + .hsi-elapsed-time .hsi-et-label { color: var(--wt21-colors-white); } @@ -21,6 +35,20 @@ white-space: nowrap; } +.hsi-elapsed-time.hsi-elapsed-time-side-buttons .hsi-et-value { + display: flex; + flex-direction: row; + justify-content: flex-end; + + line-height: 19px; + padding-top: 6px; + padding-left: 2px; + margin-bottom: 5px; + margin-left: 14px; + + background-color: var(--wt21-colors-black); +} + .hsi-elapsed-time .hsi-et-value-colon { margin: 0 -4px; } \ No newline at end of file diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.tsx index 52f2e6de1..6115cca2d 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/LeftInfoPanel/ElapsedTimeDisplay.tsx @@ -1,4 +1,5 @@ -import { ComponentProps, DisplayComponent, FSComponent, Subscribable, VNode } from '@microsoft/msfs-sdk'; +import { ComponentProps, DisplayComponent, FSComponent, Subject, Subscribable, VNode } from '@microsoft/msfs-sdk'; +import { DisplayUnitLayout } from '../../Config/DisplayUnitConfig'; import './ElapsedTimeDisplay.css'; @@ -8,25 +9,42 @@ interface ElapsedTimeProps extends ComponentProps { elapsedTimeText: Subscribable; // eslint-disable-next-line jsdoc/require-jsdoc isVisible: Subscribable; + // eslint-disable-next-line jsdoc/require-jsdoc + displayUnitLayout: DisplayUnitLayout; } /** The ElapsedTime which is displayed in the bottom left of the PFD when active. */ export class ElapsedTimeDisplay extends DisplayComponent { private readonly elapsedTimeRef = FSComponent.createRef(); + private readonly hidden = Subject.create(true); + /** @inheritdoc */ public onAfterRender(): void { - this.props.isVisible.sub(isVisible => { - this.elapsedTimeRef.instance.classList.toggle('hidden', !isVisible); - }); + this.props.isVisible.sub(isVisible => this.hidden.set(!isVisible)); } /** @inheritdoc */ public render(): VNode { + const isUsingSoftkeys = this.props.displayUnitLayout === DisplayUnitLayout.Softkeys; + return ( -
- +
); diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatInfo.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatInfo.css new file mode 100644 index 000000000..a1bc53370 --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatInfo.css @@ -0,0 +1,55 @@ +.info-format-switch { + display: flex; + flex-flow: row nowrap; + align-items: center; + + text-align: right; +} + +.info-format-switch.info-format-switch-right { + flex-flow: row-reverse nowrap; +} + +.info-format-switch:not(.info-format-switch-right) { + position: relative; + top: 215px; /* TODO this should go elsewhere */ +} + +.info-format-switch-switch-arrow-wrapper { + height: 0; +} + +.info-format-switch:not(.info-format-switch-right) .info-format-switch-switch-arrow { + min-width: 10px; + height: 14px; + margin-bottom: 6px; + margin-right: 10px; +} + +.info-format-switch-right .info-format-switch-switch-arrow { + min-width: 10px; + height: 14px; + margin-bottom: 6px; + margin-left: 10px; +} + +.info-format-switch-label { + white-space: pre; + display: flex; + flex-direction: row; + justify-content: flex-end; + + line-height: 19px; + padding-top: 6px; + padding-left: 2px; + + margin-bottom: 5px; + color: var(--wt21-colors-cyan); + background-color: var(--wt21-colors-black); +} + +.info-format-switch:not(.info-format-switch-right) .info-format-switch-label { + right: unset; + + justify-content: flex-start; +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatSwitch.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatSwitch.tsx new file mode 100644 index 000000000..a1609e8cf --- /dev/null +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/FormatSwitch.tsx @@ -0,0 +1,57 @@ +import { ComponentProps, DisplayComponent, EventBus, FSComponent, Subject, Subscribable, VNode } from '@microsoft/msfs-sdk'; + +import { MFDUserSettings } from '../../../MFD/MFDUserSettings'; +import { WT21DisplayUnitFsInstrument, WT21DisplayUnitType } from '../../WT21DisplayUnitFsInstrument'; + +import './FormatInfo.css'; + +/** + * Props for {@link FormatSwitch} + */ +export interface FormatInfoProps extends ComponentProps { + /** The event bus */ + bus: EventBus, + + /** The display unit */ + displayUnit: WT21DisplayUnitFsInstrument, + + /** The format to control */ + format: 'upper' | 'lower', + + /** The orientation of the label */ + orientation: 'left' | 'right', +} + +/** + * FORMAT switch + */ +export class FormatSwitch extends DisplayComponent { + private static readonly ARROW_ORIENTATIONS: Record<'left' | 'right', string> = { + left: 'M 7, 2 l -4, 5 l 4, 5', + right: 'M 3, 2 l 4, 5 l -4, 5', + }; + + private readonly userSettingsManagerMfd = MFDUserSettings.getAliasedManager(this.props.bus); + private readonly mfdSoftkeyFormatChangeActiveSetting = this.userSettingsManagerMfd.getSetting('mfdSoftkeyFormatChangeActive'); + + private readonly formatText = this.props.displayUnit.displayUnitType === WT21DisplayUnitType.Pfd ? 'FORMAT' : (this.props.format === 'upper' ? 'UPPER FORMAT' : 'LOWER FORMAT'); + + private readonly showLabel: Subscribable = this.props.displayUnit.displayUnitType === WT21DisplayUnitType.Pfd + ? Subject.create(true) + : this.mfdSoftkeyFormatChangeActiveSetting; + + private readonly formatLabel = this.showLabel.map((show) => show ? this.formatText : '\u00a0'); + + /** @inheritDoc */ + public render(): VNode | null { + return ( +
+ + + + + {this.formatLabel} +
+ ); + } +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/MinimumsDisplay.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/MinimumsDisplay.css index a67dc4ea4..dd44118cb 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/MinimumsDisplay.css +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/MinimumsDisplay.css @@ -1,7 +1,7 @@ .minimums-display-container { position: absolute; - top: 6%; - right: -4%; + top: -250px; + right: -28px; width: 185px; font-size: 24px; text-align: left; @@ -9,6 +9,11 @@ word-spacing: -.6ch; } +.right-info-panel-side-buttons > .minimums-display-container { + top: -206px; + right: -28px; +} + .minimums-display-container.alert { color: var(--wt21-colors-yellow); animation: mins-blink .75s step-start 5; diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.css index ff9f6a77b..642c0989a 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.css +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.css @@ -1,7 +1,12 @@ .right-info-panel { position: relative; + top: 39.5%; /* TODO This should be temporary. */ /* TODO Remove once the geometry for the panel has been fixed to leave gaps around the panel. */ margin-right: 4px; height: 100%; -} \ No newline at end of file +} + +.right-info-panel-side-buttons { + top: 38%; +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.tsx index 6eea6ea06..97bf99c67 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/RightInfoPanel.tsx @@ -1,11 +1,12 @@ import { ComponentProps, DisplayComponent, EventBus, FSComponent, VNode } from '@microsoft/msfs-sdk'; - -import { PfdOrMfd } from '../../Map/MapUserSettings'; import { WT21TCAS } from '../../Traffic/WT21TCAS'; import { MinimumsDisplay } from './MinimumsDisplay'; import { NextradInfo } from './NextradInfo'; import { TerrWxInfo } from './TerrWxInfo'; import { TfcInfo } from './TfcInfo'; +import { WT21DisplayUnitFsInstrument, WT21DisplayUnitType } from '../../WT21DisplayUnitFsInstrument'; +import { DisplayUnitLayout } from '../../Config/DisplayUnitConfig'; +import { FormatSwitch } from './FormatSwitch'; import './RightInfoPanel.css'; @@ -14,24 +15,59 @@ interface RightInfoPanelProps extends ComponentProps { /** An instance of the event bus. */ bus: EventBus; + /** The display unit */ + displayUnit: WT21DisplayUnitFsInstrument; + /** The TCAS instance. */ tcas: WT21TCAS; - - /** Whether the component is on the PFD or the MFD. */ - pfdOrMfd: PfdOrMfd; } /** The RightInfoPanel component. */ export class RightInfoPanel extends DisplayComponent { + private readonly isUsingSoftkeys = this.props.displayUnit.displayUnitConfig.displayUnitLayout === DisplayUnitLayout.Softkeys; /** @inheritdoc */ public render(): VNode { return ( -
- - - {this.props.pfdOrMfd === 'MFD' ? : null} - {this.props.pfdOrMfd === 'PFD' ? : null} +
+ {this.isUsingSoftkeys ? ( + <> + + + + + ) : ( + <> + + + + )} + {this.props.displayUnit.displayUnitType === WT21DisplayUnitType.Mfd ? : null} + {this.props.displayUnit.displayUnitType === WT21DisplayUnitType.Pfd ? : null}
); } diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.css index a902ebc42..78f48a792 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.css +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.css @@ -1,6 +1,4 @@ .terr-wx-info { - position: absolute; - top: 73.65%; right: 0; color: var(--wt21-colors-white); text-align: right; @@ -8,6 +6,10 @@ letter-spacing: -1.75px; } +.terr-wx-info-side-buttons { + margin-top: 65px; +} + .terr-wx-info > * + * { margin-top: -6px; /* font-size: 26px; */ @@ -49,4 +51,44 @@ .terr-wx-info .line-3 { margin-top: -10px; -} \ No newline at end of file +} + +.right-info-terr-wxr-switch { + letter-spacing: 1.1px; +} + +.right-info-terr-wxr-switch-arrow-wrapper { + height: 0; +} + +.right-info-terr-wxr-switch-arrow { + position: relative; + width: 10px; + height: 14px; + + top: 5px; +} + +.right-info-terr-wxr-switch-info { + display: flex; + flex-flow: column nowrap; + + padding-right: 18px; +} + +.right-info-terr-wxr-switch-line { + color: var(--wt21-colors-white); + + font-size: 20px; + line-height: 21px; +} + +.right-info-terr-wxr-switch-line-selected { + color: var(--wt21-colors-cyan); + + font-size: 21px; +} + +.right-info-terr-wxr-switch-wx { + font-size: 16px; +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.tsx index d5aeb818c..36f1b0811 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TerrWxInfo.tsx @@ -1,7 +1,9 @@ -import { ComponentProps, DisplayComponent, EventBus, FSComponent, Subject, VNode } from '@microsoft/msfs-sdk'; -import { MapFormatSupportMatrix } from '../../Map/MapFormatSupportMatrix'; +import { ComponentProps, DisplayComponent, EventBus, FSComponent, Subject, UserSettingManager, VNode } from '@microsoft/msfs-sdk'; -import { MapUserSettings, PfdOrMfd, TerrWxState } from '../../Map/MapUserSettings'; +import { DisplayUnitLayout } from '../../Config/DisplayUnitConfig'; +import { MapFormatSupportMatrix } from '../../Map/MapFormatSupportMatrix'; +import { MapSettingsMfdAliased, MapSettingsPfdAliased, MapUserSettings, TerrWxState } from '../../Map/MapUserSettings'; +import { WT21DisplayUnitFsInstrument, WT21DisplayUnitType } from '../../WT21DisplayUnitFsInstrument'; import './TerrWxInfo.css'; @@ -9,18 +11,20 @@ import './TerrWxInfo.css'; interface TerrWxInfoProps extends ComponentProps { /** An instance of the event bus. */ bus: EventBus; - // eslint-disable-next-line jsdoc/require-jsdoc - pfdOrMfd: PfdOrMfd; + + /** The display unit */ + displayUnit: WT21DisplayUnitFsInstrument, } /** The TerrWxInfo component. */ export class TerrWxInfo extends DisplayComponent { - private readonly mapSettingsManager = MapUserSettings.getAliasedManager(this.props.bus, this.props.pfdOrMfd); + private readonly mapSettingsManager = MapUserSettings.getAliasedManager(this.props.bus, this.props.displayUnit.displayUnitType === WT21DisplayUnitType.Pfd ? 'PFD' : 'MFD'); private readonly mapFormatSupport = new MapFormatSupportMatrix(); private readonly terrWxInfoRef = FSComponent.createRef(); private readonly line3 = Subject.create(''); private readonly line4 = Subject.create(''); private readonly line5 = Subject.create(''); + private readonly isUsingSoftkeys = this.props.displayUnit.displayUnitConfig.displayUnitLayout === DisplayUnitLayout.Softkeys; /** @inheritdoc */ public onAfterRender(): void { @@ -57,8 +61,30 @@ export class TerrWxInfo extends DisplayComponent { this.terrWxInfoRef.instance.classList.toggle('format-supported', isSupported); }; - /** @inheritdoc */ - public render(): VNode { + /** @inheritDoc */ + public render(): VNode | null { + return this.isUsingSoftkeys ? this.renderSoftkeyLayout() : this.renderTraditionalLayout(); + } + + /** + * Renders the softkey layout + * + * @returns a vnode + */ + private renderSoftkeyLayout(): VNode { + return ( +
+ +
+ ); + } + + /** + * Renders the traditional layout + * + * @returns a vnode + */ + private renderTraditionalLayout(): VNode { return (
TERR
@@ -70,4 +96,46 @@ export class TerrWxInfo extends DisplayComponent {
); } +} + +/** + * Props for {@link TerrWxSideButtonSwitch} + */ +interface TerrWxSideButtonSwitchProps { + /** The map user settings */ + mapUserSettings: UserSettingManager; +} + +/** + * Renders the TERR/RDR switch + */ +class TerrWxSideButtonSwitch extends DisplayComponent { + private readonly terrWxrState = this.props.mapUserSettings.getSetting('terrWxState'); + + /** @inheritDoc */ + public render(): VNode | null { + return ( +
+
+ + + +
+ +
+
it === 'TERR'), + }}>TERR
+
it === 'WX'), + }}>RDR
+
+ +
STBY
+
T 0.0
+
+ ); + } } \ No newline at end of file diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.css index 623900ee6..a595de22c 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.css +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.css @@ -1,9 +1,8 @@ .tfc-info { - position: absolute; - top: 39.25%; - right: 0; - width: 100%; height: 34%; + + margin-top: 39.25%; + color: var(--wt21-colors-white); text-align: right; font-size: 20px; @@ -12,6 +11,31 @@ white-space: nowrap; } +.tfc-info-side-buttons { + margin-top: 12px; + margin-right: 18px; +} + +.right-info-tfc-switch-arrow-wrapper { + height: 0; +} + +.right-info-tfc-switch-arrow { + position: relative; + width: 10px; + height: 14px; + + top: 10px; + right: -18px; +} + +.tfc-info-side-buttons.format-supported .tfc-data { + font-size: 18px; + line-height: 18px; + + color: var(--wt21-colors-white); +} + .tfc-info:not(.tfc-disabled) .tfc-label { font-size: 22px; } @@ -20,6 +44,10 @@ color: var(--wt21-colors-cyan); } +.tfc-info-side-buttons .tfc-label { + line-height: 22px; +} + .tfc-info-hideable { position: absolute; right: 0; @@ -40,6 +68,10 @@ align-items: center; } +.tfc-info-side-buttons .tfc-info-hideable { + top: unset; +} + .tfc-disabled .tfc-info-hideable { display: none; } diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.tsx index 809eea17d..f0caee609 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/LowerSection/RightInfoPanel/TfcInfo.tsx @@ -8,6 +8,8 @@ import { WT21_PFD_MFD_Colors as WT21_PFD_MFD_Colors } from '../../WT21_Colors'; import { TSSSystemEvents } from '../../Systems'; import { WT21TCAS } from '../../Traffic/WT21TCAS'; import { TrafficSettings, TrafficUserSettings } from '../../Traffic/TrafficUserSettings'; +import { WT21DisplayUnitFsInstrument } from '../../WT21DisplayUnitFsInstrument'; +import { DisplayUnitLayout } from '../../Config/DisplayUnitConfig'; import './TfcInfo.css'; @@ -16,6 +18,9 @@ interface TfcInfoProps extends ComponentProps { /** An instance of the event bus. */ bus: EventBus; + /** The display unit */ + displayUnit: WT21DisplayUnitFsInstrument; + /** The TCAS instance. */ tcas: WT21TCAS; @@ -34,6 +39,8 @@ export class TfcInfo extends DisplayComponent { private readonly mapSettings = MapUserSettings.getAliasedManager(this.props.bus, this.props.pfdOrMfd); private readonly trafficSettings = TrafficUserSettings.getManager(this.props.bus); + private readonly isUsingSoftkeys = this.props.displayUnit.displayUnitConfig.displayUnitLayout === DisplayUnitLayout.Softkeys; + private readonly isVisible = MappedSubject.create( ([format, isTfcEnabled]): boolean => { return format === 'TCAS' || isTfcEnabled; @@ -55,8 +62,34 @@ export class TfcInfo extends DisplayComponent { this.rootRef.instance.classList.toggle('format-supported', format !== 'PLAN'); }; + /** @inheritDoc */ + public render(): VNode | null { + return this.isUsingSoftkeys ? this.renderSoftkeyLayout() : this.renderTraditionalLayout(); + } + /** @inheritdoc */ - public render(): VNode { + private renderSoftkeyLayout(): VNode { + return ( +
+
+ + + +
+ +
TFC
+
+ + + + +
+
+ ); + } + + /** @inheritdoc */ + private renderTraditionalLayout(): VNode { return (
TFC
@@ -85,7 +118,7 @@ export class TfcInfo extends DisplayComponent { /** * Component props for individual TfcInfo subfields. */ -interface TfcInfoFieldProps extends TfcInfoProps { +interface TfcInfoFieldProps extends Omit { /** The traffic user settings manager. */ trafficSettings: UserSettingManager; diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/Checkbox.css b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/Checkbox.css index 85871380b..901be2a14 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/Checkbox.css +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/Checkbox.css @@ -1,7 +1,36 @@ +.check-side-buttons-arrow-wrapper { + display: inline; + + width: 0; + height: 0; +} + +.check-side-buttons-arrow { + position: relative; + + width: 10px; + height: 14px; + + left: -10px; +} + +.popup-menu-checkbox-right .check-side-buttons-arrow { + left: unset; + right: -12px; +} + .check-label { display: block; } +.popup-menu-checkbox-side-button .check-label { + margin-left: 18px; +} + +.popup-menu-checkbox-side-button.popup-menu-checkbox-right .check-label { + margin-right: 18px; +} + .check-design { display: inline-block; position: relative; @@ -40,16 +69,41 @@ stroke: var(--wt21-colors-magenta); } -.popup-menu-checkbox label .check-text { +.popup-menu-checkbox:not(.popup-menu-checkbox-side-button) label .check-text { width: calc(100% - 25px); display: inline-flex; justify-content: space-between } +.popup-menu-checkbox.popup-menu-checkbox-side-button label .check-text { + display: flex; + justify-content: space-between; + align-items: flex-start; +} + +.popup-menu-checkbox.popup-menu-checkbox-side-button.popup-menu-checkbox-right label .check-text { + align-items: flex-end; +} + .popup-menu-checkbox.disabled label .check-text { color: var(--wt21-colors-dark-gray); } +.popup-menu-checkbox-side-button .check-text { + flex-flow: column nowrap; +} + .check-select-value { padding-right: 3px; -} \ No newline at end of file +} + +.popup-menu-checkbox-side-button .check-select-value { + padding-top: 10px; + font-size: 30px; + + border: 2px solid transparent; +} + +.popup-menu-checkbox-side-button .check-select-value.highlight { + border: 2px solid var(--wt21-colors-cyan); +} diff --git a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/CheckboxNumeric.tsx b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/CheckboxNumeric.tsx index f0e47ce1e..8a447a6d6 100644 --- a/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/CheckboxNumeric.tsx +++ b/src/workingtitle-instruments-wt21/html_ui/Pages/VCockpit/Instruments/WT21/Shared/Menus/Components/CheckboxNumeric.tsx @@ -1,9 +1,17 @@ -import { FSComponent, MathUtils, MutableSubscribable, Subject, Subscribable, VNode } from '@microsoft/msfs-sdk'; +import { FSComponent, MathUtils, MutableSubscribable, Subject, Subscribable, SubscribableUtils, VNode } from '@microsoft/msfs-sdk'; import { WT21UiControl, WT21UiControlProps } from '../../UI/WT21UiControl'; import './Checkbox.css'; +/** + * Style of {@link CheckBoxNumeric} + */ +export enum CheckBoxNumericStyle { + Inline, + SideButtonBound, +} + /** * The properties for the CheckBox component. */ @@ -12,7 +20,7 @@ interface CheckBoxNumericProps extends WT21UiControlProps { label: string; /** The data ref subject for whether the checkbox is selected. */ - checkedDataRef: MutableSubscribable; + checkedDataRef: Subscribable | MutableSubscribable; /** The data ref subject for the selected value. */ dataRef: MutableSubscribable; @@ -29,6 +37,12 @@ interface CheckBoxNumericProps extends WT21UiControlProps { /** The maxmimun number of the value */ max?: number | Subscribable; + /** Style of numeric checkbox */ + style?: CheckBoxNumericStyle; + + /** Orientation of the numeric checkbox - only relevant if {@link style} is set to `SideButtonBound`. */ + orientation?: 'left' | 'right'; + /** Handler being fired when the checked status changes by control input */ onCheckedChanged?(value: boolean, sender: CheckBoxNumeric): void; @@ -40,20 +54,26 @@ interface CheckBoxNumericProps extends WT21UiControlProps { * The CheckBox component. */ export class CheckBoxNumeric extends WT21UiControl { + private static readonly ARROW_ORIENTATIONS: Record<'left' | 'right', string> = { + left: 'M 7, 2 l -4, 5 l 4, 5', + right: 'M 3, 2 l 4, 5 l -4, 5', + }; - protected readonly el = FSComponent.createRef(); + protected readonly focusEl = FSComponent.createRef(); protected readonly inputRef = FSComponent.createRef(); protected readonly uncheckOnChange = Subject.create(this.props.uncheckOnChange !== undefined ? this.props.uncheckOnChange : true); protected readonly increments = typeof this.props.increments === 'object' ? this.props.increments : Subject.create(this.props.increments !== undefined ? this.props.increments : 1); protected readonly min = typeof this.props.min === 'object' ? this.props.min : Subject.create(this.props.min !== undefined ? this.props.min : 0); protected readonly max = typeof this.props.max === 'object' ? this.props.max : Subject.create(this.props.max !== undefined ? this.props.max : 99999); + protected readonly style = this.props.style ?? CheckBoxNumericStyle.Inline; /** @inheritdoc */ public onUpperKnobPush(): boolean { - if (this.isDisabled === false) { - this.props.checkedDataRef.set(!this.props.checkedDataRef.get()); + if (!this.isDisabled) { if (this.props.onCheckedChanged) { - this.props.onCheckedChanged(this.props.checkedDataRef.get(), this); + this.props.onCheckedChanged(!this.props.checkedDataRef.get(), this); + } else { + SubscribableUtils.isMutableSubscribable(this.props.checkedDataRef) && this.props.checkedDataRef.set(!this.props.checkedDataRef.get()); } } return true; @@ -61,7 +81,7 @@ export class CheckBoxNumeric extends WT21UiControl { /** @inheritdoc */ public onUpperKnobInc(): boolean { - if (this.isDisabled === false) { + if (!this.isDisabled) { this.props.dataRef.set(MathUtils.clamp(this.props.dataRef.get() + this.increments.get(), this.min.get(), this.max.get())); this.onValueChangedInternal(); } @@ -70,7 +90,7 @@ export class CheckBoxNumeric extends WT21UiControl { /** @inheritdoc */ public onUpperKnobDec(): boolean { - if (this.isDisabled === false) { + if (!this.isDisabled) { this.props.dataRef.set(MathUtils.clamp(this.props.dataRef.get() - this.increments.get(), this.min.get(), this.max.get())); this.onValueChangedInternal(); } @@ -81,7 +101,9 @@ export class CheckBoxNumeric extends WT21UiControl { * Handles value changes by user input. */ private onValueChangedInternal(): void { - if (this.isDisabled === false && this.uncheckOnChange.get()) { this.props.checkedDataRef.set(false); } + if (!this.isDisabled && this.uncheckOnChange.get()) { + SubscribableUtils.isMutableSubscribable(this.props.checkedDataRef) && this.props.checkedDataRef.set(false); + } if (this.props.onValueChanged) { this.props.onValueChanged(this.props.dataRef.get(), this); } @@ -89,12 +111,12 @@ export class CheckBoxNumeric extends WT21UiControl { /** @inheritdoc */ protected onFocused(): void { - this.el.instance.classList.add(WT21UiControl.FOCUS_CLASS); + this.focusEl.instance.classList.add(WT21UiControl.FOCUS_CLASS); } /** @inheritdoc */ protected onBlurred(): void { - this.el.instance.classList.remove(WT21UiControl.FOCUS_CLASS); + this.focusEl.instance.classList.remove(WT21UiControl.FOCUS_CLASS); } /** @inheritdoc */ @@ -115,13 +137,13 @@ export class CheckBoxNumeric extends WT21UiControl { }, true); this.min.sub(min => { - if (this.isDisabled === false && min > this.props.dataRef.get()) { + if (!this.isDisabled && min > this.props.dataRef.get()) { this.props.dataRef.set(min); } }); this.max.sub(max => { - if (this.isDisabled === false && max < this.props.dataRef.get()) { + if (!this.isDisabled && max < this.props.dataRef.get()) { this.props.dataRef.set(max); } }); @@ -131,11 +153,21 @@ export class CheckBoxNumeric extends WT21UiControl { /** @inheritdoc */ public render(): VNode { return ( -
+