From 4b860316dd0ace708f2b28ab06232df693fd7e5b Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Wed, 27 Jul 2022 18:26:58 +0100 Subject: [PATCH] Finish adding aft overhead animations --- A320-main.xml | 3 + Models/FlightDeck/a320.flightdeck.xml | 515 ++++++++++++++++++++++++++ Nasal/Systems/fadec-cfm.nas | 5 + Nasal/Systems/fadec-iae.nas | 5 + Systems/a320-cockpit.xml | 15 + 5 files changed, 543 insertions(+) diff --git a/A320-main.xml b/A320-main.xml index 01ce0238..50d2dbb5 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -904,9 +904,12 @@ 0.002 + 0 0 1 0 + false + false 0 0 0 diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 5d0d7db8..8b77c36a 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -298,6 +298,9 @@ RFuelTank1Btn2O WingAntiIceBtn1F WingAntiIceBtn2O + + OVH_button_labels.092 + OVH_button_labels.093 systems/electrical/bus/ac-ess-shed @@ -463,6 +466,11 @@ OVH_button_labels.009 OVH_button_labels.012 + OVH_button_labels.053 + OVH_button_labels.059 + OVH_button_labels.061 + OVH_button_labels.063 + OVH_button_labels.091 /systems/electrical/bus/ac-2 @@ -534,6 +542,11 @@ IR3Btn1F IR3Btn2O RcdrGndCtlBtn2O + + OVH_button_labels.051 + OVH_button_labels.055 + OVH_button_labels.057 + OVH_button_labels.065 /systems/electrical/bus/ac-1 @@ -740,6 +753,11 @@ VentExtractBtn2O OVH_button_labels.012 + OVH_button_labels.055 + OVH_button_labels.059 + OVH_button_labels.061 + OVH_button_labels.063 + OVH_button_labels.092 controls/switches/annun-test @@ -22276,6 +22294,503 @@ + + + pick + OVH_button.047 + + + false + + property-assign + /controls/oxygen/passenger-mask-reset + 1 + + + nasal + + + + property-assign + /controls/cockpit/oxy-timer-reset-translate + 0.0005 + + + + property-assign + /controls/oxygen/passenger-mask-reset + 0 + + + property-assign + /controls/cockpit/oxy-timer-reset-translate + 0.0 + + + + + + set-tooltip + oxy-tmr-rst-lbl + + + + + + + select + OVH_button_labels.093 + + + /controls/oxygen/passenger-mask-reset + controls/switches/annun-test + + + + + + translate + OVH_button.047 + /controls/cockpit/oxy-timer-reset-translate + + 0.369388 + 0.2363 + 1.0866 + 0.36885 + 0.23648 + 1.08793 + + + + + + pick + OVH_button.026 + + + false + + property-toggle + /controls/cockpit/service-interphone-override + + + nasal + + + + property-assign + /controls/cockpit/service-interphone-override-translate + 0.0005 + + + + property-assign + /controls/cockpit/service-interphone-override-translate + 0.0 + + + + + + set-tooltip + svc-int-lbl + + + + + + + select + OVH_button_labels.051 + + + /controls/cockpit/service-interphone-override + controls/switches/annun-test + + + + + + translate + OVH_button.026 + /controls/cockpit/service-interphone-override-translate + + 0.369388 + 0.2363 + 1.0866 + 0.36885 + 0.23648 + 1.08793 + + + + + + pick + OVH_button.027 + + + false + + property-toggle + /controls/cockpit/avionics-compartment-light + + + nasal + + + + property-assign + /controls/cockpit/avionics-compartment-light-translate + 0.0005 + + + + property-assign + /controls/cockpit/avionics-compartment-light-translate + 0.0 + + + + + + set-tooltip + avionics-lt-lbl + + + + + + + select + OVH_button_labels.053 + + + /controls/cockpit/avionics-compartment-light + controls/switches/annun-test + + + + + + translate + OVH_button.027 + /controls/cockpit/avionics-compartment-light-translate + + 0.369388 + 0.2363 + 1.0866 + 0.36885 + 0.23648 + 1.08793 + + + + + + knob + Plane.018 + /controls/cockpit/blue-ovrd-guard-pos + 145 + + Plane.axis.004 + + vertical + + + property-cycle + /controls/cockpit/blue-ovrd-guard + 0 + 1 + false + + + nasal + + + + + + set-tooltip + blue-pump-ovrd-guard-lbl + + + + + + + pick + OVH_button.033 + + + false + + + /controls/cockpit/blue-ovrd-guard + + property-toggle + /controls/hydraulic/switches/blue-elec-ovrd + + + + /controls/cockpit/blue-ovrd-guard + + nasal + + + + + /controls/cockpit/blue-ovrd-guard + + property-assign + /controls/cockpit/blue-pump-ovrd-translate + 0.0005 + + + + property-assign + /controls/cockpit/blue-pump-ovrd-translate + 0.0 + + + + + + set-tooltip + blue-pump-ovrd-lbl + + + + + + + select + OVH_button_labels.065 + + + /controls/hydraulic/switches/blue-elec-ovrd + controls/switches/annun-test + + + + + + translate + OVH_button.033 + /controls/cockpit/blue-pump-ovrd-translate + + 0.369388 + 0.2363 + 1.0866 + 0.36885 + 0.23648 + 1.08793 + + + + + + knob + Plane.020 + /controls/cockpit/fadec-gnd-pwr-1-guard-pos + 145 + + Plane.axis + + vertical + + + property-cycle + /controls/cockpit/fadec-gnd-pwr-1-guard + 0 + 1 + false + + + nasal + + + + + + set-tooltip + fadecpwr1-lbl + + + + + + + pick + OVH_button.029 + + + false + + + /controls/cockpit/fadec-gnd-pwr-1-guard + + property-toggle + /controls/fadec/gnd-power-1 + + + + /controls/cockpit/fadec-gnd-pwr-1-guard + + nasal + + + + + /controls/cockpit/fadec-gnd-pwr-1-guard + + property-assign + /controls/cockpit/fadec-gnd-pwr-1-translate + 0.0005 + + + + property-assign + /controls/cockpit/fadec-gnd-pwr-1-translate + 0.0 + + + + + + set-tooltip + fadec-gnd-pwr-1-lbl + + + + + + + select + OVH_button_labels.057 + + + /controls/fadec/gnd-power-1 + controls/switches/annun-test + + + + + + translate + OVH_button.029 + /controls/cockpit/fadec-gnd-pwr-1-translate + + 0.369388 + 0.2363 + 1.0866 + 0.36885 + 0.23648 + 1.08793 + + + + + knob + Plane.019 + /controls/cockpit/fadec-gnd-pwr-2-guard-pos + 145 + + Plane.axis.002 + + vertical + + + property-cycle + /controls/cockpit/fadec-gnd-pwr-2-guard + 0 + 1 + false + + + nasal + + + + + + set-tooltip + fadecpwr2-lbl + + + + + + + pick + OVH_button.046 + + + false + + + /controls/cockpit/fadec-gnd-pwr-2-guard + + property-toggle + /controls/fadec/gnd-power-2 + + + + /controls/cockpit/fadec-gnd-pwr-2-guard + + nasal + + + + + /controls/cockpit/fadec-gnd-pwr-2-guard + + property-assign + /controls/cockpit/fadec-gnd-pwr-2-translate + 0.0005 + + + + property-assign + /controls/cockpit/fadec-gnd-pwr-2-translate + 0.0 + + + + + + set-tooltip + fadec-gnd-pwr-2-lbl + + + + + + + select + OVH_button_labels.091 + + + /controls/fadec/gnd-power-2 + controls/switches/annun-test + + + + + + translate + OVH_button.046 + /controls/cockpit/fadec-gnd-pwr-2-translate + + 0.369388 + 0.2363 + 1.0866 + 0.36885 + 0.23648 + 1.08793 + + + knob diff --git a/Nasal/Systems/fadec-cfm.nas b/Nasal/Systems/fadec-cfm.nas index 82839d0c..bc2c2401 100644 --- a/Nasal/Systems/fadec-cfm.nas +++ b/Nasal/Systems/fadec-cfm.nas @@ -17,6 +17,7 @@ var N22 = nil; var FADEC_S = { Power: { + groundPower: [props.globals.initNode("/controls/fadec/gnd-power-1", 0, "BOOL"), props.globals.initNode("/controls/fadec/gnd-power-2", 0, "BOOL")], powered1: props.globals.initNode("/systems/fadec/powered1", 0, "BOOL"), powered2: props.globals.initNode("/systems/fadec/powered2", 0, "BOOL"), powerup: props.globals.initNode("/systems/fadec/powerup", 0, "BOOL"), @@ -125,6 +126,8 @@ var FADEC_S = { me.Power.powered1.setValue(1); } else if (powerAvailTemp and modeSel == 2) { me.Power.powered1.setValue(1); + } else if (me.Power.groundPower[0].getBoolValue()) { + me.Power.powered1.setValue(1); } else { me.Power.powered1.setValue(0); } @@ -133,6 +136,8 @@ var FADEC_S = { me.Power.powered2.setValue(1); } else if (powerAvailTemp and modeSel == 2) { me.Power.powered2.setValue(1); + } else if (me.Power.groundPower[1].getBoolValue()) { + me.Power.powered2.setValue(1); } else { me.Power.powered2.setValue(0); } diff --git a/Nasal/Systems/fadec-iae.nas b/Nasal/Systems/fadec-iae.nas index 55c3d60f..3ef925f7 100644 --- a/Nasal/Systems/fadec-iae.nas +++ b/Nasal/Systems/fadec-iae.nas @@ -17,6 +17,7 @@ var N22 = nil; var FADEC_S = { Power: { + groundPower: [props.globals.initNode("/controls/fadec/gnd-power-1", 0, "BOOL"), props.globals.initNode("/controls/fadec/gnd-power-2", 0, "BOOL")], powered1: props.globals.initNode("/systems/fadec/powered1", 0, "BOOL"), powered2: props.globals.initNode("/systems/fadec/powered2", 0, "BOOL"), powerup: props.globals.initNode("/systems/fadec/powerup", 0, "BOOL"), @@ -125,6 +126,8 @@ var FADEC_S = { me.Power.powered1.setValue(1); } else if (powerAvailTemp and modeSel == 2) { me.Power.powered1.setValue(1); + } else if (me.Power.groundPower[0].getBoolValue()) { + me.Power.powered1.setValue(1); } else { me.Power.powered1.setValue(0); } @@ -133,6 +136,8 @@ var FADEC_S = { me.Power.powered2.setValue(1); } else if (powerAvailTemp and modeSel == 2) { me.Power.powered2.setValue(1); + } else if (me.Power.groundPower[1].getBoolValue()) { + me.Power.powered2.setValue(1); } else { me.Power.powered2.setValue(0); } diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml index b96bce69..bc1edac5 100644 --- a/Systems/a320-cockpit.xml +++ b/Systems/a320-cockpit.xml @@ -559,6 +559,21 @@ /controls/cockpit/oxygen-mask-cockpit-door-fo 20 + + + /controls/cockpit/fadec-gnd-pwr-1-guard + 20 + + + + /controls/cockpit/fadec-gnd-pwr-2-guard + 20 + + + + /controls/cockpit/blue-ovrd-guard + 20 +