diff --git a/PackageDefinitions/workingtitle-aircraft-cj4-metapackage.xml b/PackageDefinitions/workingtitle-aircraft-cj4-metapackage.xml index 9c4706d4e..0a1a0043c 100644 --- a/PackageDefinitions/workingtitle-aircraft-cj4-metapackage.xml +++ b/PackageDefinitions/workingtitle-aircraft-cj4-metapackage.xml @@ -1,4 +1,4 @@ - + CUSTOM CJ4 diff --git a/PackageDefinitions/workingtitle-aircraft-cj4.xml b/PackageDefinitions/workingtitle-aircraft-cj4.xml index 7cc0ce823..58411d4b3 100644 --- a/PackageDefinitions/workingtitle-aircraft-cj4.xml +++ b/PackageDefinitions/workingtitle-aircraft-cj4.xml @@ -1,4 +1,4 @@ - + CUSTOM CJ4 diff --git a/docs/workingtitle-cj4/CHANGES.md b/docs/workingtitle-cj4/CHANGES.md index bcb1d6a4d..5772d57d5 100644 --- a/docs/workingtitle-cj4/CHANGES.md +++ b/docs/workingtitle-cj4/CHANGES.md @@ -1,5 +1,5 @@ -# Working Title CJ4 v0.12.12 -Welcome to the Working Title CJ4 v0.12.12. This version contains compatibility fixes for SimUpdate 8. +# Working Title CJ4 v0.12.13 +Welcome to the Working Title CJ4 v0.12.13. This version contains compatibility fixes for SimUpdate 9 and some small additions. Thanks to everyone, as always, for your contributions! We really love working with you all. @@ -20,15 +20,17 @@ Installation is easy, simply copy the `workingtitle-aircraft-cj4` folder inside **Important: We recommend that you fully delete the previous `workingtitle-aircraft-cj4` folder before copying this release.** -## Fixes -- Accomodate for changes in the CAS system for SU8 -- Limit max fuel flow to try to avoid mysterious fuel loss bug +## Changes +- Compatibility with SimUpdate 9 +- Added IDENT functionality on ATC CONTROL page (thanks to @grumpy-anonsaba ) +- Fixed names of payload stations (thanks to @rthom91 ) +- Anti Ice buttons are now mutually exclusive (fixed in stock by Asobo) +- Adjusted SAI auto brightness curve to not be too bright + ## ⚠️ Known Issues * Wing Light Button does not light up. -* The Lower CCP LONG Press does not work for reselecting charts - we will look further at this. * B/C button throws an error in the FMC - do not use B/C for now. -* Some "lettered" or non-runway-specific approaches now appear as something like RNAV A - 00 and do not allow the selection of a landing runway, preventing using the Approach Refs page - this is something we will be working to address in the future. * 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. Painters should reference our new [Repainter's Guide](https://www.workingtitle.aero/packages/cj4/guides/repainter) for solutions. diff --git a/docs/workingtitle-cj4/Working Title CJ4 v0.12.12 Changes.md b/docs/workingtitle-cj4/Working Title CJ4 v0.12.12 Changes.md new file mode 100644 index 000000000..bcb1d6a4d --- /dev/null +++ b/docs/workingtitle-cj4/Working Title CJ4 v0.12.12 Changes.md @@ -0,0 +1,37 @@ +# Working Title CJ4 v0.12.12 +Welcome to the Working Title CJ4 v0.12.12. This version contains compatibility fixes for SimUpdate 8. + +Thanks to everyone, as always, for your contributions! We really love working with you all. + +## Note about Liveries +To accommodate for future work on the CJ4 there have been model changes made to the plane in SU7. This means that all liveries that still fully override panel.cfg with their own version (which they really shouldn't) won't work anymore. +You will notice a bad livery or other mods interferring by having all white screens in the cockpit. + +Liveries should use the method as described in our [Repainter's Guide](https://www.workingtitle.aero/packages/cj4/guides/repainter). +Many liveries already use that method and should work alright after the update. + +## READ THE GUIDE +Please, please, please read the operators guide for instructions on using features. A lot of hard work went into writing the guide and the Discord channels are clogged with questions that are readily answered in the guide. + +GUIDES: https://www.workingtitle.aero/packages/cj4/guides/ + +## 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.** + +## Fixes +- Accomodate for changes in the CAS system for SU8 +- Limit max fuel flow to try to avoid mysterious fuel loss bug + +## ⚠️ Known Issues +* Wing Light Button does not light up. +* The Lower CCP LONG Press does not work for reselecting charts - we will look further at this. +* B/C button throws an error in the FMC - do not use B/C for now. +* Some "lettered" or non-runway-specific approaches now appear as something like RNAV A - 00 and do not allow the selection of a landing runway, preventing using the Approach Refs page - this is something we will be working to address in the future. +* 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. Painters should reference our new [Repainter's Guide](https://www.workingtitle.aero/packages/cj4/guides/repainter) for solutions. +* Autopilot modes cannot be triggered via key bindings or controllers and must currently be triggered in the cockpit with the mouse. External binding applications are adding support for LVars and HEvents. Used SimVars are documented in our [Guide on SimVars](https://www.workingtitle.aero/packages/cj4/guides/simvars). +* 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 hand flying the approach with the given lateral and vertical guidance. diff --git a/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/flight_model.cfg b/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/flight_model.cfg index df0369a44..542ce842c 100644 --- a/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/flight_model.cfg +++ b/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/flight_model.cfg @@ -39,16 +39,16 @@ activate_cg_limit_based_on_mach = 0 ; Activate cg limitation depending on mach v max_number_of_stations = 12 ; Number of payload stations station_load.0 = 170, 16.0, -1.2, 4, TT:MENU.PAYLOAD.PILOT, 1 station_load.1 = 170, 16.0, 1.2, 4, TT:MENU.PAYLOAD.COPILOT, 2 -station_load.2 = 170, 8.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_1, 3 -station_load.3 = 170, 8.0, 1.2, 4, TT:MENU.PAYLOAD.PASSENGER_2, 3 -station_load.4 = 170, 4.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_3, 3 -station_load.5 = 170, 4.0, 1.2, 4, TT:MENU.PAYLOAD.PASSENGER_4, 3 -station_load.6 = 170, 1.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_5, 3 -station_load.7 = 170, 1.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_6, 3 -station_load.8 = 0, 11.0, 1.2, 4, TT:MENU.PAYLOAD.COUCH, 3 -station_load.9 = 50, 13.0, -1.5, 0, TT:MENU.PAYLOAD.CABINET_FL, 6 -station_load.10 = 50, 13.0, 1.5, 0, TT:MENU.PAYLOAD.CABINET_FR, 6 -station_load.11= 200, -1.6, 1.5, 0, TT:MENU.PAYLOAD.BAGGAGE_RR, 6 +station_load.2 = 170, 8.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_01, 3 +station_load.3 = 170, 8.0, 1.2, 4, TT:MENU.PAYLOAD.PASSENGER_02, 3 +station_load.4 = 170, 4.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_03, 3 +station_load.5 = 170, 4.0, 1.2, 4, TT:MENU.PAYLOAD.PASSENGER_04, 3 +station_load.6 = 170, 1.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_05, 3 +station_load.7 = 170, 1.0, -1.2, 4, TT:MENU.PAYLOAD.PASSENGER_06, 3 +station_load.8 = 0, 11.0, 1.2, 4, COUCH, 3 +station_load.9 = 50, 13.0, -1.5, 0, CABINET FRONT LEFT, 6 +station_load.10 = 50, 13.0, 1.5, 0, CABINET FRONT RIGHT, 6 +station_load.11 = 200, -1.6, 1.5, 0, BAGGAGE REAR RIGHT, 6 [CONTACT_POINTS] static_pitch = -1.7 ; degrees, pitch when at rest on the ground (+=Up, -=Dn) @@ -381,4 +381,4 @@ max_on_ground_position = 2 ; Dynamically set in-tool to last flap-position index ; DS LS AS CD LO flaps-position.0 = 0, -1, 0.0, 1.0, 1.0, 0.0, 0.0 flaps-position.1 = 15, -1, 0.5, 1.2, 1.0, 0.0, -0.2 -flaps-position.2 = 35, -1, 1.0, 1.0, 1.0, 0.0, -0.5 \ No newline at end of file +flaps-position.2 = 35, -1, 1.0, 1.0, 1.0, 0.0, -0.5 diff --git a/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/model/CJ4_Cockpit.xml b/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/model/CJ4_Cockpit.xml index 404cc72eb..da6195018 100644 --- a/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/model/CJ4_Cockpit.xml +++ b/src/workingtitle-aircraft-cj4/SimObjects/Airplanes/Asobo_CJ4/model/CJ4_Cockpit.xml @@ -208,7 +208,7 @@ - 0.7 (A:GLASSCOCKPIT AUTOMATIC BRIGHTNESS, Number) min + (A:GLASSCOCKPIT AUTOMATIC BRIGHTNESS, Number) 0.3 max 0.5 min AttitudeBackup_Screen CJ4_BackupDisplay BackupDisplay @@ -619,6 +619,8 @@ @TT_Package.DEICE_ANTI_ICE_ENGINE_ACTION_SET (R:1:@TT_Package.GT_STATE_LEFT) 1 + p0 0 != if{ 0 (>B:DEICE_Airframe_1_Set) } + True WT_soft_button_on WT_soft_button_off @@ -626,6 +628,8 @@ @TT_Package.DEICE_ANTI_ICE_ENGINE_ACTION_SET (R:1:@TT_Package.GT_STATE_RIGHT) 2 + p0 0 != if{ 0 (>B:DEICE_Airframe_2_Set) } + True WT_soft_button_on WT_soft_button_off @@ -636,6 +640,8 @@ @TT_Package.DEICE_SWITCH_AIRFRAME_ACTION_SET_DUO (R:1:@TT_Package.GT_STATE_LEFT) 2 + p0 0 != if{ 0 (>B:DEICE_Engine_1_Set) } + True WT_soft_button_on WT_soft_button_off @@ -646,6 +652,8 @@ @TT_Package.DEICE_SWITCH_AIRFRAME_ACTION_SET_DUO (R:1:@TT_Package.GT_STATE_RIGHT) 2 + p0 0 != if{ 0 (>B:DEICE_Engine_2_Set) } + True WT_soft_button_on WT_soft_button_off diff --git a/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/Waypoint.js b/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/Waypoint.js index 9c3987570..554aac507 100644 --- a/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/Waypoint.js +++ b/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/Waypoint.js @@ -696,7 +696,6 @@ class VORInfo extends WayPointInfo { }); } } -VORInfo.readManager = new InstrumentDataReadManager(); class NDBInfo extends WayPointInfo { constructor(_instrument) { super(_instrument); @@ -776,7 +775,6 @@ class NDBInfo extends WayPointInfo { }); } } -NDBInfo.readManager = new InstrumentDataReadManager(); class IntersectionInfo extends WayPointInfo { constructor(_instrument) { super(_instrument); @@ -938,7 +936,6 @@ class IntersectionInfo extends WayPointInfo { } } } -IntersectionInfo.readManager = new InstrumentDataReadManager(); IntersectionInfo.longestAirway = 0; class Frequency { constructor(_name, _mhValue, _bcd16Value, _type) { diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC.html b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC.html index f227f4423..465ee04a3 100644 --- a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC.html +++ b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC.html @@ -17,7 +17,6 @@ - diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_InitRefIndexPage.js b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_InitRefIndexPage.js index 478f8bb37..d1b5a2af6 100644 --- a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_InitRefIndexPage.js +++ b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_InitRefIndexPage.js @@ -1269,7 +1269,7 @@ class CJ4_FMC_InitRefIndexPage { ["Working-Title-MSFS-Mods[white s-text]"], [""], [" VERSION[blue]"], - ["0.12.12[s-text white]"], + ["0.12.13[s-text white]"], [""], [""], [""], diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_NavRadioPage.js b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_NavRadioPage.js index 0de036a89..3a2caed97 100644 --- a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_NavRadioPage.js +++ b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/FMC/CJ4_FMC_NavRadioPage.js @@ -731,8 +731,10 @@ class CJ4_FMC_AtcControlPage { this._fmc = fmc; this._isDirty = true; this._pressAlt = 0; + this._identPress = SimVar.GetSimVarValue("TRANSPONDER IDENT:1", "number"); + this._identActive = 0; fmc.clearDisplay(); - + this._transponderMode = 1; const modeValue = SimVar.GetSimVarValue("TRANSPONDER STATE:1", "number"); if (modeValue == 4) { @@ -755,6 +757,7 @@ class CJ4_FMC_AtcControlPage { return true; }.bind(this) }); + } get transponderMode() { @@ -781,7 +784,7 @@ class CJ4_FMC_AtcControlPage { this._freqProxy.atc1 = SimVar.GetSimVarValue("TRANSPONDER CODE:1", "number").toFixed(0).padStart(4, "0"); const pressAlt = SimVar.GetSimVarValue("PRESSURE ALTITUDE", "feet"); - + if (pressAlt !== this._pressAlt) { this._isDirty = true; this._pressAlt = " " + pressAlt.toFixed(0).padStart(4); @@ -791,7 +794,15 @@ class CJ4_FMC_AtcControlPage { this.invalidate(); } + + this._identPress = SimVar.GetSimVarValue("TRANSPONDER IDENT:1", "number"); + if (this._identActive === 1 && this._identPress === 0) { + this._identPress = 1; + } else if (this._identActive === 1 && this._identPress === 1) { + this._identActive = 0; + } + this._fmc.registerPeriodicPageRefresh(() => { this.update(); return true; @@ -799,15 +810,14 @@ class CJ4_FMC_AtcControlPage { } render() { - const modeSwitch = this._fmc._templateRenderer.renderSwitch(["ON", "STBY"], this.transponderMode, "blue"); - + let identColor = (this._identPress == false && this._identActive === 0) ? "white" : "blue"; this._fmc._templateRenderer.setTemplateRaw([ ["", "", "ATC CONTROL[blue]"], [" ATC1", "ALT REPORT "], [this._freqMap.atc1 + "[green]", "ON[blue]/OFF[s-text disabled]"], ["", "", " ALT[white]" + this._pressAlt + "FT[green]"], - ["IDENT[s-text disabled]", "TEST[s-text disabled]", "ADC2 [blue s-text]"], + ["IDENT["+ identColor +"]", "TEST[s-text disabled]", "ADC2 [blue s-text]"], [""], [""], [" SELECT"], @@ -819,12 +829,7 @@ class CJ4_FMC_AtcControlPage { [""] ]); } - /** - *TODO - IDENT BUTTON - * this._fmc.onLeftInput[1] = () => { - * Ident here eventually...... - * }; - */ + bindEvents() { this._fmc.onLeftInput[0] = () => { @@ -851,7 +856,19 @@ class CJ4_FMC_AtcControlPage { } } }; - + + this._fmc.onLeftInput[1] = () => { + if (this._transponderMode != 0) { + this._fmc.showErrorMessage("TURN ON TRANSPONDER"); + } else { + SimVar.SetSimVarValue("K:XPNDR_IDENT_ON", "number", 1); + this._identActive = 1; + this._fmc.requestCall(() => { + this.update(); + }); + } + }; + this._fmc.onLeftInput[4] = () => { this.transponderMode = this.transponderMode + 1; this._fmc.requestCall(() => { @@ -1364,4 +1381,4 @@ class CJ4_FMC_AdfControlPage { this.bindEvents(); this._isDirty = false; } -} \ No newline at end of file +} diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/SAI/CJ4_SAI.html b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/SAI/CJ4_SAI.html index 4944d64cc..4884f9e63 100644 --- a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/SAI/CJ4_SAI.html +++ b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/SAI/CJ4_SAI.html @@ -18,7 +18,6 @@ - diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/WTLibs/MapInstrument.html b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/WTLibs/MapInstrument.html index efdc916b1..ae924a313 100644 --- a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/WTLibs/MapInstrument.html +++ b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/WTLibs/MapInstrument.html @@ -20,7 +20,6 @@ - diff --git a/src/workingtitle-vcockpits-instruments/html_ui/Pages/VCockpit/Instruments/Shared/Map/WorkingTitle/MapInstrument.html b/src/workingtitle-vcockpits-instruments/html_ui/Pages/VCockpit/Instruments/Shared/Map/WorkingTitle/MapInstrument.html index be8caf766..16748ae89 100644 --- a/src/workingtitle-vcockpits-instruments/html_ui/Pages/VCockpit/Instruments/Shared/Map/WorkingTitle/MapInstrument.html +++ b/src/workingtitle-vcockpits-instruments/html_ui/Pages/VCockpit/Instruments/Shared/Map/WorkingTitle/MapInstrument.html @@ -22,7 +22,6 @@ -