diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml index 6d40408c..1c3eccc3 100644 --- a/A318-100-CFM.xml +++ b/A318-100-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml index fa79294f..054e393d 100644 --- a/A319-100-CFM.xml +++ b/A319-100-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml index 5361f41f..e87ad076 100644 --- a/A319-100-IAE.xml +++ b/A319-100-IAE.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index 73bd78ff..64ee0fb1 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 902aa67b..3c098320 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index 3de9805b..e4276ad0 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A320-main.xml b/A320-main.xml index f3628f4c..7e218759 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -1189,6 +1189,7 @@ Aircraft/IDG-A32X/Nasal/engines.nas Aircraft/IDG-A32X/Nasal/ADIRS.nas Aircraft/IDG-A32X/Nasal/fire.nas + Aircraft/IDG-A32X/Nasal/autobrake.nas Aircraft/IDG-A32X/Nasal/fadec-common.nas diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 9c795c73..382e1df6 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A320neo-PW.xml b/A320neo-PW.xml index c311ef44..92f1327c 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml index 764e7791..dffc0c17 100644 --- a/A321-200-CFM.xml +++ b/A321-200-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml index 46a61460..2bd68988 100644 --- a/A321-200-IAE.xml +++ b/A321-200-IAE.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml index 87cc3252..7001d21a 100644 --- a/A321neo-CFM.xml +++ b/A321neo-CFM.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/A321neo-PW.xml b/A321neo-PW.xml index 4e8af563..6cc62fe5 100644 --- a/A321neo-PW.xml +++ b/A321neo-PW.xml @@ -106,8 +106,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 0 -4.31395 - 0.8 - 0.5 + 0.4 + 0.6 0.02 30935.5 16978.5 @@ -121,8 +121,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -136,8 +136,8 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 4.25855 -4.51844 - 0.8 - 0.5 + 0.4 + 0.6 0.02 59785 23957 @@ -261,7 +261,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> -3.1750887 1.0 - 0.5 + 0.4 0.4 50000 50000 diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 5eed7de5..a64d5b35 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -157,6 +157,7 @@ var systemsReset = func { systems.hyd_init(); systems.fuel_init(); systems.eng_init(); + systems.autobrake_init(); fmgc.FMGCinit(); mcdu1.MCDU_reset(); mcdu2.MCDU_reset(); diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 37a5a79d..98aece02 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -1189,7 +1189,7 @@ - + select @@ -1214,6 +1214,13 @@ apprlt fd2lt ils2lt + + abs_low2 + abs_med2 + abs_max2 + dec_low2 + dec_med2 + dec_max2 @@ -4423,137 +4430,6 @@ - - - - - textranslate - abs_low - hydraulics/brakes/indicator/low - 0.125 - - 0 - -1 - 0 - - - - - textranslate - abs_med - hydraulics/brakes/indicator/med - 0.125 - - 0 - -1 - 0 - - - - - textranslate - abs_max - hydraulics/brakes/indicator/max - 0.125 - - 0 - -1 - 0 - - - - - textranslate - dec_low - hydraulics/brakes/indicator/low-dec - 0.125 - - 0 - -1 - 0 - - - - - textranslate - dec_med - hydraulics/brakes/indicator/med-dec - 0.125 - - 0 - -1 - 0 - - - - - textranslate - dec_max - hydraulics/brakes/indicator/max-dec - 0.125 - - 0 - -1 - 0 - - - - - pick - abs_low - dec_low - - - - - - false - - property-cycle - hydraulics/brakes/autobrake-setting - 1 - 0 - - - - - - pick - abs_med - dec_med - - - - - - false - - property-cycle - hydraulics/brakes/autobrake-setting - 2 - 0 - - - - - - pick - abs_max - dec_max - - - - - - false - - property-cycle - hydraulics/brakes/autobrake-setting - 3 - 0 - - - @@ -5395,6 +5271,229 @@ + + + + select + dec_low2 + + + + controls/switches/annun-test + 1 + + + + controls/autobrake/mode + 1 + + + controls/autobrake/active + 1 + + + + + + + + select + dec_med2 + + + + controls/switches/annun-test + 1 + + + + controls/autobrake/mode + 2 + + + controls/autobrake/active + 1 + + + + + + + + select + dec_max2 + + + + controls/switches/annun-test + 1 + + + + controls/autobrake/mode + 3 + + + controls/autobrake/active + 1 + + + + + + + + select + abs_low2 + + + + controls/switches/annun-test + 1 + + + controls/autobrake/mode + 1 + + + + + + + select + abs_med2 + + + + controls/switches/annun-test + 1 + + + controls/autobrake/mode + 2 + + + + + + + select + abs_max2 + + + + controls/switches/annun-test + 1 + + + controls/autobrake/mode + 3 + + + + + + + pick + abs_low + abs_low2 + dec_low + + + + + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + + nasal + + + + + + + pick + abs_med + abs_med2 + dec_med + + + + + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + + nasal + + + + + + + pick + abs_max + abs_max2 + dec_max + + + + + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + + nasal + + + + + + + translate tray diff --git a/Models/FlightDeck/res/fd_complete.ac b/Models/FlightDeck/res/fd_complete.ac index ba3b4603..8a2ae665 100644 --- a/Models/FlightDeck/res/fd_complete.ac +++ b/Models/FlightDeck/res/fd_complete.ac @@ -16,7 +16,508 @@ MATERIAL "ac3dmat1.022" rgb 1 0.9098 0.7882 amb 0.8915 0.8915 0.8915 emis 0.91 MATERIAL "ac3dmat1.024" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.2 0.2 0.2 shi 0 trans 0 MATERIAL "ac3dmat4" rgb 1 0.4667 0 amb 0.515 0.515 0.515 emis 0 0 0 spec 0 0 0 shi 128 trans 0 OBJECT world -kids 353 +kids 362 +OBJECT poly +name "dec_max2" +loc 0.000188796 -0.00037 0 +texture "main_labels2.png" +crease 45.000000 +numvert 5 +-0.588312 -0.0129876 -0.159218 +-0.588312 -0.0129876 -0.174093 +-0.587671 -0.0155592 -0.159218 +-0.587671 -0.0155592 -0.174093 +-0.587671 -0.0155592 -0.166655 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +0 0.75338 0.205402 +2 0.75338 0.185254 +4 0.804515 0.185254 +3 0.855649 0.185254 +1 0.855649 0.205402 +kids 0 +OBJECT poly +name "dec_low2" +loc 0.000188796 -0.00037 0 +texture "main_labels2.png" +crease 45.000000 +numvert 5 +-0.588312 -0.0129876 -0.133202 +-0.588312 -0.0129876 -0.118326 +-0.587671 -0.0155592 -0.118326 +-0.587671 -0.0155592 -0.133202 +-0.587671 -0.0155592 -0.125764 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +1 0.752404 0.206192 +2 0.752404 0.186044 +4 0.803542 0.186044 +3 0.85468 0.186044 +0 0.85468 0.206192 +kids 0 +OBJECT poly +name "dec_med2" +loc 0.000188617 -0.000369951 -0.018142 +texture "main_labels2.png" +crease 45.000000 +numvert 5 +-0.588312 -0.0129877 -0.133202 +-0.588312 -0.0129877 -0.118326 +-0.587671 -0.0155592 -0.125764 +-0.587671 -0.0155592 -0.133202 +-0.587671 -0.0155592 -0.118326 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +1 0.752404 0.206191 +4 0.752404 0.186044 +2 0.803542 0.186044 +3 0.85468 0.186044 +0 0.85468 0.206191 +kids 0 +OBJECT poly +name "abs_med2" +loc 0.000188796 -0.00037 0 +texture "main_labels2.png" +crease 45.000000 +numvert 17 +-0.587671 -0.0155592 -0.143906 +-0.586058 -0.0220289 -0.143906 +-0.587671 -0.0155592 -0.136468 +-0.589284 -0.0090895 -0.143906 +-0.587671 -0.0155592 -0.151344 +-0.590905 -0.0246944 -0.152758 +-0.587051 -0.0237341 -0.135054 +-0.590905 -0.0246944 -0.135054 +-0.587051 -0.0237341 -0.152758 +-0.590961 -0.00805 -0.152758 +-0.594815 -0.0090103 -0.135054 +-0.590961 -0.00805 -0.135054 +-0.594815 -0.0090103 -0.152758 +-0.586058 -0.0220289 -0.136468 +-0.589284 -0.0090895 -0.151344 +-0.589284 -0.0090895 -0.136468 +-0.586058 -0.0220289 -0.151344 +numsurf 19 +SURF 0x30 +mat 3 +refs 6 +0 0.803913 0.185254 +2 0.752775 0.185254 +13 0.752775 0.134565 +1 0.803913 0.134565 +16 0.855051 0.134565 +4 0.855051 0.185254 +SURF 0x30 +mat 3 +refs 3 +5 0.864773 0.123815 +6 0.743053 0.123814 +7 0.743053 0.123815 +SURF 0x30 +mat 3 +refs 3 +6 0.743053 0.123814 +5 0.864773 0.123815 +8 0.864773 0.123814 +SURF 0x30 +mat 3 +refs 3 +9 0.864773 0.246694 +10 0.743053 0.246694 +11 0.743053 0.246694 +SURF 0x30 +mat 3 +refs 3 +10 0.743053 0.246694 +9 0.864773 0.246694 +12 0.864773 0.246694 +SURF 0x30 +mat 3 +refs 3 +11 0.743053 0.246694 +7 0.743053 0.123815 +6 0.743053 0.123814 +SURF 0x30 +mat 3 +refs 3 +7 0.743053 0.123815 +11 0.743053 0.246694 +10 0.743053 0.246694 +SURF 0x30 +mat 3 +refs 3 +5 0.864773 0.123815 +9 0.864773 0.246694 +8 0.864773 0.123814 +SURF 0x30 +mat 3 +refs 3 +9 0.864773 0.246694 +5 0.864773 0.123815 +12 0.864773 0.246694 +SURF 0x30 +mat 3 +refs 3 +5 0.864773 0.123815 +10 0.743053 0.246694 +12 0.864773 0.246694 +SURF 0x30 +mat 3 +refs 3 +10 0.743053 0.246694 +5 0.864773 0.123815 +7 0.743053 0.123815 +SURF 0x30 +mat 3 +refs 4 +2 0.752775 0.185254 +15 0.752775 0.235943 +6 0.743053 0.123814 +13 0.752775 0.134565 +SURF 0x30 +mat 3 +refs 3 +6 0.743053 0.123814 +15 0.752775 0.235943 +11 0.743053 0.246694 +SURF 0x30 +mat 3 +refs 4 +6 0.743053 0.123814 +16 0.855051 0.134565 +1 0.803913 0.134565 +13 0.752775 0.134565 +SURF 0x30 +mat 3 +refs 3 +16 0.855051 0.134565 +6 0.743053 0.123814 +8 0.864773 0.123814 +SURF 0x30 +mat 3 +refs 4 +8 0.864773 0.123814 +14 0.855051 0.235943 +4 0.855051 0.185254 +16 0.855051 0.134565 +SURF 0x30 +mat 3 +refs 3 +14 0.855051 0.235943 +8 0.864773 0.123814 +9 0.864773 0.246694 +SURF 0x30 +mat 3 +refs 4 +3 0.803913 0.235943 +14 0.855051 0.235943 +11 0.743053 0.246694 +15 0.752775 0.235943 +SURF 0x30 +mat 3 +refs 3 +11 0.743053 0.246694 +14 0.855051 0.235943 +9 0.864773 0.246694 +kids 0 +OBJECT poly +name "abs_max2" +loc 0.000188796 -0.00037 0 +texture "main_labels2.png" +crease 45.000000 +numvert 17 +-0.587671 -0.0155592 -0.166655 +-0.586058 -0.0220289 -0.166655 +-0.589284 -0.0090895 -0.166655 +-0.587671 -0.0155592 -0.174093 +-0.587671 -0.0155592 -0.159218 +-0.589284 -0.0090895 -0.174093 +-0.590961 -0.00805 -0.157803 +-0.589284 -0.0090895 -0.159218 +-0.590961 -0.00805 -0.175507 +-0.587051 -0.0237341 -0.175507 +-0.586058 -0.0220289 -0.174093 +-0.587051 -0.0237341 -0.157803 +-0.586058 -0.0220289 -0.159218 +-0.590905 -0.0246944 -0.175507 +-0.594815 -0.0090103 -0.157803 +-0.594815 -0.0090103 -0.175507 +-0.590905 -0.0246944 -0.157803 +numsurf 19 +SURF 0x30 +mat 3 +refs 6 +4 0.75338 0.185254 +12 0.75338 0.134565 +1 0.804515 0.134565 +10 0.855649 0.134565 +3 0.855649 0.185254 +0 0.804515 0.185254 +SURF 0x30 +mat 3 +refs 4 +2 0.804515 0.235943 +5 0.855649 0.235943 +6 0.743651 0.246694 +7 0.75338 0.235943 +SURF 0x30 +mat 3 +refs 3 +6 0.743651 0.246694 +5 0.855649 0.235943 +8 0.865371 0.246694 +SURF 0x30 +mat 3 +refs 4 +9 0.865371 0.123814 +5 0.855649 0.235943 +3 0.855649 0.185254 +10 0.855649 0.134565 +SURF 0x30 +mat 3 +refs 3 +5 0.855649 0.235943 +9 0.865371 0.123814 +8 0.865371 0.246694 +SURF 0x30 +mat 3 +refs 4 +11 0.743651 0.123814 +10 0.855649 0.134565 +1 0.804515 0.134565 +12 0.75338 0.134565 +SURF 0x30 +mat 3 +refs 3 +10 0.855649 0.134565 +11 0.743651 0.123814 +9 0.865371 0.123814 +SURF 0x30 +mat 3 +refs 4 +4 0.75338 0.185254 +7 0.75338 0.235943 +11 0.743651 0.123814 +12 0.75338 0.134565 +SURF 0x30 +mat 3 +refs 3 +11 0.743651 0.123814 +7 0.75338 0.235943 +6 0.743651 0.246694 +SURF 0x30 +mat 3 +refs 3 +13 0.865371 0.123815 +14 0.743651 0.246694 +15 0.865371 0.246694 +SURF 0x30 +mat 3 +refs 3 +14 0.743651 0.246694 +13 0.865371 0.123815 +16 0.743651 0.123815 +SURF 0x30 +mat 3 +refs 3 +13 0.865371 0.123815 +8 0.865371 0.246694 +9 0.865371 0.123814 +SURF 0x30 +mat 3 +refs 3 +8 0.865371 0.246694 +13 0.865371 0.123815 +15 0.865371 0.246694 +SURF 0x30 +mat 3 +refs 3 +6 0.743651 0.246694 +16 0.743651 0.123815 +11 0.743651 0.123814 +SURF 0x30 +mat 3 +refs 3 +16 0.743651 0.123815 +6 0.743651 0.246694 +14 0.743651 0.246694 +SURF 0x30 +mat 3 +refs 3 +8 0.865371 0.246694 +14 0.743651 0.246694 +6 0.743651 0.246694 +SURF 0x30 +mat 3 +refs 3 +14 0.743651 0.246694 +8 0.865371 0.246694 +15 0.865371 0.246694 +SURF 0x30 +mat 3 +refs 3 +13 0.865371 0.123815 +11 0.743651 0.123814 +16 0.743651 0.123815 +SURF 0x30 +mat 3 +refs 3 +11 0.743651 0.123814 +13 0.865371 0.123815 +9 0.865371 0.123814 +kids 0 +OBJECT poly +name "abs_low2" +loc 0.000188796 -0.00037 0 +texture "main_labels2.png" +crease 45.000000 +numvert 17 +-0.587671 -0.0155592 -0.125764 +-0.586058 -0.0220289 -0.125764 +-0.589284 -0.0090895 -0.125764 +-0.587671 -0.0155592 -0.133202 +-0.587671 -0.0155592 -0.118326 +-0.589284 -0.0090895 -0.133202 +-0.590961 -0.00805 -0.116912 +-0.589284 -0.0090895 -0.118326 +-0.590961 -0.00805 -0.134616 +-0.587051 -0.0237341 -0.134616 +-0.586058 -0.0220289 -0.133202 +-0.587051 -0.0237341 -0.116912 +-0.586058 -0.0220289 -0.118326 +-0.590905 -0.0246944 -0.134616 +-0.594815 -0.0090103 -0.116912 +-0.594815 -0.0090103 -0.134616 +-0.590905 -0.0246944 -0.116912 +numsurf 19 +SURF 0x30 +mat 3 +refs 6 +0 0.803542 0.186044 +4 0.752404 0.186044 +12 0.752404 0.135356 +1 0.803542 0.135356 +10 0.85468 0.135356 +3 0.85468 0.186044 +SURF 0x30 +mat 3 +refs 4 +2 0.803542 0.236733 +5 0.85468 0.236733 +6 0.742683 0.247484 +7 0.752404 0.236733 +SURF 0x30 +mat 3 +refs 3 +6 0.742683 0.247484 +5 0.85468 0.236733 +8 0.864402 0.247484 +SURF 0x30 +mat 3 +refs 4 +9 0.864402 0.124605 +5 0.85468 0.236733 +3 0.85468 0.186044 +10 0.85468 0.135356 +SURF 0x30 +mat 3 +refs 3 +5 0.85468 0.236733 +9 0.864402 0.124605 +8 0.864402 0.247484 +SURF 0x30 +mat 3 +refs 4 +11 0.742683 0.124605 +10 0.85468 0.135356 +1 0.803542 0.135356 +12 0.752404 0.135356 +SURF 0x30 +mat 3 +refs 3 +10 0.85468 0.135356 +11 0.742683 0.124605 +9 0.864402 0.124605 +SURF 0x30 +mat 3 +refs 4 +4 0.752404 0.186044 +7 0.752404 0.236733 +11 0.742683 0.124605 +12 0.752404 0.135356 +SURF 0x30 +mat 3 +refs 3 +11 0.742683 0.124605 +7 0.752404 0.236733 +6 0.742683 0.247484 +SURF 0x30 +mat 3 +refs 3 +13 0.864402 0.124605 +14 0.742683 0.247484 +15 0.864402 0.247484 +SURF 0x30 +mat 3 +refs 3 +14 0.742683 0.247484 +13 0.864402 0.124605 +16 0.742683 0.124605 +SURF 0x30 +mat 3 +refs 3 +13 0.864402 0.124605 +8 0.864402 0.247484 +9 0.864402 0.124605 +SURF 0x30 +mat 3 +refs 3 +8 0.864402 0.247484 +13 0.864402 0.124605 +15 0.864402 0.247484 +SURF 0x30 +mat 3 +refs 3 +6 0.742683 0.247484 +16 0.742683 0.124605 +11 0.742683 0.124605 +SURF 0x30 +mat 3 +refs 3 +16 0.742683 0.124605 +6 0.742683 0.247484 +14 0.742683 0.247484 +SURF 0x30 +mat 3 +refs 3 +8 0.864402 0.247484 +14 0.742683 0.247484 +6 0.742683 0.247484 +SURF 0x30 +mat 3 +refs 3 +14 0.742683 0.247484 +8 0.864402 0.247484 +15 0.864402 0.247484 +SURF 0x30 +mat 3 +refs 3 +13 0.864402 0.124605 +11 0.742683 0.124605 +16 0.742683 0.124605 +SURF 0x30 +mat 3 +refs 3 +11 0.742683 0.124605 +13 0.864402 0.124605 +9 0.864402 0.124605 +kids 0 OBJECT poly name "a-thr" loc 6.69e-005 -8.96e-005 0 @@ -93681,75 +94182,6 @@ refs 3 60 0.022938 0.817279 kids 0 OBJECT poly -name "dec_low" -loc 7.37e-005 -0.00037 0 -texture "main_labels.png" -crease 45.000000 -numvert 6 --0.587671 -0.0155592 -0.125764 --0.589284 -0.0090895 -0.125764 --0.587671 -0.0155592 -0.133202 --0.587671 -0.0155592 -0.118326 --0.589284 -0.0090895 -0.133202 --0.589284 -0.0090895 -0.118326 -numsurf 1 -SURF 0x30 -mat 3 -refs 6 -5 0.752404 0.236733 -3 0.752404 0.186044 -0 0.803542 0.186044 -2 0.85468 0.186044 -4 0.85468 0.236733 -1 0.803542 0.236733 -kids 0 -OBJECT poly -name "dec_max" -loc 7.37e-005 -0.00037 0 -texture "main_labels.png" -crease 45.000000 -numvert 6 --0.587671 -0.0155592 -0.166655 --0.589284 -0.0090895 -0.166655 --0.587671 -0.0155592 -0.174093 --0.587671 -0.0155592 -0.159218 --0.589284 -0.0090895 -0.174093 --0.589284 -0.0090895 -0.159218 -numsurf 1 -SURF 0x30 -mat 3 -refs 6 -5 0.75338 0.235943 -3 0.75338 0.185254 -0 0.804515 0.185254 -2 0.855649 0.185254 -4 0.855649 0.235943 -1 0.804515 0.235943 -kids 0 -OBJECT poly -name "dec_med" -loc 7.37e-005 -0.00037 0 -texture "main_labels.png" -crease 45.000000 -numvert 6 --0.587671 -0.0155592 -0.143906 --0.587671 -0.0155592 -0.136468 --0.589284 -0.0090895 -0.143906 --0.587671 -0.0155592 -0.151344 --0.589284 -0.0090895 -0.151344 --0.589284 -0.0090895 -0.136468 -numsurf 1 -SURF 0x30 -mat 10 -refs 6 -5 0.752775 0.235943 -1 0.752775 0.185254 -0 0.803913 0.185254 -3 0.855051 0.185254 -4 0.855051 0.235943 -2 0.803913 0.235943 -kids 0 -OBJECT poly name "door" loc -0.0059102 0.0033855 0.0146721 texture "ped_xtra.png" @@ -138430,6 +138862,7 @@ OBJECT poly name "object.001" texture "cpit_3.png" crease 45.000000 +hidden numvert 114 -0.31241 0.617035 0.137513 -0.31249 0.617035 -0.133106 @@ -484018,3 +484451,129 @@ refs 3 130 0.065927 0.561417 129 0.070102 0.561419 kids 0 +OBJECT poly +name "abslt_med" +loc 7.35212e-005 -0.000369951 -0.018142 +texture "main_labels.png" +crease 45.000000 +numvert 5 +-0.588312 -0.0129877 -0.133202 +-0.588312 -0.0129877 -0.118326 +-0.589284 -0.0090895 -0.125764 +-0.589284 -0.0090895 -0.133202 +-0.589284 -0.0090895 -0.118326 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +0 0.85468 0.206191 +3 0.85468 0.236733 +2 0.803542 0.236733 +4 0.752404 0.236733 +1 0.752404 0.206191 +kids 0 +OBJECT poly +name "abslt_low" +loc 7.37e-005 -0.00037 0 +texture "main_labels.png" +crease 45.000000 +numvert 5 +-0.588312 -0.0129876 -0.133202 +-0.588312 -0.0129876 -0.118326 +-0.589284 -0.0090895 -0.118326 +-0.589284 -0.0090895 -0.133202 +-0.589284 -0.0090895 -0.125764 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +0 0.85468 0.206192 +3 0.85468 0.236733 +4 0.803542 0.236733 +2 0.752404 0.236733 +1 0.752404 0.206192 +kids 0 +OBJECT poly +name "abslt_max" +loc 7.37e-005 -0.00037 0 +texture "main_labels.png" +crease 45.000000 +numvert 5 +-0.588312 -0.0129876 -0.159218 +-0.588312 -0.0129876 -0.174093 +-0.589284 -0.0090895 -0.159218 +-0.589284 -0.0090895 -0.174093 +-0.589284 -0.0090895 -0.166655 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +1 0.855649 0.205402 +3 0.855649 0.235943 +4 0.804515 0.235943 +2 0.75338 0.235943 +0 0.75338 0.205402 +kids 0 +OBJECT poly +name "dec_med" +loc 7.35212e-005 -0.000369951 -0.018142 +texture "main_labels.png" +crease 45.000000 +numvert 5 +-0.587671 -0.0155592 -0.118326 +-0.587671 -0.0155592 -0.133202 +-0.587671 -0.0155592 -0.125764 +-0.588312 -0.0129877 -0.118326 +-0.588312 -0.0129877 -0.133202 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +3 0.752404 0.206191 +0 0.752404 0.186044 +2 0.803542 0.186044 +1 0.85468 0.186044 +4 0.85468 0.206191 +kids 0 +OBJECT poly +name "dec_low" +loc 7.37e-005 -0.00037 0 +texture "main_labels.png" +crease 45.000000 +numvert 5 +-0.587671 -0.0155592 -0.125764 +-0.587671 -0.0155592 -0.133202 +-0.587671 -0.0155592 -0.118326 +-0.588312 -0.0129876 -0.118326 +-0.588312 -0.0129876 -0.133202 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +3 0.752404 0.206192 +2 0.752404 0.186044 +0 0.803542 0.186044 +1 0.85468 0.186044 +4 0.85468 0.206192 +kids 0 +OBJECT poly +name "dec_max" +loc 7.37e-005 -0.00037 0 +texture "main_labels.png" +crease 45.000000 +numvert 5 +-0.587671 -0.0155592 -0.166655 +-0.587671 -0.0155592 -0.174093 +-0.587671 -0.0155592 -0.159218 +-0.588312 -0.0129876 -0.174093 +-0.588312 -0.0129876 -0.159218 +numsurf 1 +SURF 0x30 +mat 3 +refs 5 +4 0.75338 0.205402 +2 0.75338 0.185254 +0 0.804515 0.185254 +1 0.855649 0.185254 +3 0.855649 0.205402 +kids 0 diff --git a/Models/FlightDeck/res/main_labels.png b/Models/FlightDeck/res/main_labels.png index b49811a2..887baba3 100644 Binary files a/Models/FlightDeck/res/main_labels.png and b/Models/FlightDeck/res/main_labels.png differ diff --git a/Models/FlightDeck/res/main_labels2.png b/Models/FlightDeck/res/main_labels2.png new file mode 100644 index 00000000..cd013d83 Binary files /dev/null and b/Models/FlightDeck/res/main_labels2.png differ diff --git a/Nasal/autobrake.nas b/Nasal/autobrake.nas new file mode 100644 index 00000000..2f40fd26 --- /dev/null +++ b/Nasal/autobrake.nas @@ -0,0 +1,91 @@ +# A3XX Autobrake +# Joshua Davidson (it0uchpods) + +######################################### +# Copyright (c) it0uchpods Design Group # +######################################### + +setprop("/controls/autobrake/active", 0); +setprop("/controls/autobrake/mode", 0); + +setlistener("/sim/signals/fdm-initialized", func { + var rev1 = 0; + var rev2 = 0; + var thr1 = 0; + var thr2 = 0; + var wow1 = getprop("/gear/gear[1]/wow"); + var wow2 = getprop("/gear/gear[2]/wow"); + var gnd_speed = getprop("/velocities/groundspeed-kt"); +}); + +var autobrake_init = func { + setprop("/controls/autobrake/active", 0); + setprop("/controls/autobrake/mode", 0); +} + +# Override FG's generic brake, so we can use toe brakes to disconnect autobrake +controls.applyBrakes = func(v, which = 0) { + wow1 = getprop("/gear/gear[1]/wow"); + wow2 = getprop("/gear/gear[2]/wow"); + if (getprop("/controls/autobrake/mode") != 0 and (wow1 or wow2)) { + arm_autobrake(0); + } + if (which <= 0) { + interpolate("/controls/gear/brake-left", v, 0.5); + } + if (which >= 0) { + interpolate("/controls/gear/brake-right", v, 0.5); + } +} + +# Set autobrake mode +var arm_autobrake = func(mode) { + if (mode == 0) { # OFF + absChk.stop(); + if (getprop("/controls/autobrake/active") == 1) { + setprop("/controls/autobrake/active", 0); + setprop("/controls/gear/brake-left", 0); + setprop("/controls/gear/brake-right", 0); + } + setprop("/controls/autobrake/mode", 0); + } else if (mode == 1) { # LO + setprop("/controls/autobrake/mode", 1); + absChk.start(); + } else if (mode == 2) { # MED + setprop("/controls/autobrake/mode", 2); + absChk.start(); + } else if (mode == 3) { # MAX + setprop("/controls/autobrake/mode", 3); + absChk.start(); + } +} + +# Autobrake enable if armed +var absChk = maketimer(0.2, func { + rev1 = getprop("/engines/engine[0]/reverser-pos-norm"); + rev2 = getprop("/engines/engine[1]/reverser-pos-norm"); + thr1 = getprop("/controls/engines/engine[0]/throttle"); + thr2 = getprop("/controls/engines/engine[1]/throttle"); + wow1 = getprop("/gear/gear[1]/wow"); + wow2 = getprop("/gear/gear[2]/wow"); + gnd_speed = getprop("/velocities/groundspeed-kt"); + if (gnd_speed > 60 and rev1 < 0.01 and rev2 < 0.01) { + if (getprop("/controls/autobrake/mode") != 0 and thr1 < 0.15 and thr2 < 0.15 and wow1 and wow2) { + setprop("/controls/autobrake/active", 1); + if (getprop("/controls/autobrake/mode") == 1) { # LO + interpolate("/controls/gear/brake-left", 0.4, 0.5); + interpolate("/controls/gear/brake-right", 0.4, 0.5); + } else if (getprop("/controls/autobrake/mode") == 2) { # MED + interpolate("/controls/gear/brake-left", 0.65, 0.5); + interpolate("/controls/gear/brake-right", 0.65, 0.5); + } else if (getprop("/controls/autobrake/mode") == 3) { # MAX + interpolate("/controls/gear/brake-left", 0.9, 0.5); + interpolate("/controls/gear/brake-right", 0.9, 0.5); + } + } else { + setprop("/controls/autobrake/active", 0); + setprop("/controls/gear/brake-left", 0); + setprop("/controls/gear/brake-right", 0); + } + } +}); diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 74eacd26..6b856cb5 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -203,6 +203,7 @@ setlistener("/sim/signals/fdm-initialized", func { systems.fuel_init(); systems.fire_init(); systems.eng_init(); + systems.autobrake_init(); fmgc.APinit(); librariesLoop.start(); fmgc.FMGCinit(); diff --git a/revision.txt b/revision.txt index a7d59474..cdfeb367 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -2022 \ No newline at end of file +2023 \ No newline at end of file