fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into new-flightplan

Browse source
This commit is contained in:
Jonathan Redpath 2022-02-11 19:50:17 +00:00
commit aaf04c9c2b
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Nasal/FMGC/SimbriefParser.nas
View file

@ -112,7 +112,9 @@ var SimbriefParser = {
fmgc.FMGCInternal.arrApt = destinationID; fmgc.FMGCInternal.arrApt = destinationID;
atsu.ATISInstances[0].newStation(departureID); atsu.ATISInstances[0].newStation(departureID);
atsu.ATISInstances[0].setType(1);
atsu.ATISInstances[1].newStation(destinationID); atsu.ATISInstances[1].newStation(destinationID);
atsu.ATISInstances[1].setType(0);
fmgc.FMGCInternal.toFromSet = 1; fmgc.FMGCInternal.toFromSet = 1;
fmgc.FMGCNodes.toFromSet.setValue(1); fmgc.FMGCNodes.toFromSet.setValue(1);
@ -139,6 +141,7 @@ var SimbriefParser = {
if (size(alternates) != 0) { if (size(alternates) != 0) {
fmgc.FMGCInternal.altAirport = alternateID; fmgc.FMGCInternal.altAirport = alternateID;
atsu.ATISInstances[2].newStation(alternateID); atsu.ATISInstances[2].newStation(alternateID);
atsu.ATISInstances[2].setType(0);
fmgc.FMGCInternal.altAirportSet = 1; fmgc.FMGCInternal.altAirportSet = 1;
} }
} }

3
Nasal/MCDU/MCDU.nas
View file

@ -292,6 +292,7 @@ var lskbutton = func(btn, i) {
if (atsu.ATISInstances[0].sent != 1) { if (atsu.ATISInstances[0].sent != 1) {
if (fmgc.FMGCInternal.depApt != "") { if (fmgc.FMGCInternal.depApt != "") {
atsu.ATISInstances[0].newStation(fmgc.FMGCInternal.depApt); atsu.ATISInstances[0].newStation(fmgc.FMGCInternal.depApt);
atsu.ATISInstances[0].setType(1);
} else { } else {
atsu.ATISInstances[0].station = nil; atsu.ATISInstances[0].station = nil;
} }
@ -436,6 +437,7 @@ var lskbutton = func(btn, i) {
if (atsu.ATISInstances[1].sent != 1) { if (atsu.ATISInstances[1].sent != 1) {
if (fmgc.FMGCInternal.arrApt != "") { if (fmgc.FMGCInternal.arrApt != "") {
atsu.ATISInstances[1].newStation(fmgc.FMGCInternal.arrApt); atsu.ATISInstances[1].newStation(fmgc.FMGCInternal.arrApt);
atsu.ATISInstances[1].setType(0);
} else { } else {
atsu.ATISInstances[1].station = nil; atsu.ATISInstances[1].station = nil;
} }
@ -565,6 +567,7 @@ var lskbutton = func(btn, i) {
if (atsu.ATISInstances[2].sent != 1) { if (atsu.ATISInstances[2].sent != 1) {
if (fmgc.FMGCInternal.altAirportSet) { if (fmgc.FMGCInternal.altAirportSet) {
atsu.ATISInstances[2].newStation(fmgc.FMGCInternal.altAirport); atsu.ATISInstances[2].newStation(fmgc.FMGCInternal.altAirport);
atsu.ATISInstances[1].setType(0);
} else { } else {
atsu.ATISInstances[2].station = nil; atsu.ATISInstances[2].station = nil;
} }

5
Nasal/Systems/Comm/Notification.nas
View file

@ -302,6 +302,11 @@ var ATIS = {
return 1; return 1;
} }
}, },
setType: func(i) {
if (i >= 0 and i <= 1) {
me.type = i;
}
},
sendReq: func(i) { sendReq: func(i) {
if (me.station == nil or (me.sent and !me.received)) { if (me.station == nil or (me.sent and !me.received)) {
return 1; return 1;

2
Systems/a320-fwc.xml
View file

@ -3446,7 +3446,7 @@
<actuator name="/ECAM/warnings/fctl/altn-law-output"> <actuator name="/ECAM/warnings/fctl/altn-law-output">
<input>/ECAM/warnings/fctl/altn-law</input> <input>/ECAM/warnings/fctl/altn-law</input>
<rate_limit sense="decr">120</rate_limit> <!-- Instant --> <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
<rate_limit sense="incr">3.33333333333</rate_limit> <!-- 0.3 seconds --> <rate_limit sense="incr">0.3</rate_limit>
</actuator> </actuator>