diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 5fe4b8ca..82947a55 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -370,7 +370,7 @@ autoland_light_on brk_fan_on brk_hot_on - clock_glare + cstr_led cstr_led.001 dec_low_on @@ -442,7 +442,7 @@ wpt_led wpt_led.001 terr_on_nd_label - clock_glare + systems/electrical/bus/dc-ess @@ -5123,7 +5123,7 @@ brakes_accum_psi.mark brakes_lb_psi.mark brakes_rb_psi.mark - clock_glare + flood_lt_main.mark flood_lt_ped.mark integ_lt.mark @@ -5229,8 +5229,8 @@ chrono_reset chrono_btn clock_set - clock_display - clock_glare + + flood_lt_main.mark flood_lt_ped.mark integ_lt.mark @@ -6361,12 +6361,6 @@ qnh-test rudder-trim rudder-trim-letter - dme0 - dme - dme20 - dme10 - dme1 - dme120 0.89 0.37 @@ -6474,7 +6468,7 @@ chrono_reset chrono_btn clock_set - clock_glare + gear_lever_body ParkBrk RudderTrim @@ -6588,10 +6582,10 @@ SpdBrk - - Aircraft/A320-family/Models/Effects/clock-glare - clock_glare - + + + + Aircraft/A320-family/Models/Effects/iesi @@ -6606,14 +6600,14 @@ Aircraft/A320-family/Models/Effects/clock - clock + clock_body et_knob clock_knob chrono_reset chrono_btn clock_set - clock_display + @@ -6911,8 +6905,8 @@ - 0.1 - 0.1 + 0.0 + 0.0 1 controls/lighting/main-panel-norm @@ -7131,7 +7125,7 @@ chrono2_1 -0.547 - 0.152 + 0.151 0.196 90 72.81 @@ -7465,26 +7459,188 @@ et_knob.axis + + - + + dme_0 + + -0.529 + -0.160 + 0.1305 + 90 + 72.81 + + center-center + xy-plane + number-value + %3.0f. + instrumentation/dme[2]/indicated-distance-nm + true + left-to-right + true + false + false + led.txf + 0.007 + 1.0 + 0.012 + 0.040 + + 32 + 32 + + default + + + + dme + + -0.529 + -0.153 + 0.1305 + 90 + 72.81 + + center-center + xy-plane + number-value + %3.1f + instrumentation/dme[2]/indicated-distance-nm + false + left-to-right + true + false + false + led.txf + 0.007 + 1.0 + 0.012 + 0.040 + + 32 + 32 + + default + + + + + + dme1_0 + + -0.529 + -0.127 + 0.1305 + 90 + 72.81 + + center-center + xy-plane + number-value + %3.0f. + instrumentation/dme[3]/indicated-distance-nm + true + left-to-right + true + false + false + led.txf + 0.007 + 1.0 + 0.012 + 0.040 + + 32 + 32 + + default + + + + dme1 + + -0.529 + -0.120 + 0.1305 + 90 + 72.81 + + center-center + xy-plane + number-value + %3.1f + instrumentation/dme[3]/indicated-distance-nm + false + left-to-right + true + false + false + led.txf + 0.007 + 1.0 + 0.012 + 0.040 + + 32 + 32 + + default + + + + material + dme_0 + dme + + dme1_0 + dme1 + + + 0.89 + 0.37 + 0.08 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.89 + 0.37 + 0.08 + + select - dme0 + dme_0 instrumentation/dme[2]/operable instrumentation/dme[2]/in-range - - instrumentation/dme[2]/indicated-distance-nm - 1 - + + + instrumentation/dme[2]/indicated-distance-nm + 1 + + + instrumentation/dme[2]/indicated-distance-nm + 20 + + - /systems/electrical/bus/dc-ess + systems/electrical/bus/dc-ess 25 - /instrumentation/ddrmi/vor-adf-1 + instrumentation/ddrmi/vor-adf-1 1 @@ -7507,11 +7663,11 @@ 20 - /systems/electrical/bus/dc-ess + systems/electrical/bus/dc-ess 25 - /instrumentation/ddrmi/vor-adf-1 + instrumentation/ddrmi/vor-adf-1 1 @@ -7520,44 +7676,27 @@ select - dme20 - - - instrumentation/dme[2]/operable - instrumentation/dme[2]/in-range - - instrumentation/dme[2]/indicated-distance-nm - 20 - - - /systems/electrical/bus/dc-ess - 25 - - - /instrumentation/ddrmi/vor-adf-1 - 1 - - - - - - - select - dme10 + dme1_0 instrumentation/dme[3]/operable instrumentation/dme[3]/in-range - - instrumentation/dme[3]/indicated-distance-nm - 1 - + + + instrumentation/dme[3]/indicated-distance-nm + 1 + + + instrumentation/dme[3]/indicated-distance-nm + 20 + + - /systems/electrical/bus/dc-ess + systems/electrical/bus/dc-ess 25 - /instrumentation/ddrmi/vor-adf-2 + instrumentation/ddrmi/vor-adf-2 1 @@ -7573,233 +7712,24 @@ instrumentation/dme[3]/in-range instrumentation/dme[3]/indicated-distance-nm - 1 + 1.0 instrumentation/dme[3]/indicated-distance-nm - 20 + 20.0 - /systems/electrical/bus/dc-ess - 25 + systems/electrical/bus/dc-ess + 25.0 - /instrumentation/ddrmi/vor-adf-2 + instrumentation/ddrmi/vor-adf-2 1 - - select - dme120 - - - instrumentation/dme[3]/operable - instrumentation/dme[3]/in-range - - instrumentation/dme[3]/indicated-distance-nm - 20 - - - /systems/electrical/bus/dc-ess - 25 - - - /instrumentation/ddrmi/vor-adf-2 - 1 - - - - - - - dme0 - - -0.529 - -0.155 - 0.1305 - 90 - 72.81 - - center-center - xy-plane - number-value - 0.0 - autopilot/serviceable - false - left-to-right - true - false - false - led.txf - 0.007 - 1.0 - 0.012 - 0.040 - - 32 - 32 - - default - - - - dme - - -0.529 - -0.155 - 0.1305 - 90 - 72.81 - - center-center - xy-plane - number-value - %4.1f - instrumentation/dme[2]/indicated-distance-nm - false - left-to-right - true - false - false - led.txf - 0.007 - 1.0 - 0.012 - 0.040 - - 32 - 32 - - default - - - - dme20 - - -0.529 - -0.162 - 0.1305 - 90 - 72.81 - - center-center - xy-plane - number-value - %4.0f - instrumentation/dme[2]/indicated-distance-nm - false - left-to-right - true - false - false - led.txf - 0.007 - 1.0 - 0.012 - 0.040 - - 32 - 32 - - default - - - - dme10 - - -0.529 - -0.122 - 0.1305 - 90 - 72.81 - - center-center - xy-plane - number-value - 0.0 - autopilot/serviceable - false - left-to-right - true - false - false - led.txf - 0.007 - 1.0 - 0.012 - 0.040 - - 32 - 32 - - default - - - - dme1 - - -0.529 - -0.122 - 0.1305 - 90 - 72.81 - - center-center - xy-plane - number-value - %4.1f - instrumentation/dme[3]/indicated-distance-nm - false - left-to-right - true - false - false - led.txf - 0.007 - 1.0 - 0.012 - 0.040 - - 32 - 32 - - default - - - - dme120 - - -0.529 - -0.129 - 0.1305 - 90 - 72.81 - - center-center - xy-plane - number-value - %4.0f - instrumentation/dme[3]/indicated-distance-nm - false - left-to-right - true - false - false - led.txf - 0.007 - 1.0 - 0.012 - 0.040 - - 32 - 32 - - default - - diff --git a/Models/FlightDeck/res/Clock.png b/Models/FlightDeck/res/Clock.png index d9dcc60b..f4bab671 100644 Binary files a/Models/FlightDeck/res/Clock.png and b/Models/FlightDeck/res/Clock.png differ diff --git a/Models/Instruments/DDRMI/DDRMI.xml b/Models/Instruments/DDRMI/DDRMI.xml index 13cb3d76..92e91117 100644 --- a/Models/Instruments/DDRMI/DDRMI.xml +++ b/Models/Instruments/DDRMI/DDRMI.xml @@ -199,8 +199,8 @@ Panel lighting (dome) material - ddrmi_dme1_screen - ddrmi_dme2_screen + + ddrmi_pointer_1 ddrmi_pointer_2 ddrmi_inside @@ -271,5 +271,5 @@ ddrmi_vor_adf_flag_1 ddrmi_vor_adf_flag_2 - + diff --git a/Nasal/Instruments/clock.nas b/Nasal/Instruments/clock.nas index 6c539553..70cc279f 100644 --- a/Nasal/Instruments/clock.nas +++ b/Nasal/Instruments/clock.nas @@ -24,6 +24,7 @@ setlistener("sim/signals/fdm-initialized", func { props.globals.initNode("instrumentation/chrono[0]/chr-et-min",0,"INT"); props.globals.initNode("instrumentation/chrono[0]/chr-et-sec",0,"INT"); props.globals.initNode("controls/flight/rudder-trim-display",0,"STRING"); + setprop("controls/flight/rudder-trim-display", sprintf("%2.1f", getprop("fdm/jsbsim/hydraulics/rudder/trim-cmd-deg"))); start_loop.start(); }); @@ -197,4 +198,4 @@ setlistener("fdm/jsbsim/hydraulics/rudder/trim-cmd-deg", func() { }; }; }; -},0, 0); \ No newline at end of file +},0, 0);