From 4cc86d0ab03f3385dd008d2d9a8fb70b1a1c4093 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Mon, 27 Dec 2021 16:54:23 +0000 Subject: [PATCH] PRINTER NOT AVAIL --- Nasal/MCDU/DATA.nas | 4 ++-- Nasal/MCDU/MCDU.nas | 44 +------------------------------------------- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas index 7afe6763..6ef87d1c 100644 --- a/Nasal/MCDU/DATA.nas +++ b/Nasal/MCDU/DATA.nas @@ -11,13 +11,13 @@ var dataInput = func(key, i) { setprop("MCDU[" ~ i ~ "]/page", "GPSMON"); } elsif (key == "L5") { if (canvas_mcdu.myClosestAirport[i] != nil) { - canvas_mcdu.myClosestAirport[i].del(); + canvas_mcdu.myClosestAirport[i].del(); } canvas_mcdu.myClosestAirport[i] = nil; canvas_mcdu.myClosestAirport[i] = closestAirportPage.new(i); setprop("MCDU[" ~ i ~ "]/page", "CLOSESTAIRPORT"); } elsif (key == "R5") { - setprop("MCDU[" ~ i ~ "]/page", "PRINTFUNC"); + mcdu_message(i, "PRINTER NOT AVAILABLE"); } } diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas index 8511ce8c..8931782a 100644 --- a/Nasal/MCDU/MCDU.nas +++ b/Nasal/MCDU/MCDU.nas @@ -256,10 +256,6 @@ var lskbutton = func(btn, i) { radnavInput("L1",i); } else if (page == "DATA") { dataInput("L1",i); - } else if (page == "PRINTFUNC") { - printInput("L1",i); - } else if (page == "PRINTFUNC2") { - printInput2("L1",i); } else if (page == "LATREV") { if (canvas_mcdu.myLatRev[i].type == 0) { if (canvas_mcdu.myDeparture[i] != nil) { @@ -410,10 +406,6 @@ var lskbutton = func(btn, i) { perfDESInput("L2",i); } else if (page == "DATA") { dataInput("L2",i); - } else if (page == "PRINTFUNC") { - printInput("L2",i); - } else if (page == "PRINTFUNC2") { - printInput2("L2",i); } else if (page == "F-PLNA" or page == "F-PLNB") { canvas_mcdu.myFpln[i].pushButtonLeft(2); } else if (page == "DEPARTURE") { @@ -537,10 +529,6 @@ var lskbutton = func(btn, i) { radnavInput("L3",i); } else if (page == "DATA") { dataInput("L3",i); - } else if (page == "PRINTFUNC") { - printInput("L3",i); - } else if (page == "PRINTFUNC2") { - printInput2("L3",i); } else if (page == "F-PLNA" or page == "F-PLNB") { canvas_mcdu.myFpln[i].pushButtonLeft(3); } else if (page == "DEPARTURE") { @@ -664,8 +652,6 @@ var lskbutton = func(btn, i) { perfAPPRInput("L4",i); } else if (page == "RADNAV") { radnavInput("L4",i); - } else if (page == "PRINTFUNC2") { - printInput2("L4",i); } else if (page == "F-PLNA" or page == "F-PLNB") { canvas_mcdu.myFpln[i].pushButtonLeft(4); } else if (page == "DEPARTURE") { @@ -784,10 +770,6 @@ var lskbutton = func(btn, i) { perfGAInput("L5",i); } else if (page == "RADNAV") { radnavInput("L5",i); - } else if (page == "PRINTFUNC") { - printInput("L5",i); - } else if (page == "PRINTFUNC2") { - printInput2("L5",i); } else if (page == "DATA") { dataInput("L5",i); } else if (page == "DATA2") { @@ -855,8 +837,6 @@ var lskbutton = func(btn, i) { perfAPPRInput("L6",i); } else if (page == "PERFGA") { perfGAInput("L6",i); - } else if (page == "PRINTFUNC2") { - printInput2("L6",i); } else if (page == "F-PLNA" or page == "F-PLNB") { canvas_mcdu.myFpln[i].pushButtonLeft(6); } else if (page == "LATREV" or page == "VERTREV" or page == "DUPLICATENAMES") { @@ -932,10 +912,6 @@ var rskbutton = func(btn, i) { canvas_mcdu.myDESWIND[i].pushButtonRight(1); } else if (page == "RADNAV") { radnavInput("R1",i); - } else if (page == "PRINTFUNC") { - printInput("R1",i); - } else if (page == "PRINTFUNC2") { - printInput2("R1",i); } else if (page == "LATREV") { if (canvas_mcdu.myLatRev[i].type == 1) { if (canvas_mcdu.myArrival[i] != nil) { @@ -1008,10 +984,6 @@ var rskbutton = func(btn, i) { perfAPPRInput("R2",i); } else if (page == "RADNAV") { radnavInput("R2",i); - } else if (page == "PRINTFUNC") { - printInput("R2",i); - } else if (page == "PRINTFUNC2") { - printInput2("R2",i); } else if (page == "DEPARTURE") { canvas_mcdu.myDeparture[i].depPushbuttonRight(2); } else if (page == "ARRIVAL") { @@ -1053,10 +1025,6 @@ var rskbutton = func(btn, i) { perfTOInput("R3",i); } else if (page == "PERFAPPR") { perfAPPRInput("R3",i); - } else if (page == "PRINTFUNC") { - printInput("R3",i); - } else if (page == "PRINTFUNC2") { - printInput2("R3",i); } else if (page == "DEPARTURE") { canvas_mcdu.myDeparture[i].depPushbuttonRight(3); } else if (page == "ARRIVAL") { @@ -1146,8 +1114,6 @@ var rskbutton = func(btn, i) { perfAPPRInput("R4",i); } else if (page == "RADNAV") { radnavInput("R4",i); - } else if (page == "PRINTFUNC2") { - printInput2("R4",i); } else if (page == "DEPARTURE") { canvas_mcdu.myDeparture[i].depPushbuttonRight(4); } else if (page == "ARRIVAL") { @@ -1284,7 +1250,7 @@ var rskbutton = func(btn, i) { perfDESInput("R6",i); } else if (page == "PERFAPPR") { perfAPPRInput("R6",i); - } else if ((page == "DATA") or (page == "PRINTFUNC") or (page == "PRINTFUNC2")) { + } else if (page == "DATA") { mcdu_message(i, "AOC DISABLED"); } else if (page == "INITA") { initInputA("R6",i); @@ -1343,10 +1309,6 @@ var arrowbutton = func(btn, i) { } } else if (page == "INITB" or page == "FUELPRED") { pageNode[i].setValue("INITA"); - } else if (page == "PRINTFUNC") { - pageNode[i].setValue("PRINTFUNC2"); - } else if (page == "PRINTFUNC2") { - pageNode[i].setValue("PRINTFUNC"); } else if (page == "DEPARTURE") { canvas_mcdu.myDeparture[i].scrollLeft(); } else if (page == "ARRIVAL") { @@ -1375,10 +1337,6 @@ var arrowbutton = func(btn, i) { } } else if (page == "INITB" or page == "FUELPRED") { pageNode[i].setValue("INITA"); - } else if (page == "PRINTFUNC") { - pageNode[i].setValue("PRINTFUNC2"); - } else if (page == "PRINTFUNC2") { - pageNode[i].setValue("PRINTFUNC"); } else if (page == "DEPARTURE") { canvas_mcdu.myDeparture[i].scrollRight(); } else if (page == "ARRIVAL") {