fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into ECAM3

Browse source
This commit is contained in:
Joshua Davidson 2019-03-16 22:47:32 -04:00
commit 66976ff081
7 changed files with 147 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AircraftConfig/acconfig.nas
View file

@ -127,9 +127,9 @@ setlistener("/systems/acconfig/new-revision", func {
});
var mismatch_chk = func {
if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201810) {
if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201830) {
setprop("/systems/acconfig/mismatch-code", "0x121");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.1.0.");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.3.0.");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}

2
INSTALL.md
View file

@ -1,7 +1,7 @@
# INSTALL
## Prerequisites
Have at least following versions installed:
* FlightGear 2018.1.0 or newer
* FlightGear 2018.3.0 or newer
## Install using ZIP Snapshot
[Download](https://github.com/it0uchpods/IDG-A32X/archive/master.zip) the zip file.

17
Nasal/FMGC-b.nas
View file

@ -86,8 +86,8 @@ var Input = {
altDiff: 0,
bankLimitSW: props.globals.initNode("/it-autoflight/input/bank-limit-sw", 0, "INT"),
bankLimitSWTemp: 0,
fd1: props.globals.initNode("/it-autoflight/input/fd1", 0, "BOOL"),
fd2: props.globals.initNode("/it-autoflight/input/fd2", 0, "BOOL"),
fd1: props.globals.initNode("/it-autoflight/input/fd1", 1, "BOOL"),
fd2: props.globals.initNode("/it-autoflight/input/fd2", 1, "BOOL"),
fpa: props.globals.initNode("/it-autoflight/input/fpa", 0, "DOUBLE"),
hdg: props.globals.initNode("/it-autoflight/input/hdg", 0, "INT"),
ias: props.globals.initNode("/it-autoflight/input/spd-kts", 250, "INT"),
@ -133,9 +133,9 @@ var Output = {
apprArm: props.globals.initNode("/it-autoflight/output/appr-armed", 0, "BOOL"),
athr: props.globals.initNode("/it-autoflight/output/athr", 0, "BOOL"),
athrTemp: 0,
fd1: props.globals.initNode("/it-autoflight/output/fd1", 0, "BOOL"),
fd1: props.globals.initNode("/it-autoflight/output/fd1", 1, "BOOL"),
fd1Temp: 0,
fd2: props.globals.initNode("/it-autoflight/output/fd2", 0, "BOOL"),
fd2: props.globals.initNode("/it-autoflight/output/fd2", 1, "BOOL"),
fd2Temp: 0,
lat: props.globals.initNode("/it-autoflight/output/lat", 5, "INT"),
latTemp: 5,
@ -192,8 +192,8 @@ var ITAF = {
Input.ap1.setBoolValue(0);
Input.ap2.setBoolValue(0);
Input.athr.setBoolValue(0);
Input.fd1.setBoolValue(0);
Input.fd2.setBoolValue(0);
Input.fd1.setBoolValue(1);
Input.fd2.setBoolValue(1);
Input.hdg.setValue(360);
Input.alt.setValue(10000);
Input.vs.setValue(0);
@ -207,8 +207,8 @@ var ITAF = {
Output.ap1.setBoolValue(0);
Output.ap2.setBoolValue(0);
Output.athr.setBoolValue(0);
Output.fd1.setBoolValue(0);
Output.fd2.setBoolValue(0);
Output.fd1.setBoolValue(1);
Output.fd2.setBoolValue(1);
Output.lnavArm.setBoolValue(0);
Output.locArm.setBoolValue(0);
Output.apprArm.setBoolValue(0);
@ -861,6 +861,7 @@ var ITAF = {
if (!Output.ap1.getBoolValue() and !Output.ap2.getBoolValue() and !Output.fd1.getBoolValue() and !Output.fd2.getBoolValue()) {
me.setLatMode(9);
me.setVertMode(9);
me.setLatArm(0);
Custom.Output.fmaPower.setBoolValue(0);
} else {
Custom.Output.fmaPower.setBoolValue(1);

4
Nasal/libraries.nas
View file

@ -192,15 +192,13 @@ var systemsInit = func {
systems.fire_init();
systems.autobrake_init();
fadec.FADEC.init();
fmgc.ITAF.init();
fmgc.ITAF.init();
fmgc.FMGCinit();
mcdu.MCDU_init(0);
mcdu.MCDU_init(1);
systemsLoop.start();
icing.icingInit();
lightsLoop.start();
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
libraries.ECAM.init();
libraries.BUTTONS.init();
libraries.variousReset();

15
Systems/a320-fcs.xml
View file

@ -2031,17 +2031,18 @@
</eq>
<product>
<property>hydraulics/tiller/autopush-cmd</property>
<value>70</value>
<value>75</value>
</product>
<table>
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
<independentVar lookup="column">hydraulics/tiller/switch</independentVar>
<tableData>
-1 0 1
0.500 00.0 0.0 00.0
1.000 -70.0 0.0 70.0
30.000 -70.0 0.0 70.0
30.001 -10.0 0.0 10.0
-1 0 1
0.500 0 0 0
1.000 -75 0 75
30.000 -47 0 47
30.001 -6 0 6
135.000 0 0 0
</tableData>
</table>
</ifthen>
@ -2050,7 +2051,7 @@
<actuator name="fcs/steer-deg">
<input>hydraulics/tiller/function</input>
<rate_limit>70</rate_limit>
<rate_limit>75</rate_limit>
<output>fcs/steer-pos-deg[0]</output>
</actuator>

127
Systems/a320-ground-reactions.xml
View file

@ -9,12 +9,53 @@
<y> 0 </y>
<z> -4.31395 </z>
</location>
<static_friction> 0.4 </static_friction>
<static_friction> 1.4 </static_friction> <!-- Arbitrarily high to help nose wheel steering - no effect on braking -->
<dynamic_friction> 0.6 </dynamic_friction>
<rolling_friction> 0.02 </rolling_friction>
<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
<max_steer unit="DEG"> 70 </max_steer>
<max_steer unit="DEG"> 75 </max_steer>
<table name="CORNERING_COEFF" type="internal">
<tableData> <!-- jsbsim-pacejka.py 3.0 0.03 2.85 1.4 1.03 1.4 -->
-90.0 -0.64429852792097750
-85.0 -0.65803784878515970
-80.0 -0.67367546323532410
-75.0 -0.69148835376736980
-70.0 -0.71179130570975040
-65.0 -0.73493212105552120
-60.0 -0.76127441823995780
-55.0 -0.79115479580170660
-50.0 -0.82478835297656280
-45.0 -0.86207184328003720
-40.0 -0.90218731471298370
-35.0 -0.94282786495867110
-30.0 -0.97874912755212280
-25.0 -0.99927325792190310
-20.0 -0.98471983766820350
-15.0 -0.90363984864415470
-10.0 -0.71770750752441240
-5.0 -0.40543502538657494
0.0 0.00000000000000000
5.0 0.40543502538657494
10.0 0.71770750752441240
15.0 0.90363984864415470
20.0 0.98471983766820350
25.0 0.99927325792190310
30.0 0.97874912755212280
35.0 0.94282786495867110
40.0 0.90218731471298370
45.0 0.86207184328003720
50.0 0.82478835297656280
55.0 0.79115479580170660
60.0 0.76127441823995780
65.0 0.73493212105552120
70.0 0.71179130570975040
75.0 0.69148835376736980
80.0 0.67367546323532410
85.0 0.65803784878515970
90.0 0.64429852792097750
</tableData>
</table>
<brake_group> NONE </brake_group>
<retractable> 1 </retractable>
</contact>
@ -30,6 +71,47 @@
<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<table name="CORNERING_COEFF" type="internal">
<tableData> <!-- jsbsim-pacejka.py 3.0 0.06 2.8 0.4 1.03 0.4 -->
-90.0 -0.5760395836174765
-85.0 -0.5776440181093163
-80.0 -0.5803918992801416
-75.0 -0.5845010317001210
-70.0 -0.5902476568617109
-65.0 -0.5979865464058901
-60.0 -0.6081793463286825
-55.0 -0.6214348494943271
-50.0 -0.6385661913510731
-45.0 -0.6606706311692150
-40.0 -0.6892340269266316
-35.0 -0.7262408296125531
-30.0 -0.7741813043425955
-25.0 -0.8355026710967954
-20.0 -0.9097416834082445
-15.0 -0.9818532434458515
-10.0 -0.9824937511496707
-5.0 -0.7127565569007204
0.0 0.0000000000000000
5.0 0.7127565569007204
10.0 0.9824937511496707
15.0 0.9818532434458515
20.0 0.9097416834082445
25.0 0.8355026710967954
30.0 0.7741813043425955
35.0 0.7262408296125531
40.0 0.6892340269266316
45.0 0.6606706311692150
50.0 0.6385661913510731
55.0 0.6214348494943271
60.0 0.6081793463286825
65.0 0.5979865464058901
70.0 0.5902476568617109
75.0 0.5845010317001210
80.0 0.5803918992801416
85.0 0.5776440181093163
90.0 0.5760395836174765
</tableData>
</table>
<brake_group> LEFT </brake_group>
<retractable> 1 </retractable>
</contact>
@ -45,6 +127,47 @@
<spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<table name="CORNERING_COEFF" type="internal">
<tableData> <!-- jsbsim-pacejka.py 3.0 0.06 2.8 0.4 1.03 0.4 -->
-90.0 -0.5760395836174765
-85.0 -0.5776440181093163
-80.0 -0.5803918992801416
-75.0 -0.5845010317001210
-70.0 -0.5902476568617109
-65.0 -0.5979865464058901
-60.0 -0.6081793463286825
-55.0 -0.6214348494943271
-50.0 -0.6385661913510731
-45.0 -0.6606706311692150
-40.0 -0.6892340269266316
-35.0 -0.7262408296125531
-30.0 -0.7741813043425955
-25.0 -0.8355026710967954
-20.0 -0.9097416834082445
-15.0 -0.9818532434458515
-10.0 -0.9824937511496707
-5.0 -0.7127565569007204
0.0 0.0000000000000000
5.0 0.7127565569007204
10.0 0.9824937511496707
15.0 0.9818532434458515
20.0 0.9097416834082445
25.0 0.8355026710967954
30.0 0.7741813043425955
35.0 0.7262408296125531
40.0 0.6892340269266316
45.0 0.6606706311692150
50.0 0.6385661913510731
55.0 0.6214348494943271
60.0 0.6081793463286825
65.0 0.5979865464058901
70.0 0.5902476568617109
75.0 0.5845010317001210
80.0 0.5803918992801416
85.0 0.5776440181093163
90.0 0.5760395836174765
</tableData>
</table>
<brake_group> RIGHT </brake_group>
<retractable> 1 </retractable>
</contact>

2
revision.txt
View file

@ -1 +1 @@
4781
4783