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

Add athr limited

Browse source
This commit is contained in:
Jonathan Redpath 2018-12-06 12:41:46 +00:00
parent 361f9a58bf
commit 0270372be5
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Nasal/ECAM/ECAM-logic.nas
View file

@ -43,6 +43,16 @@ var messages_priority_2 = func {
athr_offw.noRepeat = 0; athr_offw.noRepeat = 0;
athr_offw_1.noRepeat = 0; athr_offw_1.noRepeat = 0;
} }
if (getprop("/it-autoflight/output/athr") == 1 and ((getprop("/systems/thrust/eng-out") != 1 and (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN")) or (getprop("/systems/thrust/eng-out") == 1 and (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN" or (getprop("/systems/thrust/state1") == "MAN THR" and getprop("/controls/engines/engine[0]/throttle-pos") <= 0.83) or (getprop("/systems/thrust/state2") == "MAN THR" and getprop("/controls/engines/engine[0]/throttle-pos") <= 0.83)))) and (getprop("/ECAM/warning-phase") >= 5 and getprop("/ECAM/warning-phase") <= 7)) {
athr_lim.active = 1;
athr_lim_1.active = 1;
} else {
athr_lim.active = 0;
athr_lim_1.active = 0;
athr_lim.noRepeat = 0;
athr_lim_1.noRepeat = 0;
}
} }
var messages_priority_2_old = func { var messages_priority_2_old = func {
@ -162,13 +172,13 @@ var messages_right_memo = func {
land_asap_a.active = 0; land_asap_a.active = 0;
} }
if (libraries.ap_active == 1) { if (libraries.ap_active == 1 and getprop("/it-autoflight/output/ap-warning") == 1) {
ap_off.active = 1; ap_off.active = 1;
} else { } else {
ap_off.active = 0; ap_off.active = 0;
} }
if (libraries.athr_active == 1) { if (libraries.athr_active == 1 and getprop("/it-autoflight/output/athr-warning") == 1) {
athr_off.active = 1; athr_off.active = 1;
} else { } else {
athr_off.active = 0; athr_off.active = 0;

6
Nasal/ECAM/ECAM-messages.nas
View file

@ -19,10 +19,12 @@ var warningsOld = std.Vector.new([
var warnings = std.Vector.new([ var warnings = std.Vector.new([
var ap_offw = warning.new(msg: "AUTO FLT AP OFF", active: 0, colour: "r", aural: "calv", light: "warning", noRepeat: 0), var ap_offw = warning.new(msg: "AUTO FLT AP OFF", active: 0, colour: "r", aural: "calv", light: "warning", noRepeat: 0),
var athr_offw = warning.new(msg: "AUTO FLT A/THR OFF", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0),
var athr_offw_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0),
var athr_lock = warning.new(msg: "ENG THRUST LOCKED", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0), var athr_lock = warning.new(msg: "ENG THRUST LOCKED", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0),
var athr_lock_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0), var athr_lock_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0),
var athr_offw = warning.new(msg: "AUTO FLT A/THR OFF", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0), var athr_lim = warning.new(msg: "AUTO FLT A/THR LIMITED", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0),
var athr_offw_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0) var athr_lim_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0),
]); ]);
var leftmemos = std.Vector.new([ var leftmemos = std.Vector.new([

8
Sounds/A320-common-sound.xml
View file

@ -817,7 +817,7 @@
</retard> </retard>
<apoff> <apoff>
<name>apoff</name> <name>apoff-looped</name>
<mode>looped</mode> <mode>looped</mode>
<path>/Aircraft/IDG-A32X/Sounds/apoff.wav</path> <path>/Aircraft/IDG-A32X/Sounds/apoff.wav</path>
<condition> <condition>
@ -846,17 +846,15 @@
</apoff> </apoff>
<apoff> <apoff>
<name>apoff</name> <name>apoff-single</name>
<mode>once</mode> <mode>once</mode>
<path>/Aircraft/IDG-A32X/Sounds/apoff.wav</path> <path>/Aircraft/IDG-A32X/Sounds/apoff.wav</path>
<condition> <condition>
<and> <and>
<not>
<equals> <equals>
<property>/it-autoflight/output/ap-warning</property> <property>/it-autoflight/output/ap-warning</property>
<value>2</value> <value>1</value>
</equals> </equals>
</not>
<equals> <equals>
<property>/it-autoflight/output/ap1</property> <property>/it-autoflight/output/ap1</property>
<value>0</value> <value>0</value>