diff --git a/A320-main.xml b/A320-main.xml index e37243c5..84da58bb 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -4731,7 +4731,6 @@ Aircraft/A320-family/Nasal/MCDU/PERFTO.nas Aircraft/A320-family/Nasal/MCDU/RADNAV.nas Aircraft/A320-family/Nasal/MCDU/DATA.nas - Aircraft/A320-family/Nasal/MCDU/DATA2.nas Aircraft/A320-family/Nasal/MCDU/STATUS.nas diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas index 8093bcc3..7afe6763 100644 --- a/Nasal/MCDU/DATA.nas +++ b/Nasal/MCDU/DATA.nas @@ -60,3 +60,15 @@ var printInput2 = func(key, i) { setprop("FMGC/print/mcdu/page2/R4req", 1); } } + +var data2Input = func(key, i) { + if (key == "L5") { + if (canvas_mcdu.myCLBWIND[i] == nil) { + canvas_mcdu.myCLBWIND[i] = windCLBPage.new(i); + } else { + canvas_mcdu.myCLBWIND[i].reload(); + } + fmgc.windController.accessPage[i] = "DATA2"; + setprop("MCDU[" ~ i ~ "]/page", "WINDCLB"); + } +} diff --git a/Nasal/MCDU/DATA2.nas b/Nasal/MCDU/DATA2.nas deleted file mode 100644 index 650f8bd7..00000000 --- a/Nasal/MCDU/DATA2.nas +++ /dev/null @@ -1,15 +0,0 @@ -# A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) - -# Copyright (c) 2020 Matthew Maring (mattmaring) - -var data2Input = func(key, i) { - if (key == "L5") { - if (canvas_mcdu.myCLBWIND[i] == nil) { - canvas_mcdu.myCLBWIND[i] = windCLBPage.new(i); - } else { - canvas_mcdu.myCLBWIND[i].reload(); - } - fmgc.windController.accessPage[i] = "DATA2"; - setprop("MCDU[" ~ i ~ "]/page", "WINDCLB"); - } -}