fly/A320-family
1
0
Fork 0
Code Activity

Improvements to winds format entry, fixes for nasal error

Browse source
This commit is contained in:
legoboyvdlp R 2020-06-14 18:30:58 +01:00
parent b0807111a9
commit ed66593c1b
8 changed files with 78 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Nasal/FMGC/FMGC-b.nas
View file

@ -430,6 +430,12 @@ var ITAF = {
if (FPLN.wp0Dist.getValue() <= FPLN.turnDist and !Gear.wow1.getBoolValue()) { if (FPLN.wp0Dist.getValue() <= FPLN.turnDist and !Gear.wow1.getBoolValue()) {
flightPlanController.autoSequencing(); flightPlanController.autoSequencing();
} }
#if (FPLN.wp0Dist.getValue() <= FPLN.turnDist and !Gear.wow1.getBoolValue() and fmgc.flightPlanController.flightplans[2].getWP(FPLN.currentWPTemp).fly_type == "flyBy") {
# flightPlanController.autoSequencing();
#} elsif (FPLN.wp0Dist.getValue() <= 0.1) {
# flightPlanController.autoSequencing();
#}
} }
} }
}, },

4
Nasal/FMGC/FMGC.nas
View file

@ -269,9 +269,9 @@ var updateFuel = func {
temp = getprop("/FMGC/internal/cruise-temp"); temp = getprop("/FMGC/internal/cruise-temp");
dist = flightPlanController.arrivalDist; dist = flightPlanController.arrivalDist;
wind = getprop("/FMGC/internal/trip-wind"); trpWind = getprop("/FMGC/internal/trip-wind");
wind_value = getprop("/FMGC/internal/trip-wind-value"); wind_value = getprop("/FMGC/internal/trip-wind-value");
if (find("HD", wind) != -1 or find("-", wind) != -1 or find("H", wind) != -1) { if (find("HD", trpWind) != -1 or find("-", trpWind) != -1 or find("H", trpWind) != -1) {
wind_value = wind_value * -1; wind_value = wind_value * -1;
} }
dist = dist - (dist * wind_value * 0.002); dist = dist - (dist * wind_value * 0.002);

4
Nasal/MCDU/PERFAPPR.nas
View file

@ -35,12 +35,10 @@ var perfAPPRInput = func(key, i) {
mcdu_scratchpad.scratchpads[i].empty(); mcdu_scratchpad.scratchpads[i].empty();
} else if (tfs >= 3 and tfs <= 7 and find("/", scratchpad) != -1) { } else if (tfs >= 3 and tfs <= 7 and find("/", scratchpad) != -1) {
var weather = split("/", scratchpad); var weather = split("/", scratchpad);
var mag = int(weather[0]);
var mags = size(weather[0]); var mags = size(weather[0]);
var wind = int(weather[1]);
var winds = size(weather[1]); var winds = size(weather[1]);
if (mags >= 1 and mags <= 3 and winds >= 1 and winds <= 3) { if (mags >= 1 and mags <= 3 and winds >= 1 and winds <= 3) {
if (mag != nil and wind != nil and mag >= 0 and mag <= 360 and wind >= 0 and wind <= 200) { if (num(weather[0]) != nil and num(weather[1]) != nil and int(weather[0]) >= 0 and int(weather[0]) <= 360 and int(weather[1]) >= 0 and int(weather[1]) <= 200) {
setprop("/FMGC/internal/dest-mag", weather[0]); setprop("/FMGC/internal/dest-mag", weather[0]);
setprop("/FMGC/internal/dest-wind", weather[1]); setprop("/FMGC/internal/dest-wind", weather[1]);
mcdu_scratchpad.scratchpads[i].empty(); mcdu_scratchpad.scratchpads[i].empty();

32
Nasal/MCDU/WINDCLB.nas
View file

@ -70,10 +70,10 @@ var windCLBPage = {
} }
if (me.items >= 5) { if (me.items >= 5) {
var wind = 0; var windStore = 0;
wind = fmgc.windController.clb_winds[computer_temp].wind5; windStore = fmgc.windController.clb_winds[computer_temp].wind5;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L5 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L5 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][4] = 1; me.fontMatrix[0][4] = 1;
} else { } else {
me.L5 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L5 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -84,9 +84,9 @@ var windCLBPage = {
} }
if (me.items >= 4) { if (me.items >= 4) {
wind = fmgc.windController.clb_winds[computer_temp].wind4; windStore = fmgc.windController.clb_winds[computer_temp].wind4;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L4 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L4 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][3] = 1; me.fontMatrix[0][3] = 1;
} else { } else {
me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -97,9 +97,9 @@ var windCLBPage = {
} }
if (me.items >= 3) { if (me.items >= 3) {
wind = fmgc.windController.clb_winds[computer_temp].wind3; windStore = fmgc.windController.clb_winds[computer_temp].wind3;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L3 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L3 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][2] = 1; me.fontMatrix[0][2] = 1;
} else { } else {
me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -110,9 +110,9 @@ var windCLBPage = {
} }
if (me.items >= 2) { if (me.items >= 2) {
wind = fmgc.windController.clb_winds[computer_temp].wind2; windStore = fmgc.windController.clb_winds[computer_temp].wind2;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L2 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L2 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][1] = 1; me.fontMatrix[0][1] = 1;
} else { } else {
me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -123,9 +123,9 @@ var windCLBPage = {
} }
if (me.items >= 1) { if (me.items >= 1) {
wind = fmgc.windController.clb_winds[computer_temp].wind1; windStore = fmgc.windController.clb_winds[computer_temp].wind1;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L1 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, "TRU WIND/ALT", "blu"]; me.L1 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, "TRU WIND/ALT", "blu"];
me.fontMatrix[0][0] = 1; me.fontMatrix[0][0] = 1;
} else { } else {
me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"]; me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"];

61
Nasal/MCDU/WINDCRZ.nas
View file

@ -96,9 +96,10 @@ var windCRZPage = {
# load data # load data
if (me.singleCRZ == 1) { if (me.singleCRZ == 1) {
if (me.items >= 4) { if (me.items >= 4) {
wind = fmgc.windController.crz_winds[computer_temp].wind4; var windStore = 0;
if (wind.altitude != "") { windStore = fmgc.windController.crz_winds[computer_temp].wind4;
me.L4 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; if (windStore.altitude != "") {
me.L4 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][3] = 1; me.fontMatrix[0][3] = 1;
} else { } else {
me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -109,9 +110,9 @@ var windCRZPage = {
} }
if (me.items >= 3) { if (me.items >= 3) {
wind = fmgc.windController.crz_winds[computer_temp].wind3; windStore = fmgc.windController.crz_winds[computer_temp].wind3;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L3 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L3 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][2] = 1; me.fontMatrix[0][2] = 1;
} else { } else {
me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -122,9 +123,9 @@ var windCRZPage = {
} }
if (me.items >= 2) { if (me.items >= 2) {
wind = fmgc.windController.crz_winds[computer_temp].wind2; windStore = fmgc.windController.crz_winds[computer_temp].wind2;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L2 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L2 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][1] = 1; me.fontMatrix[0][1] = 1;
} else { } else {
me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -135,9 +136,9 @@ var windCRZPage = {
} }
if (me.items >= 1) { if (me.items >= 1) {
wind = fmgc.windController.crz_winds[computer_temp].wind1; windStore = fmgc.windController.crz_winds[computer_temp].wind1;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L1 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, "TRU WIND/ALT", "blu"]; me.L1 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, "TRU WIND/ALT", "blu"];
me.fontMatrix[0][0] = 1; me.fontMatrix[0][0] = 1;
} else { } else {
me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"]; me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"];
@ -145,9 +146,9 @@ var windCRZPage = {
} }
} }
wind = fmgc.windController.crz_winds[computer_temp].sat1; windStore = fmgc.windController.crz_winds[computer_temp].sat1;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L5 = [wind.temp ~ "/" ~ wind.altitude, "SAT / ALT", "blu"]; me.L5 = [windStore.temp ~ "/" ~ windStore.altitude, "SAT / ALT", "blu"];
me.fontMatrix[0][4] = 1; me.fontMatrix[0][4] = 1;
} else { } else {
me.L5 = ["[ ]/[ ]", "SAT / ALT", "blu"]; me.L5 = ["[ ]/[ ]", "SAT / ALT", "blu"];
@ -155,9 +156,9 @@ var windCRZPage = {
} }
} else { } else {
if (me.items >= 4) { if (me.items >= 4) {
wind = fmgc.windController.winds[computer_temp][me.match_location].wind4; windStore = fmgc.windController.winds[computer_temp][me.match_location].wind4;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L4 = [sprintf("%03.0f", wind.heading) ~ "°/" ~sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L4 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][3] = 1; me.fontMatrix[0][3] = 1;
} else { } else {
me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -168,9 +169,9 @@ var windCRZPage = {
} }
if (me.items >= 3) { if (me.items >= 3) {
wind = fmgc.windController.winds[computer_temp][me.match_location].wind3; windStore = fmgc.windController.winds[computer_temp][me.match_location].wind3;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L3 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L3 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][2] = 1; me.fontMatrix[0][2] = 1;
} else { } else {
me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -181,9 +182,9 @@ var windCRZPage = {
} }
if (me.items >= 2) { if (me.items >= 2) {
wind = fmgc.windController.winds[computer_temp][me.match_location].wind2; windStore = fmgc.windController.winds[computer_temp][me.match_location].wind2;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L2 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L2 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][1] = 1; me.fontMatrix[0][1] = 1;
} else { } else {
me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -194,9 +195,9 @@ var windCRZPage = {
} }
if (me.items >= 1) { if (me.items >= 1) {
wind = fmgc.windController.winds[computer_temp][me.match_location].wind1; windStore = fmgc.windController.winds[computer_temp][me.match_location].wind1;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L1 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, "TRU WIND/ALT", "blu"]; me.L1 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, "TRU WIND/ALT", "blu"];
me.fontMatrix[0][0] = 1; me.fontMatrix[0][0] = 1;
} else { } else {
me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"]; me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"];
@ -204,9 +205,9 @@ var windCRZPage = {
} }
} }
wind = fmgc.windController.winds[computer_temp][me.match_location].sat1; windStore = fmgc.windController.winds[computer_temp][me.match_location].sat1;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L5 = [wind.temp ~ "/" ~ wind.altitude, "SAT / ALT", "blu"]; me.L5 = [windStore.temp ~ "/" ~ windStore.altitude, "SAT / ALT", "blu"];
me.fontMatrix[0][4] = 1; me.fontMatrix[0][4] = 1;
} else { } else {
me.L5 = ["[ ]/[ ]", "SAT / ALT", "blu"]; me.L5 = ["[ ]/[ ]", "SAT / ALT", "blu"];

36
Nasal/MCDU/WINDDES.nas
View file

@ -71,10 +71,10 @@ var windDESPage = {
} }
if (me.items >= 5) { if (me.items >= 5) {
var wind = 0; var windStore = 0;
wind = fmgc.windController.des_winds[computer_temp].wind5; windStore = fmgc.windController.des_winds[computer_temp].wind5;
if (wind.altitude != "") { if (wind.altitude != "") {
me.L5 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L5 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][4] = 1; me.fontMatrix[0][4] = 1;
} else { } else {
me.L5 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L5 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -85,9 +85,9 @@ var windDESPage = {
} }
if (me.items >= 4) { if (me.items >= 4) {
wind = fmgc.windController.des_winds[computer_temp].wind4; windStore = fmgc.windController.des_winds[computer_temp].wind4;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L4 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L4 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][3] = 1; me.fontMatrix[0][3] = 1;
} else { } else {
me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L4 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -98,9 +98,9 @@ var windDESPage = {
} }
if (me.items >= 3) { if (me.items >= 3) {
wind = fmgc.windController.des_winds[computer_temp].wind3; windStore = fmgc.windController.des_winds[computer_temp].wind3;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L3 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L3 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][2] = 1; me.fontMatrix[0][2] = 1;
} else { } else {
me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L3 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -111,9 +111,9 @@ var windDESPage = {
} }
if (me.items >= 2) { if (me.items >= 2) {
wind = fmgc.windController.des_winds[computer_temp].wind2; windStore = fmgc.windController.des_winds[computer_temp].wind2;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L2 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, nil, "blu"]; me.L2 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, nil, "blu"];
me.fontMatrix[0][1] = 1; me.fontMatrix[0][1] = 1;
} else { } else {
me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"]; me.L2 = ["[ ]/[ ]/[ ]", nil, "blu"];
@ -124,9 +124,9 @@ var windDESPage = {
} }
if (me.items >= 1) { if (me.items >= 1) {
wind = fmgc.windController.des_winds[computer_temp].wind1; windStore = fmgc.windController.des_winds[computer_temp].wind1;
if (wind.altitude != "") { if (windStore.altitude != "") {
me.L1 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude) ~ "/" ~ wind.altitude, "TRU WIND/ALT", "blu"]; me.L1 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude) ~ "/" ~ windStore.altitude, "TRU WIND/ALT", "blu"];
me.fontMatrix[0][0] = 1; me.fontMatrix[0][0] = 1;
} else { } else {
me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"]; me.L1 = ["[ ]/[ ]/[ ]", "TRU WIND/ALT", "blu"];
@ -137,9 +137,9 @@ var windDESPage = {
me.L6 = [" RETURN", nil, "wht"]; me.L6 = [" RETURN", nil, "wht"];
if (getprop("/FMGC/internal/alt-set")) { if (getprop("/FMGC/internal/alt-set")) {
wind = fmgc.windController.des_winds[computer_temp].alt1; windStore = fmgc.windController.des_winds[computer_temp].alt1;
if (wind.heading != 0 and wind.magnitude != 0) { if (windStore.heading != 0 and windStore.magnitude != 0) {
me.R1 = [sprintf("%03.0f", wind.heading) ~ "°/" ~ sprintf("%03.0f", wind.magnitude), "ALTN WIND ", "blu"]; me.R1 = [sprintf("%03.0f", windStore.heading) ~ "°/" ~ sprintf("%03.0f", windStore.magnitude), "ALTN WIND ", "blu"];
me.fontMatrix[1][0] = 1; me.fontMatrix[1][0] = 1;
} else { } else {
me.R1 = ["[ ]/[ ]", "ALTN WIND ", "blu"]; me.R1 = ["[ ]/[ ]", "ALTN WIND ", "blu"];