Merge branch 'master' into ECAM-sys-develop

This commit is contained in:
Joshua Davidson 2018-08-24 13:15:59 -04:00
commit a015d8e451
18 changed files with 10111 additions and 156 deletions

7
.gitignore vendored
View file

@ -1,6 +1,9 @@
#ignore generated backup files
# ignore generated backup files
*.*~
.*~
MyDevWIP
SHS
AKV.*
AKV.*
# ignore swap files
*.swp
*.swo

View file

@ -58,7 +58,7 @@ var canvas_IESI_base = {
return [];
},
update: func() {
if (getprop("/systems/electrical/battery1-amps") >= 120 or getprop("/systems/electrical/battery2-amps") >= 120 or getprop("/systems/electrical/bus/dc1") >= 25 or getprop("/systems/electrical/bus/dc2") >= 25) {
if (getprop("/systems/electrical/bus/dcbat") >= 25 or getprop("/systems/electrical/bus/dc1") >= 25 or getprop("/systems/electrical/bus/dc2") >= 25) {
if (getprop("/systems/acconfig/autoconfig-running") != 1 and getprop("/instrumentation/iesi/iesi-init") != 1) {
setprop("/instrumentation/iesi/iesi-init", 1);
setprop("/instrumentation/iesi/iesi-init-time", getprop("/sim/time/elapsed-sec"));
@ -70,7 +70,7 @@ var canvas_IESI_base = {
setprop("/instrumentation/iesi/iesi-init", 0);
}
if (getprop("/systems/electrical/battery1-amps") >= 120 or getprop("/systems/electrical/battery2-amps") >= 120 or getprop("/systems/electrical/bus/dc1") >= 25 or getprop("/systems/electrical/bus/dc2") >= 25) {
if (getprop("/systems/electrical/bus/dcbat") >= 25 or getprop("/systems/electrical/bus/dc1") >= 25 or getprop("/systems/electrical/bus/dc2") >= 25) {
IESI.page.show();
IESI.update();
} else {

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 73 KiB

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 50 KiB

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 120 KiB

View file

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 68 KiB

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 62 KiB

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 57 KiB

View file

@ -75,12 +75,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -1793,12 +1789,8 @@
</equals>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -2887,12 +2879,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -2963,12 +2951,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3034,12 +3018,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3107,12 +3087,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3189,12 +3165,8 @@
</equals>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3242,12 +3214,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3627,12 +3595,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3771,12 +3735,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -3981,12 +3941,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -4061,12 +4017,8 @@
</equals>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -4334,12 +4286,8 @@
</equals>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -5114,12 +5062,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
@ -5185,12 +5129,8 @@
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/battery1-amps</property>
<value>120</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/battery2-amps</property>
<value>120</value>
<property>systems/electrical/bus/dcbat</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>

69
Models/Tablet/Tablet.nas Normal file
View file

@ -0,0 +1,69 @@
# IDG Tablet
# Joshua Davidson (it0uchpods)
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
var Tablet1 = nil;
var Tablet_1 = nil;
var canvas_tablet_base = {
init: func(canvas_group, file = nil) {
var font_mapper = func(family, weight) {
return "LiberationFonts/LiberationSans-Regular.ttf";
};
if (file != nil) {
canvas.parsesvg(canvas_group, file, {"font-mapper": font_mapper});
var svg_keys = me.getKeys();
foreach(var key; svg_keys) {
me[key] = canvas_group.getElementById(key);
}
}
me.page = canvas_group;
return me;
},
getKeys: func() {
return [];
},
update: func() {
},
};
var canvas_Tablet_1 = {
new: func(canvas_group, file) {
var m = {parents: [canvas_Tablet_1, canvas_tablet_base]};
m.init(canvas_group, file);
return m;
},
getKeys: func() {
return [];
},
update: func() {
},
};
setlistener("sim/signals/fdm-initialized", func {
Tablet1 = canvas.new({
"name": "Tablet1",
"size": [1920, 1280],
"view": [1920, 1280],
"mipmapping": 1
});
Tablet1.addPlacement({"node": "Tablet.screen"});
var group_tablet1 = Tablet1.createGroup();
Tablet_1 = canvas_Tablet_1.new(group_tablet1, "Aircraft/IDG-A32X/Models/Tablet/res/screen.svg");
});
var showTablet = func() {
var dlg = canvas.Window.new([768, 512], "dialog");
dlg.setCanvas(Tablet1);
}

View file

@ -14,8 +14,7 @@ setlistener("/sim/signals/fdm-initialized", func {
var gs = getprop("/velocities/groundspeed-kt");
var ac1 = 0;
var ac2 = 0;
var batt1_amps = 0;
var batt2_amps = 0;
var dcbat = 0;
var pwr_src = "XX";
});
@ -65,8 +64,7 @@ var ADIRS = {
gs = getprop("/velocities/groundspeed-kt");
ac1 = getprop("/systems/electrical/bus/ac1");
ac2 = getprop("/systems/electrical/bus/ac2");
batt1_amps = getprop("/systems/electrical/battery1-amps");
batt2_amps = getprop("/systems/electrical/battery2-amps");
dcbat = getprop("/systems/electrical/bus/dcbat");
if (getprop("/controls/adirs/skip") == 1) {
if (getprop("/controls/adirs/align-time") != 5) {
@ -78,7 +76,7 @@ var ADIRS = {
}
}
if (gs > 5 or pitch > 5 or pitch < -5 or roll > 10 or roll < -10 or (ac1 < 110 and ac2 < 110 and batt1_amps < 120 and batt2_amps < 120)) {
if (gs > 5 or pitch > 5 or pitch < -5 or roll > 10 or roll < -10 or (ac1 < 110 and ac2 < 110 and dcbat < 25)) {
if (getprop("/controls/adirs/ir[0]/align") == 1) {
me.stopAlign(0,1);
}
@ -92,7 +90,7 @@ var ADIRS = {
if (ac1 >= 110 or ac2 >= 110) {
pwr_src = "AC";
} else if ((batt1_amps >= 120 or batt2_amps >= 120) and (getprop("/controls/adirs/ir[0]/knob") != 0 or getprop("/controls/adirs/ir[1]/knob") != 0 or getprop("/controls/adirs/ir[2]/knob") != 0)) {
} else if (dcbat >= 25 and (getprop("/controls/adirs/ir[0]/knob") != 0 or getprop("/controls/adirs/ir[1]/knob") != 0 or getprop("/controls/adirs/ir[2]/knob") != 0)) {
pwr_src = "BATT";
} else {
pwr_src = "XX";
@ -119,10 +117,9 @@ var ADIRS = {
beginAlign: func(n) {
ac1 = getprop("/systems/electrical/bus/ac1");
ac2 = getprop("/systems/electrical/bus/ac2");
batt1_amps = getprop("/systems/electrical/battery1-amps");
batt2_amps = getprop("/systems/electrical/battery2-amps");
dcbat = getprop("/systems/electrical/bus/dcbat");
setprop("/instrumentation/adirs/adr[" ~ n ~ "]/active", 1);
if (getprop("/controls/adirs/ir[" ~ n ~ "]/align") != 1 and getprop("/instrumentation/adirs/ir[" ~ n ~ "]/aligned") != 1 and (ac1 >= 110 or ac2 >= 110 or batt1_amps >= 120 or batt2_amps >= 120)) {
if (getprop("/controls/adirs/ir[" ~ n ~ "]/align") != 1 and getprop("/instrumentation/adirs/ir[" ~ n ~ "]/aligned") != 1 and (ac1 >= 110 or ac2 >= 110 or dcbat >= 25)) {
setprop("/controls/adirs/ir[" ~ n ~ "]/time", getprop("/sim/time/elapsed-sec"));
setprop("/controls/adirs/ir[" ~ n ~ "]/align", 1);
setprop("/controls/adirs/ir[" ~ n ~ "]/fault", 0);

View file

@ -10,6 +10,7 @@ var ac_volt_min = 110;
var dc_volt_std = 28;
var dc_volt_min = 25;
var dc_amps_std = 150;
var batt_amps = 2;
var tr_amps_std = 55;
var ac_hz_std = 400;
var ac1_src = "XX";
@ -313,14 +314,16 @@ var ELEC = {
replay = getprop("/sim/replay/replay-state");
wow = getprop("/gear/gear[1]/wow");
if (battery1_volts >= 20 and battery1_sw and !batt1_fail) {
setprop("/systems/electrical/battery1-amps", dc_amps_std);
setprop("/systems/electrical/battery1-amps", batt_amps);
} else {
setprop("/systems/electrical/battery1-amps", 0);
}
if (battery2_volts >= 20 and battery2_sw and !batt2_fail) {
setprop("/systems/electrical/battery2-amps", dc_amps_std);
setprop("/systems/electrical/battery2-amps", batt_amps);
} else {
setprop("/systems/electrical/battery2-amps", 0);
}
@ -328,7 +331,7 @@ var ELEC = {
battery1_amps = getprop("/systems/electrical/battery1-amps");
battery2_amps = getprop("/systems/electrical/battery2-amps");
if (battery1_amps > 120 or battery2_amps > 120) {
if (battery1_amps > 0 or battery2_amps > 0) {
setprop("/systems/electrical/bus/dcbat", dc_volt_std);
} else {
setprop("/systems/electrical/bus/dcbat", 0);
@ -623,7 +626,7 @@ var ELEC = {
}
} else if (battery1_percent == 100 and (dc1 > 25 or dc2 > 25) and battery1_sw and !batt1_fail) {
setprop("/systems/electrical/battery1-time", getprop("/sim/time/elapsed-sec"));
} else if (battery1_amps >= 120 and battery1_sw and !batt1_fail) {
} else if (battery1_amps > 0 and battery1_sw and !batt1_fail) {
if (getprop("/systems/electrical/battery1-time") + 5 < getprop("/sim/time/elapsed-sec")) {
battery1_percent_calc = battery1_percent - 0.25; # Roughly 90 percent every 30 mins
if (battery1_percent_calc < 0) {
@ -647,7 +650,7 @@ var ELEC = {
}
} else if (battery2_percent == 100 and (dc1 > 25 or dc2 > 25) and battery2_sw and !batt2_fail) {
setprop("/systems/electrical/battery2-time", getprop("/sim/time/elapsed-sec"));
} else if (battery2_amps >= 120 and battery2_sw and !batt2_fail) {
} else if (battery2_amps > 0 and battery2_sw and !batt2_fail) {
if (getprop("/systems/electrical/battery2-time") + 5 < getprop("/sim/time/elapsed-sec")) {
battery2_percent_calc = battery2_percent - 0.25; # Roughly 90 percent every 30 mins
if (battery2_percent_calc < 0) {

View file

@ -78,6 +78,17 @@ var HYD = {
setprop("/systems/hydraulic/elec-pump-b-fault", 0);
setprop("/systems/hydraulic/elec-pump-y-fault", 0);
setprop("/systems/hydraulic/ptu-fault", 0);
setprop("/systems/hydraulic/ptu-supplies", "XX");
setprop("/systems/hydraulic/yellow-resv-lo-air-press", 0);
setprop("/systems/hydraulic/blue-resv-lo-air-press", 0);
setprop("/systems/hydraulic/green-resv-lo-air-press", 0);
setprop("/systems/hydraulic/yellow-resv-ovht", 0);
setprop("/systems/hydraulic/blue-resv-ovht", 0);
setprop("/systems/hydraulic/green-resv-ovht", 0);
setprop("/systems/hydraulic/elec-pump-yellow-ovht", 0);
setprop("/systems/hydraulic/elec-pump-blue-ovht", 0);
setprop("/systems/hydraulic/yellow-fire-valve", 0);
setprop("/systems/hydraulic/green-fire-valve", 0);
},
loop: func() {
eng1_pump_sw = getprop("/controls/hydraulic/eng1-pump");

View file

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

View file

@ -107,6 +107,7 @@ var PNEU = {
setprop("/systems/pneumatic/pack1-fault", 0);
setprop("/systems/pneumatic/pack2-fault", 0);
setprop("/systems/pneumatic/xbleed", 0);
setprop("/systems/pneumatic/xbleed-state", "closed");
setprop("/systems/pneumatic/starting", 0);
setprop("/FMGC/internal/dep-arpt", "");
altitude = getprop("/instrumentation/altimeter/indicated-altitude-ft");
@ -130,6 +131,16 @@ var PNEU = {
setprop("/systems/pressurization/ambientpsi", "0");
setprop("/systems/pressurization/cabinpsi", "0");
setprop("/systems/pressurization/manvs-cmd", "0");
setprop("/systems/pressurization/pack-1-out-temp", 0);
setprop("/systems/pressurization/pack-2-out-temp", 0);
setprop("/systems/pressurization/pack-1-bypass", 0);
setprop("/systems/pressurization/pack-2-bypass", 0);
setprop("/systems/pressurization/pack-1-flow", 0);
setprop("/systems/pressurization/pack-2-flow", 0);
setprop("/systems/pressurization/pack-1-comp-out-temp", 0);
setprop("/systems/pressurization/pack-2-comp-out-temp", 0);
setprop("/systems/pressurization/pack-1-valve", 0);
setprop("/systems/pressurization/pack-2-valve", 0);
setprop("/systems/ventilation/cabin/fans", 0); # aircon fans
setprop("/systems/ventilation/avionics/fan", 0);
setprop("/systems/ventilation/avionics/extractvalve", "0");
@ -142,6 +153,20 @@ var PNEU = {
setprop("/controls/oxygen/masksDeployMan", 0);
setprop("/controls/oxygen/masksReset", 0); # this is the TMR RESET pb on the maintenance panel, needs 3D model
setprop("/controls/oxygen/masksSys", 0);
setprop("/systems/pneumatic/hp-valve-1-state", 0);
setprop("/systems/pneumatic/hp-valve-2-state", 0);
setprop("/systems/pneumatic/hp-valve-1", 0);
setprop("/systems/pneumatic/hp-valve-2", 0);
setprop("/systems/pneumatic/eng-valve-1-state", 0);
setprop("/systems/pneumatic/eng-valve-2-state", 0);
setprop("/systems/pneumatic/eng-valve-1", 0);
setprop("/systems/pneumatic/eng-valve-2", 0);
setprop("/systems/pneumatic/precooler-1-psi", 0);
setprop("/systems/pneumatic/precooler-2-psi", 0);
setprop("/systems/pneumatic/precooler-1-temp", 0);
setprop("/systems/pneumatic/precooler-2-temp", 0);
setprop("/systems/pneumatic/precooler-1-ovht", 0);
setprop("/systems/pneumatic/precooler-2-ovht", 0);
},
loop: func() {
bleed1_sw = getprop("/controls/pneumatic/switches/bleed1");

View file

@ -1 +1 @@
4626
4631