From 9364d0298b213424aa6519c9a36ebb3849759e45 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R <legoboyvdlp@gmail.com> Date: Thu, 4 Jul 2019 19:52:38 +0100 Subject: [PATCH] Add sound dialog --- A320-main.xml | 13 ++ AircraftConfig/acconfig.nas | 1 + Sounds/A320-common-sound.xml | 93 ++++++-- Systems/cfm56-sound.xml | 145 ++++++++++-- Systems/leapx-sound.xml | 85 +++---- Systems/v2500-sound.xml | 125 +++++++++-- gui/dialogs/sound-config.xml | 163 ++++++++++++++ qq | 414 +++++++++++++++++++++++++++++++++++ 8 files changed, 935 insertions(+), 104 deletions(-) create mode 100644 gui/dialogs/sound-config.xml create mode 100644 qq diff --git a/A320-main.xml b/A320-main.xml index 86115f41..b75ecad5 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -163,6 +163,12 @@ <wingview-fwd type="bool">0</wingview-fwd> <internal-custom type="bool">0</internal-custom> <suppress-warning type="bool">1</suppress-warning> + <exterior-volume type="double">1.0</exterior-volume> + <interior-volume type="double">1.0</interior-volume> + <wing-volume type="double">1.0</wing-volume> + <avionics-volume type="double">1.0</avionics-volume> + <effects-volume type="double">1.0</effects-volume> + <mechanical-volume type="double">1.0</mechanical-volume> </sound> <sounde> @@ -359,6 +365,13 @@ </script> </binding> </item> + <item> + <label>Adjust Sound Volumes</label> + <binding> + <command>dialog-show</command> + <dialog-name>sound-config</dialog-name> + </binding> + </item> <item> <label>Skip ADIRS</label> <binding> diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 6665fea6..a7cfc47e 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -110,6 +110,7 @@ var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dia var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml"); var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml"); var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/IDG-A32X/AircraftConfig/rendering.xml"); + spinning.start(); init_dlg.open(); diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index aa5000e5..708402e3 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -10,7 +10,7 @@ <property>sim/current-view/internal</property> </condition> <volume> - <property>/systems/apu/rpm</property> + <property>sim/sound/other/apu</property> <factor>0.005</factor> <max>0.25</max> </volume> @@ -29,7 +29,7 @@ <not><property>sim/current-view/internal</property></not> </condition> <volume> - <property>/systems/apu/rpm</property> + <property>sim/sound/other/apu</property> <factor>0.005</factor> </volume> <pitch> @@ -56,6 +56,9 @@ </equals> </and> </condition> + <volume> + <property>/sim/sound/mechanical-volume</property> + </volume> </hyd-yellow> <!-- Disabled until proper PTU system implemented, to not annoy people --> @@ -67,6 +70,7 @@ <property>/systems/hydraulic/ptu-active</property> </condition> <volume> + <property>/sim/sound/mechanical-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -153,6 +157,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -189,6 +194,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -223,6 +229,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -257,6 +264,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -291,6 +299,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -325,6 +334,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -359,6 +369,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -393,6 +404,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -427,6 +439,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -461,6 +474,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -495,6 +509,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -529,6 +544,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -563,6 +579,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -611,6 +628,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -657,6 +675,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -692,6 +711,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -726,6 +746,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -806,6 +827,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>8</factor> </volume> <reference-dist>20.0</reference-dist> @@ -837,6 +859,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>40.0</factor> </volume> </apoff> @@ -866,6 +889,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>40.0</factor> </volume> </apoff> @@ -883,6 +907,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>40.0</factor> </volume> </apoff> @@ -960,7 +985,6 @@ </condition> <volume> <property>sim/sound/other/air-con</property> - <offset>0.2</offset> </volume> </ac> @@ -971,6 +995,9 @@ <condition> <property>gear/gear[0]/wow</property> </condition> + <volume> + <property>/sim/sound/effects-volume</property> + </volume> </wow> <wow> @@ -980,6 +1007,9 @@ <condition> <property>gear/gear[1]/wow</property> </condition> + <volume> + <property>/sim/sound/effects-volume</property> + </volume> </wow> <wow> @@ -989,6 +1019,9 @@ <condition> <property>gear/gear[2]/wow</property> </condition> + <volume> + <property>/sim/sound/effects-volume</property> + </volume> </wow> <roll> @@ -1083,7 +1116,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1098,7 +1131,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1113,7 +1146,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1128,7 +1161,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1143,7 +1176,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1158,7 +1191,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1173,7 +1206,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1188,7 +1221,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1203,7 +1236,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1218,7 +1251,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1233,7 +1266,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1248,7 +1281,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1263,7 +1296,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1278,7 +1311,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1293,7 +1326,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detenta> @@ -1308,7 +1341,7 @@ </equals> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </detentb> @@ -1326,7 +1359,7 @@ </and> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </sb> <ns> @@ -1343,7 +1376,7 @@ </and> </condition> <volume> - <property>/sim/sound/effects/volume</property> + <property>/sim/sound/effects-volume</property> </volume> </ns> @@ -1355,6 +1388,7 @@ <property>/sim/sounde/btn1</property> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.75</factor> </volume> </switch> @@ -1367,6 +1401,7 @@ <property>/sim/sounde/oh-btn</property> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.75</factor> </volume> </switch> @@ -1379,6 +1414,7 @@ <property>/sim/sounde/btn3</property> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.75</factor> </volume> </switch> @@ -1391,6 +1427,7 @@ <property>/sim/sounde/knb1</property> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.60</factor> </volume> </switch> @@ -1403,6 +1440,7 @@ <property>/sim/sounde/switch1</property> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.75</factor> </volume> </switch> @@ -1418,6 +1456,7 @@ </and> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.75</factor> </volume> </switch> @@ -1447,6 +1486,7 @@ </and> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.60</factor> </volume> </cvrtone> @@ -1462,6 +1502,7 @@ </greater-than> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.80</factor> </volume> </relay> @@ -1477,6 +1518,7 @@ </greater-than> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.80</factor> </volume> </relay> @@ -1498,6 +1540,7 @@ </and> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.60</factor> </volume> </relay> @@ -1513,6 +1556,7 @@ </equals> </condition> <volume> + <property>/sim/sound/effects-volume</property> <factor>0.60</factor> </volume> </relay> @@ -1537,6 +1581,7 @@ </and> </condition> <volume> + <property>/sim/sound/avionics-volume</property> <factor>0.60</factor> </volume> </relay> @@ -1640,7 +1685,7 @@ <property>/sim/sound/warnings/chime</property> </condition> <volume> - <property>sim/sound/effects/volume</property> + <property>sim/sound/avionics-volume</property> </volume> <reference-dist>10</reference-dist> <max-dist>100</max-dist> @@ -1656,7 +1701,7 @@ <property>/sim/sound/warnings/crc</property> </condition> <volume> - <property>sim/sound/effects/volume</property> + <property>sim/sound/avionics-volume</property> </volume> <reference-dist>10</reference-dist> <max-dist>100</max-dist> @@ -1671,7 +1716,7 @@ <property>warnings/stall/active</property> </condition> <volume> - <property>sim/sound/effects/volume</property> + <property>sim/sound/avionics-volume</property> <factor>3</factor> <!--offset>1</offset--> <min>1</min> diff --git a/Systems/cfm56-sound.xml b/Systems/cfm56-sound.xml index 55363e36..50d516dc 100644 --- a/Systems/cfm56-sound.xml +++ b/Systems/cfm56-sound.xml @@ -15,6 +15,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.000</dep></entry> @@ -47,6 +48,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.000</dep></entry> @@ -136,6 +138,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -168,6 +171,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -257,6 +261,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -289,6 +294,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -378,6 +384,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -411,6 +418,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -501,6 +509,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -533,6 +542,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -622,6 +632,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -656,6 +667,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -747,6 +759,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -781,6 +794,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -872,6 +886,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -904,6 +919,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -993,6 +1009,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -1023,6 +1040,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -1113,6 +1131,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -1145,6 +1164,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -1234,6 +1254,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -1268,6 +1289,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -1359,6 +1381,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -1391,6 +1414,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -1480,6 +1504,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -1512,6 +1537,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -1601,6 +1627,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -1632,6 +1659,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -1720,6 +1748,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.60</ind> <dep>0.000</dep></entry> @@ -1749,6 +1778,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.60</ind> <dep>0.000</dep></entry> @@ -1835,6 +1865,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.62</ind> <dep>0.000</dep></entry> @@ -1867,6 +1898,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.62</ind> <dep>0.000</dep></entry> @@ -1956,6 +1988,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -1986,6 +2019,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -2093,6 +2127,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.000</dep></entry> @@ -2125,6 +2160,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.000</dep></entry> @@ -2214,6 +2250,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -2246,6 +2283,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -2335,6 +2373,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -2367,6 +2406,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -2456,6 +2496,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -2489,6 +2530,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -2579,6 +2621,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -2611,6 +2654,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -2700,6 +2744,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -2732,6 +2777,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -2821,6 +2867,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -2855,6 +2902,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -2946,6 +2994,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -2980,6 +3029,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -3071,6 +3121,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -3102,6 +3153,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -3190,6 +3242,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -3220,6 +3273,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -3318,6 +3372,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.000</dep></entry> @@ -3350,6 +3405,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.000</dep></entry> @@ -3439,6 +3495,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -3471,6 +3528,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -3560,6 +3618,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -3592,6 +3651,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -3681,6 +3741,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -3714,6 +3775,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.00</dep></entry> @@ -3804,6 +3866,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -3836,6 +3899,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.20</ind> <dep>0.000</dep></entry> @@ -3925,6 +3989,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -3959,6 +4024,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -4050,6 +4116,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -4084,6 +4151,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -4175,6 +4243,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -4207,6 +4276,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.75</ind> <dep>0.000</dep></entry> @@ -4296,6 +4366,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -4326,6 +4397,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -4428,6 +4500,7 @@ <entry><ind>22.0</ind> <dep>0.10</dep></entry> </table> <property>sim/sound/internal-custom</property> + <property>/sim/sound/mechanical-volume</property> </product> </expression> </input> @@ -4448,6 +4521,7 @@ <entry><ind>301</ind> <dep>0.00</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/avionics-volume</property> </product> </expression> </input> @@ -4467,7 +4541,8 @@ <entry><ind>-11</ind> <dep>0.00</dep></entry> <entry><ind>-12</ind> <dep>1.00</dep></entry> </table> - <property>sim/current-view/internal</property> + <property>sim/current-view/internal</property> + <property>/sim/sound/avionics-volume</property> </product> </expression> </input> @@ -4491,6 +4566,7 @@ <entry><ind>550</ind> <dep>0.30</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/effects-volume</property> </product> </expression> </input> @@ -4519,6 +4595,7 @@ <entry><ind>250</ind> <dep>0.10</dep></entry> <entry><ind>550</ind> <dep>0.30</dep></entry> </table> + <property>/sim/sound/effects-volume</property> </product> </expression> </input> @@ -4568,15 +4645,18 @@ <property>sim/current-view/internal</property> </condition> <expression> - <table> - <product> - <property>/velocities/groundspeed-kt</property> - <value>1</value> - </product> - <entry><ind>010</ind> <dep>0.00</dep></entry> - <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>140</ind> <dep>1.00</dep></entry> - </table> + <product> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.00</dep></entry> + <entry><ind>110</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + <property>/sim/sound/effects-volume</property> + </product> </expression> </input> <input> @@ -4601,15 +4681,18 @@ </or> </condition> <expression> - <table> - <product> - <property>/velocities/groundspeed-kt</property> - <value>1</value> - </product> - <entry><ind>010</ind> <dep>0.00</dep></entry> - <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>140</ind> <dep>1.00</dep></entry> - </table> + <product> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.00</dep></entry> + <entry><ind>110</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + <property>/sim/sound/effects-volume</property> + </product> </expression> </input> <input> @@ -4640,7 +4723,12 @@ <property>sim/sound/wingview-fwd</property> </or> </condition> - <value>1</value> + <expression> + <product> + <value>1</value> + <property>/sim/sound/mechanical-volume</property> + </product> + </expression> </input> <input> <condition> @@ -4699,6 +4787,7 @@ <expression> <product> <property>/systems/pneumatic/pack-psi</property> + <property>/sim/sound/effects-volume</property> <value>0.025</value> </product> </expression> @@ -4714,6 +4803,22 @@ </output> </filter> +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <expression> + <product> + <property>/systems/apu/rpm</property> + <property>/sim/sound/effects-volume</property> + </product> + </expression> + </input> + <output> + <prop>sim/sound/other/apu</prop> + </output> +</filter> + <!-- wing view properties --> <filter> diff --git a/Systems/leapx-sound.xml b/Systems/leapx-sound.xml index bd497afd..7b39c8a1 100644 --- a/Systems/leapx-sound.xml +++ b/Systems/leapx-sound.xml @@ -10,6 +10,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.00</ind> <dep>0.00</dep></entry> @@ -32,6 +33,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.00</ind> <dep>0.50</dep></entry> @@ -120,6 +122,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.06</ind> <dep>0.00</dep></entry> @@ -141,6 +144,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.06</ind> <dep>0.00</dep></entry> @@ -162,6 +166,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.32</ind> <dep>0.00</dep></entry> @@ -183,6 +188,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.32</ind> <dep>0.00</dep></entry> @@ -204,6 +210,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.65</ind> <dep>0.00</dep></entry> @@ -224,6 +231,7 @@ <input> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value> </product> <entry><ind>0.65</ind> <dep>0.00</dep></entry> @@ -434,28 +442,6 @@ - - -<filter> - <type>gain</type> - <gain>1</gain> - <input> - <expression> - <product> - <table> - <product><property>/sim/current-view/z-offset-m</property><value>1</value> </product> - <entry><ind>-5.0</ind> <dep>0.11</dep></entry> - <entry><ind>0.00</ind> <dep>1.00</dep></entry> - <entry><ind>15.0</ind> <dep>0.11</dep></entry> - </table> - <property>sim/current-view/internal</property> - </product> - </expression> - </input> - <output> - <prop>sim/sound/other/flaps</prop> - </output> -</filter> <filter> <type>gain</type> @@ -470,6 +456,7 @@ <entry><ind>22.0</ind> <dep>0.10</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/mechanical-volume</property> </product> </expression> </input> @@ -490,6 +477,7 @@ <entry><ind>301</ind> <dep>0.00</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/avionics-volume</property> </product> </expression> </input> @@ -510,6 +498,7 @@ <entry><ind>-12</ind> <dep>1.00</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/avionics-volume</property> </product> </expression> </input> @@ -533,6 +522,7 @@ <entry><ind>550</ind> <dep>0.30</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/effects-volume</property> </product> </expression> </input> @@ -553,6 +543,7 @@ </condition> <expression> <product> + <property>/sim/sound/effects-volume</property> <table> <product><property>/velocities/groundspeed-kt</property><value>1</value> </product> <entry><ind>0.00</ind> <dep>0.0001</dep></entry> @@ -610,15 +601,18 @@ <property>sim/current-view/internal</property> </condition> <expression> - <table> - <product> - <property>/velocities/groundspeed-kt</property> - <value>1</value> - </product> - <entry><ind>010</ind> <dep>0.00</dep></entry> - <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>140</ind> <dep>1.00</dep></entry> - </table> + <product> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.00</dep></entry> + <entry><ind>110</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + <property>/sim/sound/effects-volume</property> + </product> </expression> </input> <input> @@ -643,15 +637,18 @@ </or> </condition> <expression> - <table> - <product> - <property>/velocities/groundspeed-kt</property> - <value>1</value> - </product> - <entry><ind>010</ind> <dep>0.00</dep></entry> - <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>140</ind> <dep>1.00</dep></entry> - </table> + <product> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.00</dep></entry> + <entry><ind>110</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + <property>/sim/sound/effects-volume</property> + </product> </expression> </input> <input> @@ -682,7 +679,12 @@ <property>sim/sound/wingview-fwd</property> </or> </condition> - <value>1</value> + <expression> + <product> + <value>1</value> + <property>/sim/sound/mechanical-volume</property> + </product> + </expression> </input> <input> <condition> @@ -741,6 +743,7 @@ <expression> <product> <property>/systems/pneumatic/pack-psi</property> + <property>/sim/sound/effects-volume</property> <value>0.025</value> </product> </expression> diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml index 4a55dbff..49cc6626 100644 --- a/Systems/v2500-sound.xml +++ b/Systems/v2500-sound.xml @@ -15,6 +15,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.19</ind> <dep>0.000</dep></entry> @@ -48,6 +49,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.19</ind> <dep>0.000</dep></entry> @@ -138,6 +140,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -172,6 +175,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -263,6 +267,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -297,6 +302,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -388,6 +394,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.70</ind> <dep>0.000</dep></entry> @@ -420,6 +427,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.70</ind> <dep>0.000</dep></entry> @@ -509,6 +517,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -539,6 +548,7 @@ </condition> <expression> <product> + <property>/sim/sound/interior-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -629,6 +639,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -663,6 +674,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -697,6 +709,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.58</ind> <dep>1.00</dep></entry> @@ -754,6 +767,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -788,6 +802,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.14</ind> <dep>0.000</dep></entry> @@ -879,6 +894,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.12</ind> <dep>0.000</dep></entry> @@ -911,6 +927,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.12</ind> <dep>0.000</dep></entry> @@ -1000,6 +1017,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.60</ind> <dep>0.000</dep></entry> @@ -1029,6 +1047,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.60</ind> <dep>0.000</dep></entry> @@ -1171,6 +1190,8 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> + <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.70</ind> <dep>0.000</dep></entry> @@ -1199,6 +1220,8 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> + <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.70</ind> <dep>0.000</dep></entry> @@ -1284,6 +1307,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.128</ind> <dep>0.000</dep></entry> @@ -1318,6 +1342,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.128</ind> <dep>0.000</dep></entry> @@ -1409,6 +1434,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -1443,6 +1469,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -1478,6 +1505,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.702</ind> <dep>0.000</dep></entry> @@ -1508,6 +1536,7 @@ </condition> <expression> <product> + <property>/sim/sound/exterior-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.702</ind> <dep>0.000</dep></entry> @@ -1609,6 +1638,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.19</ind> <dep>0.000</dep></entry> @@ -1642,6 +1672,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.19</ind> <dep>0.000</dep></entry> @@ -1732,6 +1763,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -1766,6 +1798,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -1857,6 +1890,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -1891,6 +1925,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -1982,6 +2017,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.31</ind> <dep>0.00</dep></entry> @@ -2014,6 +2050,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.31</ind> <dep>0.00</dep></entry> @@ -2103,6 +2140,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -2136,6 +2174,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.15</ind> <dep>0.00</dep></entry> @@ -2226,6 +2265,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -2256,6 +2296,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -2354,6 +2395,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.19</ind> <dep>0.000</dep></entry> @@ -2387,6 +2429,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.19</ind> <dep>0.000</dep></entry> @@ -2477,6 +2520,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -2511,6 +2555,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.101</ind> <dep>0.000</dep></entry> @@ -2602,6 +2647,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -2636,6 +2682,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.59</ind> <dep>0.00</dep></entry> @@ -2727,6 +2774,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.31</ind> <dep>0.00</dep></entry> @@ -2759,6 +2807,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.31</ind> <dep>0.00</dep></entry> @@ -2848,6 +2897,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> <entry><ind>0.70</ind> <dep>0.000</dep></entry> @@ -2880,6 +2930,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> <entry><ind>0.70</ind> <dep>0.000</dep></entry> @@ -2969,6 +3020,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[0]/reverser-pos-norm</property> <table> <product><property>/engines/engine[0]/n1-actual</property><value>0.01</value></product> @@ -2999,6 +3051,7 @@ </condition> <expression> <product> + <property>/sim/sound/wing-volume</property> <property>/engines/engine[1]/reverser-pos-norm</property> <table> <product><property>/engines/engine[1]/n1-actual</property><value>0.01</value></product> @@ -3095,6 +3148,7 @@ <entry><ind>22.0</ind> <dep>0.10</dep></entry> </table> <property>sim/sound/internal-custom</property> + <property>/sim/sound/mechanical-volume</property> </product> </expression> </input> @@ -3115,6 +3169,7 @@ <entry><ind>301</ind> <dep>0.00</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/avionics-volume</property> </product> </expression> </input> @@ -3135,6 +3190,7 @@ <entry><ind>-12</ind> <dep>1.00</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/avionics-volume</property> </product> </expression> </input> @@ -3158,6 +3214,7 @@ <entry><ind>550</ind> <dep>0.30</dep></entry> </table> <property>sim/current-view/internal</property> + <property>/sim/sound/effects-volume</property> </product> </expression> </input> @@ -3178,6 +3235,7 @@ </condition> <expression> <product> + <property>/sim/sound/effects-volume</property> <table> <product><property>/velocities/groundspeed-kt</property><value>1</value> </product> <entry><ind>0.00</ind> <dep>0.0001</dep></entry> @@ -3235,15 +3293,18 @@ <property>sim/current-view/internal</property> </condition> <expression> - <table> - <product> - <property>/velocities/groundspeed-kt</property> - <value>1</value> - </product> - <entry><ind>010</ind> <dep>0.00</dep></entry> - <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>140</ind> <dep>1.00</dep></entry> - </table> + <product> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.00</dep></entry> + <entry><ind>110</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + <property>/sim/sound/effects-volume</property> + </product> </expression> </input> <input> @@ -3268,15 +3329,18 @@ </or> </condition> <expression> - <table> - <product> - <property>/velocities/groundspeed-kt</property> - <value>1</value> - </product> - <entry><ind>010</ind> <dep>0.00</dep></entry> - <entry><ind>110</ind> <dep>0.50</dep></entry> - <entry><ind>140</ind> <dep>1.00</dep></entry> - </table> + <product> + <table> + <product> + <property>/velocities/groundspeed-kt</property> + <value>1</value> + </product> + <entry><ind>010</ind> <dep>0.00</dep></entry> + <entry><ind>110</ind> <dep>0.50</dep></entry> + <entry><ind>140</ind> <dep>1.00</dep></entry> + </table> + <property>/sim/sound/effects-volume</property> + </product> </expression> </input> <input> @@ -3307,7 +3371,12 @@ <property>sim/sound/wingview-fwd</property> </or> </condition> - <value>1</value> + <expression> + <product> + <value>1</value> + <property>/sim/sound/mechanical-volume</property> + </product> + </expression> </input> <input> <condition> @@ -3366,6 +3435,7 @@ <expression> <product> <property>/systems/pneumatic/pack-psi</property> + <property>/sim/sound/effects-volume</property> <value>0.025</value> </product> </expression> @@ -3381,6 +3451,23 @@ </output> </filter> +<filter> + <type>gain</type> + <gain>1</gain> + <input> + <expression> + <product> + <property>/systems/apu/rpm</property> + <property>/sim/sound/effects-volume</property> + </product> + </expression> + </input> + <output> + <prop>sim/sound/other/apu</prop> + </output> +</filter> + + <!-- wing view properties --> <filter> diff --git a/gui/dialogs/sound-config.xml b/gui/dialogs/sound-config.xml new file mode 100644 index 00000000..2ddd1b4a --- /dev/null +++ b/gui/dialogs/sound-config.xml @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!-- Copyright (c) 2019 Jonathan Redpath (legoboyvdlp) --> + +<!-- A32X Sound Dialog --> + +<PropertyList> + + <name>sound-config</name> + <layout>vbox</layout> + + <group> + <layout>hbox</layout> + <text> + <halign>left</halign> + <label>Sound Configuration</label> + </text> + <button> + <halign>right</halign> + <pref-width>20</pref-width> + <pref-height>20</pref-height> + <legend>X</legend> + <key>Esc</key> + <binding> + <command>dialog-close</command> + </binding> + </button> + </group> + + <hrule/> + + <group> + <layout>vbox</layout> + <text> + <halign>left</halign> + <label>Engine Sounds</label> + </text> + </group> + + <hrule/> + + <group> + <layout>vbox</layout> + + <slider> + <halign>left</halign> + <label>Cockpit Volume</label> + <property>/sim/sound/interior-volume</property> + <min>0.0</min> + <max>1.5</max> + <x>10</x> + <y>50</y> + <width>200</width> + <binding> + <command>dialog-apply</command> + </binding> + </slider> + + <slider> + <halign>left</halign> + <label>Exterior Volume</label> + <property>/sim/sound/exterior-volume</property> + <min>0.0</min> + <max>1.5</max> + <x>10</x> + <y>50</y> + <width>200</width> + <binding> + <command>dialog-apply</command> + </binding> + </slider> + + + <slider> + <halign>left</halign> + <label>Wing Volume</label> + <property>/sim/sound/wing-volume</property> + <min>0.0</min> + <max>1.5</max> + <x>10</x> + <y>50</y> + <width>200</width> + <binding> + <command>dialog-apply</command> + </binding> + </slider> + </group> + + <hrule/> + + <group> + <layout>vbox</layout> + <text> + <halign>left</halign> + <label>Engine Sounds</label> + </text> + </group> + + <hrule/> + + <group> + <layout>vbox</layout> + + <slider> + <halign>left</halign> + <label>Avionics Volume</label> + <property>/sim/sound/avionics-volume</property> + <min>0.0</min> + <max>1.5</max> + <x>10</x> + <y>50</y> + <width>200</width> + <binding> + <command>dialog-apply</command> + </binding> + </slider> + + <slider> + <halign>left</halign> + <label>Effects Volume</label> + <property>/sim/sound/effects-volume</property> + <min>0.0</min> + <max>1.5</max> + <x>10</x> + <y>50</y> + <width>200</width> + <binding> + <command>dialog-apply</command> + </binding> + </slider> + + + <slider> + <halign>left</halign> + <label>Mechanical Volume</label> + <property>/sim/sound/mechanical-volume</property> + <min>0.0</min> + <max>1.5</max> + <x>10</x> + <y>50</y> + <width>200</width> + <binding> + <command>dialog-apply</command> + </binding> + </slider> + </group> + + <hrule/> + + <group> + <layout>hbox</layout> + + <button> + <halign>left</halign> + <legend>Close</legend> + <pref-width>210</pref-width> + <binding> + <command>dialog-close</command> + </binding> + </button> + </group> + +</PropertyList> diff --git a/qq b/qq new file mode 100644 index 00000000..9bd70d1c --- /dev/null +++ b/qq @@ -0,0 +1,414 @@ +[33mcommit e49660a10f9b35a221fcb5e5ceddec6a300087c3[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Mon Jun 24 14:44:48 2019 -0400 + + Sim: Add Shift-Click functionality to FCP, remove unused laptop mode + +[33mcommit 0caba603539c02a15ce7b0a07f4bf53f92f60e87[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Thu Jun 13 18:55:23 2019 -0400 + + Sim: revision + +[33mcommit b1ae50e4b5b93c3c45317955adfaca6586a4ef4b[m +Author: TH-555 <herrmann_t@t-online.de> +Date: Fri Jun 14 00:04:28 2019 +0200 + + VC: Some positions fixed to reduce ZFighting + +[33mcommit a4dcaa20b4b3d1745d7c012acae631a7e6bc4bc1[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Mon Jun 10 22:58:07 2019 -0400 + + Sim: Notice + +[33mcommit 54e4aeb087c945193b1ef8cce52f117799ff2b9f[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sat Jun 8 20:21:44 2019 -0400 + + VC: Fix accidently reversed push and pull for ALT knob + +[33mcommit 469380047c0a2132dcd62a9e9e995026d1ec7362[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Sat Jun 1 16:17:38 2019 +0100 + + Move transponder code up a little more + +[33mcommit 225bd09d96b972a8a9e0cb9a1774dcab10f3e7d7[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Thu May 30 10:58:55 2019 +0100 + + Fix + +[33mcommit 62f7a108bdb33dd381a434f8fd55afb8dabea2e3[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Thu May 30 10:56:22 2019 +0100 + + ATC: fix issues + +[33mcommit 04f9b63354e1418d61c66e7b5528ff04eea70ed7[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Wed May 29 17:33:42 2019 +0100 + + TCAS: fix property names, revision + +[33mcommit 1db48daccbf46ddd542a3f43933705122488a915[m +Author: Jonathan Redpath <legoboyvdlp@gmail.com> +Date: Wed May 29 17:31:25 2019 +0100 + + ATC: add transponder system (#93) + + * ATC: add transponder system + + * I know you want to be but you are not a RMP, ATC + + * Update atc.nas + + * Update A320-main.xml + + * fix + + * Disable radios in menubar, change TCAS mode according to transponder switch + + * Add new TCAS flags, will be uncommented in 2019.3 + + * Fix + + * Fix + + * Hook TCAS to electrical system + + * Fix + + * Resetting after failure + + * Fix + + * electrical output now controlled by transponder itself + + * Fix + + * fix + + * fix + + * Fix + + * Fix + + * Bugfixes, add to acconfig + + * Re-add radio dialog + + * Prevent radio dialog from modifying mode + + * Fix clear display + + * Remove conflict between dialog and setting the code on the panel + + * VC: Cleanup transponder bindings + + * Fixes + + * Fix + + * Fix finally + + * Transponder: realign + +[33mcommit 846005a217e5a82e468eed85b552cd1bd314a818[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Thu May 16 16:16:03 2019 -0400 + + Sim: Formatting + +[33mcommit 19af3617e3461baad4470841b51db80ca809c4f7[m +Author: TH-555 <herrmann_t@t-online.de> +Date: Thu May 16 21:06:39 2019 +0200 + + VC: Normal face orientation fixed + +[33mcommit 23717ec9b3b3e511a5ad7b89b2013cc7ccfe39db[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Wed May 15 17:25:13 2019 +0100 + + RMP: getBoolValue() doesn't need to have == 1 or != 1 + +[33mcommit 453fa34d6eebadfadd78f5360da7250832076db9[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Wed May 15 17:21:44 2019 +0100 + + Bugfix: radio xfer should not be repeatable + +[33mcommit 07216d3e4474947213a4568e570fc06ee670744a[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Tue May 14 12:33:51 2019 +0100 + + SD ELEC: bugfix + +[33mcommit d30cb90a602d8162488be58a63bf3edccfbf1844[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Wed May 8 19:27:26 2019 -0400 + + Sim: Name + +[33mcommit c2550fdbebd285e9b6d74c4be23e20dc90ec6a41[m +Author: TH-555 <herrmann_t@t-online.de> +Date: Wed May 1 22:45:51 2019 +0200 + + VC: Engine fire indicators repaird + +[33mcommit 269260ef93be49388c1f5d43f7490cc72c38e38f[m +Author: TH-555 <herrmann_t@t-online.de> +Date: Sat Apr 27 18:27:23 2019 +0200 + + VC: Rear breakers texture added, some lightning fixed + +[33mcommit 5af70969bd9d05c8d24a0534ae84f28ddbc62d4d[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sun Apr 21 00:11:55 2019 -0400 + + Sim: README revised + +[33mcommit 11c48d8bac2302cbca0463d89b2e38874a43b6e2[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sun Apr 21 00:10:31 2019 -0400 + + Sim: README revised + +[33mcommit 0163488357c86ef7f12d1ff2c3d357940a343d0a[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sun Apr 21 00:09:38 2019 -0400 + + Sim: FAQ revised + +[33mcommit 157ecaceafa5ec8355020b28ea4e179bbb816d5c[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Wed Apr 17 11:33:22 2019 -0400 + + GIT: FAQ revised + +[33mcommit b80f7272d431264867e7bcd2991bc8103788862f[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Wed Apr 17 11:28:50 2019 -0400 + + GIT: FAQ revised + +[33mcommit 423544881faee0f3990223fdc766b48f5cc3c8a3[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Wed Apr 17 11:00:59 2019 -0400 + + GIT: Issue template + +[33mcommit 381e02ed533aba670db42da2e3cb3894d07da570[m +Merge: 0c5be650 bbf03d86 +Author: Jonathan Redpath <legoboyvdlp@gmail.com> +Date: Tue Apr 9 10:22:58 2019 +0100 + + Merge pull request #87 from eaglerainbow/faq + + First Initial Version of an FAQ + +[33mcommit bbf03d8630d2a645b7f7dfd40ae40f55d6914194[m +Author: Nico Schmoigl <nico@cts-schmoigl.de> +Date: Sun Mar 31 20:47:31 2019 +0200 + + FAQ: Correcting menu option for frame rate + +[33mcommit 9f6f084733ae6b9f8b5a3435e418a6277d7be389[m +Author: Nico Schmoigl <nico@cts-schmoigl.de> +Date: Sun Mar 31 20:38:32 2019 +0200 + + Hints on simulation speed + +[33mcommit bc6f7ed258f482df53024d08233556fe511b7c6d[m +Author: Nico Schmoigl <nico@cts-schmoigl.de> +Date: Sun Mar 31 12:45:26 2019 +0200 + + FAQ: additional comments on downgrading + +[33mcommit 10aed85bd814a40ad4a742dc590f2a63374d08b4[m +Author: Nico Schmoigl <nico@cts-schmoigl.de> +Date: Sun Mar 31 12:42:46 2019 +0200 + + FAQ: fix typos + +[33mcommit 063de2c215f9fbc82b53ea4dffc22c3272e89de4[m +Author: Nico Schmoigl <nico@cts-schmoigl.de> +Date: Sun Mar 31 12:39:27 2019 +0200 + + Initial version of an FAQ page + +[33mcommit 0c5be65001111d149f313607e8fc20d551bd7f3b[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sun Mar 24 00:02:51 2019 -0400 + + Sim: Now ACCONFIG saves autopush prefs + +[33mcommit 157fcc1823044369d14205360010e1320b849e04[m +Merge: 82c75539 a3fa4f4b +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 23 23:41:54 2019 -0400 + + Sim: Fix mistakes in 23d3576 and 1666e5c + +[33mcommit a3fa4f4b39626143ef5c6ed54d3486a8999b59ce[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 23 23:26:13 2019 -0400 + + Sim: Minor fix + +[33mcommit 9e485381d99521062250558cadc467ab89863b88[m +Merge: 550a03a6 2c2f1025 +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 23 23:03:04 2019 -0400 + + Merge branch 'master' into acp + +[33mcommit 550a03a67006525b897ed34d8b6feafbfb6e11c0[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 23 09:55:12 2019 -0400 + + GIT: Formatting + +[33mcommit 23d3576bf5b88c72bc66f496434bec5ab9b94fa7[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Sat Mar 23 13:36:04 2019 +0000 + + Add NWS switch + +[33mcommit 08e4deb14b4f953d887a38c1e8d8c3b0a2cd290f[m +Author: Josh Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 21 16:09:18 2019 -0400 + + Engine: Fix FF and EPR + +[33mcommit 2c2f102584a47e1d3fdf7fa76964c9284193537d[m +Author: merspieler <merspieler@airmail.cc> +Date: Sun Mar 17 21:05:46 2019 +0000 + + Fix ACP call not deselectable + + Signed-off-by: merspieler <merspieler@airmail.cc> + +[33mcommit 76c937d1818bf6793ef433b9fdcd702d71689b47[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 22:44:34 2019 -0400 + + System: Fix severe mistake in FMGC -- thanks PavlinS + 0762 + +[33mcommit 891b7229666d3138166cabcc667ac88de8812f8f[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 20:09:10 2019 -0400 + + Sim: remove the sim + +[33mcommit c8e28172599410e2a0c2105ed105530b9159286e[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 19:59:51 2019 -0400 + + Sim: Remove the space + +[33mcommit d51c657337eb342cf2d2ad5b903fa6f79e8c3133[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 19:59:06 2019 -0400 + + Sim: Remove the 0 + +[33mcommit d104a888e66f1300092273abaa905066747f1ae0[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 19:51:49 2019 -0400 + + Sim: Always begin of sentance, the capital must exits. Or i will be unhappy :) + +[33mcommit a244eedc5e6d790e4073c0464b97104175afd18e[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 19:49:16 2019 -0400 + + Sim: Revision + +[33mcommit 72069d5a2ab1a5284d3064a09903ee22c957be35[m +Merge: ef52e6a2 5d4d1186 +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Sat Mar 16 19:42:46 2019 -0400 + + Merge branch 'nws-force' + +[33mcommit ef52e6a2423ab49301ccaa1533a0dd7ac8bd089a[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Fri Mar 15 23:23:30 2019 -0400 + + System: Fix severe FADEC limit bug + +[33mcommit 69374a53b37264459b5ec59ae0e0fe7cb77da73c[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 17:32:15 2019 -0400 + + System: Fix something else + +[33mcommit 4239da97550450144e607165dd6473e907c1a99f[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 17:30:37 2019 -0400 + + System: Fix something + +[33mcommit 8d2e4b97fe076d65ca62864fec9995ce8c20efc2[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 17:11:08 2019 -0400 + + Revert "Fix engine state property" + + This reverts commit 919b697e25b83fd2d22f58438cb0a8d4384ff678. + +[33mcommit 4c1a1128c81d2255425e5889e7271c857f48c521[m +Merge: 9578f7d5 919b697e +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 17:08:20 2019 -0400 + + Merge branch 'master' of github.com:it0uchpods/IDG-A32X + +[33mcommit 9578f7d5c162c03a50b92c37aa48b89089aadf69[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 17:08:04 2019 -0400 + + Sim: Revision + +[33mcommit 75f14241880bd3f932e78b084f4e42c2d453c67a[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 17:07:44 2019 -0400 + + Control: Fix autoland THR IDLE + +[33mcommit 9627d9c0224c2291eabed14e095c5e614f61c405[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 13:58:02 2019 -0400 + + System: Fix some A/P stuff + +[33mcommit 18720ea36b10ee89e9c5ea37f3da02aa7a12943b[m[33m ([m[1;31morigin/APV4[m[33m)[m +Author: Joshua Davidson <joshuadavidson2000@gmail.com> +Date: Thu Mar 14 00:08:48 2019 -0400 + + System: New autopilot controller based on IT-AUTOFLIGHT V4 -- needs more testing and possibly fixing + +[33mcommit 919b697e25b83fd2d22f58438cb0a8d4384ff678[m +Author: legoboyvdlp R <legoboyvdlp@gmail.com> +Date: Mon Mar 11 17:05:30 2019 +0000 + + Fix engine state property + +[33mcommit 82c755393c9abaf1db4460674baffe467a7fb3cd[m +Author: merspieler <merspieler@airmail.cc> +Date: Mon Mar 11 02:14:35 2019 +0000 + + rev + + Signed-off-by: merspieler <merspieler@airmail.cc> + +[33mcommit 1666e5c0c931f3f6af9c88a2f7ae8561b6a588aa[m +Author: merspieler <merspieler@airmail.cc> +Date: Mon Mar 11 02:13:40 2019 +0000 + + ar + + Signed-off-by: merspieler <merspieler@airmail.cc>