A3XX: Improve FBW Pitch axis, fix FMGC bug

This commit is contained in:
Joshua Davidson 2017-07-08 16:49:38 -04:00
parent 9bce793710
commit d6e89fd26a
2 changed files with 12 additions and 13 deletions

View file

@ -148,11 +148,10 @@ var fmabox = func {
setprop("/it-autoflight/input/trk", 0); setprop("/it-autoflight/input/trk", 0);
setprop("/it-autoflight/input/lat", 3); setprop("/it-autoflight/input/lat", 3);
setprop("/it-autoflight/input/vert", 1); setprop("/it-autoflight/input/vert", 1);
setprop("/it-autoflight/input/vs", 0);
setprop("/it-autoflight/output/fma-pwr", 0); setprop("/it-autoflight/output/fma-pwr", 0);
} else { } else {
setprop("/it-autoflight/input/trk", 0); setprop("/it-autoflight/input/trk", 0);
setprop("/it-autoflight/input/vs", 0); setprop("/it-autoflight/input/vert", 1);
setprop("/it-autoflight/output/fma-pwr", 1); setprop("/it-autoflight/output/fma-pwr", 1);
} }
} }
@ -476,11 +475,11 @@ setlistener("/it-autoflight/input/kts-mach", func {
} }
} else if (getprop("/it-autoflight/input/kts-mach") == 1) { } else if (getprop("/it-autoflight/input/kts-mach") == 1) {
if (mach >= 0.50 and mach <= 0.95) { if (mach >= 0.50 and mach <= 0.95) {
setprop("/it-autoflight/input/spd-kts", math.round(mach, 0.001)); setprop("/it-autoflight/input/spd-mach", math.round(mach, 0.001));
} else if (mach < 0.50) { } else if (mach < 0.50) {
setprop("/it-autoflight/input/spd-kts", 0.50); setprop("/it-autoflight/input/spd-mach", 0.50);
} else if (mach > 0.95) { } else if (mach > 0.95) {
setprop("/it-autoflight/input/spd-kts", 0.95); setprop("/it-autoflight/input/spd-mach", 0.95);
} }
} }
}); });

View file

@ -106,8 +106,8 @@
<property>/controls/flight/elevator</property> <property>/controls/flight/elevator</property>
<table> <table>
<property>/position/gear-agl-ft</property> <property>/position/gear-agl-ft</property>
<entry><ind> 5</ind><dep>0.10</dep></entry> <entry><ind> 5</ind><dep>0.12</dep></entry>
<entry><ind>50</ind><dep>0.05</dep></entry> <entry><ind>50</ind><dep>0.07</dep></entry>
</table> </table>
</sum> </sum>
</expression> </expression>
@ -571,9 +571,9 @@
<sum> <sum>
<table> <table>
<property>/controls/flight/elevator-input</property> <property>/controls/flight/elevator-input</property>
<entry><ind> 1</ind><dep>-7.0</dep></entry> <entry><ind> 1</ind><dep>-6.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry> <entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind>-1</ind><dep> 7.0</dep></entry> <entry><ind>-1</ind><dep> 6.0</dep></entry>
</table> </table>
<product> <product>
<table> <table>
@ -583,7 +583,7 @@
</table> </table>
<table> <table>
<property>/controls/flight/elevator-input</property> <property>/controls/flight/elevator-input</property>
<entry><ind>1</ind><dep>7.0</dep></entry> <entry><ind>1</ind><dep>6.0</dep></entry>
<entry><ind>0</ind><dep>0.0</dep></entry> <entry><ind>0</ind><dep>0.0</dep></entry>
</table> </table>
</product> </product>
@ -596,7 +596,7 @@
<table> <table>
<property>/controls/flight/elevator-input</property> <property>/controls/flight/elevator-input</property>
<entry><ind> 0</ind><dep> 0.0</dep></entry> <entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind>-1</ind><dep>-7.0</dep></entry> <entry><ind>-1</ind><dep>-6.0</dep></entry>
</table> </table>
</product> </product>
</sum> </sum>
@ -612,9 +612,9 @@
<expression> <expression>
<table> <table>
<property>/controls/flight/elevator-input</property> <property>/controls/flight/elevator-input</property>
<entry><ind> 1</ind><dep>-7.0</dep></entry> <entry><ind> 1</ind><dep>-6.0</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry> <entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind>-1</ind><dep> 7.0</dep></entry> <entry><ind>-1</ind><dep> 6.0</dep></entry>
</table> </table>
</expression> </expression>
</input> </input>