diff --git a/Models/Instruments/MCDU1/MCDU1.xml b/Models/Instruments/MCDU1/MCDU1.xml index 02c9adc1..848fab66 100644 --- a/Models/Instruments/MCDU1/MCDU1.xml +++ b/Models/Instruments/MCDU1/MCDU1.xml @@ -202,6 +202,28 @@ + + DES + PERF/DES/DES.xml + + 180 + 180 + 90 + + + + + /systems/electrical/bus/ac1 + 110 + + + /MCDU[0]/page + DES + + + + + DATA2 DATA2/DATA2.xml diff --git a/Models/Instruments/MCDU1/PERF/DES/DES.xml b/Models/Instruments/MCDU1/PERF/DES/DES.xml new file mode 100644 index 00000000..f66b38ea --- /dev/null +++ b/Models/Instruments/MCDU1/PERF/DES/DES.xml @@ -0,0 +1,585 @@ + + + + + + + EMPTY.ac + + + + + page + + -0.001 + 0.0 + 0.083 + + center-center + yz-plane + text-value + DES + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + actmode + + -0.001 + -0.045 + 0.0755 + + left-center + yz-plane + text-value + ACT MODE + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + actmode2 + + -0.001 + -0.045 + 0.0705 + + left-center + yz-plane + text-value + MANAGED + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + actmode3 + + -0.001 + -0.045 + 0.0705 + + left-center + yz-plane + text-value + SELECTED + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + select + actmode2 + + + /it-autoflight/input/spd-managed + 1 + + + + + select + actmode3 + + + /it-autoflight/input/spd-managed + 0 + + + + + + timedest + + -0.001 + -0.0 + 0.0755 + + center-center + yz-plane + text-value + TIME DEST + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + timedest2 + + -0.001 + -0.0 + 0.0715 + + center-center + yz-plane + text-value + --- + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + efob + + -0.001 + 0.045 + 0.0755 + + right-center + yz-plane + text-value + EFOB + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + efob2 + + -0.001 + 0.045 + 0.0715 + + right-center + yz-plane + text-value + --- + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + ci + + -0.001 + -0.045 + 0.065 + + left-center + yz-plane + text-value + CI + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + ci2 + + -0.001 + -0.045 + 0.0605 + + left-center + yz-plane + text-value + --- + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + ci3 + + -0.001 + -0.045 + 0.0605 + + left-center + yz-plane + text-value + %s + false + BoeingCDU-Large.ttf + /FMGC/internal/cost-index + true + false + false + 0.0050 + + 64 + 64 + + + + + select + ci2 + + /FMGC/internal/cost-index-set + + + + select + ci3 + + /FMGC/internal/cost-index-set + + + + + managed + + -0.001 + -0.045 + 0.0545 + + left-center + yz-plane + text-value + MANAGED + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + presel + + -0.001 + -0.045 + 0.0435 + + left-center + yz-plane + text-value + PRESEL + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + presel2 + + -0.001 + -0.045 + 0.0385 + + left-center + yz-plane + text-value + *[ ] + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + previous + + -0.001 + -0.045 + 0.0230 + + left-center + yz-plane + text-value + PREV + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + phase2 + + -0.001 + -0.045 + 0.0190 + + left-center + yz-plane + text-value + <PHASE + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + next + + -0.001 + 0.041 + 0.0230 + + right-center + yz-plane + text-value + NEXT + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + phase + + -0.001 + 0.043 + 0.0190 + + right-center + yz-plane + text-value + PHASE> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + + + material + page + actmode + managed + ci + efob + next + phase + previous + phase2 + timedest + presel + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + + + material + efob2 + actmode2 + actmode3 + timedest2 + + 0.2 + 0.4 + 0.2 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.2 + 0.4 + 0.2 + + + + + + material + presel2 + ci2 + ci3 + + 0 + 0.5 + 0.7 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.5 + 0.7 + + + + diff --git a/Models/Instruments/MCDU1/PERF/DES/EMPTY.ac b/Models/Instruments/MCDU1/PERF/DES/EMPTY.ac new file mode 100644 index 00000000..4dd7e1f9 --- /dev/null +++ b/Models/Instruments/MCDU1/PERF/DES/EMPTY.ac @@ -0,0 +1,3 @@ +AC3Db +OBJECT world +kids 0 diff --git a/Models/Instruments/MCDU1/PERF/DES/bg.jpg b/Models/Instruments/MCDU1/PERF/DES/bg.jpg new file mode 100644 index 00000000..b6eece57 Binary files /dev/null and b/Models/Instruments/MCDU1/PERF/DES/bg.jpg differ diff --git a/Models/Instruments/MCDU2/MCDU2.xml b/Models/Instruments/MCDU2/MCDU2.xml index 29c9968f..0bc0cdef 100644 --- a/Models/Instruments/MCDU2/MCDU2.xml +++ b/Models/Instruments/MCDU2/MCDU2.xml @@ -202,6 +202,28 @@ + + DES + PERF/DES/DES.xml + + 180 + 180 + 90 + + + + + /systems/electrical/bus/ac2 + 110 + + + /MCDU[1]/page + DES + + + + + DATA2 DATA2/DATA2.xml diff --git a/Models/Instruments/MCDU2/PERF/DES/DES.xml b/Models/Instruments/MCDU2/PERF/DES/DES.xml new file mode 100644 index 00000000..f66b38ea --- /dev/null +++ b/Models/Instruments/MCDU2/PERF/DES/DES.xml @@ -0,0 +1,585 @@ + + + + + + + EMPTY.ac + + + + + page + + -0.001 + 0.0 + 0.083 + + center-center + yz-plane + text-value + DES + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + actmode + + -0.001 + -0.045 + 0.0755 + + left-center + yz-plane + text-value + ACT MODE + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + actmode2 + + -0.001 + -0.045 + 0.0705 + + left-center + yz-plane + text-value + MANAGED + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + actmode3 + + -0.001 + -0.045 + 0.0705 + + left-center + yz-plane + text-value + SELECTED + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + select + actmode2 + + + /it-autoflight/input/spd-managed + 1 + + + + + select + actmode3 + + + /it-autoflight/input/spd-managed + 0 + + + + + + timedest + + -0.001 + -0.0 + 0.0755 + + center-center + yz-plane + text-value + TIME DEST + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + timedest2 + + -0.001 + -0.0 + 0.0715 + + center-center + yz-plane + text-value + --- + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + efob + + -0.001 + 0.045 + 0.0755 + + right-center + yz-plane + text-value + EFOB + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + efob2 + + -0.001 + 0.045 + 0.0715 + + right-center + yz-plane + text-value + --- + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + ci + + -0.001 + -0.045 + 0.065 + + left-center + yz-plane + text-value + CI + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + ci2 + + -0.001 + -0.045 + 0.0605 + + left-center + yz-plane + text-value + --- + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + ci3 + + -0.001 + -0.045 + 0.0605 + + left-center + yz-plane + text-value + %s + false + BoeingCDU-Large.ttf + /FMGC/internal/cost-index + true + false + false + 0.0050 + + 64 + 64 + + + + + select + ci2 + + /FMGC/internal/cost-index-set + + + + select + ci3 + + /FMGC/internal/cost-index-set + + + + + managed + + -0.001 + -0.045 + 0.0545 + + left-center + yz-plane + text-value + MANAGED + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + presel + + -0.001 + -0.045 + 0.0435 + + left-center + yz-plane + text-value + PRESEL + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + presel2 + + -0.001 + -0.045 + 0.0385 + + left-center + yz-plane + text-value + *[ ] + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + previous + + -0.001 + -0.045 + 0.0230 + + left-center + yz-plane + text-value + PREV + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + phase2 + + -0.001 + -0.045 + 0.0190 + + left-center + yz-plane + text-value + <PHASE + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + next + + -0.001 + 0.041 + 0.0230 + + right-center + yz-plane + text-value + NEXT + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + phase + + -0.001 + 0.043 + 0.0190 + + right-center + yz-plane + text-value + PHASE> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + + + material + page + actmode + managed + ci + efob + next + phase + previous + phase2 + timedest + presel + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + + + material + efob2 + actmode2 + actmode3 + timedest2 + + 0.2 + 0.4 + 0.2 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.2 + 0.4 + 0.2 + + + + + + material + presel2 + ci2 + ci3 + + 0 + 0.5 + 0.7 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.5 + 0.7 + + + + diff --git a/Models/Instruments/MCDU2/PERF/DES/EMPTY.ac b/Models/Instruments/MCDU2/PERF/DES/EMPTY.ac new file mode 100644 index 00000000..4dd7e1f9 --- /dev/null +++ b/Models/Instruments/MCDU2/PERF/DES/EMPTY.ac @@ -0,0 +1,3 @@ +AC3Db +OBJECT world +kids 0 diff --git a/Models/Instruments/MCDU2/PERF/DES/bg.jpg b/Models/Instruments/MCDU2/PERF/DES/bg.jpg new file mode 100644 index 00000000..b6eece57 Binary files /dev/null and b/Models/Instruments/MCDU2/PERF/DES/bg.jpg differ diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 64d4a66a..17cb24e1 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -3285,8 +3285,8 @@ - property-toggle - /systems/pressurization/ditchingpb + nasal + nasal diff --git a/Nasal/MCDU/MCDU1.nas b/Nasal/MCDU/MCDU1.nas index a390fee1..5ab3650f 100644 --- a/Nasal/MCDU/MCDU1.nas +++ b/Nasal/MCDU/MCDU1.nas @@ -69,6 +69,10 @@ var lskbutton = func(btn) { radnavInput("L2"); } else if (getprop("/MCDU[0]/page") == "CLB") { initInputA("L5"); # Does the same thing as on the INIT page + } else if (getprop("/MCDU[0]/page") == "CRZ") { + initInputA("L5"); + } else if (getprop("/MCDU[0]/page") == "DES") { + initInputA("L5"); } else { setprop("/MCDU[0]/scratchpad-msg", "1"); setprop("/MCDU[0]/scratchpad", "NOT ALLOWED"); @@ -102,6 +106,10 @@ var lskbutton = func(btn) { perfTOInput("L5"); } else if (getprop("/MCDU[0]/page") == "CLB") { perfCLBInput("L5"); + } else if (getprop("/MCDU[0]/page") == "CRZ") { + perfCRZInput("L5"); + } else if (getprop("/MCDU[0]/page") == "DES") { + perfDESInput("L5"); } else { setprop("/MCDU[0]/scratchpad-msg", "1"); setprop("/MCDU[0]/scratchpad", "NOT ALLOWED"); @@ -113,6 +121,8 @@ var lskbutton = func(btn) { perfCLBInput("L6"); } else if (getprop("/MCDU[0]/page") == "CRZ") { perfCRZInput("L6"); + } else if (getprop("/MCDU[0]/page") == "DES") { + perfDESInput("L6"); } else { setprop("/MCDU[0]/scratchpad-msg", "1"); setprop("/MCDU[0]/scratchpad", "NOT ALLOWED"); @@ -173,6 +183,8 @@ var rskbutton = func(btn) { perfTOInput("R6"); } else if (getprop("/MCDU[0]/page") == "CLB") { perfCLBInput("R6"); + } else if (getprop("/MCDU[0]/page") == "CRZ") { + perfCRZInput("R6"); } else { setprop("/MCDU[0]/scratchpad-msg", "1"); setprop("/MCDU[0]/scratchpad", "NOT ALLOWED"); @@ -688,9 +700,15 @@ var perfCRZInput = func(key) { if (key == "L6") { setprop("/MCDU[0]/page", "CLB"); } - # if (key == "R6") { - # setprop("/MCDU[0]/page", "DES"); - # } + if (key == "R6") { + setprop("/MCDU[0]/page", "DES"); + } +} + +var perfDESInput = func(key) { + if (key == "L6") { + setprop("/MCDU[0]/page", "CRZ"); + } } var arrowbutton = func(btn) { diff --git a/Nasal/MCDU/MCDU2.nas b/Nasal/MCDU/MCDU2.nas index 907476bd..7d086ead 100644 --- a/Nasal/MCDU/MCDU2.nas +++ b/Nasal/MCDU/MCDU2.nas @@ -69,6 +69,10 @@ var lskbutton = func(btn) { radnavInput("L2"); } else if (getprop("/MCDU[1]/page") == "CLB") { initInputA("L5"); # Does the same thing as on the INIT page + } else if (getprop("/MCDU[0]/page") == "CRZ") { + initInputA("L5"); + } else if (getprop("/MCDU[0]/page") == "DES") { + initInputA("L5"); } else { setprop("/MCDU[1]/scratchpad-msg", "1"); setprop("/MCDU[1]/scratchpad", "NOT ALLOWED"); @@ -102,6 +106,10 @@ var lskbutton = func(btn) { perfTOInput("L5"); } else if (getprop("/MCDU[1]/page") == "CLB") { perfCLBInput("L5"); + } else if (getprop("/MCDU[1]/page") == "CRZ") { + perfCRZInput("L5"); + } else if (getprop("/MCDU[1]/page") == "DES") { + perfDESInput("L5"); } else { setprop("/MCDU[1]/scratchpad-msg", "1"); setprop("/MCDU[1]/scratchpad", "NOT ALLOWED"); @@ -113,6 +121,8 @@ var lskbutton = func(btn) { perfCLBInput("L6"); } else if (getprop("/MCDU[1]/page") == "CRZ") { perfCRZInput("L6"); + } else if (getprop("/MCDU[0]/page") == "DES") { + perfDESInput("L6"); } else { setprop("/MCDU[1]/scratchpad-msg", "1"); setprop("/MCDU[1]/scratchpad", "NOT ALLOWED"); @@ -173,6 +183,8 @@ var rskbutton = func(btn) { perfTOInput("R6"); } else if (getprop("/MCDU[1]/page") == "CLB") { perfCLBInput("R6"); + } else if (getprop("/MCDU[1]/page") == "CRZ") { + perfCRZInput("R6"); } else { setprop("/MCDU[1]/scratchpad-msg", "1"); setprop("/MCDU[1]/scratchpad", "NOT ALLOWED"); @@ -688,9 +700,15 @@ var perfCRZInput = func(key) { if (key == "L6") { setprop("/MCDU[1]/page", "CLB"); } - # if (key == "R6") { - # setprop("/MCDU[1]/page", "DES"); - # } + if (key == "R6") { + setprop("/MCDU[1]/page", "DES"); + } +} + +var perfDESInput = func(key) { + if (key == "L6") { + setprop("/MCDU[1]/page", "CRZ"); + } } var arrowbutton = func(btn) { diff --git a/Nasal/fadec.nas b/Nasal/fadec.nas index e8e56019..78b5af7f 100644 --- a/Nasal/fadec.nas +++ b/Nasal/fadec.nas @@ -23,6 +23,7 @@ setlistener("/sim/signals/fdm-initialized", func { setprop("/systems/thrust/mct-lim", 0.0); setprop("/systems/thrust/clb-lim", 0.0); setprop("/systems/thrust/lim-flex", 0); + setprop("/engines/flex-derate", 0); thrustt.start(); }); diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index 9374f4b0..6e77c312 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -51,6 +51,8 @@ var pneu_init = func { setprop("/systems/ventilation/avionics/inletvalve", "0"); setprop("/systems/ventilation/lavatory/extractfan", 0); setprop("/systems/ventilation/lavatory/extractvalve", "0"); + setprop("/systems/pressurization/ambientpsi", "0"); + setprop("/systems/pressurization/cabinpsi", "0"); pneu_timer.start(); } diff --git a/Systems/libraries.xml b/Systems/libraries.xml index 9c711ce2..959f6ac8 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -409,17 +409,17 @@ /it-autoflight/internal/vert-speed-fpm -50000-50000 -10000 -5000 - -5000 -3200 - -4000 -2000 - -3000 -1640 - -2000 -1230 - -1000 -410 + -5000 -3500 + -4000 -3000 + -3000 -2540 + -2000 -2030 + -1000 -1000 0 0 - 1000 410 - 2000 820 - 3000 1230 - 4000 1640 - 5000 2000 + 1000 810 + 2000 1640 + 3000 2100 + 4000 2440 + 5000 3000 10000 5000 50000 50000