fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
legoboyvdlp R 2020-12-18 12:16:42 +00:00
commit 944d822ac4
4 changed files with 217 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

227
A320-main.xml
View file

@ -531,14 +531,6 @@
</script> </script>
</binding> </binding>
</item> </item>
<item>
<label>Skip ADIRS</label>
<binding>
<command>property-assign</command>
<property>/controls/adirs/skip</property>
<value>1</value>
</binding>
</item>
<item> <item>
<label>Canvas QRH</label> <label>Canvas QRH</label>
<binding> <binding>
@ -2551,18 +2543,18 @@
<binding n="0"> <binding n="0">
<condition> <condition>
<and> <and>
<not><property>/FMGC/keyboard-left</property></not> <not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not> <not><property>/FMGC/keyboard-right</property></not>
<or> <or>
<equals> <equals>
<property>sim/current-view/name</property> <property>sim/current-view/name</property>
<value>Walk View</value> <value>Walk View</value>
</equals> </equals>
<equals> <equals>
<property>sim/current-view/name</property> <property>sim/current-view/name</property>
<value>Walker Orbit View</value> <value>Walker Orbit View</value>
</equals> </equals>
</or> </or>
</and> </and>
</condition> </condition>
<command>property-assign</command> <command>property-assign</command>
@ -2697,6 +2689,65 @@
<key n="68"> <key n="68">
<name>SHIFT-d</name> <name>SHIFT-d</name>
<desc>Autopilot Disconnect</desc> <desc>Autopilot Disconnect</desc>
<binding n="0">
<command>property-assign</command>
<condition>
<and>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
<or>
<equals>
<property>sim/current-view/name</property>
<value>Walk View</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>Walker Orbit View</value>
</equals>
</or>
</and>
</condition>
<property>sim/walker/key-triggers/slide</property>
<value>1</value>
</binding>
<binding n="1">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<property>sim/walker/speed-mps</property>
</binding>
<binding n="2">
<command>property-multiply</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<factor>2.5</factor>
</binding>
<mod-up>
<binding n="0">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/slide</property>
<value>0</value>
</binding>
<binding n="1">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<property>sim/walker/speed-mps</property>
</binding>
</mod-up>
<binding> <binding>
<condition> <condition>
<property>/FMGC/keyboard-left</property> <property>/FMGC/keyboard-left</property>
@ -2713,8 +2764,22 @@
</binding> </binding>
<binding> <binding>
<condition> <condition>
<not><property>/FMGC/keyboard-left</property></not> <and>
<not><property>/FMGC/keyboard-right</property></not> <not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
<not>
<equals>
<property>sim/current-view/name</property>
<value>Walk View</value>
</equals>
</not>
<not>
<equals>
<property>sim/current-view/name</property>
<value>Walker Orbit View</value>
</equals>
</not>
</and>
</condition> </condition>
<command>nasal</command> <command>nasal</command>
<script> <script>
@ -3029,6 +3094,65 @@
<key n="83"> <key n="83">
<name>SHIFT-s</name> <name>SHIFT-s</name>
<desc>MCDU</desc> <desc>MCDU</desc>
<binding n="0">
<command>property-assign</command>
<condition>
<and>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
<or>
<equals>
<property>sim/current-view/name</property>
<value>Walk View</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>Walker Orbit View</value>
</equals>
</or>
</and>
</condition>
<property>sim/walker/key-triggers/forward</property>
<value>-1</value>
</binding>
<binding n="1">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<property>sim/walker/speed-mps</property>
</binding>
<binding n="2">
<command>property-multiply</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<factor>2.5</factor>
</binding>
<mod-up>
<binding n="0">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/forward</property>
<value>0</value>
</binding>
<binding n="1">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<property>sim/walker/speed-mps</property>
</binding>
</mod-up>
<binding> <binding>
<condition> <condition>
<property>/FMGC/keyboard-left</property> <property>/FMGC/keyboard-left</property>
@ -3109,6 +3233,65 @@
<key n="87"> <key n="87">
<name>SHIFT-w</name> <name>SHIFT-w</name>
<desc>MCDU</desc> <desc>MCDU</desc>
<binding n="0">
<command>property-assign</command>
<condition>
<and>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
<or>
<equals>
<property>sim/current-view/name</property>
<value>Walk View</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>Walker Orbit View</value>
</equals>
</or>
</and>
</condition>
<property>sim/walker/key-triggers/forward</property>
<value>1</value>
</binding>
<binding n="1">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<property>sim/walker/speed-mps</property>
</binding>
<binding n="2">
<command>property-multiply</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<factor>5.0</factor>
</binding>
<mod-up>
<binding n="0">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/forward</property>
<value>0</value>
</binding>
<binding n="1">
<command>property-assign</command>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<property>sim/walker/key-triggers/speed</property>
<property>sim/walker/speed-mps</property>
</binding>
</mod-up>
<binding> <binding>
<condition> <condition>
<property>/FMGC/keyboard-left</property> <property>/FMGC/keyboard-left</property>

2
Models/Instruments/IESI/IESI.nas
View file

@ -282,8 +282,6 @@ var showIESI = func {
dlg.setCanvas(A320IESI.MainScreen.canvas); dlg.setCanvas(A320IESI.MainScreen.canvas);
} }
setlistener("", func() { if (A320IESI.MainScreen != nil) { A320IESI.MainScreen.updateQNH(notification); } }, 0, 0);
var roundabout = func(x) { var roundabout = func(x) {
var y = x - int(x); var y = x - int(x);
return y < 0.5 ? int(x) : 1 + int(x); return y < 0.5 ? int(x) : 1 + int(x);

16
Nasal/FMGC/SimbriefParser.nas
View file

@ -59,9 +59,9 @@ var SimbriefParser = {
} }
if (size(result) == 0) { return nil; } if (size(result) == 0) { return nil; }
foreach (var test; result) { forindex (var test; result) {
if (math.abs(test.lat - coords.lat()) < 0.01666666666 and math.abs(test.lon - coords.lon()) < 0.01666666666) { if (math.abs(result[test].lat - coords.lat()) < 0.01666666666 and math.abs(result[test].lon - coords.lon()) < 0.01666666666) {
return test; return result[test];
} }
} }
return nil; return nil;
@ -170,11 +170,13 @@ var SimbriefParser = {
ofpFix.getNode("pos_lat").getValue(), ofpFix.getNode("pos_lat").getValue(),
ofpFix.getNode("pos_long").getValue()); ofpFix.getNode("pos_long").getValue());
wp = me.tryFindByCoord(coords,ident,"fix"); #wp = me.tryFindByCoord(coords,ident,"fix");
wp = me.tryFindByCoord(coords,ident,"nav"); #if (wp == nil) {
if (wp == nil) { # wp = me.tryFindByCoord(coords,ident,"nav");
#}
#if (wp == nil) {
wp = createWP(coords, ident); wp = createWP(coords, ident);
} #}
append(wps, wp); append(wps, wp);
} }

6
Nasal/Systems/hydraulics.nas
View file

@ -131,7 +131,7 @@ var HYD = {
} else { } else {
if ((me.Brakes.mode.getValue() == 2 and me.Psi.green.getValue() < 2500) or me.Brakes.mode.getValue() == 0) { if ((me.Brakes.mode.getValue() == 2 and me.Psi.green.getValue() < 2500) or me.Brakes.mode.getValue() == 0) {
# Alternate Braking (Yellow OK + Antiskid ON + electric OK) - missing condition: BSCU OK-KO # Alternate Braking (Yellow OK + Antiskid ON + electric OK) - missing condition: BSCU OK-KO
if (me.Psi.yellow.getValue() >= 2500 and me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcess.getValue() >= 24)) { if (me.Psi.yellow.getValue() >= 2500 and me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcEss.getValue() >= 24)) {
if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) {
me.Brakes.leftPressPsi.setValue(me.Psi.yellow.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); me.Brakes.leftPressPsi.setValue(me.Psi.yellow.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue());
} else { } else {
@ -144,7 +144,7 @@ var HYD = {
} }
} else { } else {
# Alternate Braking (Yellow OK + Antiskid OFF + electric OK) - missing condition: BSCU OK-KO # Alternate Braking (Yellow OK + Antiskid OFF + electric OK) - missing condition: BSCU OK-KO
if (me.Psi.yellow.getValue() >= 2500 and !me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcess.getValue() >= 24)) { if (me.Psi.yellow.getValue() >= 2500 and !me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcEss.getValue() >= 24)) {
if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) {
me.Brakes.leftPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); me.Brakes.leftPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[0].getValue());
} else { } else {
@ -157,7 +157,7 @@ var HYD = {
} }
} else { } else {
# Alternate Braking (Yellow KO or Antiskid KO or electric KO) - missing condition: BSCU OK-KO # Alternate Braking (Yellow KO or Antiskid KO or electric KO) - missing condition: BSCU OK-KO
if (me.Brakes.accumPressPsi.getValue() < 1000 and (me.Psi.yellow.getValue() < 2500 or !me.Brakes.askidSw.getValue() or (systems.ELEC.Bus.dc1.getValue() < 24 and systems.ELEC.Bus.dc2.getValue() < 24 and systems.ELEC.Bus.dcess.getValue() < 24))) { if (me.Brakes.accumPressPsi.getValue() < 1000 and (me.Psi.yellow.getValue() < 2500 or !me.Brakes.askidSw.getValue() or (systems.ELEC.Bus.dc1.getValue() < 24 and systems.ELEC.Bus.dc2.getValue() < 24 and systems.ELEC.Bus.dcEss.getValue() < 24))) {
if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) {
me.Brakes.leftPressPsi.setValue(me.Brakes.accumPressPsi.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); me.Brakes.leftPressPsi.setValue(me.Brakes.accumPressPsi.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue());
} else { } else {