From 904db4e3003b8daf631c3a3a4867726cb8bf106c Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 20:28:09 +0100 Subject: [PATCH 1/4] Remove extra floating thing on ND --- Models/Instruments/ND/canvas/res/airbusND.svg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Models/Instruments/ND/canvas/res/airbusND.svg b/Models/Instruments/ND/canvas/res/airbusND.svg index 33706324..363030ba 100644 --- a/Models/Instruments/ND/canvas/res/airbusND.svg +++ b/Models/Instruments/ND/canvas/res/airbusND.svg @@ -1200,10 +1200,6 @@ inkscape:transform-center-y="-345.50518" inkscape:label="#path6714" inkscape:transform-center-x="-0.001953124" /> Date: Thu, 5 Aug 2021 20:54:01 +0100 Subject: [PATCH 2/4] Bugfix --- Nasal/ECAM/ECAM-logic.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index b3cc9004..47d360d9 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -2136,7 +2136,7 @@ var messages_priority_2 = func { if (getprop("/systems/thrust/thr-locked-flash") == 0) { athr_lock.msg = " "; } else { - athr_lock.msg = msgSave + athr_lock.msg = msgSave; } athr_lock.active = 1; athr_lock_1.active = 1; From a84eebf5f2f727e7bd45524a105b94d5b08c4fc5 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 20:59:17 +0100 Subject: [PATCH 3/4] Improve ATIS page based upon photo reference --- Models/Instruments/MCDU/MCDU.nas | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index f9e09f1c..ecb82b0b 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1432,10 +1432,10 @@ var canvas_MCDU_base = { me.colorLeft("blu", "blu", "blu", "blu", "wht", "wht"); me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht"); me.colorLeftArrow("wht", "wht", "wht", "wht", "wht", "wht"); - me.colorCenter("grn", "grn", "grn", "grn", "wht", "wht"); + me.colorCenter("wht", "wht", "wht", "wht", "wht", "wht"); me.colorCenterS("wht", "wht", "wht", "wht", "wht", "wht"); - me.colorRight("wht", "wht", "wht", "wht", "wht", "wht"); - me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht"); + me.colorRight("blu", "blu", "blu", "blu", "wht", "blu"); + me.colorRightS("blu", "blu", "blu", "blu", "wht", "wht"); me.colorRightArrow("wht", "wht", "wht", "wht", "wht", "wht"); @@ -1468,7 +1468,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[0].station != nil) { me["Simple_L1"].setText(" " ~ atsu.ATISInstances[0].station ~ "/" ~ (atsu.ATISInstances[0].type == 0 ? "ARR" : "DEP")); me["Simple_L1"].setFont(default); - me["Simple_L1_Arrow"].show(); + if (atsu.ATISInstances[0].received) { + me["Simple_L1_Arrow"].show(); + } else { + me["Simple_L1_Arrow"].hide(); + } } else { me["Simple_L1"].setText(" [ ]/[ ]"); me["Simple_L1"].setFont(symbol); @@ -1486,6 +1490,11 @@ var canvas_MCDU_base = { me["Simple_L2"].setText(" " ~ atsu.ATISInstances[1].station ~ "/" ~ (atsu.ATISInstances[1].type == 0 ? "ARR" : "DEP")); me["Simple_L2"].setFont(default); me["Simple_L2_Arrow"].show(); + if (atsu.ATISInstances[1].received) { + me["Simple_L2_Arrow"].show(); + } else { + me["Simple_L2_Arrow"].hide(); + } } else { me["Simple_L2"].setText(" [ ]/[ ]"); me["Simple_L2"].setFont(symbol); @@ -1502,7 +1511,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[2].station != nil) { me["Simple_L3"].setText(" " ~ atsu.ATISInstances[2].station ~ "/" ~ (atsu.ATISInstances[2].type == 0 ? "ARR" : "DEP")); me["Simple_L3"].setFont(default); - me["Simple_L3_Arrow"].show(); + if (atsu.ATISInstances[2].received) { + me["Simple_L3_Arrow"].show(); + } else { + me["Simple_L3_Arrow"].hide(); + } } else { me["Simple_L3"].setText(" [ ]/[ ]"); me["Simple_L3"].setFont(symbol); @@ -1519,7 +1532,11 @@ var canvas_MCDU_base = { if (atsu.ATISInstances[3].station != nil) { me["Simple_L4"].setText(" " ~ atsu.ATISInstances[3].station ~ "/" ~ (atsu.ATISInstances[3].type == 0 ? "ARR" : "DEP")); me["Simple_L4"].setFont(default); - me["Simple_L4_Arrow"].show(); + if (atsu.ATISInstances[3].received) { + me["Simple_L4_Arrow"].show(); + } else { + me["Simple_L4_Arrow"].hide(); + } } else { me["Simple_L4"].setText(" [ ]/[ ]"); me["Simple_L4"].setFont(symbol); From 8f6ec0512b7bbe8a7cf1debf0320fd6b81893a1b Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Thu, 5 Aug 2021 21:03:51 +0100 Subject: [PATCH 4/4] Bugfix the received ATIS from a FAA server (due to changed API format) --- Nasal/Systems/Comm/Notification.nas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nasal/Systems/Comm/Notification.nas b/Nasal/Systems/Comm/Notification.nas index 5d01f494..d2510cc8 100644 --- a/Nasal/Systems/Comm/Notification.nas +++ b/Nasal/Systems/Comm/Notification.nas @@ -357,8 +357,8 @@ var ATIS = { raw = split('"}', raw)[0]; } else { if (me.type == 0) { - raw = split('{"arr":"', raw)[1]; - raw = split('","dep":', raw)[0]; + raw = split('"arr":"', raw)[1]; + raw = split('","dep":"', raw)[0]; } else { raw = split('","dep":"', raw)[1]; raw = split('"}', raw)[0];