Merge branch 'dev' into 3D
This commit is contained in:
commit
8d44fe09fe
2 changed files with 10 additions and 5 deletions
|
@ -2167,7 +2167,7 @@
|
|||
</greater-than-equals>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>ecam.ECAMControlPanel.stsBtn();</script>
|
||||
<script>ecam.ECAMControlPanel.stsBtn(nil);</script>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
|
@ -2178,7 +2178,7 @@
|
|||
</greater-than-equals>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>ecam.ECAMControlPanel.sysPageBtn("REL");</script>
|
||||
<script>ecam.ECAMControlPanel.stsBtn("REL");</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
</action>
|
||||
|
|
|
@ -161,9 +161,14 @@ var ECAMControlPanel = {
|
|||
|
||||
ecam.ECAM_controller.clear();
|
||||
},
|
||||
stsBtn: func() {
|
||||
if (SystemDisplayController.displayedPage.name != "statusPage") {
|
||||
SystemDisplayController.manCall("statusPage");
|
||||
stsBtn: func(rel) {
|
||||
if (rel == "REL") {
|
||||
pts.Modes.EcamDuXfr.setBoolValue(0);
|
||||
} else {
|
||||
if (du4_lgt.getValue() < 0.01 or systems.ELEC.Bus.ac2.getValue() < 110) {
|
||||
pts.Modes.EcamDuXfr.setBoolValue(1);
|
||||
}
|
||||
SystemDisplayController.manCall("statusPage");
|
||||
}
|
||||
},
|
||||
allBtn: func() {
|
||||
|
|
Loading…
Reference in a new issue