Merge branch 'dev' into 3D
This commit is contained in:
commit
944d822ac4
4 changed files with 217 additions and 34 deletions
227
A320-main.xml
227
A320-main.xml
|
@ -531,14 +531,6 @@
|
|||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
<item>
|
||||
<label>Skip ADIRS</label>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>/controls/adirs/skip</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
</item>
|
||||
<item>
|
||||
<label>Canvas QRH</label>
|
||||
<binding>
|
||||
|
@ -2551,18 +2543,18 @@
|
|||
<binding n="0">
|
||||
<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>
|
||||
<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>
|
||||
<command>property-assign</command>
|
||||
|
@ -2697,6 +2689,65 @@
|
|||
<key n="68">
|
||||
<name>SHIFT-d</name>
|
||||
<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>
|
||||
<condition>
|
||||
<property>/FMGC/keyboard-left</property>
|
||||
|
@ -2713,8 +2764,22 @@
|
|||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<not><property>/FMGC/keyboard-left</property></not>
|
||||
<not><property>/FMGC/keyboard-right</property></not>
|
||||
<and>
|
||||
<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>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
|
@ -3029,6 +3094,65 @@
|
|||
<key n="83">
|
||||
<name>SHIFT-s</name>
|
||||
<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>
|
||||
<condition>
|
||||
<property>/FMGC/keyboard-left</property>
|
||||
|
@ -3109,6 +3233,65 @@
|
|||
<key n="87">
|
||||
<name>SHIFT-w</name>
|
||||
<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>
|
||||
<condition>
|
||||
<property>/FMGC/keyboard-left</property>
|
||||
|
|
|
@ -282,8 +282,6 @@ var showIESI = func {
|
|||
dlg.setCanvas(A320IESI.MainScreen.canvas);
|
||||
}
|
||||
|
||||
setlistener("", func() { if (A320IESI.MainScreen != nil) { A320IESI.MainScreen.updateQNH(notification); } }, 0, 0);
|
||||
|
||||
var roundabout = func(x) {
|
||||
var y = x - int(x);
|
||||
return y < 0.5 ? int(x) : 1 + int(x);
|
||||
|
|
|
@ -59,9 +59,9 @@ var SimbriefParser = {
|
|||
}
|
||||
|
||||
if (size(result) == 0) { return nil; }
|
||||
foreach (var test; result) {
|
||||
if (math.abs(test.lat - coords.lat()) < 0.01666666666 and math.abs(test.lon - coords.lon()) < 0.01666666666) {
|
||||
return test;
|
||||
forindex (var test; result) {
|
||||
if (math.abs(result[test].lat - coords.lat()) < 0.01666666666 and math.abs(result[test].lon - coords.lon()) < 0.01666666666) {
|
||||
return result[test];
|
||||
}
|
||||
}
|
||||
return nil;
|
||||
|
@ -170,11 +170,13 @@ var SimbriefParser = {
|
|||
ofpFix.getNode("pos_lat").getValue(),
|
||||
ofpFix.getNode("pos_long").getValue());
|
||||
|
||||
wp = me.tryFindByCoord(coords,ident,"fix");
|
||||
wp = me.tryFindByCoord(coords,ident,"nav");
|
||||
if (wp == nil) {
|
||||
#wp = me.tryFindByCoord(coords,ident,"fix");
|
||||
#if (wp == nil) {
|
||||
# wp = me.tryFindByCoord(coords,ident,"nav");
|
||||
#}
|
||||
#if (wp == nil) {
|
||||
wp = createWP(coords, ident);
|
||||
}
|
||||
#}
|
||||
|
||||
append(wps, wp);
|
||||
}
|
||||
|
|
|
@ -131,7 +131,7 @@ var HYD = {
|
|||
} else {
|
||||
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
|
||||
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) {
|
||||
me.Brakes.leftPressPsi.setValue(me.Psi.yellow.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue());
|
||||
} else {
|
||||
|
@ -144,7 +144,7 @@ var HYD = {
|
|||
}
|
||||
} else {
|
||||
# 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) {
|
||||
me.Brakes.leftPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[0].getValue());
|
||||
} else {
|
||||
|
@ -157,7 +157,7 @@ var HYD = {
|
|||
}
|
||||
} else {
|
||||
# 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) {
|
||||
me.Brakes.leftPressPsi.setValue(me.Brakes.accumPressPsi.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue());
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue