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

A3XX: Fix bug in FMGC, fix bug in PFD

Browse source
This commit is contained in:
Joshua Davidson 2017-11-01 20:40:32 -04:00
parent 60e63d19f7
commit 06384b53fb
4 changed files with 74 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Models/Instruments/PFD/PFD1.xml
View file

@ -2187,16 +2187,26 @@
<type>select</type> <type>select</type>
<object-name>pitch-mode-armed-box</object-name> <object-name>pitch-mode-armed-box</object-name>
<condition> <condition>
<or> <and>
<equals> <or>
<property>modes/pfd/fma/pitch-mode-armed-box</property> <equals>
<value>1</value> <property>modes/pfd/fma/pitch-mode-armed-box</property>
</equals> <value>1</value>
<equals> </equals>
<property>modes/pfd/fma/pitch-mode2-armed-box</property> <equals>
<value>1</value> <property>modes/pfd/fma/pitch-mode2-armed-box</property>
</equals> <value>1</value>
</or> </equals>
</or>
<not-equals>
<property>modes/pfd/fma/pitch-mode-armed</property>
<value> </value>
</not-equals>
<not-equals>
<property>modes/pfd/fma/pitch-mode2-armed</property>
<value> </value>
</not-equals>
</and>
</condition> </condition>
</animation> </animation>
@ -2215,10 +2225,16 @@
<type>select</type> <type>select</type>
<object-name>roll-mode-armed-box</object-name> <object-name>roll-mode-armed-box</object-name>
<condition> <condition>
<equals> <and>
<property>modes/pfd/fma/roll-mode-armed-box</property> <equals>
<value>1</value> <property>modes/pfd/fma/roll-mode-armed-box</property>
</equals> <value>1</value>
</equals>
<not-equals>
<property>modes/pfd/fma/roll-mode-armed</property>
<value> </value>
</not-equals>
</and>
</condition> </condition>
</animation> </animation>

44
Models/Instruments/PFD/PFD2.xml
View file

@ -2187,16 +2187,26 @@
<type>select</type> <type>select</type>
<object-name>pitch-mode-armed-box</object-name> <object-name>pitch-mode-armed-box</object-name>
<condition> <condition>
<or> <and>
<equals> <or>
<property>modes/pfd/fma/pitch-mode-armed-box</property> <equals>
<value>1</value> <property>modes/pfd/fma/pitch-mode-armed-box</property>
</equals> <value>1</value>
<equals> </equals>
<property>modes/pfd/fma/pitch-mode2-armed-box</property> <equals>
<value>1</value> <property>modes/pfd/fma/pitch-mode2-armed-box</property>
</equals> <value>1</value>
</or> </equals>
</or>
<not-equals>
<property>modes/pfd/fma/pitch-mode-armed</property>
<value> </value>
</not-equals>
<not-equals>
<property>modes/pfd/fma/pitch-mode2-armed</property>
<value> </value>
</not-equals>
</and>
</condition> </condition>
</animation> </animation>
@ -2215,10 +2225,16 @@
<type>select</type> <type>select</type>
<object-name>roll-mode-armed-box</object-name> <object-name>roll-mode-armed-box</object-name>
<condition> <condition>
<equals> <and>
<property>modes/pfd/fma/roll-mode-armed-box</property> <equals>
<value>1</value> <property>modes/pfd/fma/roll-mode-armed-box</property>
</equals> <value>1</value>
</equals>
<not-equals>
<property>modes/pfd/fma/roll-mode-armed</property>
<value> </value>
</not-equals>
</and>
</condition> </condition>
</animation> </animation>

14
Nasal/FMGC-b.nas
View file

@ -308,6 +308,8 @@ var vertical = func {
setprop("/it-autoflight/mode/vert", "ALT HLD"); setprop("/it-autoflight/mode/vert", "ALT HLD");
if (getprop("/it-autoflight/output/loc-armed")) { if (getprop("/it-autoflight/output/loc-armed")) {
setprop("/it-autoflight/mode/arm", "LOC"); setprop("/it-autoflight/mode/arm", "LOC");
} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
setprop("/it-autoflight/mode/arm", "LNV");
} else { } else {
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
} }
@ -328,6 +330,8 @@ var vertical = func {
setprop("/it-autoflight/mode/vert", "V/S"); setprop("/it-autoflight/mode/vert", "V/S");
if (getprop("/it-autoflight/output/loc-armed")) { if (getprop("/it-autoflight/output/loc-armed")) {
setprop("/it-autoflight/mode/arm", "LOC"); setprop("/it-autoflight/mode/arm", "LOC");
} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
setprop("/it-autoflight/mode/arm", "LNV");
} else { } else {
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
} }
@ -381,6 +385,8 @@ var vertical = func {
} }
if (getprop("/it-autoflight/output/loc-armed")) { if (getprop("/it-autoflight/output/loc-armed")) {
setprop("/it-autoflight/mode/arm", "LOC"); setprop("/it-autoflight/mode/arm", "LOC");
} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
setprop("/it-autoflight/mode/arm", "LNV");
} else { } else {
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
} }
@ -397,8 +403,10 @@ var vertical = func {
setprop("/it-autoflight/input/fpa", fpanow); setprop("/it-autoflight/input/fpa", fpanow);
setprop("/it-autoflight/output/vert", 5); setprop("/it-autoflight/output/vert", 5);
setprop("/it-autoflight/mode/vert", "FPA"); setprop("/it-autoflight/mode/vert", "FPA");
if (getprop("/it-autoflight/output/loc-armed") == 1) { if (getprop("/it-autoflight/output/loc-armed")) {
setprop("/it-autoflight/mode/arm", "LOC"); setprop("/it-autoflight/mode/arm", "LOC");
} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
setprop("/it-autoflight/mode/arm", "LNV");
} else { } else {
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
} }
@ -438,6 +446,8 @@ var vertical = func {
setprop("/it-autoflight/internal/alt", altinput); setprop("/it-autoflight/internal/alt", altinput);
if (getprop("/it-autoflight/output/loc-armed")) { if (getprop("/it-autoflight/output/loc-armed")) {
setprop("/it-autoflight/mode/arm", "LOC"); setprop("/it-autoflight/mode/arm", "LOC");
} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
setprop("/it-autoflight/mode/arm", "LNV");
} else { } else {
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
} }
@ -458,6 +468,8 @@ var vertical = func {
setprop("/it-autoflight/mode/vert", " "); setprop("/it-autoflight/mode/vert", " ");
if (getprop("/it-autoflight/output/loc-armed")) { if (getprop("/it-autoflight/output/loc-armed")) {
setprop("/it-autoflight/mode/arm", "LOC"); setprop("/it-autoflight/mode/arm", "LOC");
} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
setprop("/it-autoflight/mode/arm", "LNV");
} else { } else {
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
} }

2
revision.txt
View file

@ -1 +1 @@
3040 3041