From fe31511c4634824619f42f7f3865b5139df90b31 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 5 Aug 2017 23:07:21 -0400 Subject: [PATCH] A3XX: Brand new FADEC system much improved, and new engine MilThrust tables --- A320-main.xml | 2 + Engines/cfm56_5a1.xml | 91 +++---- Engines/cfm56_5b3.xml | 91 +++---- Engines/cfm56_5b4.xml | 91 +++---- Engines/cfm56_5b6.xml | 91 +++---- Engines/cfm56_5b9.xml | 91 +++---- Engines/direct.xml | 3 - Engines/leap1a26.xml | 93 +++---- Engines/leap1a32.xml | 93 +++---- Engines/pw1127g.xml | 93 +++---- Engines/pw1133g.xml | 93 +++---- Engines/v2522_a5.xml | 93 +++---- Engines/v2527_a5.xml | 91 +++---- Engines/v2533_a5.xml | 93 +++---- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 2 +- Nasal/fadec-common.nas | 39 +-- Systems/cfm56-sound.xml | 20 +- Systems/custom-autothrust.xml | 41 ++- Systems/fadec-cfm.xml | 263 ++++++++++++++++--- Systems/fadec-iae.xml | 198 ++++++++++++-- Systems/fcs.xml | 4 +- Systems/libraries.xml | 51 ++-- Systems/v2500-sound.xml | 20 +- 23 files changed, 1071 insertions(+), 676 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index cf1afb0c..a65505d8 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -549,6 +549,7 @@ 0 0 0.94 + 0 0 @@ -561,6 +562,7 @@ 0 0 0.94 + 0 0 diff --git a/Engines/cfm56_5a1.xml b/Engines/cfm56_5a1.xml index 25c81078..e239e592 100644 --- a/Engines/cfm56_5a1.xml +++ b/Engines/cfm56_5a1.xml @@ -7,52 +7,53 @@ --> - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/cfm56_5b3.xml b/Engines/cfm56_5b3.xml index c93c4386..05437736 100644 --- a/Engines/cfm56_5b3.xml +++ b/Engines/cfm56_5b3.xml @@ -7,52 +7,53 @@ --> - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/cfm56_5b4.xml b/Engines/cfm56_5b4.xml index 63f5d823..b596225d 100644 --- a/Engines/cfm56_5b4.xml +++ b/Engines/cfm56_5b4.xml @@ -7,52 +7,53 @@ --> - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/cfm56_5b6.xml b/Engines/cfm56_5b6.xml index 74b79aa8..4aeecd11 100644 --- a/Engines/cfm56_5b6.xml +++ b/Engines/cfm56_5b6.xml @@ -7,52 +7,53 @@ --> - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/cfm56_5b9.xml b/Engines/cfm56_5b9.xml index 7d2a7a77..9727099e 100644 --- a/Engines/cfm56_5b9.xml +++ b/Engines/cfm56_5b9.xml @@ -7,52 +7,53 @@ --> - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/direct.xml b/Engines/direct.xml index 375bc0ce..e53320be 100644 --- a/Engines/direct.xml +++ b/Engines/direct.xml @@ -6,8 +6,5 @@ ####################################### --> - diff --git a/Engines/leap1a26.xml b/Engines/leap1a26.xml index ee53d7c6..edfd93a7 100644 --- a/Engines/leap1a26.xml +++ b/Engines/leap1a26.xml @@ -6,53 +6,54 @@ ####################################### --> - - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 + - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/leap1a32.xml b/Engines/leap1a32.xml index 8376498e..2567aeca 100644 --- a/Engines/leap1a32.xml +++ b/Engines/leap1a32.xml @@ -6,53 +6,54 @@ ####################################### --> - - 27000 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 + - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 27000 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/pw1127g.xml b/Engines/pw1127g.xml index af426ebe..064f2b98 100644 --- a/Engines/pw1127g.xml +++ b/Engines/pw1127g.xml @@ -6,53 +6,54 @@ ####################################### --> - - 26345 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 + - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 26345 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/pw1133g.xml b/Engines/pw1133g.xml index abe3b3e9..cf55eb68 100644 --- a/Engines/pw1133g.xml +++ b/Engines/pw1133g.xml @@ -6,53 +6,54 @@ ####################################### --> - - 26345 - 8.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 + - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 26345 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/v2522_a5.xml b/Engines/v2522_a5.xml index f9dc0cab..c80df5c0 100644 --- a/Engines/v2522_a5.xml +++ b/Engines/v2522_a5.xml @@ -6,53 +6,54 @@ ####################################### --> - - 26600 - 10.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 + - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 26600 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/v2527_a5.xml b/Engines/v2527_a5.xml index 707f6286..54efa469 100644 --- a/Engines/v2527_a5.xml +++ b/Engines/v2527_a5.xml @@ -7,52 +7,53 @@ --> - 26600 - 10.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 26600 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Engines/v2533_a5.xml b/Engines/v2533_a5.xml index f9dc0cab..c89777ad 100644 --- a/Engines/v2533_a5.xml +++ b/Engines/v2533_a5.xml @@ -6,53 +6,54 @@ ####################################### --> - - 26600 - 10.1 - 0.5 - 0.03 - 22.4 - 60.9 - 0.2 - 2.0 - 105.8 - 102.1 - 0 - 0 + - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 - 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 - 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 - 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 - 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 - 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 - -
- + 26600 + 8.1 + 0.5 + 0.03 + 22.4 + 60.9 + 0.2 + 2.0 + 103.8 + 99.6 + 0 + 0 - - - velocities/mach - atmosphere/density-altitude - - -10000 0 10000 20000 30000 40000 50000 - 0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 - 0.2 1.1710 0.9340 0.6970 0.5060 0.3550 0.2310 0.1430 - 0.4 1.1500 0.9210 0.6920 0.5060 0.3570 0.2330 0.1450 - 0.6 1.1810 0.9510 0.7210 0.5320 0.3780 0.2480 0.1540 - 0.8 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.1600 - 0.9 1.2580 1.0200 0.7820 0.5820 0.4170 0.2750 0.0000 - 1.0 1.1810 0.9510 0.7210 0.5320 0.3780 0.0000 0.0000 - 1.2 1.1500 0.9210 0.6920 0.0000 0.0000 0.0000 0.0000 - 1.4 1.1710 0.9340 0.0000 0.0000 0.0000 0.0000 0.0000 - -
- + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 + 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 + 0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 + 0.6 0.0 0.0 0.0 0.0 0.0276 0.0718 0.1073 + 0.8 0.0 0.0 0.0 0.0 0.0474 0.0868 0.0900 + 1.0 0.0 0.0 0.0 0.0 0.0 0.0552 0.0800 + +
+ + + + velocities/mach + atmosphere/density-altitude + + -10000 0 10000 20000 30000 40000 50000 + 0.0 1.2600 1.0000 0.7400 0.5440 0.3720 0.2410 0.0000 + 0.2 1.1710 0.9740 0.6970 0.5160 0.3650 0.2310 0.0000 + 0.4 1.1500 0.9570 0.6920 0.5260 0.3670 0.2230 0.0000 + 0.6 1.1810 0.9410 0.7210 0.5460 0.3380 0.1880 0.0000 + 0.8 1.2290 1.0200 0.7820 0.5370 0.2840 0.1450 0.0000 + 0.9 1.2580 1.0200 0.7820 0.5020 0.2510 0.0650 0.0000 + 1.0 1.1810 0.9510 0.7210 0.4210 0.1540 0.0150 0.0000 + 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 + +
+ + diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 1ca65962..aa203836 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -95,7 +95,7 @@ var canvas_lowerECAM_base = { lowerECAM_apu.page.hide(); lowerECAM_eng1.page.hide(); lowerECAM_eng.page.hide(); - lowerECAM_fctl.page.hide(); + lowerECAM_fctl.page.hide(); } settimer(func me.update(), 0.02); diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas index e937548d..bbf31ea9 100644 --- a/Nasal/fadec-common.nas +++ b/Nasal/fadec-common.nas @@ -12,12 +12,14 @@ setprop("/systems/thrust/epr/toga-lim", 0.0); setprop("/systems/thrust/epr/mct-lim", 0.0); setprop("/systems/thrust/epr/flx-lim", 0.0); setprop("/systems/thrust/epr/clb-lim", 0.0); -setprop("/systems/thrust/n1/toga-lim", 95.8); +setprop("/systems/thrust/n1/toga-lim", 0.0); +setprop("/systems/thrust/n1/mct-lim", 0.0); setprop("/systems/thrust/n1/flx-lim", 0.0); +setprop("/systems/thrust/n1/clb-lim", 0.0); setprop("/engines/flx-thr", 0.0); setprop("/controls/engines/thrust-limit", "TOGA"); -setprop("/controls/engines/epr-limit", 1.308); -setprop("/controls/engines/n1-limit", 95.8); +setprop("/controls/engines/epr-limit", 0.0); +setprop("/controls/engines/n1-limit", 0.0); setprop("/systems/thrust/state1", "IDLE"); setprop("/systems/thrust/state2", "IDLE"); setprop("/systems/thrust/lvrclb", "0"); @@ -51,10 +53,9 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func { } else if (thrr >= 0.78 and thrr < 0.83) { setprop("/it-autoflight/input/athr", 1); if (getprop("/controls/engines/thrust-limit") == "FLX") { - var derate = getprop("/engines/flex-derate"); - setprop("/controls/engines/engine[0]/throttle-fdm", 0.88 - derate); + setprop("/controls/engines/engine[0]/throttle-fdm", 0.97); } else { - setprop("/controls/engines/engine[0]/throttle-fdm", 0.84); + setprop("/controls/engines/engine[0]/throttle-fdm", 0.94); } setprop("/systems/thrust/state1", "MCT"); } else if (thrr >= 0.83 and thrr < 0.95) { @@ -63,7 +64,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func { unflex(); } else if (thrr >= 0.95) { setprop("/it-autoflight/input/athr", 1); - setprop("/controls/engines/engine[0]/throttle-fdm", 0.88); + setprop("/controls/engines/engine[0]/throttle-fdm", 0.97); setprop("/systems/thrust/state1", "TOGA"); unflex(); } @@ -83,7 +84,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func { } else if (thrr >= 0.95) { setprop("/systems/thrust/state1", "TOGA"); } - setprop("/controls/engines/engine[0]/throttle-fdm", 0.88); + setprop("/controls/engines/engine[0]/throttle-fdm", 1.00); } }); @@ -106,10 +107,9 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func { } else if (thrr >= 0.78 and thrr < 0.83) { setprop("/it-autoflight/input/athr", 1); if (getprop("/controls/engines/thrust-limit") == "FLX") { - var derate = getprop("/engines/flex-derate"); - setprop("/controls/engines/engine[1]/throttle-fdm", 0.88 - derate); + setprop("/controls/engines/engine[1]/throttle-fdm", 0.97); } else { - setprop("/controls/engines/engine[1]/throttle-fdm", 0.84); + setprop("/controls/engines/engine[1]/throttle-fdm", 0.94); } setprop("/systems/thrust/state2", "MCT"); } else if (thrr >= 0.83 and thrr < 0.95) { @@ -118,7 +118,7 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func { unflex(); } else if (thrr >= 0.95) { setprop("/it-autoflight/input/athr", 1); - setprop("/controls/engines/engine[1]/throttle-fdm", 0.88); + setprop("/controls/engines/engine[1]/throttle-fdm", 0.97); setprop("/systems/thrust/state2", "TOGA"); unflex(); } @@ -138,7 +138,7 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func { } else if (thrr >= 0.95) { setprop("/systems/thrust/state2", "TOGA"); } - setprop("/controls/engines/engine[1]/throttle-fdm", 0.88); + setprop("/controls/engines/engine[1]/throttle-fdm", 1.00); } }); @@ -177,16 +177,19 @@ var thrust_lim = func { var eprmct = getprop("/systems/thrust/epr/mct-lim"); var eprflx = getprop("/systems/thrust/epr/flx-lim"); var eprclb = getprop("/systems/thrust/epr/clb-lim"); + var n1toga = getprop("/systems/thrust/n1/toga-lim"); + var n1mct = getprop("/systems/thrust/n1/mct-lim"); var n1flx = getprop("/systems/thrust/n1/flx-lim"); + var n1clb = getprop("/systems/thrust/n1/clb-lim"); if (getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) { if ((state1 == "TOGA" or state2 == "TOGA" or (state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) or getprop("/systems/thrust/alpha-floor") == 1 or getprop("/systems/thrust/toga-lk") == 1) { setprop("/controls/engines/thrust-limit", "TOGA"); setprop("/controls/engines/epr-limit", eprtoga); - setprop("/controls/engines/n1-limit", 95.8); + setprop("/controls/engines/n1-limit", n1toga); } else if ((state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) and getprop("/systems/thrust/lim-flex") == 0) { setprop("/controls/engines/thrust-limit", "MCT"); setprop("/controls/engines/epr-limit", eprmct); - setprop("/controls/engines/n1-limit", 92.5); + setprop("/controls/engines/n1-limit", n1mct); } else if ((state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) and getprop("/systems/thrust/lim-flex") == 1) { setprop("/controls/engines/thrust-limit", "FLX"); setprop("/controls/engines/epr-limit", eprflx); @@ -194,7 +197,7 @@ var thrust_lim = func { } else if (state1 == "CL" or state2 == "CL" or state1 == "MAN" or state2 == "MAN" or state1 == "IDLE" or state2 == "IDLE") { setprop("/controls/engines/thrust-limit", "CLB"); setprop("/controls/engines/epr-limit", eprclb); - setprop("/controls/engines/n1-limit", 89.1); + setprop("/controls/engines/n1-limit", n1clb); } } else if (getprop("/FMGC/internal/flex-set") == 1 and getprop("/systems/fadec/n1mode1") == 0 and getprop("/systems/fadec/n1mode2") == 0) { setprop("/systems/thrust/lim-flex", 1); @@ -204,7 +207,7 @@ var thrust_lim = func { } else { setprop("/controls/engines/thrust-limit", "TOGA"); setprop("/controls/engines/epr-limit", eprtoga); - setprop("/controls/engines/n1-limit", 95.8); + setprop("/controls/engines/n1-limit", n1toga); } } @@ -217,8 +220,6 @@ var unflex = func { } var thrust_loop = func { - var derate = getprop("/engines/flex-derate"); - setprop("/engines/flx-thr", 0.88 - derate); var state1 = getprop("/systems/thrust/state1"); var state2 = getprop("/systems/thrust/state2"); if ((state1 == "CL") and (state2 == "CL")) { diff --git a/Systems/cfm56-sound.xml b/Systems/cfm56-sound.xml index 5b4602fb..1a191336 100644 --- a/Systems/cfm56-sound.xml +++ b/Systems/cfm56-sound.xml @@ -210,9 +210,9 @@ /engines/engine[0]/n10.01 - 0.75 0.00 - 0.80 0.10 - 1.08 0.80 + 0.65 0.00 + 0.70 0.10 + 1.02 0.80
 @@ -230,9 +230,9 @@ /engines/engine[1]/n10.01 - 0.75 0.00 - 0.80 0.10 - 1.08 0.80 + 0.65 0.00 + 0.70 0.10 + 1.02 0.80
 @@ -354,8 +354,8 @@ /engines/engine[0]/n10.01 - 0.80 0.80 - 1.08 1.28 + 0.70 0.80 + 1.02 1.28
 @@ -373,8 +373,8 @@ /engines/engine[1]/n10.01 - 0.80 0.80 - 1.08 1.28 + 0.70 0.80 + 1.02 1.28
 diff --git a/Systems/custom-autothrust.xml b/Systems/custom-autothrust.xml index c257ff11..8fcb0e9d 100644 --- a/Systems/custom-autothrust.xml +++ b/Systems/custom-autothrust.xml @@ -114,6 +114,31 @@ 0.1 + + + Throttle Comparator + gain + 1 + + + + /controls/engines/engine[0]/throttle-man + /controls/engines/engine[1]/throttle-man + + + /controls/engines/engine[0]/throttle-man + + + + + /controls/engines/engine[0]/throttle-man + /controls/engines/engine[1]/throttle-man + + + /controls/engines/engine[1]/throttle-man + + /controls/engines/throttle-pid-max + @@ -170,7 +195,9 @@ 10.0 0.00001 0.005 - 0.800 + + /controls/engines/throttle-pid-max + @@ -232,7 +259,9 @@ 10.0 0.00001 0.005 - 0.800 + + /controls/engines/throttle-pid-max + @@ -285,7 +314,9 @@ 10.0 0.00001 0.005 - 1.000 + + /controls/engines/throttle-pid-max + @@ -338,7 +369,9 @@ 10.0 0.00001 0.005 - 1.000 + + /controls/engines/throttle-pid-max + diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml index bd30e44c..8bad5fb4 100644 --- a/Systems/fadec-cfm.xml +++ b/Systems/fadec-cfm.xml @@ -6,7 +6,7 @@ ####################################### --> - + @@ -18,16 +18,16 @@ 0.05 - - /controls/engines/engine[0]/throttle-pos - 0.000.00 - 0.010.00 - 0.600.80 - 0.650.80 - 0.780.84 - 0.830.84 - 0.950.88 -
+ + /controls/engines/engine[0]/throttle-pos + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97 +
/controls/engines/engine[0]/throttle-man @@ -40,21 +40,71 @@ 0.05 - - /controls/engines/engine[1]/throttle-pos - 0.000.00 - 0.010.00 - 0.600.80 - 0.650.80 - 0.780.84 - 0.830.84 - 0.950.88 -
+ + /controls/engines/engine[1]/throttle-pos + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97 +
/controls/engines/engine[1]/throttle-man + + MAN CMD One + gain + 1 + 0.05 + + + + + /controls/engines/engine[0]/throttle-pos + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97 +
+ /controls/engines/throttle-scale + + + + /controls/engines/engine[0]/throttle-cmd-man + + + + MAN CMD Two + gain + 1 + 0.05 + + + + + /controls/engines/engine[1]/throttle-pos + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97 +
+ /controls/engines/throttle-scale + + + + /controls/engines/engine[1]/throttle-cmd-man + + N1 CMD 1 gain @@ -75,18 +125,21 @@ - /engines/flx-thr + + 0.97 + /engines/flx-throttle + 0.00 22.4 - 1.00105.8 + 1.00103.8
 - /controls/engines/engine[0]/throttle-man + /controls/engines/engine[0]/throttle-cmd-man0.00 22.4 - 1.00105.8 + 1.00103.8
 @@ -113,18 +166,21 @@ - /engines/flx-thr + + 0.97 + /engines/flx-throttle + 0.00 22.4 - 1.00105.8 + 1.00103.8
 - /controls/engines/engine[1]/throttle-man + /controls/engines/engine[1]/throttle-cmd-man0.00 22.4 - 1.00105.8 + 1.00103.8
 @@ -141,7 +197,7 @@ /controls/engines/engine[0]/throttle-cmd-cmd0.00 22.4 - 1.00105.8 + 1.00103.8
@@ -158,7 +214,7 @@ /controls/engines/engine[1]/throttle-cmd-cmd0.00 22.4 - 1.00105.8 + 1.00103.8
@@ -523,6 +579,46 @@ + + N1 Limit TOGA + gain + 1 + 0.05 + + + + + 0.97 + /controls/engines/throttle-scale + + 0.00 22.4 + 1.00103.8 +
+ + + /systems/thrust/n1/toga-lim + + + + N1 Limit MCT + gain + 1 + 0.05 + + + + + 0.94 + /controls/engines/throttle-scale + + 0.00 22.4 + 1.00103.8 +
+ + + /systems/thrust/n1/mct-lim + + N1 Limit FLX gain @@ -530,16 +626,111 @@ 0.05 - - /engines/flx-thr - 0.00 22.4 - 1.00105.8 -
+ + + 0.97 + /engines/flx-throttle + + 0.00 22.4 + 1.00103.8 +
/systems/thrust/n1/flx-lim + + N1 Limit CLB + gain + 1 + 0.05 + + + + + 0.91 + /controls/engines/throttle-scale + + 0.00 22.4 + 1.00103.8 +
+ + + /systems/thrust/n1/clb-lim + + + + Throttle Output One + gain + 1 + 0.05 + + + + + /controls/engines/thrust-limit + FLX + + + /systems/thrust/state1 + MCT + + + + + + /controls/engines/engine[0]/throttle-fdm + /engines/flx-throttle + + + + + + + /controls/engines/engine[0]/throttle-fdm + /controls/engines/throttle-scale + + + + /controls/engines/engine[0]/throttle-output + + + + Throttle Output Two + gain + 1 + 0.05 + + + + + /controls/engines/thrust-limit + FLX + + + /systems/thrust/state2 + MCT + + + + + + /controls/engines/engine[1]/throttle-fdm + /engines/flx-throttle + + + + + + + /controls/engines/engine[1]/throttle-fdm + /controls/engines/throttle-scale + + + + /controls/engines/engine[1]/throttle-output + + EGT L gain diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml index 25616a54..9335d1f9 100644 --- a/Systems/fadec-iae.xml +++ b/Systems/fadec-iae.xml @@ -20,13 +20,13 @@ /controls/engines/engine[0]/throttle-pos - 0.000.00 - 0.010.00 - 0.600.80 - 0.650.80 - 0.780.84 - 0.830.84 - 0.950.88 + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97
 @@ -42,18 +42,68 @@ /controls/engines/engine[1]/throttle-pos - 0.000.00 - 0.010.00 - 0.600.80 - 0.650.80 - 0.780.84 - 0.830.84 - 0.950.88 + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97
 /controls/engines/engine[1]/throttle-man + + + MAN CMD One + gain + 1 + 0.05 + + + + + /controls/engines/engine[0]/throttle-pos + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97 +
+ /controls/engines/throttle-scale + + + + /controls/engines/engine[0]/throttle-cmd-man + + + + MAN CMD Two + gain + 1 + 0.05 + + + + + /controls/engines/engine[1]/throttle-pos + 0.000.00 + 0.010.00 + 0.600.91 + 0.650.91 + 0.780.94 + 0.830.94 + 0.950.97 +
+ /controls/engines/throttle-scale + + + + /controls/engines/engine[1]/throttle-cmd-man + EPR Scale @@ -64,8 +114,8 @@ /position/altitude-ft - 00.444 - 420000.784 + 00.487 + 420000.721
 @@ -81,7 +131,7 @@ /position/altitude-ft - 00.992 + 00.988130000.975420000.966
@@ -101,7 +151,7 @@ /engines/engine[0]/n1 18.00.00 22.40.03 - 105.81.00 + 103.81.00 /engines/epr-scale @@ -145,7 +195,10 @@ - /engines/flx-thr + + 0.97 + /engines/flx-throttle + 0.0000.031.0001.00
@@ -155,7 +208,7 @@ - /controls/engines/engine[0]/throttle-man + /controls/engines/engine[0]/throttle-cmd-man0.0000.031.0001.00
@@ -192,7 +245,7 @@ /engines/engine[1]/n1 18.00.00 22.40.03 - 105.81.00 + 103.81.00 /engines/epr-scale @@ -236,7 +289,10 @@ - /engines/flx-thr + + 0.97 + /engines/flx-throttle + 0.0000.031.0001.00
@@ -246,7 +302,7 @@ - /controls/engines/engine[1]/throttle-man + /controls/engines/engine[1]/throttle-cmd-man0.0000.031.0001.00
@@ -382,7 +438,7 @@ /controls/engines/engine[0]/throttle-man0.00 22.4 - 1.00105.8 + 1.00103.8
 @@ -399,7 +455,7 @@ /controls/engines/engine[1]/throttle-man0.00 22.4 - 1.00105.8 + 1.00103.8
 @@ -740,7 +796,10 @@ - 0.88 + + 0.97 + /controls/engines/throttle-scale + 0.0000.031.0001.00
@@ -774,7 +833,10 @@ - 0.84 + + 0.94 + /controls/engines/throttle-scale + 0.0000.031.0001.00
@@ -808,7 +870,10 @@ - /engines/flx-thr + + 0.97 + /engines/flx-throttle + 0.0000.031.0001.00
@@ -842,7 +907,10 @@ - 0.80 + + 0.91 + /controls/engines/throttle-scale + 0.0000.031.0001.00
@@ -868,6 +936,78 @@ /systems/thrust/epr/clb-lim + + Throttle Output One + gain + 1 + 0.05 + + + + + /controls/engines/thrust-limit + FLX + + + /systems/thrust/state1 + MCT + + + + + + /controls/engines/engine[0]/throttle-fdm + /engines/flx-throttle + + + + + + + /controls/engines/engine[0]/throttle-fdm + /controls/engines/throttle-scale + + + + /controls/engines/engine[0]/throttle-output + + + + Throttle Output Two + gain + 1 + 0.05 + + + + + /controls/engines/thrust-limit + FLX + + + /systems/thrust/state2 + MCT + + + + + + /controls/engines/engine[1]/throttle-fdm + /engines/flx-throttle + + + + + + + /controls/engines/engine[1]/throttle-fdm + /controls/engines/throttle-scale + + + + /controls/engines/engine[1]/throttle-output + + EGT L gain diff --git a/Systems/fcs.xml b/Systems/fcs.xml index 66adfd3e..c8ff8866 100644 --- a/Systems/fcs.xml +++ b/Systems/fcs.xml @@ -102,14 +102,14 @@ - /controls/engines/engine[0]/throttle-fdm + /controls/engines/engine[0]/throttle-output 1 fcs/throttle-cmd-norm fcs/throttle-pos-norm - /controls/engines/engine[1]/throttle-fdm + /controls/engines/engine[1]/throttle-output 1 fcs/throttle-cmd-norm[1] fcs/throttle-pos-norm[1] diff --git a/Systems/libraries.xml b/Systems/libraries.xml index e7603ce0..9c97fb54 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -8,22 +8,41 @@ - - Flex Derate - gain - 1 - 0.05 - - - - /FMGC/internal/flex-cmd - 00.00 - 700.12 -
- - - /engines/flex-derate - + + OAT Thrust Scale + gain + 1 + 0.05 + + + + /environment/temperature-degc + 700.790 + 400.815 + -601.000 +
+ + + /controls/engines/throttle-scale + + + + FLX Thrust Scale + gain + 1 + 0.05 + + + + /FMGC/internal/flex + 700.790 + 400.815 + -601.000 +
+ + + /engines/flx-throttle + FF 1 diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml index 5b4602fb..1a191336 100644 --- a/Systems/v2500-sound.xml +++ b/Systems/v2500-sound.xml @@ -210,9 +210,9 @@ /engines/engine[0]/n10.01 - 0.75 0.00 - 0.80 0.10 - 1.08 0.80 + 0.65 0.00 + 0.70 0.10 + 1.02 0.80
 @@ -230,9 +230,9 @@ /engines/engine[1]/n10.01 - 0.75 0.00 - 0.80 0.10 - 1.08 0.80 + 0.65 0.00 + 0.70 0.10 + 1.02 0.80
 @@ -354,8 +354,8 @@ /engines/engine[0]/n10.01 - 0.80 0.80 - 1.08 1.28 + 0.70 0.80 + 1.02 1.28
 @@ -373,8 +373,8 @@ /engines/engine[1]/n10.01 - 0.80 0.80 - 1.08 1.28 + 0.70 0.80 + 1.02 1.28