chore: Update stable to 0.6.2-rc (#5460)

* fix(mcdu): empty weather request (#4647) * update aircraft folder name in readme (#4674) Co-authored-by: DerL30N <[email protected]> * fix: XML behavior script errors (#4819) * fix: model script issues (#4857) Co-authored-by: pepperoni505 <[email protected]> * fix: change angleDiff -> diffAngle (#4897) * feat: force usage of modern flight model (#4930) * feat(textures): fire panel corrections (#5111) * Update CHANGELOG.md * feat(textures): fire panel corrections * move firetest dot closer to center * docs: switch from MIT to GPLv3 (#5241) * docs: switch from MIT to GPLv3 * this changes the license of the A32NX project from MIT to GNU GPLv3, following a decision by the dev team * docs: readme update * chore(readme): updated known issues to be more up-to-date with latest dev progress (#5277) * fix:removed old issues * fix: new issues * fix: better grammar/consistency in format * fix:bulleting * ref to flybywire docs Co-authored-by: Will Pine <[email protected]> * fix(mfd): terr radar (#5470) * Changelog 0.6.2 * fix: compatibility with upcoming changes (#5351) * fix(lights): switch compatibility * fix: formatting * fix: Console/Floor LT switch * fix: workaround for "NOT IN DATABASE" Co-authored-by: Saschl <[email protected]> * feat: port updated touchdown fx * fix: update simvar for ECAM message * fix: logo LT update code * fix: separate dome light emission * fix: formatting * fix: master warning and master caut pb * fix: consistent ids in template * fix: ann lt test for master caut and warn + prevent gear up on ground * fix: add gear lever wwise event * fix: formatting Co-authored-by: Saschl <[email protected]> Co-authored-by: Taz5150 <[email protected]> * Changelog * fix(light):logo light * fix(model): restored default reverser animation logic * fix(fwc): removed old warning template in xml * refactor(lights): new potentiometer for lights, emissives and screens (#5244) * Refactor Continuous knobs, add FBW_Stepless * Implement FBW_Stepless_Potentiometer * Turn on pedestal lights, set it to 0 * Adjust isOn() for new potentiometer scale * Adjust cockpit floodlights + indirect light * Add to CHANGELOG.md * Refactor / Suggestions from PR Co-authored-by: Benjamin Dupont <[email protected]> * fix: change external view HUD back to airliner type (SU5 compatibility fix) (#5513) * Update CHANGELOG.md * Update cockpit.cfg Adds vcockpit_hud = 1, which makes the external view HUD an airliner style rather than GA style under SU5 * fix(lights): Fix broken daytime lights (#5324) * Added color start value for lights * Increase pedal ambient light * fix(lights): console lights * fix(lights): reverted to default dome lights * build: bump version Co-authored-by: ExampleWasTaken <[email protected]> Co-authored-by: DerL30N <[email protected]> Co-authored-by: Andreas Guther <[email protected]> Co-authored-by: Tyler Knox <[email protected]> Co-authored-by: pepperoni505 <[email protected]> Co-authored-by: Benjamin Dupont <[email protected]> Co-authored-by: Imenes <[email protected]> Co-authored-by: Will Pine <[email protected]> Co-authored-by: Siddharth S <[email protected]> Co-authored-by: Saschl <[email protected]> Co-authored-by: Taz5150 <[email protected]> Co-authored-by: Johan Bouveng <[email protected]> Co-authored-by: donstim <[email protected]>
flybywiresim · Aug 3, 2021 · 1f940ca · 1f940ca
1 parent 4a1cccc
commit 1f940ca
Show file tree

Hide file tree

Showing 37 changed files with 1,725 additions and 534 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -3,6 +3,14 @@
 <!-- Always use "1." at the start instead of "2. " or "X. " as GitHub will auto renumber everything. -->
 <!-- Use the following format below -->
 <!--  1. [Changed Area] Title of changes - @github username (Name)  -->
+## 0.6.2
+1. [FLIGHT MODEL] Force usage of modern flight model - @aguther (Andreas Guther)
+1. [TEXTURE] Corrected fire panel - @ImenesFBW (Imenes)
+1. [MODEL] Fixed artifacting of pedestal and push buttons - @tyler58546 (tyler58546)
+1. [LIGHTS] New potentiometer for lights, emissives and screens. - @bouveng (Johan Bouveng)
+1. [MISC] Fixed flight plan entry and broken lights for SU5 @Saschl (saschl#9432), @Taz5150 (TazX [Z+2]#0405)
+1. [TERR] Fixed terrain radar for SU5 - @2hwk (2Cas#1022)
+1. [MISC] Change back to airliner hud in external view for SU5 - @donstim (donbikes#4084)
 
 ## 0.6.1
 1. [DISPLAYS] RMP backlight, ATC and RTPI font color and backlight - @marcman86 (marcman86#4907)

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -65,49 +65,47 @@ This version is the same as the regular master/development version, but with the
 
 ### Please follow ALL steps in this README if you encounter any issues with installation before seeking support.
 
-Open the zip that you downloaded from one of the links above, and drag the A32NX folder inside the zip into your Community folder.
+Open the zip that you downloaded from one of the links above, and drag the flybywire-aircraft-a320-neo folder inside the zip into your Community folder.
 
 See below for the location of your Community folder:
 
 For the Microsoft Store edition AND/OR Gamepass edition:
-- Copy the "A32NX" folder into your community package folder. It is located in:
+- Copy the "flybywire-aircraft-a320-neo" folder into your community package folder. It is located in:
 `C:\Users\[YOUR USERNAME]\AppData\Local\Packages\Microsoft.FlightSimulator_<RANDOMLETTERS>\LocalCache\Packages\Community`.
 
 For the Steam edition:
-- Copy the "A32NX" folder into your community package folder. It is located in:
+- Copy the "flybywire-aircraft-a320-neo" folder into your community package folder. It is located in:
 `C:\Users\[YOUR USERNAME]\AppData\Roaming\Microsoft Flight Simulator\Packages\Community`.
 
 For the Boxed edition:
-- Copy the "A32NX" folder into your community package folder. It is located in:
+- Copy the "flybywire-aircraft-a320-neo" folder into your community package folder. It is located in:
 `C:\Users\[YOUR USERNAME]\AppData\Local\MSFSPackages\Community`.
 
 If the above methods do not work:
 - You can find your community folder by going into FS2020 general options and enabling developer mode. You will see a menu appear on top. Go to tools and virtual file system. Click on watch bases and your community folder will be listed in one of the folders.
-- Please make sure you're copying the "A32NX" folder into your community package folder, NOT the "flybywiresim-a32nx" folder.
+- Please make sure you're copying the "flybywire-aircraft-a320-neo" folder into your community package folder, NOT the "flybywiresim-a32nx" folder.
 
 ## Contributing
 
 See [Contributing.md](.github/Contributing.md)
 
-## Known Issues (Please note that most issues are being worked on and some of them may even be fixed in the master branch)
+## Known Issues
 
-- Captain's PFD may occasionally turn off during flight
-- No Smoking switch doesn't use a full range of motion.
-- Automatic ECAM page switching has minor bugs.
-- AP not following the flight plan (leaking input values affect, but don't disconnect the AP) [Workaround: Set dead-zones for your input device higher]
-- Autopilot goes direct to RWY on APP (same with the default A320) [Workaround: Use DIR to a waypoint or selected heading]
-- Upper ECAM displays wrong THR levers position / N1 rating.
-- Newly added ASOBO A320 liveries are incompatible with the A32NX mod.
-- Ruder keybindings not working (you have to set your keybinding to rudder axis right and left)
-- Wing dips on landing (due to bad transition to direct law in flare, same with the default A320)  [Workaround use minimal aileron input on landing]
-- Black screens / unable to start (conflict with another mod/livery or incorrect installation of the A32NX mod, use the [installer](https://api.flybywiresim.com/installer))
+[List of most commonly reported and known issues](https://docs.flybywiresim.com/start/reported-issues/). To request a new feature or report a new issue, please see our [Issues](https://github.com/flybywiresim/a32nx/issues) tracker.
 
 ## License
 
-The original contents of this repository are licensed under the MIT license.
+Original source code assets present in this repository are licensed under the GNU GPLv3.
+Original 3D assets are licensed under CC BY-NC 4.0.
 
 **Microsoft Flight Simulator © Microsoft Corporation. The FlyByWire Simulations A32NX was created under Microsoft's "Game Content Usage Rules" using assets from Microsoft Flight Simulator, and it is not endorsed by or affiliated with Microsoft.**
 
+The contents of distribution packages built from the sources in this repository are therefore licensed as follows:
+
+- in the case of original source code from FBW or compiled binaries generated from it, under GPLv3.
+- in the case of original 3D assets from FBW, under CC BY-NC 4.0.
+- in the case of assets covered by the "Game Content Usage Rules", under the license granted by those rules.
+
 ## FAQ
 
 **Q: Can I download the aircraft in the current state?**

diff --git a/flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/A32NX_Interior_Generics.xml b/flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/A32NX_Interior_Generics.xml
@@ -10,13 +10,16 @@
             - ANIM_SIMVAR_MAX       Default: 100        The upper bound of the position
             - INCREMENT             Default: 1          The increment for each click / hold update
 
-    Authors: Benjamin Dupont (@Benjozork) 10/10/20
+            OR:
+
+            - POTENTIOMETER         <no default>        The potentiometer index to increment
     -->
     <Template Name="FBW_Continuous_Knob_Finite_From_Simvar">
         <DefaultTemplateParameters>
             <ANIM_SIMVAR_UNITS>percent</ANIM_SIMVAR_UNITS>
             <ANIM_SIMVAR_MIN>0</ANIM_SIMVAR_MIN>
             <ANIM_SIMVAR_MAX>100</ANIM_SIMVAR_MAX>
+            <ANIM_NAME>#ANIM_NAME#</ANIM_NAME>
             <INCREMENT>1</INCREMENT>
             <WHEEL_INCREMENT>4</WHEEL_INCREMENT>
             <EXTRA_INTERACTION/>
@@ -29,6 +32,15 @@
             <ANIM_WRAP>True</ANIM_WRAP>
         </DefaultTemplateParameters>
 
+        <OverrideTemplateParameters>
+            <Condition Valid="POTENTIOMETER">
+                <True>
+                    <ANIM_SIMVAR>#ANIM_SIMVAR#:#POTENTIOMETER#</ANIM_SIMVAR>
+                    <SET_CODE>#POTENTIOMETER# (&gt;K:2:LIGHT_POTENTIOMETER_SET)</SET_CODE>
+                </True>
+            </Condition>
+        </OverrideTemplateParameters>
+
         <UseTemplate Name="ASOBO_GT_Anim_Code">
             <ANIM_CODE>
                 (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #ANIM_SIMVAR_MIN# - #ANIM_SIMVAR_MAX# #ANIM_SIMVAR_MIN# - / 100 *
@@ -37,21 +49,21 @@
 
         <UseTemplate Name="FBW_Continuous_Knob_Finite_From_Simvar_Impl">
             <CLOCKWISE_CODE>
-                (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #INCREMENT# + #ANIM_SIMVAR_MAX# min (&gt;#ANIM_SIMVAR#)
+                (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #INCREMENT# + #ANIM_SIMVAR_MAX# min #SET_CODE#
             </CLOCKWISE_CODE>
             <ANTICLOCKWISE_CODE>
-                (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #INCREMENT# - #ANIM_SIMVAR_MIN# max (&gt;#ANIM_SIMVAR#)
+                (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #INCREMENT# - #ANIM_SIMVAR_MIN# max #SET_CODE#
             </ANTICLOCKWISE_CODE>
 
             <!-- Provide the wheel code if we have WHEEL_INCREMENT -->
             <Condition Valid="WHEEL_INCREMENT">
                 <True>
                     <WHEEL_CLOCKWISE_CODE>
-                        (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #WHEEL_INCREMENT# + #ANIM_SIMVAR_MAX# min (&gt;#ANIM_SIMVAR#)
+                        (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #WHEEL_INCREMENT# + #ANIM_SIMVAR_MAX# min #SET_CODE#
                     </WHEEL_CLOCKWISE_CODE>
 
                     <WHEEL_ANTICLOCKWISE_CODE>
-                        (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #WHEEL_INCREMENT# - #ANIM_SIMVAR_MIN# max (&gt;#ANIM_SIMVAR#)
+                        (#ANIM_SIMVAR#, #ANIM_SIMVAR_UNITS#) #WHEEL_INCREMENT# - #ANIM_SIMVAR_MIN# max #SET_CODE#
                     </WHEEL_ANTICLOCKWISE_CODE>
                 </True>
             </Condition>
@@ -514,27 +526,69 @@
             - NODE_ID               <no default>        The Node ID associated with this knob
             - LOCAL_SIMVAR          <no default>        The LVar that will be used for this knob
             - ANIM_VAR_TYPE         <I>                 Type of the variable used for the animation
-            - MAX_ROT_PERCENT       <100>               The maximum percent out of it's animation the knob can rotate
+            - ANIM_SIMVAR_MAX       <100>               The maximum percent out of it's animation the knob can rotate
             - CONVERSION_FORMULA    <optional>          The formula with which the rotation percentage will be transformed into the LOCAL_SIMVAR.
             - INCREMENT             Default: 1          The increment for each click / hold update
     -->
     <Template Name="FBW_Continuous_Knob_Limited_From_Simvar">
         <DefaultTemplateParameters>
-            <MAX_ROT_PERCENT>100</MAX_ROT_PERCENT>
+            <NODE_ID>#NODE_ID#</NODE_ID>
+            <PART_ID>#NODE_ID#</PART_ID>
+            <ANIM_NAME>#NODE_ID#</ANIM_NAME>
+            <ANIM_SIMVAR_MAX>100</ANIM_SIMVAR_MAX>
             <CONVERSION_FORMULA></CONVERSION_FORMULA>
-            <ANIM_VAR_TYPE>L</ANIM_VAR_TYPE>
         </DefaultTemplateParameters>
 
         <Update Frequency="40">
-            (#ANIM_VAR_TYPE#:XMLVAR_#NODE_ID#, percent) #MAX_ROT_PERCENT# min (&gt;#ANIM_VAR_TYPE#:XMLVAR_#NODE_ID#, percent)
-            (#ANIM_VAR_TYPE#:XMLVAR_#NODE_ID#, percent) #CONVERSION_FORMULA# (&gt;#LOCAL_SIMVAR#, #LOCAL_SIMVAR_UNITS#)
+            (L:XMLVAR_#NODE_ID#, percent) #ANIM_SIMVAR_MAX# min (&gt;L:XMLVAR_#NODE_ID#, percent)
+            (L:XMLVAR_#NODE_ID#, percent) #CONVERSION_FORMULA# (&gt;#LOCAL_SIMVAR#, #LOCAL_SIMVAR_UNITS#)
         </Update>
 
         <UseTemplate Name="FBW_Continuous_Knob_Finite_From_Simvar">
             <ANIM_SIMVAR_MIN>0</ANIM_SIMVAR_MIN>
             <ANIM_SIMVAR_MAX>100</ANIM_SIMVAR_MAX>
-            <ANIM_SIMVAR>#ANIM_VAR_TYPE#:XMLVAR_#NODE_ID#</ANIM_SIMVAR>
+            <ANIM_SIMVAR>L:XMLVAR_#NODE_ID#</ANIM_SIMVAR>
             <ANIM_SIMVAR_UNITS>percent</ANIM_SIMVAR_UNITS>
+            <ANIM_CODE>#ANIM_CODE#</ANIM_CODE>
         </UseTemplate>
     </Template>
+
+
+    <!--
+    Template for rigging a stepless knob/potentiometer to be used for dimming of lights, emissives and screens.
+
+    Main Parameters:
+            - NODE_ID               <no default>                The Node ID associated with this potentiometer
+            - ANIM_SIMVAR           <A:LIGHT POTENTIOMETER>     The name of the simvar to use for this potentiometer
+            - ANIM_SIMVAR_UNITS     Default: "percent"          The simvar units
+            - ANIM_SIMVAR_MIN       Default: 0                  The lower bound of the position
+            - ANIM_SIMVAR_MAX       Default: 100                The upper bound of the position
+            - INCREMENT             Default: 1                  The increment for each click / hold update
+            - WHEEL_INCREMENT       Default: 5                  The increment for mouse wheel interactions
+            - POTENTIOMETER         <no default>                The light potentiometer index to increment
+            - ANNOTATE_TOOLTIP      Default: True               Turn on tooltip potentiometer % value (#ANIMTIP# (73%))
+    -->
+    <Template Name="FBW_Stepless_Potentiometer">
+        <DefaultTemplateParameters>
+            <NODE_ID>#NODE_ID#</NODE_ID>
+            <PART_ID>#NODE_ID#</PART_ID>
+            <ANIM_NAME>#NODE_ID#</ANIM_NAME>
+            <ANIM_SIMVAR_UNITS>Percent</ANIM_SIMVAR_UNITS>
+            <ANIM_SIMVAR>A:LIGHT POTENTIOMETER</ANIM_SIMVAR>
+            <WHEEL_INCREMENT>5</WHEEL_INCREMENT>
+            <ANNOTATE_TOOLTIP>True</ANNOTATE_TOOLTIP>
+        </DefaultTemplateParameters>
+
+        <Component ID="#NODE_ID#" Node="#NODE_ID#">
+            <UseTemplate Name="FBW_Continuous_Knob_Finite_From_Simvar">
+                <Condition Valid="ANNOTATE_TOOLTIP">
+                    <True>
+                        <ANIMTIP_0>#ANIMTIP_0# (%((#ANIM_SIMVAR#:#POTENTIOMETER#, #ANIM_SIMVAR_UNITS#))%!d!%%)</ANIMTIP_0>
+                        <ANIMTIP_1>#ANIMTIP_1# (%((#ANIM_SIMVAR#:#POTENTIOMETER#, #ANIM_SIMVAR_UNITS#))%!d!%%)</ANIMTIP_1>
+                    </True>
+                </Condition>
+            </UseTemplate>
+        </Component>
+    </Template>
+
 </ModelBehaviors>