Merge branch 'master' into FMGC

This commit is contained in:
Joshua Davidson 2019-02-10 18:14:11 -05:00
commit e93de61a35
10 changed files with 102 additions and 73 deletions

View file

@ -405,7 +405,7 @@
<minimum-fg-version>2018.1.0</minimum-fg-version>
</sim>
<consumables>
<fuel>
<tank n="0">
@ -446,22 +446,40 @@
<max-lb type="double">440</max-lb>
</weight>
<weight n="1">
<name>Passengers</name>
<name>Forward Cabin</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">24360</max-lb>
<max-lb type="double">4649</max-lb>
</weight>
<weight n="2">
<name>Forward Cargo</name>
<name>Center Cabin</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">9400</max-lb>
<max-lb type="double">13949</max-lb>
</weight>
<weight n="3">
<name>Aft Cargo</name>
<name>Aft Cabin</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">9400</max-lb>
<max-lb type="double">10462</max-lb>
</weight>
<weight n="4">
<name>Forward Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">5000</max-lb>
</weight>
<weight n="5">
<name>Aft Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[5]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">6662</max-lb>
</weight>
<weight n="6">
<name>Aft Bulk Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[6]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">3285</max-lb>
</weight>
</payload>

View file

@ -464,7 +464,7 @@ var takeoff = func {
var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {
if (getprop("/engines/engine[0]/state") == 3) {
removelistener(eng_one_chk_c);
setprop("/controls/lighting/strobe", 1);
setprop("/controls/switches/strobe", 0.5);
setprop("/controls/lighting/taxi-light-switch", 1);
setprop("/controls/lighting/landing-lights[1]", 1);
setprop("/controls/lighting/landing-lights[2]", 1);

View file

@ -88,10 +88,28 @@
<halign>left</halign>
<label>You will need to restart FlightGear, and install the latest .zip file.</label>
</text>
<hrule>
<color>
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
<alpha>0.95</alpha>
</color>
</hrule>
<text>
<halign>left</halign>
<label>GIT users: Please press Remind Me Later, and run a "git pull" command. (or pull using GIT GUI)</label>
</text>
<text>
<halign>left</halign>
<label>Make sure you have cloned from either of the following: (git remote -v to check)</label>
</text>
<text>
<halign>left</halign>
<label>HTTP: http://www.github.com/it0uchpods/IDG-A32X.git or SSH: git@github.com:it0uchpods/IDG-A32X.git</label>
</text>
</group>
<hrule>

View file

@ -138,10 +138,10 @@ var ECAM_controller = {
loop: func() {
# check active messages
# config_warnings();
# messages_priority_3();
messages_priority_3();
messages_priority_2();
# messages_priority_1();
# messages_priority_0();
messages_priority_1();
messages_priority_0();
messages_memo();
messages_right_memo();
@ -219,6 +219,9 @@ var ECAM_controller = {
}
}
},
clear: func() {
print("Clear!");
},
};
setlistener("/systems/electrical/bus/dc-ess", func {

View file

@ -3,17 +3,15 @@
# Copyright (c) 2019 Jonathan Redpath (legoboyvdlp)
var messages_priority_3 = func {
if ((getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and (getprop("/ECAM/warning-phase") <= 3 and getprop("/ECAM/warning-phase") >= 5)) and ((((getprop("/engines/engine[0]/n1-actual") < 75.0 and getprop("/engines/engine[1]/n1-actual") < 75.0)) or ((getprop("/engines/engine[0]/n1-actual") < 77.0 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) or (getprop("/engines/engine[1]/n1-actual") < 77.0 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0))) or getprop("/controls/flight/flap-pos") > 1)) {
lg_not_dn.active = 1;
setprop("/systems/gear/landing-gear-warning-light", 1);
# FCTL
if (getprop("/ECAM/warning-phase") == 6 and getprop("/controls/flight/flap-lever") != 0 and getprop("/instrumentation/altimeter/indicated-altitude-ft") > 22000) {
flap_not_zero.active = 1;
} else {
lg_not_dn.active = 0;
lg_not_dn.noRepeat = 0;
setprop("/systems/gear/landing-gear-warning-light", 0);
flap_not_zero.active = 0;
flap_not_zero.noRepeat = 0;
}
}
var messages_priority_2 = func {
# AUTOFLT
if (getprop("/it-autoflight/output/ap-warning") == 2) {
ap_offw.active = 1;
} else {
@ -52,43 +50,7 @@ var messages_priority_2 = func {
}
}
var messages_priority_2_old = func {
if ((((getprop("/ECAM/warning-phase") >= 1 and getprop("/ECAM/warning-phase") <= 2) or (getprop("/ECAM/warning-phase") >= 9 and getprop("/ECAM/warning-phase") <= 10) and (wow and getprop("/engines/engine[0]/state") == 3)) or getprop("/ECAM/warning-phase") == 6) and getprop("/systems/failures/pack1") == 1) {
pack1_fault.active = 1;
} else {
pack1_fault.active = 0;
pack1_fault.noRepeat = 0;
}
if (pack1_fault.active == 1 and getprop("/controls/pneumatic/switches/pack1") == 1) {
pack1_fault_subwarn_1.active = 1;
} else {
pack1_fault_subwarn_1.active = 0;
pack1_fault_subwarn_1.noRepeat = 0;
}
if ((((getprop("/ECAM/warning-phase") >= 1 and getprop("/ECAM/warning-phase") <= 2) or (getprop("/ECAM/warning-phase") >= 9 and getprop("/ECAM/warning-phase") <= 10) and (wow and getprop("/engines/engine[1]/state") == 3)) or getprop("/ECAM/warning-phase") == 6) and getprop("/systems/failures/pack2") == 1) {
pack2_fault.active = 1;
} else {
pack2_fault.active = 0;
pack2_fault.noRepeat = 0;
}
if (pack2_fault.active == 1 and getprop("/controls/pneumatic/switches/pack2") == 1) {
pack2_fault_subwarn_1.active = 1;
} else {
pack2_fault_subwarn_1.active = 0;
pack2_fault_subwarn_1.noRepeat = 0;
}
if (getprop("/controls/gear/brake-parking") and (getprop("/ECAM/warning-phase") >= 6 and getprop("/ECAM/warning-phase") <= 7)) {
park_brk_on.active = 1;
} else {
park_brk_on.active = 0;
park_brk_on.noRepeat = 0;
}
}
var messages_priority_2 = func {}
var messages_priority_1 = func {}
var messages_priority_0 = func {}

View file

@ -15,13 +15,14 @@ var warningsOld = std.Vector.new([
]);
var warnings = std.Vector.new([
var flap_not_zero = warning.new(msg: "F/CTL FLAP LVR NOT ZERO", active: 0, colour: "r", aural: "crc", light: "warning", noRepeat: 0),
var ap_offw = warning.new(msg: "AUTO FLT AP OFF", active: 0, colour: "r", aural: "calv", light: "warning", noRepeat: 0),
var athr_offw = warning.new(msg: "AUTO FLT A/THR OFF", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0),
var athr_offw_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0),
var athr_lock = warning.new(msg: "ENG THRUST LOCKED", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0),
var athr_lock_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0),
var athr_lim = warning.new(msg: "AUTO FLT A/THR LIMITED", active: 0, colour: "a", aural: "chime", light: "caution", noRepeat: 0),
var athr_lim_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0),
var athr_lim_1 = warning.new(msg: "-THR LEVERS........MOVE", active: 0, colour: "b", aural: "none", light: "none", noRepeat: 0)
]);
var leftmemos = std.Vector.new([

View file

@ -181,9 +181,9 @@
<independentVar lookup="row">aero/alpha-rad</independentVar>
<tableData>
-1.57 1.3083
-0.20 0.0331
-0.20 0.0301
0.00 0.0000
0.20 0.0331
0.20 0.0301
1.57 1.3083
</tableData>
</table>
@ -210,7 +210,7 @@
<tableData>
0.00 0.000
0.20 0.000
0.79 0.002
0.82 0.002
1.10 0.023
1.80 0.015
</tableData>

View file

@ -20,38 +20,65 @@
</location>
<pointmass name="Crew">
<weight unit="LBS">380</weight>
<weight unit="LBS">320</weight>
<location name="POINTMASS" unit="M">
<x> 5.29845 </x>
<y> 0 </y>
<z> -0.66384 </z>
<z> 0.5 </z>
</location>
</pointmass>
<pointmass name="PAX">
<weight unit="LBS">23000</weight>
<pointmass name="Forward Cabin">
<weight unit="LBS">3722</weight>
<location name="POINTMASS" unit="M">
<x> 18.8231 </x>
<x> 10 </x>
<y> 0 </y>
<z> 0.19249 </z>
<z> 0.5 </z>
</location>
</pointmass>
<pointmass name="Center Cabin">
<weight unit="LBS">11361</weight>
<location name="POINTMASS" unit="M">
<x> 16.5 </x>
<y> 0 </y>
<z> 0.5 </z>
</location>
</pointmass>
<pointmass name="Aft Cabin">
<weight unit="LBS">8422</weight>
<location name="POINTMASS" unit="M">
<x> 26 </x>
<y> 0 </y>
<z> 0.5 </z>
</location>
</pointmass>
<pointmass name="Fwd Cargo">
<weight unit="LBS">3000</weight>
<location name="POINTMASS" unit="M">
<x> 13.0849 </x>
<x> 14.0 </x>
<y> 0 </y>
<z> -1.18112 </z>
<z> -1.1 </z>
</location>
</pointmass>
<pointmass name="Aft Cargo">
<weight unit="LBS">3000</weight>
<location name="POINTMASS" unit="M">
<x> 24.5565 </x>
<x> 24.0 </x>
<y> 0 </y>
<z> -1.18112 </z>
<z> -1.1 </z>
</location>
</pointmass>
<pointmass name="Aft Bulk Cargo">
<weight unit="LBS">0</weight>
<location name="POINTMASS" unit="M">
<x> 29.0 </x>
<y> 0 </y>
<z> -1.1 </z>
</location>
</pointmass>
</mass_balance>

View file

@ -31,7 +31,7 @@
<expression>
<dif>
<property>/position/altitude-agl-ft</property>
<value>15.001</value>
<value>14.201</value>
</dif>
</expression>
</input>

View file

@ -1 +1 @@
4752
4756