fly/A320-family
1
0
Fork 0
Code Activity

Bugfix

Browse source
This commit is contained in:
legoboyvdlp R 2019-11-02 16:20:08 +00:00
parent 77120dcf04
commit 62c855c56f
2 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Nasal/ECAM/ECAM-controller.nas
View file

@ -70,31 +70,33 @@ var warning = {
}
},
warnlight: func() {
if (me.light > 1 or me.noRepeat == 1 or (me.active == 0 and me.wasActive == 0)) {return;}
if (me.active == 1) {
lights[me.light].setBoolValue(1);
me.noRepeat = 1;
} elsif (me.wasActive) {
print("Yesssssss");
if (me.light > 1) { return; }
if (me.active == 0 and me.wasActive == 1) {
lights[me.light].setBoolValue(0);
me.wasActive = 0;
}
if (me.noRepeat == 1 or me.active == 0) { return; }
lights[me.light].setBoolValue(1);
me.noRepeat = 1;
},
sound: func() {
if (me.aural > 2 or me.noRepeat2 == 1 or (me.active == 0 and me.wasActive == 0)) {return;}
if (me.active == 1) {
if (me.aural != 0) {
aural[me.aural].setBoolValue(0);
}
me.noRepeat2 = 1;
settimer(func() {
aural[me.aural].setBoolValue(1);
}, 0.15);
} elsif (me.wasActive) {
print("Noooooooo");
if (me.aural > 2) { return; }
if (me.active == 0 and me.wasActive == 1) {
aural[me.aural].setBoolValue(0);
me.wasActive = 0;
}
if (me.noRepeat2 == 1 or me.active == 0) { return; }
if (me.aural != 0) {
aural[me.aural].setBoolValue(0);
}
me.noRepeat2 = 1;
settimer(func() {
aural[me.aural].setBoolValue(1);
}, 0.15);
},
callPage: func() {
if (me.sdPage == "nil" or me.hasCalled == 1) { return; }
@ -207,6 +209,9 @@ var ECAM_controller = {
w.warnlight();
w.sound();
counter += 1;
} elsif (w.wasActive == 1) {
w.warnlight();
w.sound();
}
}
}

30
Systems/a320-adr.xml
View file

@ -729,6 +729,36 @@
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/baro-alt-corrected-1-capt">
<input>/systems/navigation/adr/computation/baro-alt-corrected-1-capt</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/baro-alt-corrected-2-capt">
<input>/systems/navigation/adr/computation/baro-alt-corrected-2-capt</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/baro-alt-corrected-3-capt">
<input>/systems/navigation/adr/computation/baro-alt-corrected-3-capt</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/baro-alt-corrected-1-fo">
<input>/systems/navigation/adr/computation/baro-alt-corrected-1-fo</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/baro-alt-corrected-2-capt">
<input>/systems/navigation/adr/computation/baro-alt-corrected-2-fo</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/baro-alt-corrected-3-fo">
<input>/systems/navigation/adr/computation/baro-alt-corrected-3-fo</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/cas-1">
<input>/systems/navigation/adr/computation/cas-1</input>
<gain>1</gain>