Merge branch 'nws-force'
This commit is contained in:
Joshua Davidson
commit
72069d5a2a
4 changed files with 136 additions and 12 deletions
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -2031,7 +2031,7 @@
|
|||
</eq>
|
||||
<product>
|
||||
<property>hydraulics/tiller/autopush-cmd</property>
|
||||
<value>70</value>
|
||||
<value>75</value>
|
||||
</product>
|
||||
<table>
|
||||
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
|
||||
|
|
@ -2039,9 +2039,10 @@
|
|||
<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.000 -75.0 0.0 75.0
|
||||
30.000 -47.0 0.0 47.0
|
||||
30.001 -06.0 0.0 06.0
|
||||
135.000 00.0 0.0 00.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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Reference in a new issue