Fix Mapstructure error
This commit is contained in:
parent
66f575a9e0
commit
2ecfd0e8e2
4 changed files with 13 additions and 25 deletions
|
@ -19,7 +19,7 @@ canvas.SymbolLayer.add(name, {
|
||||||
.close()
|
.close()
|
||||||
.setStrokeLineWidth(3)
|
.setStrokeLineWidth(3)
|
||||||
.setColor(1,1,1)
|
.setColor(1,1,1)
|
||||||
.setScale(1);
|
.setScale(1,1);
|
||||||
},
|
},
|
||||||
vor_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_vor.svg',
|
vor_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_vor.svg',
|
||||||
airport_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_airport.svg',
|
airport_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_airport.svg',
|
||||||
|
|
|
@ -182,18 +182,18 @@ var ECAM_controller = {
|
||||||
rightLines[n].setValue("");
|
rightLines[n].setValue("");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getprop("/systems/acconfig/autoconfig-running")) { return; }
|
|
||||||
|
|
||||||
# write to ECAM
|
# write to ECAM
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
foreach (var w; warnings.vector) {
|
if (!getprop("/systems/acconfig/autoconfig-running")) {
|
||||||
if (counter >= 9) { break; }
|
foreach (var w; warnings.vector) {
|
||||||
if (w.active == 1) {
|
if (counter >= 9) { break; }
|
||||||
w.write();
|
if (w.active == 1) {
|
||||||
w.warnlight();
|
w.write();
|
||||||
w.sound();
|
w.warnlight();
|
||||||
counter += 1;
|
w.sound();
|
||||||
|
counter += 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,6 +85,8 @@ var phaseLoop = func() {
|
||||||
master1 = pts.Controls.Engines.Engine1.cutoffSw.getBoolValue();
|
master1 = pts.Controls.Engines.Engine1.cutoffSw.getBoolValue();
|
||||||
master2 = pts.Controls.Engines.Engine2.cutoffSw.getBoolValue();
|
master2 = pts.Controls.Engines.Engine2.cutoffSw.getBoolValue();
|
||||||
|
|
||||||
|
FWC.Flipflop.recallReset.setValue(0);
|
||||||
|
|
||||||
# Various things
|
# Various things
|
||||||
if (gear_agl < 5) {
|
if (gear_agl < 5) {
|
||||||
FWC.Flipflop.gearSet.setBoolValue(1);
|
FWC.Flipflop.gearSet.setBoolValue(1);
|
||||||
|
@ -265,13 +267,6 @@ var setPhase = func(newPhase) {
|
||||||
if (newPhase >= 1 and newPhase <= 10 and _lastPhase != newPhase) {
|
if (newPhase >= 1 and newPhase <= 10 and _lastPhase != newPhase) {
|
||||||
pts.ECAM.fwcWarningPhase.setValue(newPhase);
|
pts.ECAM.fwcWarningPhase.setValue(newPhase);
|
||||||
FWC.Flipflop.recallReset.setValue(1);
|
FWC.Flipflop.recallReset.setValue(1);
|
||||||
settimer(func() {
|
|
||||||
if (FWC.Flipflop.recallReset.getValue() == 1) { # catch unexpected error, trying something new here
|
|
||||||
FWC.Flipflop.recallReset.setValue(0);
|
|
||||||
} else {
|
|
||||||
die("Exception in ECAM-phases.nas, line 271");
|
|
||||||
}
|
|
||||||
}, 0.1);
|
|
||||||
_lastPhase = newPhase;
|
_lastPhase = newPhase;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -312,14 +312,7 @@ canvas.Element.setVisible = func(vis) {
|
||||||
me._lastVisible = vis;
|
me._lastVisible = vis;
|
||||||
me.setBool("visible", vis);
|
me.setBool("visible", vis);
|
||||||
};
|
};
|
||||||
canvas.Element._lastX = nil;
|
|
||||||
canvas.Element._lastY = nil;
|
|
||||||
canvas.Element.setScale = func(x, y) {
|
|
||||||
if (x == me._lastX and y == me._lastY) {return me;}
|
|
||||||
me._lastX = x;
|
|
||||||
me._lastY = y;
|
|
||||||
me.setScale(x, y);
|
|
||||||
};
|
|
||||||
|
|
||||||
# In air, flaps 1 is slats only. On ground, it is slats and flaps.
|
# In air, flaps 1 is slats only. On ground, it is slats and flaps.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue