GIT: Merge master

This commit is contained in:
Joshua Davidson 2018-05-12 11:06:44 -04:00
commit 0046cca848
23 changed files with 25065 additions and 24959 deletions

View file

@ -112,43 +112,39 @@
<electrical>
<path></path>
</electrical>
<!-- 0 is FADEC -->
<autopilot n="1">
<path>Aircraft/IDG-A32X/Systems/hydraulics.xml</path>
</autopilot>
<autopilot n="2">
<path>Aircraft/IDG-A32X/Systems/fbw-drivers.xml</path>
</autopilot>
<autopilot n="3">
<path>Aircraft/IDG-A32X/Systems/fbw-roll-yaw.xml</path>
</autopilot>
<autopilot n="4">
<path>Aircraft/IDG-A32X/Systems/fbw-pitch.xml</path>
</autopilot>
<autopilot n="5">
<autopilot n="3">
<path>Aircraft/IDG-A32X/Systems/fmgc-drivers.xml</path>
</autopilot>
<autopilot n="6">
<autopilot n="4">
<path>Aircraft/IDG-A32X/Systems/fmgc-roll-yaw.xml</path>
</autopilot>
<autopilot n="7">
<autopilot n="5">
<path>Aircraft/IDG-A32X/Systems/fmgc-pitch.xml</path>
</autopilot>
<autopilot n="8">
<autopilot n="6">
<path>Aircraft/IDG-A32X/Systems/fmgc-thrust.xml</path>
</autopilot>
<autopilot n="9">
<autopilot n="7">
<path>Aircraft/IDG-A32X/Systems/libraries.xml</path>
</autopilot>
<autopilot n="11">
<autopilot n="8">
<path>Aircraft/IDG-A32X/Systems/upper-ecam.xml</path>
</autopilot>
<autopilot n="12">
<autopilot n="9">
<path>Aircraft/IDG-A32X/Systems/lower-ecam.xml</path>
</autopilot>
<autopilot n="13">
<!-- 10 is sound -->
<autopilot n="11">
<path>Aircraft/IDG-A32X/Systems/pfd.xml</path>
</autopilot>
<autopilot n="14">
<autopilot n="12">
<path>Aircraft/IDG-A32X/Systems/zoom-views.xml</path>
</autopilot>
</systems>
@ -415,6 +411,8 @@
<output>
<ap1>0</ap1>
<ap2>0</ap2>
<lat>0</lat>
<vert>0</vert>
</output>
<custom>
<show-hdg>0</show-hdg>
@ -429,6 +427,12 @@
<it-fbw n="0">
<alpha-hld type="bool">0</alpha-hld>
<law type="int">0</law>
<roll-lim type="double">33</roll-lim>
<roll-back type="bool">0</roll-back>
<protections n="0">
<overspeed type="bool">0</overspeed>
<overspeed-roll-back type="bool">0</overspeed-roll-back>
</protections>
</it-fbw>
<apu>
@ -537,13 +541,11 @@
<aileron-left>0.5</aileron-left>
<aileron-right>-0.5</aileron-right>
<elevator-input>0</elevator-input>
<elevator-fbw>0</elevator-fbw>
<elevator-left>0.1</elevator-left>
<elevator-right>0.1</elevator-right>
<elevator-trim-fdm>0.0</elevator-trim-fdm>
<flap-pos type="int">0</flap-pos>
<ground-spoilers-armed type="bool">0</ground-spoilers-armed>
<roll-fbw>0</roll-fbw>
<rudder-trim-fdm>0.0</rudder-trim-fdm>
<spoiler-l1>0.0</spoiler-l1>
<spoiler-l2>0.0</spoiler-l2>
@ -729,6 +731,7 @@
<options n="0">
<system n="0">
<keyboard-mode type="bool">0</keyboard-mode>
<laptop-mode type="bool">0</laptop-mode>
</system>
<steep-ils type="bool">0</steep-ils>
<steep-ils-avail type="bool">0</steep-ils-avail>

View file

@ -12,7 +12,6 @@
<name>aircraft-config-about</name>
<layout>vbox</layout>
<pref-width>800</pref-width>
<group>
<layout>hbox</layout>
@ -66,7 +65,7 @@
</text>
<text>
<halign>left</halign>
<label>Pre V1.0, Shared Libraries 1.4.5</label>
<label>Pre V1.0, Shared Libraries 1.5.0</label>
</text>
</group>

View file

@ -87,6 +87,7 @@ setprop("/systems/acconfig/out-of-date", 0);
setprop("/systems/acconfig/mismatch-code", "0x000");
setprop("/systems/acconfig/mismatch-reason", "XX");
setprop("/systems/acconfig/options/keyboard-mode", 0);
setprop("/systems/acconfig/options/laptop-mode", 0);
setprop("/systems/acconfig/options/adirs-skip", 0);
setprop("/systems/acconfig/options/welcome-skip", 0);
setprop("/systems/acconfig/options/pfd-rate", 1);
@ -107,7 +108,7 @@ var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircr
var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/IDG-A32X/AircraftConfig/updated.xml");
var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml");
var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml");
var du_framerate = gui.Dialog.new("sim/gui/dialogs/acconfig/du-framerate/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-framerate.xml");
var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml");
spinning.start();
init_dlg.open();
@ -127,18 +128,20 @@ setlistener("/systems/acconfig/new-revision", func {
var mismatch_chk = func {
if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201730) {
setprop("/systems/acconfig/mismatch-code", "0x121");
setprop("/systems/acconfig/mismatch-reason", "FGFS version older than 2017.3.0, please update FlightGear.");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2017.3.0.");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
print("Mismatch: 0x121");
welcome_dlg.close();
} else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) {
setprop("/systems/acconfig/mismatch-code", "0x223");
setprop("/systems/acconfig/mismatch-reason", "The aircraft position is invalid for initialization. Check your scenery.");
setprop("/systems/acconfig/mismatch-reason", "Preposterous configuration detected for initialization. Check your position or scenery.");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
print("Mismatch: 0x223");
welcome_dlg.close();
} else if (getprop("/systems/acconfig/libraries-loaded") != 1) {
setprop("/systems/acconfig/mismatch-code", "0x247");
setprop("/systems/acconfig/mismatch-reason", "System files are missing or damaged. Please download a new copy of the aircraft.");
@ -146,6 +149,7 @@ var mismatch_chk = func {
error_mismatch.open();
}
print("Mismatch: 0x247");
welcome_dlg.close();
}
}
@ -170,11 +174,13 @@ setlistener("/sim/signals/fdm-initialized", func {
var readSettings = func {
io.read_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options");
setprop("/options/system/keyboard-mode", getprop("/systems/acconfig/options/keyboard-mode"));
setprop("/options/system/laptop-mode", getprop("/systems/acconfig/options/laptop-mode"));
setprop("/controls/adirs/skip", getprop("/systems/acconfig/options/adirs-skip"));
}
var writeSettings = func {
setprop("/systems/acconfig/options/keyboard-mode", getprop("/options/system/keyboard-mode"));
setprop("/systems/acconfig/options/laptop-mode", getprop("/options/system/laptop-mode"));
setprop("/systems/acconfig/options/adirs-skip", getprop("/controls/adirs/skip"));
io.write_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options");
}

View file

@ -10,14 +10,14 @@
<PropertyList>
<name>aircraft-config-du-framerate</name>
<name>aircraft-config-du-quality</name>
<layout>vbox</layout>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>DU Framerate</label>
<label>DU Quality</label>
</text>
<button>
<halign>right</halign>
@ -49,7 +49,7 @@
<text>
<halign>left</halign>
<label>Here you can adjust the framerate of the Display Units. 1 = Best Quality, 5 = Best Performance</label>
<label>Here you can adjust the quality of the Display Units. 1 = Best Quality, 5 = Best Performance</label>
</text>
<group>

View file

@ -23,7 +23,7 @@
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>Error: Mismatch</label>
<label>Something Happened!</label>
</text>
</group>
@ -41,7 +41,7 @@
<text>
<halign>left</halign>
<label>A configuration error or internal error has occurred. The aircraft has been disabled.</label>
<label>Something happened and an internal error has occurred. The aircraft has been disabled.</label>
</text>
<text>
<halign>left</halign>

View file

@ -53,6 +53,11 @@
<label>Keyboard Mode: Maps flight controls to number pad, and number rows, instead of view shortucts.</label>
</text>
<text>
<halign>left</halign>
<label>Laptop Mode: Not implemented yet. When implemented, will allow easier operation on laptops.</label>
</text>
<hrule/>
<text>

View file

@ -17,8 +17,23 @@
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>Aircraft Configuration V1.4.5</label>
<label>Aircraft Configuration V1.5.0</label>
</text>
<empty><stretch>1</stretch></empty>
<button>
<row>0</row>
<col>0</col>
<halign>right</halign>
<pref-width>20</pref-width>
<pref-height>20</pref-height>
<legend>?</legend>
<binding>
<command>nasal</command>
<script>
acconfig.help_dlg.open();
</script>
</binding>
</button>
<button>
<halign>right</halign>
<pref-width>20</pref-width>
@ -66,23 +81,23 @@
</button>
<button>
<halign>center</halign>
<legend>Aircraft Help</legend>
<legend>DU Quality</legend>
<pref-width>140</pref-width>
<binding>
<command>nasal</command>
<script>
acconfig.help_dlg.open();
acconfig.du_quality.open();
</script>
</binding>
</button>
<button>
<halign>center</halign>
<legend>DU Framerate</legend>
<legend>About Aircraft</legend>
<pref-width>140</pref-width>
<binding>
<command>nasal</command>
<script>
acconfig.du_framerate.open();
acconfig.about_dlg.open();
</script>
</binding>
</button>
@ -357,6 +372,29 @@
<live>true</live>
</checkbox>
<checkbox>
<label>Laptop Mode (See Aircraft Help)</label>
<halign>left</halign>
<enable>
<property>/systems/acconfig/extra-stuff</property>
</enable>
<property>/options/system/laptop-mode</property>
<binding>
<command>property-toggle</command>
<property>/options/system/laptop-mode</property>
</binding>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
acconfig.writeSettings();
</script>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>Skip ADIRS Alignment</label>
<halign>left</halign>

View file

@ -19,6 +19,21 @@
<halign>left</halign>
<label>Welcome!</label>
</text>
<empty><stretch>1</stretch></empty>
<button>
<row>0</row>
<col>0</col>
<halign>right</halign>
<pref-width>20</pref-width>
<pref-height>20</pref-height>
<legend>?</legend>
<binding>
<command>nasal</command>
<script>
acconfig.help_dlg.open();
</script>
</binding>
</button>
<button>
<halign>right</halign>
<pref-width>20</pref-width>

View file

@ -4931,11 +4931,29 @@
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-lever</property>
<factor>-60</factor>
<offset-deg>28</offset-deg>
<center>
<x-m>0.103496</x-m>
<y-m>-0.080651</y-m>
<z-m>-0.143532</z-m>
</center>
<axis>
<x>0</x>
<y>-1</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-lever</property>
<factor>0.052</factor>
<factor>0.050</factor>
<axis>
<x>1</x>
<y>0</y>
@ -4947,7 +4965,7 @@
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-arm</property>
<factor>-0.005</factor>
<factor>-0.00125</factor>
<axis>
<x>1</x>
<y>0</y>
@ -4955,6 +4973,18 @@
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-arm</property>
<factor>0.006</factor>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<!-- Sidestick Left -->
<animation>
<type>rotate</type>

File diff suppressed because it is too large Load diff

View file

@ -4356,9 +4356,8 @@
</or>
</and>
</condition>
<command>property-assign</command>
<command>property-toggle</command>
<property>systems/pressurization/ditchingpb</property>
<value>1</value>
</binding>
<binding>
<condition>

69
Models/Tablet/Tablet.nas Normal file
View file

@ -0,0 +1,69 @@
# IDG Tablet
# Joshua Davidson (it0uchpods)
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
var Tablet1 = nil;
var Tablet_1 = nil;
var canvas_tablet_base = {
init: func(canvas_group, file = nil) {
var font_mapper = func(family, weight) {
return "LiberationFonts/LiberationSans-Regular.ttf";
};
if (file != nil) {
canvas.parsesvg(canvas_group, file, {"font-mapper": font_mapper});
var svg_keys = me.getKeys();
foreach(var key; svg_keys) {
me[key] = canvas_group.getElementById(key);
}
}
me.page = canvas_group;
return me;
},
getKeys: func() {
return [];
},
update: func() {
},
};
var canvas_Tablet_1 = {
new: func(canvas_group, file) {
var m = {parents: [canvas_Tablet_1, canvas_tablet_base]};
m.init(canvas_group, file);
return m;
},
getKeys: func() {
return [];
},
update: func() {
},
};
setlistener("sim/signals/fdm-initialized", func {
Tablet1 = canvas.new({
"name": "Tablet1",
"size": [1920, 1280],
"view": [1920, 1280],
"mipmapping": 1
});
Tablet1.addPlacement({"node": "Tablet.screen"});
var group_tablet1 = Tablet1.createGroup();
Tablet_1 = canvas_Tablet_1.new(group_tablet1, "Aircraft/IDG-A32X/Models/Tablet/res/screen.svg");
});
var showTablet = func() {
var dlg = canvas.Window.new([768, 512], "dialog");
dlg.setCanvas(Tablet1);
}

View file

@ -519,7 +519,7 @@
<property>metrics/Sw-sqft</property>
<property>metrics/bw-ft</property>
<property>fcs/rudder-pos-rad</property>
<value>-0.053</value>
<value>0.053</value>
</product>
</function>

File diff suppressed because it is too large Load diff

View file

@ -13,33 +13,33 @@
<name>autopilot</name>
<layout>vbox</layout>
<pref-width>260</pref-width>
<pref-width>260</pref-width>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>IT-AUTOFLIGHT System (A3XX)</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>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>IT-AUTOFLIGHT System (A3XX)</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/>
<hrule/>
<group>
<layout>hbox</layout>
<button>
<legend>AP1</legend>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<binding>
<command>property-toggle</command>
<property>/it-autoflight/input/ap1</property>
@ -47,7 +47,7 @@
</button>
<button>
<legend>AP2</legend>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<binding>
<command>property-toggle</command>
<property>/it-autoflight/input/ap2</property>
@ -55,7 +55,7 @@
</button>
<button>
<legend>FD1</legend>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<binding>
<command>property-toggle</command>
<property>/it-autoflight/input/fd1</property>
@ -63,7 +63,7 @@
</button>
<button>
<legend>FD2</legend>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<binding>
<command>property-toggle</command>
<property>/it-autoflight/input/fd2</property>
@ -336,8 +336,8 @@
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<enable>
<and>
@ -363,8 +363,8 @@
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<enable>
<and>
@ -391,7 +391,7 @@
<input>
<row>0</row>
<col>3</col>
<pref-width>50</pref-width>
<pref-width>50</pref-width>
<property>/it-autoflight/input/spd-kts</property>
<live type="bool">true</live>
<enable>
@ -414,8 +414,8 @@
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<enable>
<and>
@ -442,8 +442,8 @@
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<enable>
<and>
@ -481,8 +481,8 @@
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<enable>
<and>
@ -508,8 +508,8 @@
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<enable>
<and>
@ -536,7 +536,7 @@
<input>
<row>0</row>
<col>3</col>
<pref-width>50</pref-width>
<pref-width>50</pref-width>
<property>/it-autoflight/input/spd-mach</property>
<live type="bool">true</live>
<enable>
@ -559,8 +559,8 @@
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<enable>
<and>
@ -587,8 +587,8 @@
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<enable>
<and>
@ -672,8 +672,8 @@
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<enable>
<equals>
@ -693,8 +693,8 @@
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<enable>
<equals>
@ -715,7 +715,7 @@
<input>
<row>0</row>
<col>3</col>
<pref-width>40</pref-width>
<pref-width>40</pref-width>
<property>/it-autoflight/input/hdg</property>
<live type="bool">true</live>
<enable>
@ -732,8 +732,8 @@
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<enable>
<equals>
@ -754,8 +754,8 @@
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<enable>
<equals>
@ -815,7 +815,7 @@
</button>
<button>
<pref-width>75</pref-width>
<pref-width>75</pref-width>
<legend>EXPED</legend>
<enable>
<property>/systems/unused/unused-button</property>
@ -897,7 +897,7 @@
</button>
<button>
<pref-width>75</pref-width>
<pref-width>75</pref-width>
<legend>APPR</legend>
<binding>
<command>property-assign</command>
@ -919,8 +919,8 @@
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<binding>
<command>property-adjust</command>
@ -934,8 +934,8 @@
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<binding>
<command>property-adjust</command>
@ -950,7 +950,7 @@
<input>
<row>0</row>
<col>3</col>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<property>/it-autoflight/input/alt</property>
<live type="bool">true</live>
<binding>
@ -961,8 +961,8 @@
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<binding>
<command>property-adjust</command>
@ -977,8 +977,8 @@
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<binding>
<command>property-adjust</command>
@ -1003,8 +1003,8 @@
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<enable>
<equals>
@ -1024,8 +1024,8 @@
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<enable>
<equals>
@ -1046,7 +1046,7 @@
<input>
<row>0</row>
<col>3</col>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<property>/it-autoflight/input/vs</property>
<live type="bool">true</live>
<enable>
@ -1063,8 +1063,8 @@
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<enable>
<equals>
@ -1085,8 +1085,8 @@
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<enable>
<equals>
@ -1117,8 +1117,8 @@
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<enable>
<equals>
@ -1138,8 +1138,8 @@
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<enable>
<equals>
@ -1160,7 +1160,7 @@
<input>
<row>0</row>
<col>3</col>
<pref-width>55</pref-width>
<pref-width>55</pref-width>
<property>/it-autoflight/input/fpa</property>
<live type="bool">true</live>
<enable>
@ -1177,8 +1177,8 @@
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<enable>
<equals>
@ -1199,8 +1199,8 @@
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<enable>
<equals>

View file

@ -1,363 +0,0 @@
<?xml version="1.0"?>
<!--
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<!-- Airbus A3XX FBW System -->
<!-- Joshua Davidson (it0uchpods) -->
<PropertyList>
<!-- =============================================================== -->
<!-- Surface Position Feeding -->
<!-- =============================================================== -->
<filter>
<debug>false</debug>
<type>noise-spike</type>
<enable>
<condition>
<equals>
<property>/systems/acconfig/mismatch-code</property>
<value>0x000</value>
</equals>
</condition>
</enable>
<input>
<condition>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</condition>
<value>0</value>
</input>
<input>/controls/flight/aileron</input>
<output>/controls/flight/aileron-input-fast</output>
<max-rate-of-change>5</max-rate-of-change>
</filter>
<filter>
<debug>false</debug>
<type>noise-spike</type>
<enable>
<condition>
<equals>
<property>/systems/acconfig/mismatch-code</property>
<value>0x000</value>
</equals>
</condition>
</enable>
<input>
<condition>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</condition>
<value>0</value>
</input>
<input>/controls/flight/elevator</input>
<output>/controls/flight/elevator-input-fast</output>
<max-rate-of-change>5</max-rate-of-change>
</filter>
<filter>
<debug>false</debug>
<type>noise-spike</type>
<enable>
<condition>
<equals>
<property>/systems/acconfig/mismatch-code</property>
<value>0x000</value>
</equals>
</condition>
</enable>
<input>
<condition>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</condition>
<property>/it-autoflight/internal/aileron-cmd</property>
</input>
<input>
<expression>
<table>
<property>/controls/flight/aileron</property>
<entry><ind>-1.00</ind><dep>-1</dep></entry>
<entry><ind>-0.04</ind><dep> 0</dep></entry>
<entry><ind> 0.00</ind><dep> 0</dep></entry>
<entry><ind> 0.04</ind><dep> 0</dep></entry>
<entry><ind> 1.00</ind><dep> 1</dep></entry>
</table>
</expression>
</input>
<output>/controls/flight/aileron-input</output>
<max-rate-of-change>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<value>1.0</value>
</max-rate-of-change>
<max-rate-of-change>5</max-rate-of-change>
</filter>
<filter>
<debug>false</debug>
<type>noise-spike</type>
<enable>
<condition>
<equals>
<property>/systems/acconfig/mismatch-code</property>
<value>0x000</value>
</equals>
</condition>
</enable>
<input>
<condition>
<and>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
<less-than-equals>
<property>/position/gear-agl-ft</property>
<value>30</value>
</less-than-equals>
<greater-than-equals>
<property>/controls/flight/flap-pos</property>
<value>4</value>
</greater-than-equals>
<less-than>
<property>/controls/engines/engine[0]/throttle</property>
<value>0.65</value>
</less-than>
<less-than>
<property>/controls/engines/engine[1]/throttle</property>
<value>0.65</value>
</less-than>
<equals>
<property>/FMGC/status/to-state</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[0]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/controls/flight/elevator</property>
<entry><ind>-1.00</ind><dep>-1</dep></entry>
<entry><ind>-0.04</ind><dep> 0</dep></entry>
<entry><ind> 0.00</ind><dep> 0</dep></entry>
<entry><ind> 0.04</ind><dep> 0</dep></entry>
<entry><ind> 1.00</ind><dep> 1</dep></entry>
</table>
<table>
<property>/position/gear-agl-ft</property>
<entry><ind> 5</ind><dep>0.20</dep></entry>
<entry><ind>30</ind><dep>0.10</dep></entry>
</table>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
<less-than-equals>
<property>/position/gear-agl-ft</property>
<value>30</value>
</less-than-equals>
<greater-than-equals>
<property>/controls/flight/flap-pos</property>
<value>4</value>
</greater-than-equals>
<less-than>
<property>/controls/engines/engine[0]/throttle</property>
<value>0.65</value>
</less-than>
<less-than>
<property>/controls/engines/engine[1]/throttle</property>
<value>0.65</value>
</less-than>
<equals>
<property>/FMGC/status/to-state</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[0]/wow</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
<expression>
<sum>
<table>
<property>/controls/flight/elevator</property>
<entry><ind>-1.00</ind><dep>-1</dep></entry>
<entry><ind>-0.04</ind><dep> 0</dep></entry>
<entry><ind> 0.00</ind><dep> 0</dep></entry>
<entry><ind> 0.04</ind><dep> 0</dep></entry>
<entry><ind> 1.00</ind><dep> 1</dep></entry>
</table>
<value>0.15</value>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<property>/it-autoflight/internal/elevator-cmd</property>
</input>
<input>
<condition>
<and>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
<value>0.0</value>
</input>
<input>
<expression>
<table>
<property>/controls/flight/elevator</property>
<entry><ind>-1.00</ind><dep>-1</dep></entry>
<entry><ind>-0.04</ind><dep> 0</dep></entry>
<entry><ind> 0.00</ind><dep> 0</dep></entry>
<entry><ind> 0.04</ind><dep> 0</dep></entry>
<entry><ind> 1.00</ind><dep> 1</dep></entry>
</table>
</expression>
</input>
<output>/controls/flight/elevator-input</output>
<max-rate-of-change>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<value>1.0</value>
</max-rate-of-change>
<max-rate-of-change>5</max-rate-of-change>
</filter>
</PropertyList>

View file

@ -6,675 +6,69 @@
##############################################
-->
<!-- Airbus A3XX FBW System -->
<!-- Airbus A320 FBW System -->
<!-- Joshua Davidson (it0uchpods) -->
<!-- I didn't see an easy way to do this controller in JSBsim, so I keep it here -->
<PropertyList>
<!-- =============================================================== -->
<!-- Vertical -->
<!-- =============================================================== -->
<filter>
<name>IT-CONTROLLER: LOAD FACTOR CMD</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<sum>
<table>
<property>/controls/flight/elevator-input</property>
<entry><ind> 1</ind><dep>-0.5</dep></entry>
<entry><ind> 0</ind><dep> 1.0</dep></entry>
<entry><ind>-1</ind><dep> 2.5</dep></entry>
</table>
</sum>
</expression>
</input>
<output>/it-fbw/g-target</output>
<min>
<condition>
<not-equals>
<property>/controls/flight/flap-pos</property>
<value>0</value>
</not-equals>
</condition>
<value>0.0</value>
</min>
<min>-1.0</min>
<max>
<condition>
<not-equals>
<property>/controls/flight/flap-pos</property>
<value>0</value>
</not-equals>
</condition>
<value>2.0</value>
</max>
<max>2.5</max>
</filter>
<filter>
<name>IT-CONTROLLER: COMPUTED G</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<sum>
<property>/accelerations/pilot-gdamped</property>
<div>
<value>-1</value>
<cos>
<deg2rad>
<product>
<property>/orientation/roll-deg</property>
<value>0.965</value>
</product>
</deg2rad>
</cos>
</div>
<value>1</value>
</sum>
</expression>
</input>
<output>/it-fbw/g-computed</output>
</filter>
<filter>
<name>IT-CONTROLLER: G ERROR</name>
<type>gain</type>
<gain>-1.0</gain>
<input>
<expression>
<dif>
<property>/it-fbw/g-target</property>
<property>/it-fbw/g-computed</property>
</dif>
</expression>
</input>
<output>/it-fbw/g-error</output>
</filter>
<pi-simple-controller>
<name>IT-CONTROLLER: G ELEVATOR</name>
<name>FBW PITCH G PI</name>
<debug>false</debug>
<enable>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
</enable>
<input>
<property>/it-fbw/g-error</property>
<property>/fdm/jsbsim/fbw/pitch/g-error</property>
</input>
<reference>
<value>0</value>
</reference>
<output>
<property>/it-fbw/g-elevator-cmd</property>
<property>/fdm/jsbsim/fbw/pitch/g-pi</property>
</output>
<config>
<Kp>-1.5</Kp>
<Ki>-1.5</Ki>
<Ki>
<condition>
<and>
<equals>
<property>/fdm/jsbsim/position/wow</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
<value>-1.5</value>
</Ki>
<Ki>0.0</Ki>
<min>
<condition>
<less-than>
<property>/controls/flight/elevator-input</property>
<property>/fdm/jsbsim/fbw/pitch/e-i</property>
<value>0</value>
</less-than>
</condition>
<property>/controls/flight/elevator-input</property>
<property>/fdm/jsbsim/fbw/pitch/e-i</property>
</min>
<min>0.0</min>
<max>
<condition>
<greater-than>
<property>/controls/flight/elevator-input</property>
<property>/fdm/jsbsim/fbw/pitch/e-i</property>
<value>0</value>
</greater-than>
</condition>
<property>/controls/flight/elevator-input</property>
<property>/fdm/jsbsim/fbw/pitch/e-i</property>
</max>
<max>0.0</max>
</config>
</pi-simple-controller>
<filter>
<name>IT-CONTROLLER: G ELEVATOR INVERT</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<less-than-equals>
<property>/orientation/roll-deg</property>
<value>90</value>
</less-than-equals>
<greater-than-equals>
<property>/orientation/roll-deg</property>
<value>-90</value>
</greater-than-equals>
</and>
</condition>
<property>/it-fbw/g-elevator-cmd</property>
</input>
<input>
<property>/it-fbw/g-elevator-cmd</property>
<scale>-1.0</scale>
</input>
<output>/it-fbw/g-elevator</output>
</filter>
<filter>
<name>IT-CONTROLLER: PITCH RATE CMD</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<not-equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</not-equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 1</ind><dep>-5.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind>-1</ind><dep> 5.0</dep></entry>
</table>
<product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>-15.00000</ind><dep>1</dep></entry>
<entry><ind>-14.99999</ind><dep>0</dep></entry>
</table>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind>1</ind><dep>5.0</dep></entry>
<entry><ind>0</ind><dep>0.0</dep></entry>
</table>
</product>
<product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>29.99999</ind><dep>0</dep></entry>
<entry><ind>30.00000</ind><dep>1</dep></entry>
</table>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind>-1</ind><dep>-5.0</dep></entry>
</table>
</product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>-18</ind><dep> 5</dep></entry>
<entry><ind>-15</ind><dep> 0</dep></entry>
<entry><ind> 30</ind><dep> 0</dep></entry>
<entry><ind> 33</ind><dep>-5</dep></entry>
</table>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<not-equals>
<property>/it-fbw/law</property>
<value>0</value>
</not-equals>
<not-equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</not-equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 1</ind><dep>-5.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind>-1</ind><dep> 5.0</dep></entry>
</table>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 0.0</ind><dep> 1.5</dep></entry>
<entry><ind>-1.0</ind><dep> 5.0</dep></entry>
</table>
<product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>29.99999</ind><dep>0</dep></entry>
<entry><ind>30.00000</ind><dep>1</dep></entry>
</table>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 0</ind><dep>-1.5</dep></entry>
<entry><ind>-1</ind><dep>-5.0</dep></entry>
</table>
</product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind> 30</ind><dep> 0</dep></entry>
<entry><ind> 33</ind><dep>-5</dep></entry>
</table>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<not-equals>
<property>/it-fbw/law</property>
<value>0</value>
</not-equals>
<equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 1.0</ind><dep>-3.5</dep></entry>
<entry><ind> 0.0</ind><dep> 1.5</dep></entry>
<entry><ind>-1.0</ind><dep> 5.0</dep></entry>
</table>
<product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>-15.00000</ind><dep>1</dep></entry>
<entry><ind>-14.99999</ind><dep>0</dep></entry>
</table>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind>1</ind><dep> 3.5</dep></entry>
<entry><ind>0</ind><dep>-1.5</dep></entry>
</table>
</product>
<product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>29.99999</ind><dep>0</dep></entry>
<entry><ind>30.00000</ind><dep>1</dep></entry>
</table>
<table>
<property>/it-fbw/g-elevator</property>
<entry><ind> 0</ind><dep>-1.5</dep></entry>
<entry><ind>-1</ind><dep>-5.0</dep></entry>
</table>
</product>
<table>
<property>/orientation/pitch-deg</property>
<entry><ind>-18</ind><dep> 5</dep></entry>
<entry><ind>-15</ind><dep> 0</dep></entry>
<entry><ind> 30</ind><dep> 0</dep></entry>
<entry><ind> 33</ind><dep>-5</dep></entry>
</table>
</sum>
</expression>
</input>
<output>/it-fbw/pitch-rate</output>
</filter>
<filter>
<name>IT-CONTROLLER: PITCH KP (P Gain)</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/velocities/mach</property>
<entry><ind>0.2</ind><dep>-0.31</dep></entry>
<entry><ind>0.9</ind><dep>-0.15</dep></entry>
</table>
</expression>
</input>
<output>/it-fbw/pitch-kp</output>
</filter>
<filter>
<name>IT-CONTROLLER: PITCH TI (I Time)</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/velocities/mach</property>
<entry><ind>0.2</ind><dep>0.75</dep></entry>
<entry><ind>0.9</ind><dep>0.55</dep></entry>
</table>
</expression>
</input>
<output>/it-fbw/pitch-ti</output>
</filter>
<pid-controller>
<name>IT-CONTROLLER: PITCH</name>
<debug>false</debug>
<enable>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
</enable>
<input>
<property>/orientation/pitch-rate-degps</property>
</input>
<reference>
<property>/it-fbw/pitch-rate</property>
</reference>
<output>
<property>/controls/flight/elevator-fbw-pid</property>
</output>
<config>
<Kp>
<property>/it-fbw/pitch-kp</property>
</Kp>
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
<Ti>
<property>/it-fbw/pitch-ti</property>
</Ti>
<Td>0.005</Td>
<u_min>-1</u_min>
<u_max>1</u_max>
</config>
</pid-controller>
<filter>
<name>IT-CONTROLLER: ELEVATOR INVERT</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<less-than-equals>
<property>/orientation/roll-deg</property>
<value>90</value>
</less-than-equals>
<greater-than-equals>
<property>/orientation/roll-deg</property>
<value>-90</value>
</greater-than-equals>
</and>
</condition>
<property>/controls/flight/elevator-fbw-pid</property>
</input>
<input>
<property>/controls/flight/elevator-fbw-pid</property>
<scale>-1.0</scale>
</input>
<output>/controls/flight/elevator-fbw-cmd</output>
</filter>
<filter>
<name>IT-CONTROLLER: PITCH OPTION</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<feedback-if-disabled>true</feedback-if-disabled>
<initialize-to>output</initialize-to>
<input>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
<property>/controls/flight/elevator-fbw-cmd</property>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>2</value>
</equals>
</or>
</and>
</condition>
<property>/controls/flight/elevator-input-fast</property>
</input>
<input>
<condition>
<and>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
</or>
</and>
</condition>
<value>0.1</value>
</input>
<input>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>3</value>
</equals>
</condition>
<value>0</value>
</input>
<output>/controls/flight/elevator-fbw</output>
</filter>
<filter>
<name>IT-CONTROLLER: PITCH TRIM</name>
<debug>false</debug>
<initialize-to>output</initialize-to>
<type>noise-spike</type>
<enable>
<condition>
<and>
<or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>1</value>
</equals>
</or>
<or>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>100</value>
</greater-than-equals>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</and>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
</and>
</or>
<less-than>
<property>/orientation/roll-deg</property>
<value>40</value>
</less-than>
<greater-than>
<property>/orientation/roll-deg</property>
<value>-40</value>
</greater-than>
<or>
<greater-than>
<property>/controls/flight/elevator-fbw</property>
<value>0.01</value>
</greater-than>
<less-than>
<property>/controls/flight/elevator-fbw</property>
<value>-0.01</value>
</less-than>
</or>
<less-than>
<property>/fdm/jsbsim/forces/load-factor</property>
<value>-0.5</value>
</less-than>
<not-equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</not-equals>
</and>
</condition>
</enable>
<input>
<condition>
<greater-than>
<property>/controls/flight/elevator-fbw</property>
<value>0.01</value>
</greater-than>
</condition>
<value>1</value>
</input>
<input>
<condition>
<less-than>
<property>/controls/flight/elevator-fbw</property>
<value>-0.01</value>
</less-than>
</condition>
<value>-1</value>
</input>
<output>/controls/flight/elevator-trim</output>
<min>-1.0</min>
<max>0.32</max>
<max-rate-of-change>0.01</max-rate-of-change>
</filter>
</PropertyList>

View file

@ -1,747 +0,0 @@
<?xml version="1.0"?>
<!--
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<!-- Airbus A3XX FBW System -->
<!-- Joshua Davidson (it0uchpods) -->
<PropertyList>
<!-- =============================================================== -->
<!-- Lateral -->
<!-- =============================================================== -->
<filter>
<name>IT-CONTROLLER: ROLL</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/roll-lim</property>
<value>33</value>
</equals>
<not-equals>
<property>/it-fbw/roll-back</property>
<value>1</value>
</not-equals>
<not-equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</not-equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>-1</ind><dep>-15.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind> 1</ind><dep> 15.0</dep></entry>
</table>
<product>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>-33.00000</ind><dep>1</dep></entry>
<entry><ind>-32.99999</ind><dep>0</dep></entry>
</table>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>-1</ind><dep>15.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
</table>
</product>
<product>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>32.99999</ind><dep>0</dep></entry>
<entry><ind>33.00000</ind><dep>1</dep></entry>
</table>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>0</ind><dep> 0.0</dep></entry>
<entry><ind>1</ind><dep>-15.0</dep></entry>
</table>
</product>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/roll-lim</property>
<value>67</value>
</equals>
<not-equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</not-equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>-1</ind><dep>-15.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind> 1</ind><dep> 15.0</dep></entry>
</table>
<product>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>-67.00000</ind><dep>1</dep></entry>
<entry><ind>-66.99999</ind><dep>0</dep></entry>
</table>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>-1</ind><dep>15.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
</table>
</product>
<product>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>66.99999</ind><dep>0</dep></entry>
<entry><ind>67.00000</ind><dep>1</dep></entry>
</table>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>0</ind><dep> 0.0</dep></entry>
<entry><ind>1</ind><dep>-15.0</dep></entry>
</table>
</product>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/roll-back</property>
<value>1</value>
</equals>
<not-equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</not-equals>
</and>
</condition>
<expression>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>-67</ind><dep> 25.0</dep></entry>
<entry><ind>-40</ind><dep> 10.0</dep></entry>
<entry><ind>-33</ind><dep> 0.0</dep></entry>
<entry><ind> 33</ind><dep> 0.0</dep></entry>
<entry><ind> 40</ind><dep>-10.0</dep></entry>
<entry><ind> 67</ind><dep>-25.0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</equals>
<not-equals>
<property>/it-fbw/protections/overspeed-roll-back</property>
<value>1</value>
</not-equals>
</and>
</condition>
<expression>
<sum>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>-1</ind><dep>-15.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind> 1</ind><dep> 15.0</dep></entry>
</table>
<product>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>-40.00000</ind><dep>1</dep></entry>
<entry><ind>-39.99999</ind><dep>0</dep></entry>
</table>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>-1</ind><dep>15.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
</table>
</product>
<product>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>39.99999</ind><dep>0</dep></entry>
<entry><ind>40.00000</ind><dep>1</dep></entry>
</table>
<table>
<property>/controls/flight/aileron-input</property>
<entry><ind>0</ind><dep> 0.0</dep></entry>
<entry><ind>1</ind><dep>-15.0</dep></entry>
</table>
</product>
</sum>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-fbw/protections/overspeed</property>
<value>1</value>
</equals>
<equals>
<property>/it-fbw/protections/overspeed-roll-back</property>
<value>1</value>
</equals>
</and>
</condition>
<expression>
<table>
<property>/orientation/roll-deg</property>
<entry><ind>-40</ind><dep> 25.0</dep></entry>
<entry><ind>-15</ind><dep> 10.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind> 15</ind><dep>-10.0</dep></entry>
<entry><ind> 40</ind><dep>-25.0</dep></entry>
</table>
</expression>
</input>
<output>/it-fbw/roll-rate</output>
</filter>
<filter>
<name>IT-CONTROLLER: ROLL KP (P Gain)</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/velocities/mach</property>
<entry><ind>0.2</ind><dep>0.13</dep></entry>
<entry><ind>0.9</ind><dep>0.06</dep></entry>
</table>
</expression>
</input>
<output>/it-fbw/roll-kp</output>
</filter>
<filter>
<name>IT-CONTROLLER: ROLL TI (I Time)</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/velocities/mach</property>
<entry><ind>0.2</ind><dep>0.75</dep></entry>
<entry><ind>0.9</ind><dep>0.65</dep></entry>
</table>
</expression>
</input>
<output>/it-fbw/roll-ti</output>
</filter>
<pid-controller>
<name>IT-CONTROLLER: ROLL</name>
<debug>false</debug>
<enable>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
</and>
</condition>
</enable>
<input>
<property>/orientation/roll-rate-degps</property>
</input>
<reference>
<property>/it-fbw/roll-rate</property>
</reference>
<output>
<property>/controls/flight/aileron-fbw-cmd</property>
</output>
<config>
<Kp>
<property>/it-fbw/roll-kp</property>
</Kp>
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
<Ti>
<property>/it-fbw/roll-ti</property>
</Ti>
<Td>0.005</Td>
<u_min>-1</u_min>
<u_max>1</u_max>
</config>
</pid-controller>
<filter>
<name>IT-CONTROLLER: ROLL OPTION</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<feedback-if-disabled>true</feedback-if-disabled>
<initialize-to>output</initialize-to>
<input>
<condition>
<and>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
</and>
</condition>
<property>/controls/flight/aileron-fbw-cmd</property>
</input>
<input>
<condition>
<and>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>1</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>2</value>
</equals>
</or>
</and>
</condition>
<property>/controls/flight/aileron-input-fast</property>
</input>
<input>
<condition>
<and>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
</or>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
</and>
</condition>
<property>/controls/flight/rudder</property>
<scale>-1</scale>
</input>
<input>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>3</value>
</equals>
</condition>
<value>0</value>
</input>
<output>/controls/flight/roll-fbw</output>
</filter>
<filter>
<name>IT-CONTROLLER: SPOILER</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<equals>
<property>/it-fbw/roll-back</property>
<value>0</value>
</equals>
</condition>
<expression>
<product>
<property>/controls/flight/aileron-input</property>
<table>
<property>/instrumentation/airspeed-indicator/indicated-mach</property>
<entry><ind>0.2</ind><dep>1.00</dep></entry>
<entry><ind>0.9</ind><dep>0.25</dep></entry>
</table>
</product>
</expression>
</input>
<input>
<condition>
<equals>
<property>/it-fbw/roll-back</property>
<value>1</value>
</equals>
</condition>
<value>0</value>
</input>
<output>/controls/flight/spoiler-input</output>
</filter>
<filter>
<name>IT-CONTROLLER: LEFT SPOILER</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<equals>
<property>/systems/failures/aileron-left</property>
<value>0</value>
</equals>
<not-equals>
<property>/it-fbw/law</property>
<value>3</value>
</not-equals>
</and>
</condition>
<expression>
<table>
<property>/controls/flight/spoiler-input</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/systems/failures/aileron-left</property>
<value>1</value>
</equals>
<not-equals>
<property>/it-fbw/law</property>
<value>3</value>
</not-equals>
</and>
</condition>
<expression>
<table>
<property>/controls/flight/roll-fbw</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<input>0</input>
<output>/controls/flight/spoiler-left-fbw-cmd</output>
<min>-1</min>
<max>1</max>
</filter>
<filter>
<name>IT-CONTROLLER: RIGHT SPOILER</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<equals>
<property>/systems/failures/aileron-right</property>
<value>0</value>
</equals>
<not-equals>
<property>/it-fbw/law</property>
<value>3</value>
</not-equals>
</and>
</condition>
<expression>
<table>
<property>/controls/flight/spoiler-input</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<and>
<equals>
<property>/systems/failures/aileron-right</property>
<value>1</value>
</equals>
<not-equals>
<property>/it-fbw/law</property>
<value>3</value>
</not-equals>
</and>
</condition>
<expression>
<table>
<property>/controls/flight/roll-fbw</property>
<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
</table>
</expression>
</input>
<input>0</input>
<output>/controls/flight/spoiler-right-fbw-cmd</output>
<min>-1</min>
<max>1</max>
</filter>
<!-- =============================================================== -->
<!-- Yaw Damper/Turn Coordinator -->
<!-- =============================================================== -->
<filter>
<name>IT-CONTROLLER: YAW DAMPER/TURN COORDINATOR FEEDBACK IF DISABLED</name>
<enable>
<condition>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
<not-equals>
<property>/it-fbw/law</property>
<value>0</value>
</not-equals>
<greater-than-equals>
<property>/controls/flight/rudder</property>
<value>0.1</value>
</greater-than-equals>
<less-than-equals>
<property>/controls/flight/rudder</property>
<value>-0.1</value>
</less-than-equals>
<less-than>
<property>/position/gear-agl-ft</property>
<value>50</value>
</less-than>
<equals>
<property>/it-autoflight/output/lat</property>
<value>4</value>
</equals>
</or>
</condition>
</enable>
<type>gain</type>
<gain>1.0</gain>
<input>0</input>
<output>/controls/flight/rudder-fbw-cmd</output>
<min>-0.2</min>
<max>0.2</max>
</filter>
<pid-controller>
<name>IT-CONTROLLER: YAW DAMPER/TURN COORDINATOR</name>
<debug>false</debug>
<enable>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<not-equals>
<property>/it-autoflight/output/lat</property>
<value>4</value>
</not-equals>
<less-than>
<property>/controls/flight/rudder</property>
<value>0.1</value>
</less-than>
<greater-than>
<property>/controls/flight/rudder</property>
<value>-0.1</value>
</greater-than>
</and>
</condition>
</enable>
<input>
<property>/instrumentation/slip-skid-ball/indicated-slip-skid</property>
</input>
<reference>
<value>0</value>
</reference>
<output>
<property>/controls/flight/rudder-fbw-cmd</property>
</output>
<config>
<Kp>0.025</Kp>
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
<Ti>3.0</Ti>
<Td>0.00001</Td>
<u_min>-0.2</u_min>
<u_max>0.2</u_max>
</config>
</pid-controller>
<filter>
<name>IT-CONTROLLER: RUDDER OPTION</name>
<debug>false</debug>
<feedback-if-disabled>true</feedback-if-disabled>
<initialize-to>output</initialize-to>
<input>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
<less-than>
<property>/controls/flight/rudder</property>
<value>0.1</value>
</less-than>
<greater-than>
<property>/controls/flight/rudder</property>
<value>-0.1</value>
</greater-than>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<not-equals>
<property>/it-autoflight/output/lat</property>
<value>4</value>
</not-equals>
</and>
</condition>
<property>/controls/flight/rudder-fbw-cmd</property>
</input>
<input>
<condition>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
<not-equals>
<property>/it-fbw/law</property>
<value>0</value>
</not-equals>
<greater-than-equals>
<property>/controls/flight/rudder</property>
<value>0.1</value>
</greater-than-equals>
<less-than-equals>
<property>/controls/flight/rudder</property>
<value>-0.1</value>
</less-than-equals>
<less-than>
<property>/position/gear-agl-ft</property>
<value>50</value>
</less-than>
<equals>
<property>/it-autoflight/output/lat</property>
<value>4</value>
</equals>
</or>
</condition>
<property>/controls/flight/rudder</property>
</input>
<output>/controls/flight/rudder-fbw</output>
<type>noise-spike</type>
<max-rate-of-change>2.5</max-rate-of-change>
</filter>
</PropertyList>

View file

@ -657,20 +657,6 @@
<debug>false</debug>
<type>gain</type>
<gain>0.15</gain>
<enable>
<condition>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</condition>
</enable>
<input>
<property>/orientation/pitch-deg</property>
</input>
@ -678,7 +664,7 @@
<property>/it-autoflight/internal/target-pitch-deg</property>
</reference>
<output>
<property>/it-autoflight/internal/elevator-cmd</property> <!-- Inputs to the FBW Pitch Rate -->
<property>/fdm/jsbsim/fbw/fmgc/pitch-cmd</property> <!-- Inputs to the FBW Pitch Rate -->
</output>
<min>-0.3</min>
<max>0.3</max>

View file

@ -197,20 +197,6 @@
<debug>false</debug>
<type>gain</type>
<gain>-0.1</gain>
<enable>
<condition>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</condition>
</enable>
<input>
<property>/orientation/roll-deg</property>
</input>
@ -245,7 +231,7 @@
<value>0</value>
</reference>
<output>
<property>/it-autoflight/internal/aileron-cmd</property> <!-- Inputs to the FBW Roll Rate -->
<property>/fdm/jsbsim/fbw/fmgc/roll-cmd</property> <!-- Inputs to the FBW Roll Rate -->
</output>
<min>-0.32</min>
<max>0.32</max>
@ -315,20 +301,6 @@
<debug>false</debug>
<feedback-if-disabled>true</feedback-if-disabled>
<initialize-to>output</initialize-to>
<enable>
<condition>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</condition>
</enable>
<input>
<condition>
<not-equals>
@ -347,7 +319,7 @@
</condition>
<property>/it-autoflight/internal/rudder-cmd</property>
</input>
<output>/controls/flight/rudder</output>
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output>
<type>noise-spike</type>
<max-rate-of-change>0.6</max-rate-of-change>
</filter>

View file

@ -553,14 +553,7 @@
<name>TAS</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<product>
<property>/velocities/uBody-fps</property>
<value>0.592484</value>
</product>
</expression>
</input>
<input>/instrumentation/airspeed-indicator/true-speed-kt</input>
<output>/velocities/TAS</output>
</filter>

View file

@ -276,8 +276,8 @@
<product>
<table>
<product><property>/engines/engine[0]/n1-actual</property><value>0.01</value> </product>
<entry><ind>0.15</ind> <dep>0.40</dep></entry>
<entry><ind>0.22</ind> <dep>0.85</dep></entry>
<entry><ind>0.15</ind> <dep>0.50</dep></entry>
<entry><ind>0.22</ind> <dep>1.00</dep></entry>
<entry><ind>0.50</ind> <dep>1.30</dep></entry>
</table>
</product>
@ -296,8 +296,8 @@
<product>
<table>
<product><property>/engines/engine[1]/n1-actual</property><value>0.01</value> </product>
<entry><ind>0.15</ind> <dep>0.40</dep></entry>
<entry><ind>0.22</ind> <dep>0.85</dep></entry>
<entry><ind>0.15</ind> <dep>0.50</dep></entry>
<entry><ind>0.22</ind> <dep>1.00</dep></entry>
<entry><ind>0.50</ind> <dep>1.30</dep></entry>
</table>
</product>

View file

@ -1 +1 @@
4405
4408