fix: fms-v2 fmgc variable ref #8376
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ataManager (cherry picked from commit a28688a)
BlueberryKing
approved these changes
Feb 2, 2024
flogross89
added a commit
that referenced
this pull request
Jul 1, 2024
* Deduplicate waypoints when inserting into flightplan * Fix origin being active leg initially * Add IF for procedures starting with FX * Implement FROM/TO leg deletion * fix: fms-v2 fmgc variable ref (#8376) fix(fms-v2): don't require explicit Fmgc namespace reference when calling fmgc's DataManager * Always compute IF at runway/airport * Only restring to enroute if arrival changed * Fix arrival not being rebuilt for transition change * Reset enroute transition when arrival changes * Show ILS frequency on Arrivals page * Set active leg when arrival changes while flying it * Deduplicate after airway entry * Create disco but no tmpy on waypoint entry * Fix missing approach vias with Navigraph data * Remove `MagVar` class * Fix no disco for waypoint insertion before destination * Fix being able to clear PPOS * fix: cleanup docker images for more space * Remove deleted import * Improve airway entry perf by filtering at db level * Fix typo in constraint parsing * Port AIRPORT key functionality * Remove unnecessary navdata workaround * Remove accidental CSS changes * Use 0 as default origin altitude * Rename to more meaningful name * Only transmit fixinfos of active flightplan * Treat "at" speed constraints as "atOrBelow" * Fix inaccurate comments * Use more appropriate name * Keep using `Avionics.Utils.bearingDistanceToCoordinates` for now * Fix typo * Remove unused code * Fix DIR to waypoint bug * Move DIR to logic out of page rendering code * Remove debugging code * Fix AIRPORT button * Fix VNAV not resetting after landing * Port forced turn indications * Fix turn area exceedance message logic * Fix toggle overfly function in non active flightplan * Keep database format for altitude constraints * Remove unnecessary speed constraint abstraction layer * Remove unused constraint properties on TF leg * Remove unclear comment * Filter out approach to missing runways * Change to simpler FROM/TO deletion stopgap logic * Keep upstream leg when stringing arrival to upstream * Fix typo in FROM/TO validation * Fix ILS frequency display after first arrival selection * Allow selection of arrival without runway * String XI to XF * Remove XI if leg added after it * Fix typecheck * Fix airport/runway altitude shown in flight plan * Delete alternate flight plan after NEW DEST * Ensure DIR to leg is not in missed approach * Use TF leg after truncating duplicate waypoint * Fix performance data rounding * Only change out of GA phase with new destination * Make approach transition names unique * fix: clock build * fix: weather request manual entry * Ignore null legs in distance calculation * Identify procedures by id over ident * fix: clock build pt 2 * Adjust flypad imports * sync and serialization fixes * fix: efb build * Fix first departure leg runway check * Fix linting issues * Don't override runway idents * Fix leftover procedure identification inconsistencies * Export `getAlongTrackDistanceTo` * Fix some more linting issues * Port basic atsu flightplan synchronisation code * Fix lint even harder * Fix departure page layout * Fix alternate destination being copied to active * Do not try to string MANUAL legs * Fix single waypoint SID imports again * feat: fms-v2 msfs sync (#8508) * add intial sync with all todos and hacks * serialize dest and origin airports * fix: guard origin and destination airport in serialization * fix: waypoint insertion, add extra module for sync * remove unncecessary change * use more granular sync events * some cleanup * feat: sync flight plan from game * fix some errors * more log * fix: export FlightPlanRpcServer * fix: mapping * fix: delay init until ingame * use native fms2 sync * fix: missing airport and runway in sync * Revert "fix: missing airport and runway in sync" This reverts commit 0d87e5a. * Revert "use native fms2 sync" This reverts commit b9f2f1f. * fix: sync confusion * small improvement * enable basic load from sim * fix: rpcclient creation * only use rpc client for initial load * fix: datastore subscription * fix: enroute waypoint insertion * fix: approach mapping, off by one error and runway selection * remove flightPlanTest * fix: typing errors * fix: destination runways without secondary designator * fix: lint * fix(sync): use sensible defaults if mapping fails * fix: init issue after fixing other init issue * Fix wrong FD leg ident * Improve arrival and departure pages * Handle explicit NO SID, NO STAR, etc. selection * Refactor MPR selection * Fix missing disco after leg deletion in alternate * Remove arrival procedures after changing alternate * Dump entire alternate plan when changing altn dest * feat: load MSFS flightplan in "SAVE" mode too * Remove commented code * Remove FacilityCache console logging * Highlight entire row for selected approach * Allow repeated constraints in F-PLN page * Remove duplicate code * Fix deletion of leg after CI at segment boundary * Implement basic support for XI IF XF leg combination * Disable SEC fpln functionality for now * Disable fms-v2 tests until they are fixed * improve error handling and runway designatorChars * make loading and saving more resilient * Disable inoperative buttons * Remove debugger statement * Fix WAYPOINT page entry * Fix missing error message after waypoint insertion * fix: potential bogus comparison * Rebuild arrival after setting all alternate procedures * Handle missing geometry leg again * Reset managed speed constraint after GA * Increase VM leg size * Make MRP side dependent * Remove dead code * Fix AIRPORT button getting stuck * Fix references to dead functions * Fix typo * Remove TODO for clarity * Sync cruise step deletion * Re-add licence identifier * Move `WaypointConstraintType` * fix: do not transmit empty vectors if not needed * Encode MRP in ARINC429 * Update comment * Remove unused arguments * Fix wrong TO waypoint for runways * Fix EFB build again * fix: efb ts config * fix: revert optimization until better solution found * fix: new allocation optimisation for efis vector sync * refactor: undefined -> null * Add null check * Remove JS FMCDataManager * fix: hotfix for departure page issue with selecting new dep runway * fix: only set atc crz flight level when defined, remove console logs * Change runway ident format * fix: fpln sync after recent changes * Remove SID when changing runway * Remove arrival when changing approach * fix: text alignment for constraints (font still needs work) * ci: Rename workflows from 'PR' to more descriptive names (#8614) * Update and rename pr.yml to pr-build.yml * Update PULL_REQUEST_TEMPLATE.md * Update and rename pr-target.yml to pr-semantics.yml * Update pr-build.yml * feat(flight_model): Add drag from landing lights (#8554) * add landing light drag * Doc and naming * typo * Auto stash before checking out "origin/master" * Updated drag values * changelog * Update cruise.FLT --------- Co-authored-by: 2hwk <15316958+2hwk@users.noreply.github.com> Co-authored-by: donstim <70166617+donstim@users.noreply.github.com> * refactor: Fadec rewrite using Cpp framework (#8547) * Initial scaffolding for new fadec * Added SIMULATION RATE to base data * Added SIM ON GROUND to base data * Initial scaffolding for new EngineControl * Initial scaffolding for both aircraft * Remove build code for old fadec * migrated the common.h code to Fadec.h * removed simulation time params * inlined var init * Code cleanup and documentation * Renaming of context var * Added ThrustLimit_A380X class and helper methods in Fadec.h * Improved insertThousandsSeparator helper * Merge fix * Commenting ThrustLimits_A380X.h * Commenting SimDataStructs.h * Adding Polynomials_A380X.hpp * Adding Table1502_A380X.hpp * Adding Table1502_A380X.hpp * Adding some commenting to framework classes * Adding FuelConfiguration class * Added TODO * Import fix * code style fix * Renamed Class * changed class access and fixed migrated code * Added FadecSimData class and implemented initialization of EngineControl * Added EngineControl_A380X.cpp update() * Adding some commenting to framework class * Implemented additional update functions * Implemented all required functions * Checked initialize * Checked update * Bug fix setting feed tanks * Fix unit for EGT * Refactored var access * Added profiler * Added more profiler * Refactored writing and added gauge profiler * added "using DataDefinitionVector" * Prepared A32NX fadec migration (wip) * Improved Pause detection (removed unnecessary read) * Additional profiler when PROFILING is set * Added usage commenting to SimpleProfiler * Added default flag to set data on Sim Object * Added a flag to turn on/off warning of dirty data read. * Minor docu fix in AircraftVariable.h * Prepared A32NX fadec migration (wip) * Fixed reading of initial pause var * Added fuel config and data definitions * Added ThrustLimits_A32NX.hpp * Added Polynomials_A32NX.hpp * Added Tables1502_A32NX.hpp * Fixed to_string_with_zero_padding by making static * Added initializeEngineControlData * Added comment * Added Gph (Gallons per hour) to UNITS * Added profiler metadata output * Migration done - debugging wip * Commenting FuelConfiguration_A32NX.h * Commenting and cleanup * Commenting, cleanup and removed a recursion * Commenting * Added EngineRatios class * Migration done - debugging wip * Fixed engine startup - code working so far * Moved read only Aircraft Variables to DataDefinition for 50% performance increase for data update * Further cleanup * Undo change in logic for fuel used * Migration A380X done - debugging & testing * Cleanup and commenting * Fixed fuel issue on A380X * Cleanup and commenting * Removed previous fadec code * Cleanup and commenting * Reversed tank order of flyPad Fuel Page * Cleanup and commenting * Fix LVar resetting * Review changes * Added CHANGELOG.md entry * fix(fadec): flex temp unit conversion (#8617) fix: flex temp unit conversion * Show NOT ALLOWED upon procedure reselection * Merge legs after certain disco deletions * Fix circling approach not showing up * fix: Fixed bug in checklist to not display previous checklists as completed (#8615) Fixed bug in checklist to not display previous checklists as completed. * Fix ND not updating after TMPY deletion * Fix disco deletion * Show NOT ALLOWED upon procedure reselection * Merge legs after certain disco deletions * Fix circling approach not showing up * Fix ND not updating after TMPY deletion * Fix disco deletion * fix: don't throw null true bearing when parsing discont * fix: check for null vs truthiness * fix: use strict !== * Fix FREQ not shown after deduplicating airway fixes * Port tropopause uplink * Show NOT ALLOWED when attempting to clr ZFW/ZFWCG * Remove unused import * HIde circling approaches * Show CLB or DES prompt when necessary * Show NO TRANS when explicitly selected * Show ENTRY for pilot constructed points on PROG page * Filter STARs when only runway selected * Revert "Show NO TRANS when explicitly selected" This reverts commit f6a8905. * Fix NO SID, NO STAR selection not working * Improve automatic NONE selection * Improve automatic NONE trans selection * Handle missing airways during uplink * clean up after git mess * make performance data nullable (incl. FMC implications); remove dead code; revert change on PilotWaypoint * GeometricPathBuilder fix * update from a380 branch * merge fix * re-insert MathUtils, to be deleted with MFD PR * updated fms type improvements (make nullable, don't use undefined) * feat(fms): fm legs * fix(fms): to wpt details for fm leg * Fix trans lvl being reset when changing runway * Fix runway formatting on PERF page * feat(utils): add angle normalise functions * fix(fms): fix vor station declination fixes fix info radials * fix: handle "at or below" constraint * chore: update fms-v2 workflow * fix: 380 fadec build * fix(fms): cf leg interpretation * fix(fms): idf sids => also sids starting with cf leg * feat(fms): fa leg v0.0.1 * fix: eslint ref * style: run lint after merge * chore: fix lint * chore: fix lint * Treat missed approach legs as climb constraints * Fix missed approach track not being shown * Allow SID without runway * lint-fix * fix lint error, don't include debug switches in a/c specific lnav config * fix build :/ * make legEta non-static, update copyright claims, remove facLoader (tracers comments) * holland's comments: update copyright claims, remove exports, change file and var naming * don't delete one more copyright claim * fix merge error * [VNAV] a32nx fixes (cherry picked from commit 8c68638) --------- Co-authored-by: BBK <22713769+BlueberryKing@users.noreply.github.com> Co-authored-by: Saschl <19493808+Saschl@users.noreply.github.com> Co-authored-by: Saschl <sascharudolf46@gmail.com> Co-authored-by: Sascha Rudolf <sascha.rudolf@sap.com> Co-authored-by: Benjamin Dupont <4503241+Benjozork@users.noreply.github.com> Co-authored-by: Andreas Guther <andreas@guther.family> Co-authored-by: 2hwk <reasonstouninstall@tutanota.com> Co-authored-by: 2hwk <15316958+2hwk@users.noreply.github.com> Co-authored-by: Aurora Takemi <98479040+alepouna@users.noreply.github.com> Co-authored-by: Croc <38904654+crocket63@users.noreply.github.com> Co-authored-by: donstim <70166617+donstim@users.noreply.github.com> Co-authored-by: Frank Kopp <frank@familie-kopp.de> Co-authored-by: Michael Corcoran <tracer@outlook.co.nz>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of Changes
Fix for fms-v2 branch: Do not explicitly reference the Fmgc namespace/variable, since WaypointFactory is exported via index.ts anyways. In the A380x MFD, Fmgc throws an "undefined" error.
References
Additional context
as discussed in discord
Discord username (if different from GitHub): floridude
Testing instructions
Try storing/deleting pilot-defined waypoints. Untested on A32NX so far.
How to download the PR for QA
Every new commit to this PR will cause a new A32NX artifact to be created, built, and uploaded.