From 1134421fd7ef8240f42df45f8a3169c09679f0ec Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 13 Sep 2018 07:55:08 -0400 Subject: [PATCH 1/2] System: Fix PTU powering systems magically with no source, fixes #37 --- Nasal/hydraulics.nas | 14 +++++++------- revision.txt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index bffe7247..05a43167 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -125,7 +125,7 @@ var HYD = { setprop("/systems/hydraulic/ptu-active", 0); } - if ((rat_man_sw == 1 or getprop("/controls/electrical/switches/emer-gen") == 1) and (gs > 100)) { + if ((rat_man_sw == 1 or getprop("/controls/electrical/switches/emer-gen") == 1) and gs > 100) { setprop("/controls/hydraulic/rat", 1); setprop("/controls/hydraulic/rat-deployed", 1); } else if (gs < 100) { @@ -134,7 +134,7 @@ var HYD = { ptu_active = getprop("/systems/hydraulic/ptu-active"); - if ((elec_pump_blue_sw and dc_ess >= 25 and !blue_pump_fail) and (stateL == 3 or stateR == 3 or getprop("/gear/gear[0]/wow") == 0) and !blue_leak) { + if (elec_pump_blue_sw and dc_ess >= 25 and !blue_pump_fail and (stateL == 3 or stateR == 3 or getprop("/gear/gear[0]/wow") == 0) and !blue_leak) { if (blue_psi < 2900) { setprop("/systems/hydraulic/blue-psi", blue_psi + 50); } else { @@ -154,13 +154,13 @@ var HYD = { } } - if ((eng1_pump_sw and stateL == 3 and !green_pump_fail) and !green_leak) { + if (eng1_pump_sw and stateL == 3 and !green_pump_fail and !green_leak) { if (green_psi < 2900) { setprop("/systems/hydraulic/green-psi", green_psi + 50); } else { setprop("/systems/hydraulic/green-psi", 3000); } - } else if ((ptu_active and stateL != 3 and !ptu_fail) and !green_leak) { + } else if (ptu_active and !ptu_fail and yellow_psi >= 1500 and !green_leak) { if (green_psi < 2900) { setprop("/systems/hydraulic/green-psi", green_psi + 50); } else { @@ -174,19 +174,19 @@ var HYD = { } } - if ((eng2_pump_sw and stateR == 3 and !yellow_pump_eng_fail) and !yellow_leak) { + if (eng2_pump_sw and stateR == 3 and !yellow_pump_eng_fail and !yellow_leak) { if (yellow_psi < 2900) { setprop("/systems/hydraulic/yellow-psi", yellow_psi + 50); } else { setprop("/systems/hydraulic/yellow-psi", 3000); } - } else if ((elec_pump_yellow_sw and dc_ess >= 25 and !yellow_pump_elec_fail) and !yellow_leak) { + } else if (elec_pump_yellow_sw and dc_ess >= 25 and !yellow_pump_elec_fail and !yellow_leak) { if (yellow_psi < 2900) { setprop("/systems/hydraulic/yellow-psi", yellow_psi + 50); } else { setprop("/systems/hydraulic/yellow-psi", 3000); } - } else if ((ptu_active and stateR != 3 and !ptu_fail) and !yellow_leak) { + } else if (ptu_active and !ptu_fail and green_psi >= 1500 and !yellow_leak) { if (yellow_psi < 2900) { setprop("/systems/hydraulic/yellow-psi", yellow_psi + 50); } else { diff --git a/revision.txt b/revision.txt index f0441ad0..9a8337be 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4634 \ No newline at end of file +4635 \ No newline at end of file From bb9f64858c622be399cd620c110f37accdb74e19 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 13 Sep 2018 18:52:24 -0400 Subject: [PATCH 2/2] System: Base Core for lower ECAM pages --- Models/FlightDeck/a320.flightdeck.xml | 60 +++++++++++---------------- Nasal/ECAM.nas | 29 ++++++++++++- 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 24bd362c..5fe8009b 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -1073,9 +1073,8 @@ 25 - property-assign - ECAM/Lower/page - sts + nasal + @@ -1093,9 +1092,8 @@ 25 - property-assign - ECAM/Lower/page - apu + nasal + @@ -1113,9 +1111,8 @@ 25 - property-assign - ECAM/Lower/page - bleed + nasal + @@ -1133,9 +1130,8 @@ 25 - property-assign - ECAM/Lower/page - press + nasal + @@ -1153,9 +1149,8 @@ 25 - property-assign - ECAM/Lower/page - elec + nasal + @@ -1173,9 +1168,8 @@ 25 - property-assign - ECAM/Lower/page - hyd + nasal + @@ -1193,9 +1187,8 @@ 25 - property-assign - ECAM/Lower/page - fuel + nasal + @@ -1213,9 +1206,8 @@ 25 - property-assign - ECAM/Lower/page - eng + nasal + @@ -1233,9 +1225,8 @@ 25 - property-assign - ECAM/Lower/page - cond + nasal + @@ -1253,9 +1244,8 @@ 25 - property-assign - ECAM/Lower/page - door + nasal + @@ -1273,9 +1263,8 @@ 25 - property-assign - ECAM/Lower/page - wheel + nasal + @@ -1293,9 +1282,8 @@ 25 - property-assign - ECAM/Lower/page - fctl + nasal + diff --git a/Nasal/ECAM.nas b/Nasal/ECAM.nas index 5129a218..8893ef3b 100644 --- a/Nasal/ECAM.nas +++ b/Nasal/ECAM.nas @@ -7,7 +7,6 @@ setprop("/ECAM/left-msg", "NONE"); setprop("/position/gear-agl-ft", 0); -setprop("/ECAM/Lower/page", "fctl"); # w = White, b = Blue, g = Green, a = Amber, r = Red var ECAM = { @@ -17,6 +16,19 @@ var ECAM = { setprop("/ECAM/to-memo-enable", 1); setprop("/ECAM/to-config", 0); setprop("/ECAM/ldg-memo-enable", 0); + setprop("/ECAM/Lower/page", ""); + setprop("/ECAM/Lower/light/apu", 0); + setprop("/ECAM/Lower/light/bleed", 0); + setprop("/ECAM/Lower/light/cond", 0); + setprop("/ECAM/Lower/light/door", 0); + setprop("/ECAM/Lower/light/elec", 0); + setprop("/ECAM/Lower/light/eng", 0); + setprop("/ECAM/Lower/light/fctl", 0); + setprop("/ECAM/Lower/light/fuel", 0); + setprop("/ECAM/Lower/light/hyd", 0); + setprop("/ECAM/Lower/light/press", 0); + setprop("/ECAM/Lower/light/sts", 0); + setprop("/ECAM/Lower/light/wheel", 0); var stateL = getprop("/engines/engine[0]/state"); var stateR = getprop("/engines/engine[1]/state"); var thrustL = getprop("/systems/thrust/state1"); @@ -25,6 +37,7 @@ var ECAM = { var speed = getprop("/velocities/airspeed-kt"); var wow = getprop("/gear/gear[0]/wow"); var altitude = getprop("/position/gear-agl-ft"); + LowerECAM.reset(); }, MSGclr: func() { setprop("/ECAM/ecam-checklist-active", 0); @@ -118,6 +131,8 @@ var ECAM = { } else { setprop("/ECAM/to-config", 0); } + + LowerECAM.loop(); }, toConfig: func() { stateL = getprop("/engines/engine[0]/state"); @@ -137,3 +152,15 @@ var ECAM = { }; ECAM.MSGclr(); + +var LowerECAM = { + button: func(b) { + + }, + loop: func() { + + }, + reset: func() { + + }, +};