1
0
Fork 0

Merge branch 'dev' into 3D

This commit is contained in:
Jonathan Redpath 2021-10-07 19:39:33 +01:00
commit 01ff8ca120
8 changed files with 199 additions and 124 deletions

View file

@ -653,15 +653,19 @@ var canvas_lowerECAMPageElec =
obj["ELEC-Line-ACESS-TRESS"].hide();
}
}),
props.UpdateManager.FromHashList(["elec15XE2","statInvVolts","statInvHertz"], nil, func(val) {
if (val.elec15XE2) {
props.UpdateManager.FromHashValue("elec15XE2", nil, func(val) {
if (val) {
obj["STATINV-group"].show();
obj["StatVolt"].setText(sprintf("%s",val.statInvVolts));
obj["StatHertz"].setText(sprintf("%s",val.statInvHertz));
} else {
obj["STATINV-group"].hide();
}
}),
props.UpdateManager.FromHashValue("statInvVolts", 0.1, func(val) {
obj["StatVolt"].setText(sprintf("%s",math.round(val)));
}),
props.UpdateManager.FromHashValue("statInvHertz", 0.5, func(val) {
obj["StatHz"].setText(sprintf("%s",math.round(val)));
}),
];
obj.displayedGForce = 0;

View file

@ -27,6 +27,9 @@ var SwitchingPanel = {
},
doAttHdg: func(newAttHdg) {
if (newAttHdg < -1 or newAttHdg > 1) { return; }
systems.ADIRS.backupSupply[2][1] = newAttHdg == -1 ? 0 : 1;
me.Switches.attHdg.setValue(newAttHdg);
foreach (var predicate; keys(canvas_nd.ND_1.NDCpt.predicates)) {
call(canvas_nd.ND_1.NDCpt.predicates[predicate]);

View file

@ -264,9 +264,8 @@ var ADIRS = {
ADIRunits: [nil, nil, nil],
# Electrical
mainSupply: [systems.ELEC.Bus.acEss, systems.ELEC.Bus.ac2, systems.ELEC.Bus.ac1],
backupSupply: [[systems.ELEC.Source.Bat2.volt, 0], [systems.ELEC.Source.Bat2.volt, 1], [systems.ELEC.Source.Bat1.volt, 1]],
# ADIRS power directly from a separate bus connected to battery (no c.b. unlike main hot bus), as they are so critical
mainSupply: [systems.ELEC.Bus.acEssShed, systems.ELEC.Bus.ac2, systems.ELEC.Bus.ac1],
backupSupply: [[systems.ELEC.Bus.dcHot1, 0], [systems.ELEC.Bus.dcHot2, 1], [systems.ELEC.Bus.dcHot1, 1]],
# PTS
Lights: {

View file

@ -11,11 +11,11 @@
<product>
<property>aero/alpha-deg</property>
<table>
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
<independentVar lookup="row">/velocities/airspeed-kt</independentVar>
<tableData>
0 0.0
29 0.0
30 1.0
0.00 0.0
59.99 0.0
60.00 1.0
</tableData>
</table>
</product>
@ -51,32 +51,62 @@
<sensor name="/systems/navigation/probes/pitot-1">
<input>/systems/pitot[0]/measured-total-pressure-inhg</input>
<quantization name="/systems/navigation/probes/pitot-1">
<bits>18</bits>
<min>2.953</min>
<max>41.34</max>
</quantization>
</sensor>
<sensor name="/systems/navigation/probes/pitot-2">
<input>/systems/pitot[1]/measured-total-pressure-inhg</input>
<quantization name="/systems/navigation/probes/pitot-2">
<bits>18</bits>
<min>2.953</min>
<max>41.34</max>
</quantization>
</sensor>
<sensor name="/systems/navigation/probes/pitot-3">
<input>/systems/pitot[2]/measured-total-pressure-inhg</input>
<quantization name="/systems/navigation/probes/pitot-3">
<bits>18</bits>
<min>2.953</min>
<max>41.34</max>
</quantization>
</sensor>
<sensor name="/systems/navigation/probes/static-1">
<input>/systems/static[0]/pressure-inhg</input>
<quantization name="/systems/navigation/probes/static-1">
<bits>18</bits>
<min>2.953</min>
<max>32.48</max>
</quantization>
</sensor>
<sensor name="/systems/navigation/probes/static-2">
<input>/systems/static[1]/pressure-inhg</input>
<quantization name="/systems/navigation/probes/static-2">
<bits>18</bits>
<min>2.953</min>
<max>32.48</max>
</quantization>
</sensor>
<sensor name="/systems/navigation/probes/static-3">
<input>/systems/static[2]/pressure-inhg</input>
<quantization name="/systems/navigation/probes/static-3">
<bits>18</bits>
<min>2.953</min>
<max>32.48</max>
</quantization>
</sensor>
<fcs_function name="/systems/navigation/probes/tat-1/compute-tat">
<function>
<product>
<value>0.995</value> <!-- empirical recovery factor -->
<value>0.995</value>
<property>propulsion/tat-c</property>
</product>
</function>
@ -85,7 +115,7 @@
<fcs_function name="/systems/navigation/probes/tat-2/compute-tat">
<function>
<product>
<value>0.996</value> <!-- empirical recovery factor -->
<value>0.996</value>
<property>propulsion/tat-c</property>
</product>
</function>
@ -95,8 +125,8 @@
<input>/systems/navigation/probes/tat-1/compute-tat</input>
<quantization name="/systems/navigation/adr/output/tat-1">
<bits>11</bits>
<min>-256</min>
<max>256</max>
<min>-60</min>
<max>99</max>
</quantization>
</sensor>
@ -104,8 +134,8 @@
<input>/systems/navigation/probes/tat-2/compute-tat</input>
<quantization name="/systems/navigation/adr/output/tat-2">
<bits>11</bits>
<min>-256</min>
<max>256</max>
<min>-60</min>
<max>99</max>
</quantization>
</sensor>
@ -117,8 +147,8 @@
<input>/instrumentation/altimeter[0]/pressure-alt-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-1-capt">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -126,8 +156,8 @@
<input>/instrumentation/altimeter[1]/pressure-alt-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-2-capt">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -135,8 +165,8 @@
<input>/instrumentation/altimeter[2]/pressure-alt-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-3-capt">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -144,8 +174,8 @@
<input>/instrumentation/altimeter[3]/pressure-alt-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-1-fo">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -153,8 +183,8 @@
<input>/instrumentation/altimeter[4]/pressure-alt-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-2-fo">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -162,8 +192,8 @@
<input>/instrumentation/altimeter[5]/pressure-alt-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-3-fo">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -171,8 +201,8 @@
<input>/instrumentation/altimeter[0]/indicated-altitude-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-corrected-1-capt">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -180,8 +210,8 @@
<input>/instrumentation/altimeter[1]/indicated-altitude-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-corrected-2-capt">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -189,8 +219,8 @@
<input>/instrumentation/altimeter[2]/indicated-altitude-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-corrected-3-capt">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -198,8 +228,8 @@
<input>/instrumentation/altimeter[3]/indicated-altitude-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-corrected-1-fo">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -207,8 +237,8 @@
<input>/instrumentation/altimeter[4]/indicated-altitude-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-corrected-2-fo">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>
</quantization>
</sensor>
@ -216,8 +246,8 @@
<input>/instrumentation/altimeter[5]/indicated-altitude-ft</input>
<quantization name="/systems/navigation/adr/output/baro-alt-corrected-3-fo">
<bits>17</bits>
<min>-65536</min>
<max>65536</max>
<min>-2000</min>
<max>50000</max>>
</quantization>
</sensor>
@ -255,7 +285,7 @@
<fcs_function name="/systems/navigation/adr/computation/cas-1-compute"> <!-- same as mach but with sea level pressure and multiplied by speed of sound at sea level -->
<function>
<product>
<value>661.47</value>
<value>661.4746</value>
<pow>
<property>/systems/navigation/adr/computation/cas-1-product</property>
<value>0.5</value>
@ -298,7 +328,7 @@
<fcs_function name="/systems/navigation/adr/computation/cas-2-compute">
<function>
<product>
<value>661.47</value>
<value>661.4746</value>
<pow>
<property>/systems/navigation/adr/computation/cas-2-product</property>
<value>0.5</value>
@ -341,7 +371,7 @@
<fcs_function name="/systems/navigation/adr/computation/cas-3-compute">
<function>
<product>
<value>661.47</value>
<value>661.4746</value>
<pow>
<property>/systems/navigation/adr/computation/cas-3-product</property>
<value>0.5</value>
@ -355,7 +385,7 @@
<quantization name="/systems/navigation/adr/computation/cas-1">
<bits>14</bits>
<min>0</min>
<max>1024</max>
<max>450</max>
</quantization>
</sensor>
@ -364,7 +394,7 @@
<quantization name="/systems/navigation/adr/computation/cas-2">
<bits>14</bits>
<min>0</min>
<max>1024</max>
<max>450</max>
</quantization>
</sensor>
@ -373,7 +403,7 @@
<quantization name="/systems/navigation/adr/computation/cas-3">
<bits>14</bits>
<min>0</min>
<max>1024</max>
<max>450</max>
</quantization>
</sensor>
@ -502,7 +532,7 @@
<quantization name="/systems/navigation/adr/computation/mach-1">
<bits>16</bits>
<min>0</min>
<max>4.096</max> <!-- O_o -->
<max>1.0</max> <!-- O_o -->
</quantization>
</sensor>
@ -511,7 +541,7 @@
<quantization name="/systems/navigation/adr/computation/mach-2">
<bits>16</bits>
<min>0</min>
<max>4.096</max>
<max>1.0</max>
</quantization>
</sensor>
@ -520,31 +550,16 @@
<quantization name="/systems/navigation/adr/computation/mach-3">
<bits>16</bits>
<min>0</min>
<max>4.096</max>
<max>1.0</max>
</quantization>
</sensor>
<fcs_function name="/systems/navigation/adr/computation/sat-1-compute">
<function>
<difference>
<property>/systems/navigation/probes/tat-1/tat</property>
<quotient>
<pow>
<property>/instrumentation/airspeed-indicator/true-speed-kt</property>
<value>2</value>
</pow>
<value>7569</value>
</quotient>
</difference>
</function>
</fcs_function>
<sensor name="/systems/navigation/adr/computation/sat-1">
<input>/environment/temperature-degc</input>
<quantization name="/systems/navigation/adr/computation/sat-1">
<bits>11</bits>
<min>-256</min>
<max>256</max>
<min>-99</min>
<max>80</max>
</quantization>
</sensor>
@ -552,24 +567,21 @@
<input>/environment/temperature-degc</input>
<quantization name="/systems/navigation/adr/computation/sat-2">
<bits>11</bits>
<min>-256</min>
<max>256</max>
<min>-99</min>
<max>80</max>
</quantization>
</sensor>
<fcs_function name="/systems/navigation/adr/computation/tas-1-compute">
<function>
<product>
<value>661.47</value> <!-- speed of sound at SL -->
<value>38.96695</value>
<property>/systems/navigation/adr/computation/mach-1</property>
<pow>
<quotient>
<sum>
<property>/systems/navigation/adr/computation/sat-1</property>
<value>273.15</value>
</sum>
<value>288.15</value> <!-- temperature at SL -->
</quotient>
<sum>
<property>/systems/navigation/adr/computation/sat-1</property>
<value>273.15</value>
</sum>
<value>0.5</value>
</pow>
</product>
@ -579,16 +591,13 @@
<fcs_function name="/systems/navigation/adr/computation/tas-2-compute">
<function>
<product>
<value>661.47</value> <!-- speed of sound at SL -->
<value>38.96695</value>
<property>/systems/navigation/adr/computation/mach-2</property>
<pow>
<quotient>
<sum>
<property>/systems/navigation/adr/computation/sat-2</property>
<value>273.15</value>
</sum>
<value>288.15</value> <!-- temperature at SL -->
</quotient>
<sum>
<property>/systems/navigation/adr/computation/sat-2</property>
<value>273.15</value>
</sum>
<value>0.5</value>
</pow>
</product>
@ -598,16 +607,13 @@
<fcs_function name="/systems/navigation/adr/computation/tas-3-compute">
<function>
<product>
<value>661.47</value> <!-- speed of sound at SL -->
<value>38.96695</value>
<property>/systems/navigation/adr/computation/mach-3</property>
<pow>
<quotient>
<sum>
<property>/systems/navigation/adr/computation/sat-1</property> <!-- use captain's probe -->
<value>273.15</value>
</sum>
<value>288.15</value> <!-- temperature at SL -->
</quotient>
<sum>
<property>/systems/navigation/adr/computation/sat-1</property>
<value>273.15</value>
</sum>
<value>0.5</value>
</pow>
</product>
@ -619,7 +625,7 @@
<quantization name="/systems/navigation/adr/computation/tas-1">
<bits>15</bits>
<min>0</min>
<max>2048</max>
<max>599</max>
</quantization>
</sensor>
@ -628,7 +634,7 @@
<quantization name="/systems/navigation/adr/computation/tas-2">
<bits>15</bits>
<min>0</min>
<max>2048</max>
<max>599</max>
</quantization>
</sensor>
@ -637,7 +643,7 @@
<quantization name="/systems/navigation/adr/computation/tas-3">
<bits>15</bits>
<min>0</min>
<max>2048</max>
<max>599</max>
</quantization>
</sensor>

View file

@ -826,13 +826,29 @@
</switch>
<!-- Emergency Generator -->
<switch name="/systems/electrical/some-electric-thingie/speed-abv-100">
<default value="0"/>
<test logic="AND" value="1">
/systems/navigation/adr/output/cas-1 gt 100
/systems/navigation/adr/operating-1 eq 1
</test>
</switch>
<actuator name="/systems/electrical/some-electric-thingie/speed-abv-100-output">
<input>/systems/electrical/some-electric-thingie/speed-abv-100</input>
<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
<rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
</actuator>
<switch name="/systems/electrical/some-electric-thingie/rat-deploy">
<default value="/systems/electrical/some-electric-thingie/rat-deploy"/>
<test logic="AND" value="1">
/instrumentation/airspeed-indicator/indicated-speed-kt gt 100
/systems/electrical/bus/dc-hot-1 ge 25
/systems/electrical/some-electric-thingie/speed-abv-100-output eq 1
/controls/electrical/switches/emer-gen-test eq 0
/sim/time/elapsed-sec gt 30
/systems/electrical/bus/ac-1 eq 0
/systems/electrical/bus/ac-2 eq 0
/systems/electrical/bus/ac-1 lt 1
/systems/electrical/bus/ac-2 lt 1
/controls/electrical/switches/emer-elec-man-on eq 0
</test>
<test logic="OR" value="1">
@ -2109,6 +2125,33 @@
<gain>1.0</gain>
</pure_gain>
<!-- Mirror sub-buses (todo CB logic) -->
<pure_gain name="/systems/electrical/bus/sub-bus/dc-hot-1-703"> <!-- Sub-bus with no CB protection -->
<input>/systems/electrical/sources/bat-1/volt</input>
<gain>1.0</gain>
</pure_gain>
<pure_gain name="/systems/electrical/bus/sub-bus/dc-hot-2-704"> <!-- Sub-bus with no CB protection -->
<input>/systems/electrical/sources/bat-2/volt</input>
<gain>1.0</gain>
</pure_gain>
<pure_gain name="/systems/electrical/bus/sub-bus/dc-2-202">
<input>/systems/electrical/bus/dc-2</input> <!-- todo CB 1PN2 -->
<gain>1.0</gain>
</pure_gain>
<pure_gain name="/systems/electrical/bus/sub-bus/dc-2-204">
<input>/systems/electrical/bus/dc-2</input> <!-- todo CB 3PN2 -->
<gain>1.0</gain>
</pure_gain>
<pure_gain name="/systems/electrical/bus/sub-bus/dc-2-206-208">
<input>/systems/electrical/bus/dc-2</input> <!-- todo CB 6PN -->
<gain>1.0</gain>
</pure_gain>
</channel>
<channel name="Emergency Electric Logic" execrate="8">
@ -2197,8 +2240,6 @@
<test value="/systems/electrical/bus/dc-2">
/systems/electrical/bus/dc-2 ge 25
</test>
<!--<output>/systems/electrical/outputs/adf</output>
<output>/systems/electrical/outputs/dme</output>-->
<output>/systems/electrical/outputs/efis</output>
<output>/systems/electrical/outputs/fcp-power</output>
<output>/systems/electrical/outputs/fuel-pump[0]</output>
@ -2206,13 +2247,31 @@
<output>/systems/electrical/outputs/fuel-pump[2]</output>
<output>/systems/electrical/outputs/gps</output>
<output>/systems/electrical/outputs/mk-viii</output>
<!--<output>/systems/electrical/outputs/nav[0]</output>
<output>/systems/electrical/outputs/nav[1]</output>
<output>/systems/electrical/outputs/nav[2]</output>
<output>/systems/electrical/outputs/nav[3]</output>-->
<output>/systems/electrical/outputs/tacan</output>
<output>/systems/electrical/outputs/turn-coordinator</output>
</switch>
<switch name="/instrumentation/comm[0]/power-btn">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/dc-ess ge 25
</test>
</switch>
<switch name="/instrumentation/comm[1]/power-btn">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/dc-2 ge 25
</test>
</switch>
<switch name="/instrumentation/comm[2]/power-btn">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/dc-1 ge 25
</test>
</switch>
</channel>
<channel name="Overhead Lights" execrate="8">

View file

@ -382,7 +382,10 @@
/systems/failures/fctl/elac1 eq 0
<test logic="OR">
/systems/electrical/bus/dc-ess ge 25
/systems/electrical/bus/dc-hot-1 ge 25
<test logic="AND"> <!-- in flight: DC HOT backup -->
/systems/electrical/bus/sub-bus/dc-hot-1-703 ge 25
/gear/gear[1]/wow eq 0
</test>
</test>
</test>
</switch>
@ -401,8 +404,11 @@
/controls/fctl/switches/elac2 eq 1
/systems/failures/fctl/elac2 eq 0
<test logic="OR">
/systems/electrical/bus/dc-2 ge 25
/systems/electrical/bus/dc-hot-2 ge 25
/systems/electrical/bus/sub-bus/dc-2-202 ge 25
<test logic="AND"> <!-- in flight: DC HOT backup -->
/systems/electrical/bus/sub-bus/dc-hot-2-704 ge 25
/gear/gear[1]/wow eq 0
</test>
</test>
</test>
</switch>
@ -422,7 +428,10 @@
/systems/failures/fctl/sec1 eq 0
<test logic="OR">
/systems/electrical/bus/dc-ess ge 25
/systems/electrical/bus/dc-hot-1 ge 25
<test logic="AND"> <!-- in flight: DC HOT backup -->
/systems/electrical/bus/sub-bus/dc-hot-1-703 ge 25
/gear/gear[1]/wow eq 0
</test>
</test>
</test>
</switch>
@ -440,7 +449,7 @@
<test logic="AND" value="1">
/controls/fctl/switches/sec2 eq 1
/systems/failures/fctl/sec2 eq 0
/systems/electrical/bus/dc-2 ge 25
/systems/electrical/bus/sub-bus/dc-2-204 ge 25
</test>
</switch>
@ -457,7 +466,7 @@
<test logic="AND" value="1">
/controls/fctl/switches/sec3 eq 1
/systems/failures/fctl/sec3 eq 0
/systems/electrical/bus/dc-2 ge 25
/systems/electrical/bus/sub-bus/dc-2-204 ge 25
</test>
</switch>

View file

@ -826,10 +826,10 @@
fcs/slat-locked-cmd eq 1
<test logic="OR">
/gear/gear[1]/wow ne 1
/velocities/airspeed-kt ge 60
/systems/navigation/adr/output/cas-1 ge 60
</test>
<test logic="OR">
aero/alpha-deg gt 7.6
/systems/navigation/adr/output/aoa-1 gt 7.6
/systems/navigation/adr/output/cas-1 lt 154
</test>
</test>
@ -838,10 +838,10 @@
/controls/flight/flaps-input ne 0
<test logic="OR">
/gear/gear[1]/wow ne 1
/velocities/airspeed-kt ge 60
/systems/navigation/adr/output/cas-1 ge 60
</test>
<test logic="OR">
aero/alpha-deg gt 8.5
/systems/navigation/adr/output/aoa-1 gt 8.5
/systems/navigation/adr/output/cas-1 lt 148
</test>
</test>

View file

@ -140,7 +140,7 @@
<dme> <!-- fake extra dme units for the ILS -->
<name>dme</name>
<number>2</number>
<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</dme>
@ -173,19 +173,14 @@
<marker-beacon> <!-- part of VOR1 unit -->
<name>marker-beacon</name>
<number>0</number>
<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</marker-beacon>
<marker-beacon>
<name>marker-beacon</name>
<number>0</number>
</marker-beacon>
<nav-radio> <!-- VOR unit -->
<name>nav</name>
<number>0</number>
<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</nav-radio>
@ -199,7 +194,7 @@
<nav-radio> <!-- ILS unit -->
<name>nav</name>
<number>2</number>
<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</nav-radio>