fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ECAM: Add merspieler and legoboyvdlp's ECAM changes -- a few thing to sort out still

Browse source
This commit is contained in:
Joshua Davidson 2018-04-12 12:54:25 -04:00
parent 096b46a0f0
commit 9332ca07b1
11 changed files with 9503 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1135
Models/Instruments/Lower-ECAM/Lower-ECAM.nas
View file

File diff suppressed because it is too large Load diff

1347
Models/Instruments/Lower-ECAM/res/bleed.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 72 KiB

1004
Models/Instruments/Lower-ECAM/res/cond.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 50 KiB

2337
Models/Instruments/Lower-ECAM/res/elec.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 117 KiB

0
Models/Instruments/Lower-ECAM/res/eng-eis2.svg → Models/Instruments/Lower-ECAM/res/eng.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

1455
Models/Instruments/Lower-ECAM/res/fuel.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 69 KiB

1166
Models/Instruments/Lower-ECAM/res/hyd.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 62 KiB

1051
Models/Instruments/Lower-ECAM/res/press.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 56 KiB

21
Nasal/electrical.nas
View file

@ -1,5 +1,6 @@
# A3XX Electrical System # A3XX Electrical System
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
# Some parts are in JSBsim system!
############################################## ##############################################
# Copyright (c) Joshua Davidson (it0uchpods) # # Copyright (c) Joshua Davidson (it0uchpods) #
@ -137,13 +138,13 @@ var fctlpoweruptest = func {
setprop("/systems/failures/sec1", 1); setprop("/systems/failures/sec1", 1);
setprop("/systems/electrical/battery-available", 1); setprop("/systems/electrical/battery-available", 1);
setprop("/systems/electrical/elac1-test", 1); setprop("/systems/electrical/elac1-test", 1);
settimer(func(){ settimer(func() {
setprop("/systems/failures/elac1-fault", 0); setprop("/systems/failures/elac1-fault", 0);
setprop("/systems/electrical/elac1-test", 0); setprop("/systems/electrical/elac1-test", 0);
},8); }, 8);
settimer(func(){ settimer(func() {
setprop("/systems/failures/sec1", 0); setprop("/systems/failures/sec1", 0);
},8.5); }, 8.5);
} }
gen1_sw = getprop("/controls/electrical/switches/gen1"); gen1_sw = getprop("/controls/electrical/switches/gen1");
@ -155,15 +156,13 @@ var fctlpoweruptest = func {
setprop("/systems/failures/elac2-fault", 1); setprop("/systems/failures/elac2-fault", 1);
setprop("/systems/electrical/dc2-available", 1); setprop("/systems/electrical/dc2-available", 1);
setprop("/systems/electrical/elac2-test", 1); setprop("/systems/electrical/elac2-test", 1);
settimer(func(){ settimer(func() {
setprop("/systems/failures/elac2-fault", 0); setprop("/systems/failures/elac2-fault", 0);
setprop("/systems/electrical/elac2-test", 0); setprop("/systems/electrical/elac2-test", 0);
},8); }, 8);
} }
} }
# Main Elec System # Main Elec System
var ELEC = { var ELEC = {
@ -204,6 +203,12 @@ var ELEC = {
setprop("/systems/electrical/extra/apu-volts", 0); setprop("/systems/electrical/extra/apu-volts", 0);
setprop("/systems/electrical/extra/gen1-volts", 0); setprop("/systems/electrical/extra/gen1-volts", 0);
setprop("/systems/electrical/extra/gen2-volts", 0); setprop("/systems/electrical/extra/gen2-volts", 0);
setprop("/systems/electrical/extra/gen1-load", 0);
setprop("/systems/electrical/extra/gen2-load", 0);
setprop("/systems/electrical/extra/tr1-volts", 0);
setprop("/systems/electrical/extra/tr2-volts", 0);
setprop("/systems/electrical/extra/tr1-amps", 0);
setprop("/systems/electrical/extra/tr2-amps", 0);
setprop("/systems/electrical/extra/ext-hz", 0); setprop("/systems/electrical/extra/ext-hz", 0);
setprop("/systems/electrical/extra/apu-hz", 0); setprop("/systems/electrical/extra/apu-hz", 0);
setprop("/systems/electrical/extra/galleyshed", 0); setprop("/systems/electrical/extra/galleyshed", 0);

40
Nasal/it-fbw.nas
View file

@ -39,31 +39,31 @@ var fctlInit = func {
var update_loop = func { var update_loop = func {
var elac1_sw = getprop("/controls/fctl/elac1"); var elac1_sw = getprop("/controls/fctl/elac1");
var elac2_sw = getprop("/controls/fctl/elac2"); var elac2_sw = getprop("/controls/fctl/elac2");
var sec1_sw = getprop("/controls/fctl/sec1"); var sec1_sw = getprop("/controls/fctl/sec1");
var sec2_sw = getprop("/controls/fctl/sec2"); var sec2_sw = getprop("/controls/fctl/sec2");
var sec3_sw = getprop("/controls/fctl/sec3"); var sec3_sw = getprop("/controls/fctl/sec3");
var fac1_sw = getprop("/controls/fctl/fac1"); var fac1_sw = getprop("/controls/fctl/fac1");
var fac2_sw = getprop("/controls/fctl/fac2"); var fac2_sw = getprop("/controls/fctl/fac2");
var elac1_fail = getprop("/systems/failures/elac1"); var elac1_fail = getprop("/systems/failures/elac1");
var elac2_fail = getprop("/systems/failures/elac2"); var elac2_fail = getprop("/systems/failures/elac2");
var sec1_fail = getprop("/systems/failures/sec1"); var sec1_fail = getprop("/systems/failures/sec1");
var sec2_fail = getprop("/systems/failures/sec2"); var sec2_fail = getprop("/systems/failures/sec2");
var sec3_fail = getprop("/systems/failures/sec3"); var sec3_fail = getprop("/systems/failures/sec3");
var fac1_fail = getprop("/systems/failures/fac1"); var fac1_fail = getprop("/systems/failures/fac1");
var fac2_fail = getprop("/systems/failures/fac2"); var fac2_fail = getprop("/systems/failures/fac2");
var ac_ess = getprop("/systems/electrical/bus/ac-ess"); var ac_ess = getprop("/systems/electrical/bus/ac-ess");
var dc_ess = getprop("/systems/electrical/bus/dc-ess"); var dc_ess = getprop("/systems/electrical/bus/dc-ess");
var dc_ess_shed = getprop("/systems/electrical/bus/dc-ess-shed"); var dc_ess_shed = getprop("/systems/electrical/bus/dc-ess-shed");
var ac1 = getprop("/systems/electrical/bus/ac1"); var ac1 = getprop("/systems/electrical/bus/ac1");
var ac2 = getprop("/systems/electrical/bus/ac2"); var ac2 = getprop("/systems/electrical/bus/ac2");
var dc1 = getprop("/systems/electrical/bus/dc1"); var dc1 = getprop("/systems/electrical/bus/dc1");
var dc2 = getprop("/systems/electrical/bus/dc2"); var dc2 = getprop("/systems/electrical/bus/dc2");
var battery1_sw = getprop("/controls/electrical/switches/battery1"); var battery1_sw = getprop("/controls/electrical/switches/battery1");
var battery2_sw = getprop("/controls/electrical/switches/battery2"); var battery2_sw = getprop("/controls/electrical/switches/battery2");
var elac1_test = getprop("/systems/electrical/elac1-test"); var elac1_test = getprop("/systems/electrical/elac1-test");
var elac2_test = getprop("/systems/electrical/elac2-test"); var elac2_test = getprop("/systems/electrical/elac2-test");
if (elac1_sw and !elac1_fail and (dc_ess >= 25 or battery1_sw) and !elac1_test) { if (elac1_sw and !elac1_fail and (dc_ess >= 25 or battery1_sw) and !elac1_test) {
setprop("/systems/fctl/elac1", 1); setprop("/systems/fctl/elac1", 1);

2
revision.txt
View file

@ -1 +1 @@
4404 4405