From 4c45396dd865dd3f41b5468b9bdff71c17791906 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Tue, 16 May 2017 12:35:52 +0100 Subject: [PATCH] fix INIT, scratchoad, CLR key, and add DATA --- Models/Instruments/MCDU1/DATA/DATA.xml | 336 +++++++++++++++++++++++ Models/Instruments/MCDU1/DATA/EMPTY.ac | 3 + Models/Instruments/MCDU1/INITA/INITA.xml | 62 ++++- Models/Instruments/MCDU1/MCDU1.xml | 41 +++ Models/Instruments/MCDU1/SCRATCHPAD.xml | 2 +- Models/Instruments/MCDU2/DATA/DATA.xml | 336 +++++++++++++++++++++++ Models/Instruments/MCDU2/DATA/EMPTY.ac | 3 + Models/Instruments/MCDU2/INITA/INITA.xml | 62 ++++- Models/Instruments/MCDU2/MCDU2.xml | 41 +++ Models/Instruments/MCDU2/SCRATCHPAD.xml | 2 +- Nasal/MCDU1.nas | 18 +- Nasal/MCDU2.nas | 18 +- 12 files changed, 896 insertions(+), 28 deletions(-) create mode 100644 Models/Instruments/MCDU1/DATA/DATA.xml create mode 100644 Models/Instruments/MCDU1/DATA/EMPTY.ac create mode 100644 Models/Instruments/MCDU2/DATA/DATA.xml create mode 100644 Models/Instruments/MCDU2/DATA/EMPTY.ac diff --git a/Models/Instruments/MCDU1/DATA/DATA.xml b/Models/Instruments/MCDU1/DATA/DATA.xml new file mode 100644 index 00000000..8c07ec11 --- /dev/null +++ b/Models/Instruments/MCDU1/DATA/DATA.xml @@ -0,0 +1,336 @@ + + + + + + + EMPTY.ac + + + page + + -0.001 + 0.0 + 0.083 + + center-center + yz-plane + text-value + DATA + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + position + + -0.001 + -0.045 + 0.0760 + + left-center + yz-plane + text-value + POSITION + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + positionmon + + -0.001 + -0.045 + 0.0720 + + left-center + yz-plane + text-value + <MONITOR + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + irs + + -0.001 + -0.045 + 0.066 + + left-center + yz-plane + text-value + IRS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + irs2 + + -0.001 + -0.045 + 0.06 + + left-center + yz-plane + text-value + <MONITOR + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + gps + + -0.001 + -0.045 + 0.0545 + + left-center + yz-plane + text-value + GPS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + gps2 + + -0.001 + -0.045 + 0.0500 + + left-center + yz-plane + text-value + <MONITOR + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + print + + -0.001 + 0.041 + 0.033 + + right-center + yz-plane + text-value + PRINT + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + print2 + + -0.001 + 0.043 + 0.029 + + right-center + yz-plane + text-value + FUNCTION> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + status + + -0.001 + -0.045 + 0.0415 + + left-center + yz-plane + text-value + <A/C STATUS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + aoc + + -0.001 + 0.041 + 0.0230 + + right-center + yz-plane + text-value + AOC + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + aoc2 + + -0.001 + 0.043 + 0.0190 + + right-center + yz-plane + text-value + FUNCTION> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + + + material + page + position + positionmon + irs + irs2 + gps + gps2 + print + print2 + status + aoc + aoc2 + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + diff --git a/Models/Instruments/MCDU1/DATA/EMPTY.ac b/Models/Instruments/MCDU1/DATA/EMPTY.ac new file mode 100644 index 00000000..4dd7e1f9 --- /dev/null +++ b/Models/Instruments/MCDU1/DATA/EMPTY.ac @@ -0,0 +1,3 @@ +AC3Db +OBJECT world +kids 0 diff --git a/Models/Instruments/MCDU1/INITA/INITA.xml b/Models/Instruments/MCDU1/INITA/INITA.xml index fd111ebe..bf3c401d 100644 --- a/Models/Instruments/MCDU1/INITA/INITA.xml +++ b/Models/Instruments/MCDU1/INITA/INITA.xml @@ -147,14 +147,14 @@ -0.001 -0.045 - 0.0605 + 0.0590 left-center yz-plane text-value ----/---------- false - BoeingCDU-Large.ttf + BoeingCDU-Small.ttf autopilot/serviceable true false @@ -167,7 +167,7 @@ - init + initreq -0.001 0.040 @@ -381,7 +381,7 @@ -0.001 -0.045 - 0.029 + 0.0275 left-center yz-plane @@ -498,7 +498,7 @@ -0.001 -0.045 - 0.0190 + 0.0170 left-center yz-plane @@ -540,6 +540,29 @@ 64 + + LAT + + -0.001 + -0.045 + 0.0435 + + left-center + yz-plane + text-value + LAT + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + LONG-val @@ -563,6 +586,29 @@ 64 + + LAT-val + + -0.001 + -0.045 + 0.0395 + + left-center + yz-plane + text-value + N/A + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + tropo @@ -628,6 +674,7 @@ wind wind2 LONG + LAT 1 1 @@ -653,10 +700,10 @@ material - init + initreq alignirs alignirs-arrow - init + initreq requeststar request fromtobox @@ -715,6 +762,7 @@ material tropovalue LONG-val + LAT-val 0 0.5 diff --git a/Models/Instruments/MCDU1/MCDU1.xml b/Models/Instruments/MCDU1/MCDU1.xml index e68f8d18..6fb35b4e 100644 --- a/Models/Instruments/MCDU1/MCDU1.xml +++ b/Models/Instruments/MCDU1/MCDU1.xml @@ -70,6 +70,28 @@ + + DATA + DATA/DATA.xml + + 180 + 180 + 90 + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[0]/page + DATA + + + + + pick init @@ -89,6 +111,25 @@ + + pick + data + + + false + + nasal + + + + /systems/electrical/bus/ac1 + 25 + + + + + + pick a diff --git a/Models/Instruments/MCDU1/SCRATCHPAD.xml b/Models/Instruments/MCDU1/SCRATCHPAD.xml index f435dcca..cff0279b 100644 --- a/Models/Instruments/MCDU1/SCRATCHPAD.xml +++ b/Models/Instruments/MCDU1/SCRATCHPAD.xml @@ -15,7 +15,7 @@ -0.001 -0.044 - 0.0120 + 0.0130 left-center yz-plane diff --git a/Models/Instruments/MCDU2/DATA/DATA.xml b/Models/Instruments/MCDU2/DATA/DATA.xml new file mode 100644 index 00000000..8c07ec11 --- /dev/null +++ b/Models/Instruments/MCDU2/DATA/DATA.xml @@ -0,0 +1,336 @@ + + + + + + + EMPTY.ac + + + page + + -0.001 + 0.0 + 0.083 + + center-center + yz-plane + text-value + DATA + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + position + + -0.001 + -0.045 + 0.0760 + + left-center + yz-plane + text-value + POSITION + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + positionmon + + -0.001 + -0.045 + 0.0720 + + left-center + yz-plane + text-value + <MONITOR + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + irs + + -0.001 + -0.045 + 0.066 + + left-center + yz-plane + text-value + IRS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + irs2 + + -0.001 + -0.045 + 0.06 + + left-center + yz-plane + text-value + <MONITOR + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + gps + + -0.001 + -0.045 + 0.0545 + + left-center + yz-plane + text-value + GPS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + gps2 + + -0.001 + -0.045 + 0.0500 + + left-center + yz-plane + text-value + <MONITOR + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + print + + -0.001 + 0.041 + 0.033 + + right-center + yz-plane + text-value + PRINT + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + print2 + + -0.001 + 0.043 + 0.029 + + right-center + yz-plane + text-value + FUNCTION> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + status + + -0.001 + -0.045 + 0.0415 + + left-center + yz-plane + text-value + <A/C STATUS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + aoc + + -0.001 + 0.041 + 0.0230 + + right-center + yz-plane + text-value + AOC + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + aoc2 + + -0.001 + 0.043 + 0.0190 + + right-center + yz-plane + text-value + FUNCTION> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + + + material + page + position + positionmon + irs + irs2 + gps + gps2 + print + print2 + status + aoc + aoc2 + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + diff --git a/Models/Instruments/MCDU2/DATA/EMPTY.ac b/Models/Instruments/MCDU2/DATA/EMPTY.ac new file mode 100644 index 00000000..4dd7e1f9 --- /dev/null +++ b/Models/Instruments/MCDU2/DATA/EMPTY.ac @@ -0,0 +1,3 @@ +AC3Db +OBJECT world +kids 0 diff --git a/Models/Instruments/MCDU2/INITA/INITA.xml b/Models/Instruments/MCDU2/INITA/INITA.xml index fd111ebe..bf3c401d 100644 --- a/Models/Instruments/MCDU2/INITA/INITA.xml +++ b/Models/Instruments/MCDU2/INITA/INITA.xml @@ -147,14 +147,14 @@ -0.001 -0.045 - 0.0605 + 0.0590 left-center yz-plane text-value ----/---------- false - BoeingCDU-Large.ttf + BoeingCDU-Small.ttf autopilot/serviceable true false @@ -167,7 +167,7 @@ - init + initreq -0.001 0.040 @@ -381,7 +381,7 @@ -0.001 -0.045 - 0.029 + 0.0275 left-center yz-plane @@ -498,7 +498,7 @@ -0.001 -0.045 - 0.0190 + 0.0170 left-center yz-plane @@ -540,6 +540,29 @@ 64 + + LAT + + -0.001 + -0.045 + 0.0435 + + left-center + yz-plane + text-value + LAT + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + LONG-val @@ -563,6 +586,29 @@ 64 + + LAT-val + + -0.001 + -0.045 + 0.0395 + + left-center + yz-plane + text-value + N/A + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + tropo @@ -628,6 +674,7 @@ wind wind2 LONG + LAT 1 1 @@ -653,10 +700,10 @@ material - init + initreq alignirs alignirs-arrow - init + initreq requeststar request fromtobox @@ -715,6 +762,7 @@ material tropovalue LONG-val + LAT-val 0 0.5 diff --git a/Models/Instruments/MCDU2/MCDU2.xml b/Models/Instruments/MCDU2/MCDU2.xml index 3e037a6a..7c336931 100644 --- a/Models/Instruments/MCDU2/MCDU2.xml +++ b/Models/Instruments/MCDU2/MCDU2.xml @@ -70,6 +70,28 @@ + + DATA + DATA/DATA.xml + + 180 + 180 + 90 + + + + + /systems/electrical/bus/ac2 + 25 + + + /MCDU[1]/page + DATA + + + + + pick init @@ -89,6 +111,25 @@ + + pick + data + + + false + + nasal + + + + /systems/electrical/bus/ac2 + 25 + + + + + + pick a diff --git a/Models/Instruments/MCDU2/SCRATCHPAD.xml b/Models/Instruments/MCDU2/SCRATCHPAD.xml index 236ad697..1bfb1b7d 100644 --- a/Models/Instruments/MCDU2/SCRATCHPAD.xml +++ b/Models/Instruments/MCDU2/SCRATCHPAD.xml @@ -15,7 +15,7 @@ -0.001 -0.044 - 0.0120 + 0.0130 left-center yz-plane diff --git a/Nasal/MCDU1.nas b/Nasal/MCDU1.nas index e3cc508e..32bb0abe 100644 --- a/Nasal/MCDU1.nas +++ b/Nasal/MCDU1.nas @@ -19,7 +19,13 @@ var pagebutton = func(btn) { setprop("/MCDU[0]/page", "NONE"); settimer(func { setprop("/MCDU[0]/page", "INITA"); - }, 0.3); + }, 0.2); + } + if (btn == "data") { + setprop("/MCDU[0]/page", "NONE"); + settimer(func { + setprop("/MCDU[0]/page", "DATA"); + }, 0.2); } } @@ -80,13 +86,13 @@ var button = func(btn) { } else if (btn == "SLASH") { setprop("/MCDU[0]/scratchpad", scratchpad ~ "/"); } else if (btn == "SP") { - setprop("/MCDU[0]/scratchpad", " "); + setprop("/MCDU[0]/scratchpad", scratchpad ~ " "); # this button adds a space } else if (btn == "CLR") { var scratchpad = getprop("/MCDU[0]/scratchpad"); - if (scratchpad == "NOT ALLOWED") { - setprop("/MCDU[0]/scratchpad", ""); - } else if (size(scratchpad) > 0) { - setprop("/MCDU[0]/scratchpad", left(scratchpad, size(scratchpad)-1)); + if (scratchpad == " ") { + setprop("/MCDU[0]/scratchpad", "CLR"); + } else { + setprop("/MCDU[0]/scratchpad", " "); } } else if (btn == "0") { setprop("/MCDU[0]/scratchpad", scratchpad ~ "0"); diff --git a/Nasal/MCDU2.nas b/Nasal/MCDU2.nas index 30b54c09..3437564a 100644 --- a/Nasal/MCDU2.nas +++ b/Nasal/MCDU2.nas @@ -19,7 +19,13 @@ var pagebutton = func(btn) { setprop("/MCDU[1]/page", "NONE"); settimer(func { setprop("/MCDU[1]/page", "INITA"); - }, 0.3); + }, 0.2); + } + if (btn == "data") { + setprop("/MCDU[1]/page", "NONE"); + settimer(func { + setprop("/MCDU[1]/page", "DATA"); + }, 0.2); } } @@ -80,13 +86,13 @@ var button = func(btn) { } else if (btn == "SLASH") { setprop("/MCDU[1]/scratchpad", scratchpad ~ "/"); } else if (btn == "SP") { - setprop("/MCDU[1]/scratchpad", " "); + setprop("/MCDU[1]/scratchpad", scratchpad ~ " "); # adds a space } else if (btn == "CLR") { var scratchpad = getprop("/MCDU[1]/scratchpad"); - if (scratchpad == "NOT ALLOWED") { - setprop("/MCDU[0]/scratchpad", ""); - } else if (size(scratchpad) > 0) { - setprop("/MCDU[1]/scratchpad", left(scratchpad, size(scratchpad)-1)); + if (scratchpad == " ") { + setprop("/MCDU[1]/scratchpad", "CLR"); + } else { + setprop("/MCDU[1]/scratchpad", " "); } } else if (btn == "0") { setprop("/MCDU[1]/scratchpad", scratchpad ~ "0");