fly/A320-family
1
0
Fork 0
Code Activity

Nasal - correct namespace definitions

Browse source
This commit is contained in:
legoboyvdlp R 2020-05-16 21:04:03 +01:00
parent c555b5b337
commit b453e2e3a3
7 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
A320-main.xml
View file

@ -3950,8 +3950,6 @@
<file>Aircraft/A320-family/Nasal/Libraries/property-tree-setup.nas</file>
</pts>
<libraries>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-main.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/libraries.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/buttons.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/shake.nas</file>
@ -3963,8 +3961,6 @@
</acconfig>
<systems>
<file>Aircraft/A320-family/Nasal/Systems/APU.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/effects.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/electrical.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/pneumatics.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/hydraulics.nas</file>
@ -3973,14 +3969,27 @@
<file>Aircraft/A320-family/Nasal/Systems/ADIRS/ADR.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ADIRS/SwitchingPanel.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/Comm/HF.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/brakes.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/brakesystem.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
<file>Aircraft/A320-family/Nasal/Instruments/clock.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/icing.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
</systems>
<ecam>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-main.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-controller.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-logic.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-messages.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-phases.nas</file>
</ecam>
<effects>
<file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/effects.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file>
</effects>
<fadec>
<file>Aircraft/A320-family/Nasal/Systems/FADEC/fadec-common.nas</file>
</fadec>
@ -4027,6 +4036,7 @@
<file>Aircraft/A320-family/Nasal/MCDU/DATA.nas</file>
<file>Aircraft/A320-family/Nasal/MCDU/STATUS.nas</file>
</mcdu>
<!-- Canvas -->
<canvas_pfd>
<file>Aircraft/A320-family/Models/Instruments/PFD/PFD.nas</file>
</canvas_pfd>
@ -4043,15 +4053,7 @@
<canvas_mcdu>
<file>Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas</file>
</canvas_mcdu>
<ecam>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-controller.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-logic.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-messages.nas</file>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-phases.nas</file>
</ecam>
<icing>
<file>Aircraft/A320-family/Nasal/Systems/icing.nas</file>
</icing>
<!-- Autopush -->
<autopush>
<file>Aircraft/A320-family/Nasal/Autopush/autopush.nas</file>
</autopush>
@ -4064,6 +4066,7 @@
<autopush_route>
<file>Aircraft/A320-family/Nasal/Autopush/autopush_route.nas</file>
</autopush_route>
<!-- Panels -->
<rmp>
<file>Aircraft/A320-family/Nasal/Panels/rmp.nas</file>
</rmp>

36
Models/FlightDeck/a320.flightdeck.xml
View file

@ -2023,7 +2023,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("sts");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("sts");</script>
</binding>
</action>
</animation>
@ -2042,7 +2042,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("apu");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("apu");</script>
</binding>
</action>
</animation>
@ -2061,7 +2061,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("bleed");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("bleed");</script>
</binding>
</action>
</animation>
@ -2080,7 +2080,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("press");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("press");</script>
</binding>
</action>
</animation>
@ -2099,7 +2099,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("elec");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("elec");</script>
</binding>
</action>
</animation>
@ -2118,7 +2118,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("hyd");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("hyd");</script>
</binding>
</action>
</animation>
@ -2137,7 +2137,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("fuel");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("fuel");</script>
</binding>
</action>
</animation>
@ -2156,7 +2156,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("eng");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("eng");</script>
</binding>
</action>
</animation>
@ -2175,7 +2175,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("cond");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("cond");</script>
</binding>
</action>
</animation>
@ -2194,7 +2194,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("door");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("door");</script>
</binding>
</action>
</animation>
@ -2213,7 +2213,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("wheel");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("wheel");</script>
</binding>
</action>
</animation>
@ -2232,7 +2232,7 @@
</greater-than-equals>
</condition>
<command>nasal</command>
<script>libraries.ECAMControlPanel.sysPageBtn("fctl");</script>
<script>ecam.ECAMControlPanel.sysPageBtn("fctl");</script>
</binding>
</action>
</animation>
@ -2502,16 +2502,14 @@
</condition>
<command>nasal</command>
<script>
libraries.ECAMControlPanel.rclBtn();
ecam.ECAMControlPanel.rclBtn();
ecam.FWC.Btn.recall.setValue(1);
</script>
</binding>
<mod-up>
<binding>
<command>nasal</command>
<script>
ecam.FWC.Btn.recall.setValue(0);
</script>
<script>ecam.FWC.Btn.recall.setValue(0);</script>
</binding>
</mod-up>
</action>
@ -2533,16 +2531,14 @@
</condition>
<command>nasal</command>
<script>
libraries.ECAMControlPanel.clrBtn();
ecam.ECAMControlPanel.clrBtn();
ecam.FWC.Btn.clr.setValue(1);
</script>
</binding>
<mod-up>
<binding>
<command>nasal</command>
<script>
ecam.FWC.Btn.clr.setValue(0);
</script>
<script>ecam.FWC.Btn.clr.setValue(0);</script>
</binding>
</mod-up>
</action>

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

@ -104,7 +104,7 @@ var warning = {
},
callPage: func() {
if (me.sdPage == "nil" or me.hasCalled == 1) { return; }
libraries.SystemDisplay.failCall(me.sdPage);
ecam.SystemDisplay.failCall(me.sdPage);
me.hasCalled = 1;
}
};
@ -336,7 +336,7 @@ var ECAM_controller = {
}
if (statusFlag == 1 and lines[0].getValue() == "") {
libraries.SystemDisplay.manCall("sts");
ecam.SystemDisplay.manCall("sts");
statusFlag = 0;
}
},

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

@ -1600,13 +1600,13 @@ var messages_right_memo = func {
land_asap_a.active = 0;
}
if (libraries.ap_active == 1 and apWarn.getValue() == 1) {
if (ecam.ap_active == 1 and apWarn.getValue() == 1) {
ap_off.active = 1;
} else {
ap_off.active = 0;
}
if (libraries.athr_active == 1 and athrWarn.getValue() == 1) {
if (ecam.athr_active == 1 and athrWarn.getValue() == 1) {
athr_off.active = 1;
} else {
athr_off.active = 0;

6
Nasal/FMGC/FCU.nas
View file

@ -102,7 +102,7 @@ var FCUController = {
if (me.FCUworking and fbw.FBW.activeLaw.getValue() == 0) {
if (!ap1.getBoolValue()) {
ap1Input.setValue(1);
libraries.apWarnNode.setValue(0);
ecam.apWarnNode.setValue(0);
} else {
apOff("hard", 1);
}
@ -489,7 +489,7 @@ var updateActiveFMGC = func {
# Autopilot Disconnection
var apOff = func(type, side) {
if ((ap1Input.getValue() and (side == 1 or side == 0)) or (ap2Input.getValue() and (side == 2 or side == 0))) {
libraries.doApWarn(type);
ecam.doApWarn(type);
}
if (side == 0) {
@ -509,7 +509,7 @@ var athrOff = func(type) {
fadec.lockThr();
}
athrInput.setValue(0);
libraries.doAthrWarn(type);
ecam.doAthrWarn(type);
}
}

2
Nasal/FMGC/FMGC.nas
View file

@ -788,7 +788,7 @@ var ManagedSPD = maketimer(0.25, func {
}
} else {
ManagedSPD.stop();
libraries.mcpSPDKnbPull();
fcu.FCUController.SPDPull();
}
});

10
Nasal/Libraries/libraries.nas
View file

@ -195,7 +195,7 @@ var triggerDoor = func(door, doorName, doorDesc) {
var systemsInit = func {
fbw.FBW.init();
light_manager.init();
effects.light_manager.init();
systems.ELEC.init();
systems.PNEU.init();
systems.HYD.init();
@ -203,8 +203,9 @@ var systemsInit = func {
systems.ADIRS.init();
systems.eng_init();
systems.APUController.init();
systems.fire_init();
systems.autobrake_init();
systems.fire_init();
systems.icingInit();
fmgc.flightPlanController.reset();
fadec.FADEC.init();
fmgc.ITAF.init();
@ -212,9 +213,8 @@ var systemsInit = func {
mcdu.MCDU_init(0);
mcdu.MCDU_init(1);
systemsLoop.start();
icing.icingInit();
lightsLoop.start();
libraries.ECAM.init();
ecam.ECAM.init();
libraries.variousReset();
rmp.init();
acp.init();
@ -235,7 +235,7 @@ var systemsLoop = maketimer(0.1, func {
systems.HYD.loop();
systems.FUEL.loop();
systems.ADIRS.loop();
libraries.ECAM.loop();
ecam.ECAM.loop();
libraries.BUTTONS.update();
fadec.FADEC.loop();
rmp.rmpUpdate();