diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 50c7c03b..e6d60502 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -69,7 +69,7 @@ var aileron_ind_right = props.globals.getNode("/ECAM/Lower/aileron-ind-right", 1 var elevator_ind_left = props.globals.getNode("/ECAM/Lower/elevator-ind-left", 1); var elevator_ind_right = props.globals.getNode("/ECAM/Lower/elevator-ind-right", 1); var elevator_trim_deg = props.globals.getNode("/ECAM/Lower/elevator-trim-deg", 1); -var final_deg = props.globals.getNode("/fdm/jsbsim/hydraulic/rudder/final-deg", 1); +var final_deg = props.globals.getNode("/fdm/jsbsim/hydraulics/rudder/final-deg", 1); var temperature_degc = props.globals.getNode("/environment/temperature-degc", 1); var gw = props.globals.getNode("/FMGC/internal/gw", 1); var tank3_content_lbs = props.globals.getNode("/fdm/jsbsim/propulsion/tank[2]/contents-lbs", 1); @@ -182,16 +182,16 @@ var eng1_running = props.globals.getNode("/engines/engine[0]/running", 1); var eng2_running = props.globals.getNode("/engines/engine[1]/running", 1); var switch_cart = props.globals.getNode("/controls/electrical/ground-cart", 1); var total_psi = props.globals.getNode("/systems/pneumatic/total-psi", 1); -var spoiler_L1 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-l1/final-deg", 1); -var spoiler_L2 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-l2/final-deg", 1); -var spoiler_L3 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-l3/final-deg", 1); -var spoiler_L4 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-l4/final-deg", 1); -var spoiler_L5 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-l5/final-deg", 1); -var spoiler_R1 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-r1/final-deg", 1); -var spoiler_R2 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-r2/final-deg", 1); -var spoiler_R3 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-r3/final-deg", 1); -var spoiler_R4 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-r4/final-deg", 1); -var spoiler_R5 = props.globals.getNode("/fdm/jsbsim/hydraulic/spoiler-r5/final-deg", 1); +var spoiler_L1 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-l1/final-deg", 1); +var spoiler_L2 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-l2/final-deg", 1); +var spoiler_L3 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-l3/final-deg", 1); +var spoiler_L4 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-l4/final-deg", 1); +var spoiler_L5 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-l5/final-deg", 1); +var spoiler_R1 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-r1/final-deg", 1); +var spoiler_R2 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-r2/final-deg", 1); +var spoiler_R3 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-r3/final-deg", 1); +var spoiler_R4 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-r4/final-deg", 1); +var spoiler_R5 = props.globals.getNode("/fdm/jsbsim/hydraulics/spoiler-r5/final-deg", 1); var spoiler_L1_fail = props.globals.getNode("/systems/failures/spoiler-l1", 1); var spoiler_L2_fail = props.globals.getNode("/systems/failures/spoiler-l2", 1); var spoiler_L3_fail = props.globals.getNode("/systems/failures/spoiler-l3", 1); @@ -1319,8 +1319,8 @@ var canvas_lowerECAM_elec = { me["ELEC-Line-Emergen-ESSTR-off"].hide(); me["EMERGEN-Label-off"].hide(); - me["EmergenVolt"].setText(sprintf("s", math.round(emerGenVolts.getValue()))); - me["EmergenHz"].setText(sprintf("s", math.round(emerGenHz.getValue()))); + me["EmergenVolt"].setText(sprintf("%s", math.round(emerGenVolts.getValue()))); + me["EmergenHz"].setText(sprintf("%s", math.round(emerGenHz.getValue()))); if (emerGenVolts.getValue() > 120 or emerGenVolts.getValue() < 110 or emerGenHz.getValue() > 410 or emerGenHz.getValue() < 390) { me["Emergen-Label"].setColor(0.7333,0.3803,0); @@ -1682,11 +1682,14 @@ var canvas_lowerECAM_elec = { } } - if (switch_ac_ess_feed.getValue() == 1) { + if (getprop("/systems/electrical/relay/ac-ess-feed-1/contact-pos") == 1) { + me["ELEC-Line-AC1-ACESS"].show(); + me["ELEC-Line-AC2-ACESS"].hide(); + } elsif (getprop("/systems/electrical/relay/ac-ess-feed-2/contact-pos") == 1) { me["ELEC-Line-AC1-ACESS"].hide(); me["ELEC-Line-AC2-ACESS"].show(); } else { - me["ELEC-Line-AC1-ACESS"].show(); + me["ELEC-Line-AC1-ACESS"].hide(); me["ELEC-Line-AC2-ACESS"].hide(); } diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index b9facf65..18dc869f 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -1969,16 +1969,10 @@ <property>controls/OH/protectors/ratman</property> <value>1</value> </equals> - <or> - <greater-than-equals> - <property>systems/electrical/bus/dc-bat</property> - <value>25</value> - </greater-than-equals> - <greater-than-equals> - <property>systems/electrical/bus/dc-ess</property> - <value>25</value> - </greater-than-equals> - </or> + <greater-than-equals> + <property>/systems/electrical/bus/dc-hot-2</property> + <value>25</value> + </greater-than-equals> </and> </condition> <command>property-toggle</command> @@ -3710,16 +3704,10 @@ <property>controls/OH/protectors/elecratman</property> <value>1</value> </equals> - <or> - <greater-than-equals> - <property>systems/electrical/bus/dc-bat</property> - <value>25</value> - </greater-than-equals> - <greater-than-equals> - <property>systems/electrical/bus/dc-ess</property> - <value>25</value> - </greater-than-equals> - </or> + <greater-than-equals> + <property>/systems/electrical/bus/dc-hot-1</property> + <value>25</value> + </greater-than-equals> </and> </condition> <command>property-assign</command> diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index 864acc43..1ff789e5 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -58,8 +58,8 @@ var HYD = { yellowElec: props.globals.getNode("/controls/hydraulic/switches/yellow-elec"), }, Valve: { - yellowFire: props.globals.getNode("/systems/hydraulics/sources/yellow-edp/fire-valve"), - greenFire: props.globals.getNode("/systems/hydraulics/sources/green-edp/fire-valve"), + yellowFire: props.globals.getNode("/systems/hydraulic/sources/yellow-edp/fire-valve"), + greenFire: props.globals.getNode("/systems/hydraulic/sources/green-edp/fire-valve"), }, init: func() { me.resetFail();