From 6657b3430e010308beb7830a638fffb98040feb5 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Fri, 18 Feb 2022 13:02:42 +0000 Subject: [PATCH] Strobe light: add intermediate position again. Animate lower part of flap lever. Fix stby compass axis. QNH knob - animate --- A320-main.xml | 6 + Models/FlightDeck/a320.flightdeck.xml | 489 ++++++++++++++++++++------ Systems/a320-cockpit.xml | 20 ++ 3 files changed, 402 insertions(+), 113 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 443b94ed..80c49e0d 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -882,6 +882,12 @@ 0 0 + + 0 + 0 + 0.0015 + 0.0015 + 0 0 diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index e8b30bc1..40e4b65c 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -1419,9 +1419,37 @@ /controls/flight/rudder-trim 0 + + property-assign + /controls/cockpit/rudder-trim-reset-translate + 0.0015 + + + + property-assign + /controls/cockpit/rudder-trim-reset-translate + 0.0 + + + + + set-tooltip + rud_trim_lbl + + + - + + + translate + RudderTrimReset + /controls/cockpit/rudder-trim-reset-translate + + -1 + + + rudder-trim-letter @@ -1478,21 +1506,6 @@ default - - translate - ParkBrk - fdm/jsbsim/fcs/brake-lever - - 00 - 0.10.002 - 0.90.002 - 10 - - - 1 - - - knob ParkBrk @@ -1505,10 +1518,25 @@ false - property-toggle + property-adjust controls/gear/brake-parking + 0 + 1 + false + + + property-assign + /controls/cockpit/park-brk-translate + 0.0025 + + + property-assign + /controls/cockpit/park-brk-translate + 0.0 + + set-tooltip @@ -1518,6 +1546,15 @@ + + translate + ParkBrk + /controls/cockpit/park-brk-translate-pos + + 1 + + + @@ -1525,7 +1562,7 @@ CockpitDoorSwitch CockpitDoorSwitch.mark controls/doors/doorc-switch-pos - vertical + horizontal 14 25 @@ -1535,7 +1572,7 @@ property-adjust controls/doors/doorc-switch - -1 + 1 -1 1 0 @@ -3784,15 +3821,37 @@ libraries.toggleSTD(); + + property-assign + /controls/cockpit/qnh-cpt-knb-translate + 0.0015 + + instrumentation/altimeter/std + + + + property-assign + /controls/cockpit/qnh-cpt-knb-translate + 0.004 + + instrumentation/altimeter/std + + + + nasal + + true - nasal - + property-adjust + /instrumentation/altimeter/setting-inhg + 0.01 + 22.00 + 32.47 + false @@ -3811,10 +3870,12 @@ - nasal - + property-adjust + /instrumentation/altimeter/setting-hpa + 1 + 745 + 1100 + false @@ -3845,10 +3906,12 @@ true - nasal - + property-adjust + /instrumentation/altimeter/setting-inhg + -0.01 + 22.00 + 32.47 + false @@ -3867,10 +3930,12 @@ - nasal - + property-adjust + /instrumentation/altimeter/setting-hpa + -1 + 745 + 1100 + false @@ -3897,6 +3962,13 @@ true + + + set-tooltip + qnh_cpt-lbl + + + @@ -3918,15 +3990,37 @@ libraries.toggleSTD(); + + property-assign + /controls/cockpit/qnh-fo-knb-translate + 0.0015 + + instrumentation/altimeter/std + + + + property-assign + /controls/cockpit/qnh-fo-knb-translate + 0.004 + + instrumentation/altimeter/std + + + + nasal + + true - nasal - + property-adjust + /instrumentation/altimeter/setting-inhg + 0.01 + 22.00 + 32.47 + false @@ -3945,10 +4039,12 @@ - nasal - + property-adjust + /instrumentation/altimeter/setting-hpa + 1 + 745 + 1100 + false @@ -3979,10 +4075,12 @@ true - nasal - + property-adjust + /instrumentation/altimeter/setting-inhg + -0.01 + 22.00 + 32.47 + false @@ -4001,10 +4099,12 @@ - nasal - + property-adjust + /instrumentation/altimeter/setting-hpa + -1 + 745 + 1100 + false @@ -4031,6 +4131,41 @@ true + + + set-tooltip + qnh_fo-lbl + + + + + + + translate + qnh_cpt_knb + /controls/cockpit/qnh-cpt-knb-translate + + -0.36567 + -0.25113 + 0.46417 + -0.33621 + -0.25113 + 0.47319 + + + + + translate + qnh_fo_knb + /controls/cockpit/qnh-fo-knb-translate + + -0.36567 + -0.25113 + 0.46417 + -0.33621 + -0.25113 + 0.47319 + @@ -4094,6 +4229,9 @@ property-adjust /instrumentation/altimeter[6]/setting-inhg 0.01 + 22.00 + 32.47 + false @@ -4131,6 +4269,9 @@ property-adjust /instrumentation/altimeter[6]/setting-inhg -0.01 + 22.00 + 32.47 + false @@ -4166,7 +4307,7 @@ set-tooltip qnh_iesi-lbl - + @@ -4186,54 +4327,72 @@ - pick + knob qnh_cpt_sw + instrumentation/altimeter/inhg-left-pos + 40 + -43 + + qnh_cpt_sw.axis + - - - - - true property-cycle instrumentation/altimeter/inhg-left - 0 1 + 0 + false nasal + + + set-tooltip + qnh_cpt_toggle-lbl + + + - pick + knob qnh_fo_sw + instrumentation/altimeter/inhg-right-pos + 40 + -43 + + qnh_fo_sw.axis + - - - - - true property-cycle instrumentation/altimeter/inhg-right - 0 1 + 0 + false nasal + + + set-tooltip + qnh_fo_toggle-lbl + + + rotate qnh_cpt_knb controls/switches/qnh-knb - 11.25 + -11.25 qnh_cpt_knb.axis @@ -4243,38 +4402,12 @@ rotate qnh_fo_knb controls/switches/qnh-knb - 11.25 + -11.25 qnh_fo_knb.axis - - rotate - qnh_cpt_sw - instrumentation/altimeter/inhg-left - - 040 - 1-3 - - - qnh_cpt_sw.axis - - - - - rotate - qnh_fo_sw - instrumentation/altimeter/inhg-right - - 040 - 1-3 - - - qnh_fo_sw.axis - - - qnh-inhg-left @@ -4598,8 +4731,21 @@ setprop("sim/sounde/btn1", 1); + + property-assign + /controls/cockpit/fd-1-translate + 0.0015 + + + + property-assign + /controls/cockpit/fd-1-translate + 0.0 + + + select fd1_led @@ -4616,6 +4762,21 @@ + + + translate + fd1 + fd1_led + /controls/cockpit/fd-1-translate + + -0.366265 + 0.39799 + 0.481225 + -0.375885 + 0.39799 + 0.478435 + + pick @@ -4637,8 +4798,21 @@ nasal + + property-assign + /controls/cockpit/ls-1-translate + 0.0015 + + + + property-assign + /controls/cockpit/ls-1-translate + 0.0 + + + select ils_led @@ -4655,6 +4829,21 @@ + + + translate + ils + ils_led + /controls/cockpit/ls-1-translate + + -0.366265 + 0.39799 + 0.481225 + -0.375885 + 0.39799 + 0.478435 + + pick @@ -4676,8 +4865,21 @@ nasal + + property-assign + /controls/cockpit/ls-2-translate + 0.0015 + + + + property-assign + /controls/cockpit/ls-2-translate + 0.0 + + + select ils2_led @@ -4694,6 +4896,21 @@ + + + translate + ils2 + ils2_led + /controls/cockpit/ls-2-translate + + -0.366265 + 0.39799 + 0.481225 + -0.375885 + 0.39799 + 0.478435 + + pick @@ -4708,8 +4925,21 @@ setprop("sim/sounde/btn1", 1); + + property-assign + /controls/cockpit/fd-2-translate + 0.0015 + + + + property-assign + /controls/cockpit/fd-2-translate + 0.0 + + + select fd2_led @@ -4726,6 +4956,21 @@ + + + translate + fd2 + fd2_led + /controls/cockpit/fd-2-translate + + -0.366265 + 0.39799 + 0.481225 + -0.375885 + 0.39799 + 0.478435 + + @@ -7019,6 +7264,8 @@ knob + FlapsLever + FlapsLever_low fdm/jsbsim/fcs/flap-lever 30 @@ -7031,13 +7278,17 @@ FlapsLever.axis - FlapsLever false nasal + + property-assign + /controls/cockpit/flaps-lever-translate + 0.003 + false @@ -7045,7 +7296,19 @@ nasal + + property-assign + /controls/cockpit/flaps-lever-translate + 0.003 + + + + property-assign + /controls/cockpit/flaps-lever-translate + 0 + + set-tooltip @@ -7057,23 +7320,8 @@ translate - FlapsLever - fdm/jsbsim/fcs/flap-lever - - 0.00.0 - 0.10.002 - 0.90.002 - 1.00.0 - 1.10.002 - 1.90.002 - 2.00.0 - 2.10.002 - 2.90.002 - 3.00.0 - 3.10.002 - 3.90.002 - 4.00.0 - + FlapsLever_low + /controls/cockpit/flaps-lever-translate-pos 0.064759 0.080047 @@ -8258,6 +8506,13 @@ + + + set-tooltip + rud_trim_lbl + + + @@ -9562,6 +9817,7 @@ gravity_gear ped_footrest FlapsLever + FlapsLever_low SpdBrk @@ -12303,6 +12559,7 @@ property-cycle controls/switches/strobe 0 + 0.5 1 false @@ -12569,7 +12826,13 @@ StbyCompassLtSwtch controls/lighting/stby-compass-switch-pos - StbyCompassLtSwtch.axis + + -0.13725 + 0.06933 + 0.9063 + -0.13725 + 0.06745 + 0.9063 -30 60 diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml index 1b7c179e..b37eaacd 100644 --- a/Systems/a320-cockpit.xml +++ b/Systems/a320-cockpit.xml @@ -85,6 +85,26 @@ 10 + + /controls/cockpit/flaps-lever-translate + 20 + + + + /controls/cockpit/park-brk-translate + 20 + + + + /instrumentation/altimeter/inhg-left + 20 + + + + /instrumentation/altimeter/inhg-right + 20 + + /controls/doors/doorc-switch 20