Merge pull request #753 from Working-Title-MSFS-Mods/CJ4/Prerelease-0…

….8.5-bugfix

CJ4: Prerelease 0.9.0 bugfix

PackageDefinitions/workingtitle-aircraft-cj4-metapackage.xml

@@ -1,4 +1,4 @@
-<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.8.2">
+<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.9.0">
 	<ItemSettings>
 		<ContentType>CUSTOM</ContentType>
 		<Title>CJ4</Title>

PackageDefinitions/workingtitle-aircraft-cj4.xml

@@ -1,4 +1,4 @@
-<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.8.2">
+<AssetPackage Name="workingtitle-aircraft-cj4" Version="0.9.0">
 	<ItemSettings>
 		<ContentType>CUSTOM</ContentType>
 		<Title>CJ4</Title>

build.ps1

@@ -1,7 +1,7 @@
 param (
     [Parameter(Mandatory = $true)][string]$Project,
     [string]$Package,
-    [string]$MinimumGameVersion = "1.10.7",
+    [string]$MinimumGameVersion = "1.12.13",
     [string]$OutputPath = ".\build\",
     [switch]$WatchFiles = $false,
     [switch]$CleanBuild = $false

docs/workingtitle-cj4/CHANGES.md

@@ -1,6 +1,6 @@
-# Working Title CJ4 v0.8.2 Changes
+# Working Title CJ4 v0.9.0 Changes
 
-Welcome to the Working Title CJ4 v0.8.2. This is a point release to address compatibility with MSFS 1.12.13.0 (VR Update).
+Welcome to the Working Title CJ4 v0.9.
 
 ## Installation
 Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside the zip file to your MSFS Community folder. 
@@ -11,36 +11,119 @@ Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside
 The alternate default liveries that now ship with MSFS are not compatible with the CJ4 yet at this time. They currently ship with panel.cfg files that do not include our FADEC module. Please use the standard livery or a known compatible 3rd party or community livery.
 
 ## Remarks to flight plan synchronization between the Game and FMS 
-Our recommendation is to keep FP Sync _off_.  
-You can still "file" your flight plan to ATC by entering it in the world map of MSFS and it will remain visible to ATC/VFR.
+The FP SYNC option is one way: it updates the simulator flight plan from the FMC. To load a plan into the FMS you can either enter it manually or use the _FPLN RECALL (GAME/SB)_ option in _IDX -> PAGE2 -> ROUTE MENU_
 
-To then load the plan into the FMS you can either enter it manually or use the _FPLN RECALL (GAME/SB)_ option in _IDX -> PAGE2 -> ROUTE MENU_
-
-Due to the increased accuracy and capabilities of the FMC managed flight plan, you may find that the sync to the game does not always work as expected or does not reflect the FMC flight plan.
+Due to the increased accuracy and capabilities of the FMC managed flight plan, you may find that the sync to the game does not always work as expected or does not reflect the FMC flight plan exactly.
 
 ## KEY FEATURES
-* Compatibility with MSFS 1.12.13.0
+* Added Cross Pointers flight director
+* Flight director now works with AP off, including lateral guidance
+* Added Takeoff Go-Around (TOGA) mode
+* Holds functionality and autopilot, including proper entry types and exit arming
+* Course intercept, Point/Bearing/Distance fixes, Point/Distance fixes, Lat/Lon fixes
+* Completely overhauled Flight Model (WIP) (Credit: Metzgergva)
+* Com 2 can now be used to transmit and receive.
+
+## Flight Plan Manager
+* Fixed errors where negative values would be returned for a leg course
+* When approach is loaded, destination airport is removed and the runway becomes the final waypoint
+
+## LNAV
+* Off-course sidewinder wandering behavior should be greatly reduced
+* Support added for flying holds
+* FMS now calculates correct DTK for very long legs along changing great circle bearings
+* FMS will now continue to sequence even if the active nav mode source is a nav radio
+* FMS will no longer sequence past the destination runway fix to the airport fix
+
+## VNAV
+* VNAV will now continue to the most recent restriction even during a large amount of turn anticipation
+* FPA for approach legs will now be calculated from the FAF so steeper angles can be automatically supported
+
+## Autopilot
+* Adjusted VS to round up in approach to prevent drifting under GP (Current AP workaround)
+* Added inhibit .1nm from runway threshold to prevent aircraft from flying towards center of airport
+* Added TOGA functionality. When pressed on ground, provides 10 degree FD pitch up, runway heading tracking. Hotspot to engage is the L FIRE BOTTLE click hotspot
+* VS mode now properly captures the current vertical speed when engaging
+* AP now goes to Roll/Pitch upon landing
+* Fixed issue where APPR sensitivity could appear even outside of the approach segment
+* VS wheel now properly adjusts target aircraft pitch when in PITCH mode
+
+## Comms
+* COM2 transmit and receive is now fully supported in the panel and compatible with vPilot
+* COM switches on audio panel can now enable or disable transmit for that channel
+* COM knobs will now disable receive for that channel when turned down
 
 ## FMC
-* Fixed an issue where FPLN and LEGS would not show modifications unless the page was changed under certain conditions
-* FMC should now be able to continue to be used even on page error in most circumstances
+* Holding CLR for 1/2 second or longer will clear the entire scratchpad
+
+### DIR
+* Page layout has been overhauled
+* Available fixes should properly reflect remaining legs in plan
+* Nearest airports function should now operate
+* Direct-to should no longer route you back to the origin runway if the selected fix is a non-ICAO leg termination (also applies to LEGS)
+
+### LEGS
+* Fixed legs page blacking out with empty flight plan
+* Fixed inability to copy magenta TO fix to scratchpad
+* Added lat/lon user waypoints support
+* Added shorthand lat/lon user waypoint support
+* Added place/bearing/distance user waypoint support
+* Added flight plan offset user waypoint support
+* Added ability to drop fix on blue FROM leg to intercept leg course
+* Fixed incorrectly rounded distance displays
+* Added NEW HOLD and HOLD AT support
+* Added support for hold EXIT ARMED and CANCEL EXIT
+* Added AUTO/INHIBIT FMS fix sequencing selection
+
+### PERF
+* Fixed bug where it would go to perf init after vnav setup 3/3
+* Fixed cruise altitude cell in perf init from showing FL + 5 boxes
+* Fixed bug in approach ref not showing headwind/tailwind
+
+### FPLN
+* V-Speeds will reset when entering a new origin after landing.
+* Airways should now be enterable connecting to the final departure fix
+* Fuel used is now reset with new origin
+
+### FPLN HOLD
+* Added hold page support for all data fields, except for QUAD/RADIAL
+* Added support for automatically detected entry type
+* Added support for EXIT HOLD and CANCEL EXIT
+* Wired hold support into EXEC/CANCEL MOD
+
+### HOLD LIST
+* Added HOLD LIST page
+* Adeed support for up to 6 holds in list
+
+## PFD/MFD
+* Added Cross Pointers (X-PTR) flight director and setting persistence on restart
+* Setting altimeter to hPA stays persistent on restart
+* Cyan vertical speed arrow is now removed when in GP or VPATH
+* Adjusted map ranges to realistic values (5, 10, 25, 50, 100, 200, 300, 600)
+* Corrected PPOS scaling
+* MFD Wind speed font size same as PFD
+* Fixed outer range display cut off
+* Added (N)orth label to PLAN view
+* Wind indicator hidden on PLAN view
+* Various map draw improvements
+* Added correct icons for different VOR types and NDBs
+* Enabled map symbols are now drawn and updated around the current location
+* INTERS now only shows named and non terminal waypoints
+* Added display of terminal waypoints (to be enabled in FMC)
+* Map will show a maximum of 40 symbols as in the real unit (configurable in Defaults in later version)
 
-## Flight Plan Import
-* Fixed an issue where game flight plans with blank ICAO legs would cause the plan to fail to load
-* Simbrief plans with 3 letter ICAO airports prefixed with K should now properly load
+## Misc
+* AOA indicator only lights up on gear down or greater than flaps 15.
+* Standby attitude indicator (SAI) baro settings are changed to whatever is set in PFD.
 
 ## ⚠️ Known Issues
-* Sync to the game flightplan (ATC/VFR Map) is very much work in progress and turned off by default. You can enable this feature in MOD SETTINGS on the FMC.
-* Some external applications that use the GPS/Flight plan SimVars may not function correctly or as expected.
+* Some external applications that use the GPS/Flight plan SimVars may not function correctly or as expected when FP Sync is off.
 * Loading and saving flights can have bad results.
 * Custom liveries can render FADEC inoperative if they ship with a panel.cfg. You must uninstall them or remove their panel.cfg from the livery folder. This is a limitation of the Asobo livery system.
+* On FPLN you cant enter airways properly when arrival/approach procedures are already selected (to be fixed soon).
 * Autopilot modes cannot be triggered via keybindings or controllers and must currently be triggered in the cockpit with the mouse.
-* TOD sometimes will flash on the PFD during an approach.
-* Sometimes a heading to altitude instruction on takeoff will display further than the first RNAV fix on an RNAV departure procedure; in these cases the workaround is to cross-check the DP chart and remove the erronious waypoint either by deleting the heading to altitude fix or dropping the first RNAV fix onto the magenta line in the LEGS page.
+* Sometimes a heading to altitude instruction on takeoff will display further than the first RNAV fix on an RNAV departure procedure; in these cases the workaround is to cross-check the DP chart and remove the erroneous waypoint either by deleting the heading to altitude fix or dropping the first RNAV fix onto the magenta line in the LEGS page.
 * Due to sim autopilot bank rate limitations, the aircraft may overshoot on certain RNP approaches with tight turns. If you encounter this, we recommend handflying the approach with the given lateral and vertical guidance.
 * Sometimes when turning more than 90 degrees onto an approach segment, VNAV might give a NOPATH condition because it sees that you are too high.  Engage FLC or VS and descend down and it should recapture the path.
-* Very long legs may display some constant cross track deviation on the map and course needles. The plane will still track properly towards the fix. This will be addressed later in the beta.
-* The FMS now builds turn anticipation into direct-to course projection. However, you will still encounter some overshoot beyond 90 or so degrees.
 * If for whatever reason, you find that VNAV is not behaving as expected, try and turn it off and on again.
 
-### 🎅 Have fun! 🎅

docs/workingtitle-cj4/Working Title CJ4 v0.8.2 Changes.md

@@ -0,0 +1,46 @@
+# Working Title CJ4 v0.8.2 Changes
+
+Welcome to the Working Title CJ4 v0.8.2. This is a point release to address compatibility with MSFS 1.12.13.0 (VR Update).
+
+## Installation
+Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside the zip file to your MSFS Community folder. 
+
+**Important: We recommend that you fully delete the previous `workingtitle-aircraft-cj4` folder before copying this release.**
+
+## Default Livery Conflicts
+The alternate default liveries that now ship with MSFS are not compatible with the CJ4 yet at this time. They currently ship with panel.cfg files that do not include our FADEC module. Please use the standard livery or a known compatible 3rd party or community livery.
+
+## Remarks to flight plan synchronization between the Game and FMS 
+Our recommendation is to keep FP Sync _off_.  
+You can still "file" your flight plan to ATC by entering it in the world map of MSFS and it will remain visible to ATC/VFR.
+
+To then load the plan into the FMS you can either enter it manually or use the _FPLN RECALL (GAME/SB)_ option in _IDX -> PAGE2 -> ROUTE MENU_
+
+Due to the increased accuracy and capabilities of the FMC managed flight plan, you may find that the sync to the game does not always work as expected or does not reflect the FMC flight plan.
+
+## KEY FEATURES
+* Compatibility with MSFS 1.12.13.0
+
+## FMC
+* Fixed an issue where FPLN and LEGS would not show modifications unless the page was changed under certain conditions
+* FMC should now be able to continue to be used even on page error in most circumstances
+
+## Flight Plan Import
+* Fixed an issue where game flight plans with blank ICAO legs would cause the plan to fail to load
+* Simbrief plans with 3 letter ICAO airports prefixed with K should now properly load
+
+## ⚠️ Known Issues
+* Sync to the game flightplan (ATC/VFR Map) is very much work in progress and turned off by default. You can enable this feature in MOD SETTINGS on the FMC.
+* Some external applications that use the GPS/Flight plan SimVars may not function correctly or as expected.
+* Loading and saving flights can have bad results.
+* Custom liveries can render FADEC inoperative if they ship with a panel.cfg. You must uninstall them or remove their panel.cfg from the livery folder. This is a limitation of the Asobo livery system.
+* Autopilot modes cannot be triggered via keybindings or controllers and must currently be triggered in the cockpit with the mouse.
+* TOD sometimes will flash on the PFD during an approach.
+* Sometimes a heading to altitude instruction on takeoff will display further than the first RNAV fix on an RNAV departure procedure; in these cases the workaround is to cross-check the DP chart and remove the erronious waypoint either by deleting the heading to altitude fix or dropping the first RNAV fix onto the magenta line in the LEGS page.
+* Due to sim autopilot bank rate limitations, the aircraft may overshoot on certain RNP approaches with tight turns. If you encounter this, we recommend handflying the approach with the given lateral and vertical guidance.
+* Sometimes when turning more than 90 degrees onto an approach segment, VNAV might give a NOPATH condition because it sees that you are too high.  Engage FLC or VS and descend down and it should recapture the path.
+* Very long legs may display some constant cross track deviation on the map and course needles. The plane will still track properly towards the fix. This will be addressed later in the beta.
+* The FMS now builds turn anticipation into direct-to course projection. However, you will still encounter some overshoot beyond 90 or so degrees.
+* If for whatever reason, you find that VNAV is not behaving as expected, try and turn it off and on again.
+
+### 🎅 Have fun! 🎅

docs/workingtitle-cj4/Working Title CJ4 v0.8.3 Changes.md

@@ -0,0 +1,48 @@
+# Working Title CJ4 v0.8.3 Changes
+
+Welcome to the Working Title CJ4 v0.8.3. This is a point release to primarily address pitch oscillations during climb and cruise.
+
+## Installation
+Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside the zip file to your MSFS Community folder. 
+
+**Important: We recommend that you fully delete the previous `workingtitle-aircraft-cj4` folder before copying this release.**
+
+## Default Livery Conflicts
+The alternate default liveries that now ship with MSFS are not compatible with the CJ4 yet at this time. They currently ship with panel.cfg files that do not include our FADEC module. Please use the standard livery or a known compatible 3rd party or community livery.
+
+## Remarks to flight plan synchronization between the Game and FMS 
+Our recommendation is to keep FP Sync _off_.  
+You can still "file" your flight plan to ATC by entering it in the world map of MSFS and it will remain visible to ATC/VFR.
+
+To then load the plan into the FMS you can either enter it manually or use the _FPLN RECALL (GAME/SB)_ option in _IDX -> PAGE2 -> ROUTE MENU_
+
+Due to the increased accuracy and capabilities of the FMC managed flight plan, you may find that the sync to the game does not always work as expected or does not reflect the FMC flight plan.
+
+## KEY FEATURES
+* Adjustments to autopilot controller gains to address pitch oscillations
+
+## FMS
+* FMS will now continue to sequence even when the active nav source is not FMS
+* FMS will no longer sequence past the destination runway fix even if you fly beyond it
+
+## FMC
+* FPLN page will now properly accept airways following the departure fix
+
+## Autopilot
+* Adjusted pitch PID gains to eliminate oscillation under certain conditions
+
+## ⚠️ Known Issues
+* Sync to the game flightplan (ATC/VFR Map) is very much work in progress and turned off by default. You can enable this feature in MOD SETTINGS on the FMC.
+* Some external applications that use the GPS/Flight plan SimVars may not function correctly or as expected.
+* Loading and saving flights can have bad results.
+* Custom liveries can render FADEC inoperative if they ship with a panel.cfg. You must uninstall them or remove their panel.cfg from the livery folder. This is a limitation of the Asobo livery system.
+* Autopilot modes cannot be triggered via keybindings or controllers and must currently be triggered in the cockpit with the mouse.
+* TOD sometimes will flash on the PFD during an approach.
+* Sometimes a heading to altitude instruction on takeoff will display further than the first RNAV fix on an RNAV departure procedure; in these cases the workaround is to cross-check the DP chart and remove the erronious waypoint either by deleting the heading to altitude fix or dropping the first RNAV fix onto the magenta line in the LEGS page.
+* Due to sim autopilot bank rate limitations, the aircraft may overshoot on certain RNP approaches with tight turns. If you encounter this, we recommend handflying the approach with the given lateral and vertical guidance.
+* Sometimes when turning more than 90 degrees onto an approach segment, VNAV might give a NOPATH condition because it sees that you are too high.  Engage FLC or VS and descend down and it should recapture the path.
+* Very long legs may display some constant cross track deviation on the map and course needles. The plane will still track properly towards the fix. This will be addressed later in the beta.
+* The FMS now builds turn anticipation into direct-to course projection. However, you will still encounter some overshoot beyond 90 or so degrees.
+* If for whatever reason, you find that VNAV is not behaving as expected, try and turn it off and on again.
+
+### 🎅 Have fun! 🎅

src/.eslintrc.json

@@ -20,6 +20,27 @@
         "semi": [2, "always"]
     },
     "globals": {
+        "EBingReference": "writable",
+        "Vec2": "writable",
+        "AirportSize": "writable",
+        "CitySize": "writable",
+        "SvgMapConfig": "writable",
+        "SvgObstacleElement": "writable",
+        "ISvgMapRootElement": "writable",
+        "BaseInstrument": "writable",
+        "EWeatherRadar": "writable",
+        "NPCAirplaneManager": "writable",
+        "SvgAirplaneElement": "writable",
+        "SvgFlightPlanElement": "writable",
+        "SvgBackOnTrackElement": "writable",
+        "Quality": "writable",
+        "EInputStatus": "writable",
+        "SvgMap": "writable",
+        "SvgConstraintElement": "writable",
+        "EBingMode": "writable",
+        "SvgCityManager": "writable",
+        "AirportLoader": "writable",
+        "NearestAirspacesLoader": "writable",
         "VerticalNavModeState": "writable",
         "CJ4_MFD": "writable",
         "CJ4_PFD": "writable",

src/workingtitle-aircraft-cj4/ModelBehaviorDefs/Asobo_CJ4/Control.xml

@@ -117,6 +117,27 @@
         </UseTemplate>
     </Template>
 
+    <Template Name="ASOBO_FMC_Push_CLR_Template">
+        <DefaultTemplateParameters>
+            <NODE_ID_CLR>#FMC_NAME#_Push_CLR#SUFFIX_ID#</NODE_ID_CLR>
+            <ANIM_NAME_CLR>#FMC_NAME#_Push_CLR#SUFFIX_ID#</ANIM_NAME_CLR>
+        </DefaultTemplateParameters>
+        <EditableTemplateParameters>
+            <AddParams>
+                <NODE_ID_CLR></NODE_ID_CLR>
+                <ANIM_NAME_CLR></ANIM_NAME_CLR>
+            </AddParams>
+        </EditableTemplateParameters>
+
+        <UseTemplate Name="ASOBO_FMC_PushButton">
+            <HTML_EVENT_ID>CLR</HTML_EVENT_ID>
+		    <LONG_CLICK_TIME>0.5</LONG_CLICK_TIME>
+            <HAS_LONG_PRESS>True</HAS_LONG_PRESS>
+            <NODE_ID>#NODE_ID_CLR#</NODE_ID>
+            <ANIM_NAME>#ANIM_NAME_CLR#</ANIM_NAME>
+        </UseTemplate>
+    </Template>
+
     <!-- AP SUB ########################################### -->
     <Template Name="ASOBO_AUTOPILOT_Push_SubTemplate">
         <DefaultTemplateParameters>