From 173a23d6575507987554dbe9577237174f7e5ed2 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 5 Apr 2017 22:24:04 -0400 Subject: [PATCH] Many bugfixes to systems, proper engine spinup speed, NEW electrical system, NEW OVERHEAD SWITCH LIGHTS, and ELEC panel switches working, APU BLEED, and APU MASTER and START --- A319-100-IAE-set.xml | 2 +- A320-200-IAE-set.xml | 2 +- A320-main.xml | 1 + A321-200-IAE-set.xml | 2 +- ACJ-IAE-set.xml | 2 +- AircraftConfig/acconfig.nas | 53 +- AircraftConfig/main.xml | 3 - Engines/v2522_a5.xml | 6 +- Engines/v2527_a5.xml | 6 +- Engines/v2533_a5.xml | 6 +- Models/FlightDeck/a320.flightdeck.xml | 124 +- Models/Instruments/ECAM/Display.xml | 104 +- Models/Instruments/OHpanel/OHpanel.xml | 743 +- .../OHpanel/res/buttons - Copy.png | Bin 5169 -> 0 bytes Models/Instruments/OHpanel/res/buttons.png | Bin 5774 -> 817 bytes Models/Instruments/OHpanel/res/buttons2.png | Bin 0 -> 6180 bytes Models/Instruments/OHpanel/res/ohpanel.ac | 1496 ++- Models/Instruments/OHpanel/res/ohpanel.ac.bak | 8508 ++++++++++------- .../Instruments/Upper-ECAM/Upper-ECAM-IAE.xml | 24 + Nasal/electrical.nas | 609 +- Nasal/electrical.new.nas | 114 - Nasal/engines.nas | 4 +- Nasal/systems.nas | 51 +- 23 files changed, 7186 insertions(+), 4674 deletions(-) delete mode 100644 Models/Instruments/OHpanel/res/buttons - Copy.png create mode 100644 Models/Instruments/OHpanel/res/buttons2.png delete mode 100644 Nasal/electrical.new.nas diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml index 93b8ccca..8d0e3078 100644 --- a/A319-100-IAE-set.xml +++ b/A319-100-IAE-set.xml @@ -75,7 +75,6 @@ - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/systems.nas Aircraft/A320Family/Nasal/a319livery.nas Aircraft/A320Family/Models/Instruments/ND/ND.nas @@ -88,6 +87,7 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index d2cf5cb4..cbd3b338 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -68,7 +68,6 @@ - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/systems.nas Aircraft/A320Family/Nasal/a320livery.nas Aircraft/A320Family/Models/Instruments/ND/ND.nas @@ -81,6 +80,7 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas diff --git a/A320-main.xml b/A320-main.xml index d4fa88b4..4db7926e 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -346,6 +346,7 @@ true 0 + 0 diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml index 833a5d07..a6e24a31 100644 --- a/A321-200-IAE-set.xml +++ b/A321-200-IAE-set.xml @@ -68,7 +68,6 @@ - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/systems.nas Aircraft/A320Family/Nasal/a321livery.nas Aircraft/A320Family/Models/Instruments/ND/ND.nas @@ -81,6 +80,7 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas diff --git a/ACJ-IAE-set.xml b/ACJ-IAE-set.xml index 00cd15c5..32933902 100644 --- a/ACJ-IAE-set.xml +++ b/ACJ-IAE-set.xml @@ -74,7 +74,6 @@ - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/systems.nas Aircraft/A320Family/Nasal/acjlivery.nas Aircraft/A320Family/Models/Instruments/ND/ND.nas @@ -87,6 +86,7 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 3c54efc8..c6d3fca5 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -26,14 +26,14 @@ var colddark = func { setprop("/controls/engines/engine-start-switch", 1); setprop("/controls/engines/engine[0]/cutoff-switch", 1); setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/electric/engine[0]/generator", 0); - setprop("/controls/electric/engine[1]/generator", 0); + setprop("/controls/electrical/switches/gen1", 0); + setprop("/controls/electrical/switches/gen2", 0); setprop("/controls/flight/slats", 0.000); setprop("/controls/flight/flaps", 0.000); setprop("/controls/flight/flap-lever", 0); setprop("/controls/flight/speedbrake-arm", 0); setprop("/controls/gear/gear-down", 1); -# systems.elec_init(); + systems.elec_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -53,8 +53,9 @@ var colddark_b = func { setprop("/controls/APU/master", 0); setprop("/controls/APU/start", 0); setprop("/controls/APU/bleed", 0); - setprop("/controls/electric/APU-generator", 0); - setprop("/controls/electric/battery-switch", 0); + setprop("/controls/electrical/switches/gen-apu", 0); + setprop("/controls/electrical/switches/battery1", 0); + setprop("/controls/electrical/switches/battery2", 0); setprop("/systems/acconfig/autoconfig-running", 0); ps_load_dlg.close(); ps_loaded_dlg.open(); @@ -68,25 +69,27 @@ var beforestart = func { setprop("/controls/engines/engine-start-switch", 1); setprop("/controls/engines/engine[0]/cutoff-switch", 1); setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/electric/engine[0]/generator", 0); - setprop("/controls/electric/engine[1]/generator", 0); + setprop("/controls/electrical/switches/gen1", 0); + setprop("/controls/electrical/switches/gen2", 0); setprop("/controls/flight/slats", 0.000); setprop("/controls/flight/flaps", 0.000); setprop("/controls/flight/flap-lever", 0); setprop("/controls/flight/speedbrake-arm", 0); setprop("/controls/gear/gear-down", 1); -# systems.elec_init(); + systems.elec_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); setprop("/controls/APU/master", 0); setprop("/controls/APU/start", 0); setprop("/controls/APU/bleed", 0); - setprop("/controls/electric/APU-generator", 0); - setprop("/controls/electric/battery-switch", 0); + setprop("/controls/electrical/switches/gen-apu", 0); + setprop("/controls/electrical/switches/battery1", 0); + setprop("/controls/electrical/switches/battery2", 0); # Now the Startup! - setprop("/controls/electric/battery-switch", 1); + setprop("/controls/electrical/switches/battery1", 1); + setprop("/controls/electrical/switches/battery2", 1); setprop("/controls/APU/master", 1); setprop("/controls/APU/start", 1); var apu_rpm_chk = setlistener("/systems/apu/rpm", func { @@ -98,10 +101,11 @@ var beforestart = func { } var beforestart_b = func { # Continue with engine start prep. - setprop("/controls/electric/APU-generator", 1); + setprop("/controls/electrical/switches/gen-apu", 1); + setprop("/controls/electrical/switches/galley", 1); setprop("/controls/APU/bleed", 1); - setprop("/controls/electric/engine[0]/generator", 1); - setprop("/controls/electric/engine[1]/generator", 1); + setprop("/controls/electrical/switches/gen1", 1); + setprop("/controls/electrical/switches/gen2", 1); setprop("/systems/acconfig/autoconfig-running", 0); ps_load_dlg.close(); ps_loaded_dlg.open(); @@ -115,25 +119,27 @@ var taxi = func { setprop("/controls/engines/engine-start-switch", 1); setprop("/controls/engines/engine[0]/cutoff-switch", 1); setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/electric/engine[0]/generator", 0); - setprop("/controls/electric/engine[1]/generator", 0); + setprop("/controls/electrical/switches/gen1", 0); + setprop("/controls/electrical/switches/gen2", 0); setprop("/controls/flight/slats", 0.000); setprop("/controls/flight/flaps", 0.000); setprop("/controls/flight/flap-lever", 0); setprop("/controls/flight/speedbrake-arm", 0); setprop("/controls/gear/gear-down", 1); -# systems.elec_init(); + systems.elec_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); setprop("/controls/APU/master", 0); setprop("/controls/APU/start", 0); setprop("/controls/APU/bleed", 0); - setprop("/controls/electric/APU-generator", 0); - setprop("/controls/electric/battery-switch", 0); + setprop("/controls/electrical/switches/gen-apu", 0); + setprop("/controls/electrical/switches/battery1", 0); + setprop("/controls/electrical/switches/battery2", 0); # Now the Startup! - setprop("/controls/electric/battery-switch", 1); + setprop("/controls/electrical/switches/battery1", 1); + setprop("/controls/electrical/switches/battery2", 1); setprop("/controls/APU/master", 1); setprop("/controls/APU/start", 1); var apu_rpm_chk = setlistener("/systems/apu/rpm", func { @@ -145,10 +151,11 @@ var taxi = func { } var taxi_b = func { # Continue with engine start prep, and start engine 2. - setprop("/controls/electric/APU-generator", 1); + setprop("/controls/electrical/switches/gen-apu", 1); + setprop("/controls/electrical/switches/galley", 1); setprop("/controls/APU/bleed", 1); - setprop("/controls/electric/engine[0]/generator", 1); - setprop("/controls/electric/engine[1]/generator", 1); + setprop("/controls/electrical/switches/gen1", 1); + setprop("/controls/electrical/switches/gen2", 1); setprop("/controls/engines/engine-start-switch", 2); setprop("/controls/engines/engine[1]/cutoff-switch", 0); var eng_two_chk = setlistener("/engines/engine[1]/state", func { diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index 7e341357..514a41ac 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -214,9 +214,6 @@ left - - /systems/unused/unusedthing - /controls/switches/cart dialog-apply diff --git a/Engines/v2522_a5.xml b/Engines/v2522_a5.xml index 3cb417f8..90906b2f 100644 --- a/Engines/v2522_a5.xml +++ b/Engines/v2522_a5.xml @@ -13,13 +13,13 @@ 23000 - 2.0 + 5.1 0.8 0.03 23.4 63.7 - 5.1 - 22.8 + 0.2 + 2.0 105.8 102.1 0 diff --git a/Engines/v2527_a5.xml b/Engines/v2527_a5.xml index da4ea998..d2f64b5e 100644 --- a/Engines/v2527_a5.xml +++ b/Engines/v2527_a5.xml @@ -13,13 +13,13 @@ 26600 - 2.0 + 5.1 0.8 0.03 23.4 63.7 - 5.1 - 22.8 + 0.2 + 2.0 105.8 102.1 0 diff --git a/Engines/v2533_a5.xml b/Engines/v2533_a5.xml index f2c65661..22e5907b 100644 --- a/Engines/v2533_a5.xml +++ b/Engines/v2533_a5.xml @@ -13,13 +13,13 @@ 32000 - 2.0 + 5.1 0.8 0.03 23.4 63.7 - 5.1 - 22.8 + 0.2 + 2.0 105.8 102.1 0 diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index eb153100..ed860296 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -73,10 +73,36 @@ -15 - - /systems/electrical/outputs/efis - 12 - + + + + + /controls/electrical/switches/battery1 + 1 + + + /controls/electrical/switches/battery2 + 1 + + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + @@ -89,10 +115,16 @@ -15 - - /systems/electrical/outputs/efis - 12 - + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + @@ -107,10 +139,16 @@ -15 - - /systems/electrical/outputs/efis - 12 - + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + @@ -123,10 +161,16 @@ -15 - - /systems/electrical/outputs/efis - 12 - + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + @@ -141,10 +185,36 @@ -15 - - /systems/electrical/outputs/efis - 12 - + + + + + /controls/electrical/switches/battery1 + 1 + + + /controls/electrical/switches/battery2 + 1 + + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + @@ -159,10 +229,16 @@ -15 - - /systems/electrical/outputs/efis - 12 - + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + diff --git a/Models/Instruments/ECAM/Display.xml b/Models/Instruments/ECAM/Display.xml index f00f73b2..b2002081 100644 --- a/Models/Instruments/ECAM/Display.xml +++ b/Models/Instruments/ECAM/Display.xml @@ -9,16 +9,10 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode ENG - ENG 128 @@ -29,16 +23,10 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode BLEED - BLEED 128 @@ -49,16 +37,10 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode STATUS - STATUS 128 @@ -69,19 +51,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode PRESS - PRESS - 128/ + 128 128 256 256 @@ -89,19 +65,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode ELEC - ELEC - 128/ + 128 128 256 256 @@ -109,19 +79,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode HYD - HYD - 128/ + 128 128 256 256 @@ -129,19 +93,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode FUEL - FUEL - 128/ + 128 128 256 256 @@ -149,19 +107,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode APU - APU - 128/ + 128 128 256 256 @@ -169,19 +121,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode COND - COND - 128/ + 128 128 256 256 @@ -189,19 +135,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode DOOR - DOOR - 128/ + 128 128 256 256 @@ -210,19 +150,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode WHEEL - WHEEL - 128/ + 128 128 256 256 @@ -230,19 +164,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode FCTL - FCTL - 128/ + 128 128 256 256 @@ -252,16 +180,10 @@ Rudder animation - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode FCTL - 128 80 @@ -271,19 +193,13 @@ - - - systems/electrical/outputs/efis - 15 - instrumentation/efis/ecam/display-mode ALL - ALL - 128/ + 128 128 256 256 diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 5ca0f2d5..2ffcf0ef 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -69,10 +69,61 @@ + + + select + ACESSFeedBtn1F + ACESSFeedBtn2O + APUBleedBtn1F + APUBleedBtn2O + APUGenBtn1F + APUGenBtn2O + APUMasterBtn1F + APUMasterBtn2O + APUStartBtn1A + APUStartBtn2O + BatteryBtn11F + BatteryBtn21F + BatteryBtn12O + BatteryBtn22O + Battery-lvl + BusTieBtn2O + ExtPwrBtn1A + ExtPwrBtn2O + GalleyPwrBtn1F + GalleyPwrBtn2O + Gen1Btn1F + Gen1Btn2O + Gen2Btn1F + Gen2Btn2O + IDG1Btn1F + IDG2Btn1F + + + + /controls/electrical/switches/battery1 + 1 + + + /controls/electrical/switches/battery2 + 1 + + + /systems/electrical/bus/dc1 + 25 + + + /systems/electrical/bus/dc2 + 25 + + + + + material adirs-coords - battery-lvl + Battery-lvl 1 1 @@ -98,7 +149,7 @@ select - battery-lvl + Battery-lvl controls/electric/battery-switch @@ -663,63 +714,290 @@ - Battery pick + Galley pick pick - BatteryBtn1 - BatteryBtn2 + GalleyPwrBtn + GalleyPwrBtn1F + GalleyPwrBtn2O false property-toggle - controls/electric/battery-switch + /controls/electrical/switches/galley - + - Battery off - textranslate - BatteryBtn2 - controls/electric/battery-switch - - 00.5 - 10 - - - 1 - 0 - + select + GalleyPwrBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + select + GalleyPwrBtn2O + + + + /controls/electrical/switches/galley + 0 + + + /controls/switches/annun-test + 1 + + + + + + + Battery1 pick + pick + BatteryBtn11 + BatteryBtn12 + BatteryBtn11F + BatteryBtn12O + + + false + + property-toggle + /controls/electrical/switches/battery1 + + + + + + select + BatteryBtn11F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + BatteryBtn12O + + + + /controls/electrical/switches/battery1 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + Battery2 pick + pick + BatteryBtn21 + BatteryBtn22 + BatteryBtn21F + BatteryBtn22O + + + false + + property-toggle + /controls/electrical/switches/battery2 + + + + + + select + BatteryBtn21F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + BatteryBtn22O + + + + /controls/electrical/switches/battery2 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + + + + select + IDG1Btn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + Generator 1 pick pick Gen1Btn1 Gen1Btn2 + Gen1Btn1F + Gen1Btn2O false property-toggle - controls/electric/engine[0]/generator + /controls/electrical/switches/gen1 + - Generator 1 off - textranslate - Gen1Btn2 - controls/electric/engine[0]/generator - - 00.5 - 10 - - - 1 - 0 - + select + Gen1Btn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + Gen1Btn2O + + + + /controls/electrical/switches/gen1 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + AC ESS pick + pick + ACESSFeedBtn + ACESSFeedBtn1F + ACESSFeedBtn2O + + + false + + property-toggle + /controls/electrical/switches/acc-ess-feed + + + + + + select + ACESSFeedBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + ACESSFeedBtn2O + + + + /controls/electrical/switches/acc-ess-feed + 0 + + + /controls/switches/annun-test + 1 + + + @@ -727,29 +1005,80 @@ pick APUGenBtn1 APUGenBtn2 + APUGenBtnA + APUGenBtnO false property-toggle - controls/electric/APU-generator + /controls/electrical/switches/gen-apu - - APU generator off - textranslate - APUGenBtn2 - controls/electric/APU-generator - - 00.5 - 10 - - - 1 - 0 - + select + APUGenBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + select + APUGenBtn2O + + + + /controls/electrical/switches/gen-apu + 0 + + + /controls/switches/annun-test + 1 + + + + + + + Bus Tie pick + pick + BusTieBtn + BusTieBtn2O + + + false + + property-toggle + /controls/electrical/switches/apu-ext-crosstie + + + + + + select + BusTieBtn2O + + + + /controls/electrical/switches/apu-ext-crosstie + 0 + + + /controls/switches/annun-test + 1 + + + @@ -757,26 +1086,54 @@ pick ExtPwrBtn1 ExtPwrBtn2 + ExtPwrBtn1A + ExtPwrBtn2O false property-toggle - controls/electric/external-power + /controls/electrical/switches/gen-ext - - External power on - textranslate - ExtPwrBtn2 - controls/electric/external-power - 0.5 - - 1 - 0 - + select + ExtPwrBtn1A + + + + /controls/switches/cart + 1 + + + /controls/switches/annun-test + 1 + + + + + + select + ExtPwrBtn2O + + + + + /controls/switches/cart + 1 + + + /controls/electrical/switches/gen-ext + 1 + + + + /controls/switches/annun-test + 1 + + + @@ -784,29 +1141,84 @@ pick Gen2Btn1 Gen2Btn2 + Gen2Btn1F + Gen2Btn2O false property-toggle - controls/electric/engine[1]/generator + /controls/electrical/switches/gen2 + - Generator 2 off - textranslate - Gen2Btn2 - controls/electric/engine[1]/generator - - 00.5 - 10 - - - 1 - 0 - + select + Gen2Btn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + Gen2Btn2O + + + + /controls/electrical/switches/gen2 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + + + + select + IDG2Btn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + @@ -917,6 +1329,8 @@ pick APUBleedBtn1 APUBleedBtn2 + APUBleedBtn1F + APUBleedBtn2O false @@ -926,16 +1340,39 @@ + - APU bleed on - textranslate - APUBleedBtn2 - controls/APU/bleed - 0.5 - - 1 - 0 - + select + APUBleedBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + APUBleedBtn2O + + + + /controls/APU/bleed + 1 + + + /controls/switches/annun-test + 1 + + + @@ -1361,40 +1798,48 @@ pick APUMasterBtn1 APUMasterBtn2 + APUMasterBtn1F + APUMasterBtn2O false property-toggle - controls/APU/master + /controls/APU/master - + + + select + APUMasterBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + - APU master switch fault - textranslate - APUMasterBtn1 - engines/apu/serviceable - - 00 - 10 - - - 1 - 0 - - - - APU master switch on - textranslate - APUMasterBtn2 - controls/APU/master - 0.5 - - 1 - 0 - + select + APUMasterBtn2O + + + + /controls/APU/master + 1 + + + /controls/switches/annun-test + 1 + + + @@ -1402,6 +1847,8 @@ pick APUStartBtn1 APUStartBtn2 + APUStartBtn1A + APUStartBtn2O false @@ -1409,19 +1856,39 @@ property-toggle controls/APU/start - - APU starter on - textranslate - APUStartBtn2 - controls/APU/start - 0.5 - - 1 - 0 - + select + APUStartBtn1A + + + + /systems/apu/rpm + 99 + + + /controls/switches/annun-test + 1 + + + + + + select + APUStartBtn2O + + + + /controls/APU/start + 1 + + + /controls/switches/annun-test + 1 + + + @@ -1510,6 +1977,46 @@ -0.2597 + + + Annun lights pick + pick + AnnunciatorLtSwtch + + + false + + property-cycle + /controls/switches/annun-test + + 0 + 1 + + + + + Annun lights rotate + rotate + AnnunciatorLtSwtch + /controls/switches/annun-test + + -135 + 00 + 1-35 + + + 0 + 1 + 0 + +
+ -0.01 + 0 + -0.2597 +
+ + + @@ -1830,7 +2337,7 @@ - battery-lvl + Battery-lvl -0.008 -0.057 @@ -1843,7 +2350,7 @@ xy-plane number-value %2.1f - /systems/electrical/suppliers/battery + /systems/electrical/battery1-volts led.txf true false @@ -1856,7 +2363,7 @@ - battery-lvl + Battery-lvl -0.008 0.035 @@ -1869,7 +2376,7 @@ xy-plane number-value %2.1f - /systems/electrical/suppliers/battery + /systems/electrical/battery2-volts led.txf true false diff --git a/Models/Instruments/OHpanel/res/buttons - Copy.png b/Models/Instruments/OHpanel/res/buttons - Copy.png deleted file mode 100644 index 9197b2d97dbe53f5224cdb938a2d5cf2df919a33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5169 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 diff --git a/Models/Instruments/OHpanel/res/buttons.png b/Models/Instruments/OHpanel/res/buttons.png index 552ac849966ee5d848f00b5c7685cd609ddc7373..a25f1b0e04d13e536a114023a0a1e6c721c22b3b 100644 GIT binary patch literal 817 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*&nj7F$fsmvhMr<6q3yhi70W-&&^HED*1ZVvs*Y@>?MOwPP%d2 zb6wMfh_#igUZt&k=Qrt$&xilgf9Ei|fSk#~Ai&^2B?h@BJ;*+9`Mip414BbD_kvZ| z^cp~p?D78aUyMP4p#kVQ1`aAQsAm$yMGXuUOyv3+XQ&esCI8MApW8W)QHLSnHq(k# wTe%nPo~&a0Sm@7wR;q;+%!gzLf6XJ-s?Abut{JwWz=X@->FVdQ&MBb@04>gYx&QzG literal 5774 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 diff --git a/Models/Instruments/OHpanel/res/buttons2.png b/Models/Instruments/OHpanel/res/buttons2.png new file mode 100644 index 0000000000000000000000000000000000000000..138cc9bca1a40ff4dbf89339d9f105164c51ec07 GIT binary patch literal 6180 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 + + + osgtext-green + + 0.0007 + 0.0445 + -0.0018 + + center-center + yz-plane + text-value + %s + /controls/flight/flap-txt + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + +