From 296d481ca772b8f3c57ea4fea51b8166185b0193 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 15 Jul 2018 22:37:54 -0400 Subject: [PATCH] DU: Lower ECAM FCTL bugfix, Sim: bugfixes --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 110 +++++++++---------- Systems/flight-recorder.xml | 60 ---------- 2 files changed, 50 insertions(+), 120 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 1430422d..f16b9f8f 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -53,16 +53,6 @@ setprop("/ECAM/Lower/elevator-trim-deg", 0); setprop("/fdm/jsbsim/hydraulics/rudder/final-deg", 0); setprop("/environment/temperature-degc", 0); setprop("/FMGC/internal/gw", 0); -setprop("/controls/flight/spoiler-l1-failed", 0); -setprop("/controls/flight/spoiler-l2-failed", 0); -setprop("/controls/flight/spoiler-l3-failed", 0); -setprop("/controls/flight/spoiler-l4-failed", 0); -setprop("/controls/flight/spoiler-l5-failed", 0); -setprop("/controls/flight/spoiler-r1-failed", 0); -setprop("/controls/flight/spoiler-r2-failed", 0); -setprop("/controls/flight/spoiler-r3-failed", 0); -setprop("/controls/flight/spoiler-r4-failed", 0); -setprop("/controls/flight/spoiler-r5-failed", 0); setprop("/instrumentation/du/du4-test", 0); setprop("/instrumentation/du/du4-test-time", 0); setprop("/instrumentation/du/du4-test-amount", 0); @@ -644,10 +634,10 @@ var canvas_lowerECAM_fctl = { } # Spoiler Fail - if (getprop("/controls/flight/spoiler-l1-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-l1") or green_psi < 1500) { me["spoiler1Lex"].setColor(0.7333,0.3803,0); me["spoiler1Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l1/final-deg") < 1.5) { me["spoiler1Lf"].show(); } else { me["spoiler1Lf"].hide(); @@ -658,10 +648,10 @@ var canvas_lowerECAM_fctl = { me["spoiler1Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l2-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-l2") or yellow_psi < 1500) { me["spoiler2Lex"].setColor(0.7333,0.3803,0); me["spoiler2Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l2/final-deg") < 1.5) { me["spoiler2Lf"].show(); } else { me["spoiler2Lf"].hide(); @@ -672,10 +662,10 @@ var canvas_lowerECAM_fctl = { me["spoiler2Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l3-failed") or blue_psi < 1500) { + if (getprop("/systems/failures/spoiler-l3") or blue_psi < 1500) { me["spoiler3Lex"].setColor(0.7333,0.3803,0); me["spoiler3Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l3/final-deg") < 1.5) { me["spoiler3Lf"].show(); } else { me["spoiler3Lf"].hide(); @@ -686,10 +676,10 @@ var canvas_lowerECAM_fctl = { me["spoiler3Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l4-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-l4") or yellow_psi < 1500) { me["spoiler4Lex"].setColor(0.7333,0.3803,0); me["spoiler4Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l4/final-deg") < 1.5) { me["spoiler4Lf"].show(); } else { me["spoiler4Lf"].hide(); @@ -700,10 +690,10 @@ var canvas_lowerECAM_fctl = { me["spoiler4Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l5-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-l5") or green_psi < 1500) { me["spoiler5Lex"].setColor(0.7333,0.3803,0); me["spoiler5Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l5/final-deg") < 1.5) { me["spoiler5Lf"].show(); } else { me["spoiler5Lf"].hide(); @@ -714,10 +704,10 @@ var canvas_lowerECAM_fctl = { me["spoiler5Lf"].hide(); } - if (getprop("/controls/flight/spoiler-r1-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-r1") or green_psi < 1500) { me["spoiler1Rex"].setColor(0.7333,0.3803,0); me["spoiler1Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r1/final-deg") < 1.5) { me["spoiler1Rf"].show(); } else { me["spoiler1Rf"].hide(); @@ -728,10 +718,10 @@ var canvas_lowerECAM_fctl = { me["spoiler1Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r2-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-r2") or yellow_psi < 1500) { me["spoiler2Rex"].setColor(0.7333,0.3803,0); me["spoiler2Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r2/final-deg") < 1.5) { me["spoiler2Rf"].show(); } else { me["spoiler2Rf"].hide(); @@ -742,10 +732,10 @@ var canvas_lowerECAM_fctl = { me["spoiler2Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r3-failed") or blue_psi < 1500) { + if (getprop("/systems/failures/spoiler-r3") or blue_psi < 1500) { me["spoiler3Rex"].setColor(0.7333,0.3803,0); me["spoiler3Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r3/final-deg") < 1.5) { me["spoiler3Rf"].show(); } else { me["spoiler3Rf"].hide(); @@ -756,10 +746,10 @@ var canvas_lowerECAM_fctl = { me["spoiler3Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r4-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-r4") or yellow_psi < 1500) { me["spoiler4Rex"].setColor(0.7333,0.3803,0); me["spoiler4Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r4/final-deg") < 1.5) { me["spoiler4Rf"].show(); } else { me["spoiler4Rf"].hide(); @@ -770,10 +760,10 @@ var canvas_lowerECAM_fctl = { me["spoiler4Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r5-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-r5") or green_psi < 1500) { me["spoiler5Rex"].setColor(0.7333,0.3803,0); me["spoiler5Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r5/final-deg") < 1.5) { me["spoiler5Rf"].show(); } else { me["spoiler5Rf"].hide(); @@ -1090,7 +1080,7 @@ var canvas_lowerECAM_wheel = { } # Spoilers - if (getprop("/controls/flight/spoiler-l1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l1/final-deg") < 1.5) { me["spoiler1Lex"].hide(); me["spoiler1Lrt"].show(); } else { @@ -1098,7 +1088,7 @@ var canvas_lowerECAM_wheel = { me["spoiler1Lex"].show(); } - if (getprop("/controls/flight/spoiler-l2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l2/final-deg") < 1.5) { me["spoiler2Lex"].hide(); me["spoiler2Lrt"].show(); } else { @@ -1106,7 +1096,7 @@ var canvas_lowerECAM_wheel = { me["spoiler2Lex"].show(); } - if (getprop("/controls/flight/spoiler-l3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l3/final-deg") < 1.5) { me["spoiler3Lex"].hide(); me["spoiler3Lrt"].show(); } else { @@ -1114,7 +1104,7 @@ var canvas_lowerECAM_wheel = { me["spoiler3Lex"].show(); } - if (getprop("/controls/flight/spoiler-l4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l4/final-deg") < 1.5) { me["spoiler4Lex"].hide(); me["spoiler4Lrt"].show(); } else { @@ -1122,7 +1112,7 @@ var canvas_lowerECAM_wheel = { me["spoiler4Lex"].show(); } - if (getprop("/controls/flight/spoiler-l5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l5/final-deg") < 1.5) { me["spoiler5Lex"].hide(); me["spoiler5Lrt"].show(); } else { @@ -1130,7 +1120,7 @@ var canvas_lowerECAM_wheel = { me["spoiler5Lex"].show(); } - if (getprop("/controls/flight/spoiler-r1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r1/final-deg") < 1.5) { me["spoiler1Rex"].hide(); me["spoiler1Rrt"].show(); } else { @@ -1138,7 +1128,7 @@ var canvas_lowerECAM_wheel = { me["spoiler1Rex"].show(); } - if (getprop("/controls/flight/spoiler-r2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r2/final-deg") < 1.5) { me["spoiler2Rex"].hide(); me["spoiler2Rrt"].show(); } else { @@ -1146,7 +1136,7 @@ var canvas_lowerECAM_wheel = { me["spoiler2Rex"].show(); } - if (getprop("/controls/flight/spoiler-r3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r3/final-deg") < 1.5) { me["spoiler3Rex"].hide(); me["spoiler3Rrt"].show(); } else { @@ -1154,7 +1144,7 @@ var canvas_lowerECAM_wheel = { me["spoiler3Rex"].show(); } - if (getprop("/controls/flight/spoiler-r4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r4/final-deg") < 1.5) { me["spoiler4Rex"].hide(); me["spoiler4Rrt"].show(); } else { @@ -1162,7 +1152,7 @@ var canvas_lowerECAM_wheel = { me["spoiler4Rex"].show(); } - if (getprop("/controls/flight/spoiler-r5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r5/final-deg") < 1.5) { me["spoiler5Rex"].hide(); me["spoiler5Rrt"].show(); } else { @@ -1171,10 +1161,10 @@ var canvas_lowerECAM_wheel = { } # Spoiler Fail - if (getprop("/controls/flight/spoiler-l1-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-l1") or green_psi < 1500) { me["spoiler1Lex"].setColor(0.7333,0.3803,0); me["spoiler1Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l1/final-deg") < 1.5) { me["spoiler1Lf"].show(); } else { me["spoiler1Lf"].hide(); @@ -1185,10 +1175,10 @@ var canvas_lowerECAM_wheel = { me["spoiler1Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l2-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-l2") or yellow_psi < 1500) { me["spoiler2Lex"].setColor(0.7333,0.3803,0); me["spoiler2Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l2/final-deg") < 1.5) { me["spoiler2Lf"].show(); } else { me["spoiler2Lf"].hide(); @@ -1199,10 +1189,10 @@ var canvas_lowerECAM_wheel = { me["spoiler2Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l3-failed") or blue_psi < 1500) { + if (getprop("/systems/failures/spoiler-l3") or blue_psi < 1500) { me["spoiler3Lex"].setColor(0.7333,0.3803,0); me["spoiler3Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l3/final-deg") < 1.5) { me["spoiler3Lf"].show(); } else { me["spoiler3Lf"].hide(); @@ -1213,10 +1203,10 @@ var canvas_lowerECAM_wheel = { me["spoiler3Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l4-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-l4") or yellow_psi < 1500) { me["spoiler4Lex"].setColor(0.7333,0.3803,0); me["spoiler4Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l4/final-deg") < 1.5) { me["spoiler4Lf"].show(); } else { me["spoiler4Lf"].hide(); @@ -1227,10 +1217,10 @@ var canvas_lowerECAM_wheel = { me["spoiler4Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l5-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-l5") or green_psi < 1500) { me["spoiler5Lex"].setColor(0.7333,0.3803,0); me["spoiler5Lrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-l5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-l5/final-deg") < 1.5) { me["spoiler5Lf"].show(); } else { me["spoiler5Lf"].hide(); @@ -1241,10 +1231,10 @@ var canvas_lowerECAM_wheel = { me["spoiler5Lf"].hide(); } - if (getprop("/controls/flight/spoiler-r1-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-r1") or green_psi < 1500) { me["spoiler1Rex"].setColor(0.7333,0.3803,0); me["spoiler1Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r1") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r1/final-deg") < 1.5) { me["spoiler1Rf"].show(); } else { me["spoiler1Rf"].hide(); @@ -1255,10 +1245,10 @@ var canvas_lowerECAM_wheel = { me["spoiler1Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r2-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-r2") or yellow_psi < 1500) { me["spoiler2Rex"].setColor(0.7333,0.3803,0); me["spoiler2Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r2") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r2/final-deg") < 1.5) { me["spoiler2Rf"].show(); } else { me["spoiler2Rf"].hide(); @@ -1269,10 +1259,10 @@ var canvas_lowerECAM_wheel = { me["spoiler2Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r3-failed") or blue_psi < 1500) { + if (getprop("/systems/failures/spoiler-r3") or blue_psi < 1500) { me["spoiler3Rex"].setColor(0.7333,0.3803,0); me["spoiler3Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r3") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r3/final-deg") < 1.5) { me["spoiler3Rf"].show(); } else { me["spoiler3Rf"].hide(); @@ -1283,10 +1273,10 @@ var canvas_lowerECAM_wheel = { me["spoiler3Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r4-failed") or yellow_psi < 1500) { + if (getprop("/systems/failures/spoiler-r4") or yellow_psi < 1500) { me["spoiler4Rex"].setColor(0.7333,0.3803,0); me["spoiler4Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r4") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r4/final-deg") < 1.5) { me["spoiler4Rf"].show(); } else { me["spoiler4Rf"].hide(); @@ -1297,10 +1287,10 @@ var canvas_lowerECAM_wheel = { me["spoiler4Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r5-failed") or green_psi < 1500) { + if (getprop("/systems/failures/spoiler-r5") or green_psi < 1500) { me["spoiler5Rex"].setColor(0.7333,0.3803,0); me["spoiler5Rrt"].setColor(0.7333,0.3803,0); - if (getprop("/controls/flight/spoiler-r5") < 0.033) { + if (getprop("/fdm/jsbsim/hydraulics/spoiler-r5/final-deg") < 1.5) { me["spoiler5Rf"].show(); } else { me["spoiler5Rf"].hide(); diff --git a/Systems/flight-recorder.xml b/Systems/flight-recorder.xml index c8995632..3f6bd727 100644 --- a/Systems/flight-recorder.xml +++ b/Systems/flight-recorder.xml @@ -55,66 +55,6 @@ double engines/engine[1]/reverser-pos-norm - - - double - controls/flight/elevator-left - - - double - controls/flight/elevator-right - - - double - controls/flight/aileron-left - - - double - controls/flight/aileron-right - - - double - controls/flight/spoiler-l1 - - - double - controls/flight/spoiler-l2 - - - double - controls/flight/spoiler-l3 - - - double - controls/flight/spoiler-l4 - - - double - controls/flight/spoiler-l5 - - - double - controls/flight/spoiler-r1 - - - double - controls/flight/spoiler-r2 - - - double - controls/flight/spoiler-r3 - - - double - controls/flight/spoiler-r4 - - - double - controls/flight/spoiler-r5 - - - double - controls/flight/rudder-fdm double