fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into FMGC

Browse source
This commit is contained in:
legoboyvdlp R 2020-03-22 16:13:36 +00:00
commit d4a233ea65
7 changed files with 4211 additions and 4112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/Effects/ddrmi.eff
View file

@ -3,7 +3,7 @@
<inherits-from>Effects/model-interior</inherits-from> <inherits-from>Effects/model-interior</inherits-from>
<parameters> <parameters>
<lightmap-enabled type="int">1</lightmap-enabled> <lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/panel-light</use></lightmap-factor> <lightmap-factor type="float" n="0"><use>controls/lighting/panel-light</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3"> <texture n="3">
<image>Aircraft/A320-family/Models/Effects/ddrmi.png</image> <image>Aircraft/A320-family/Models/Effects/ddrmi.png</image>

106
Models/Instruments/DDRMI/DDRMI.xml
View file

@ -10,26 +10,6 @@
<path>res/DDRMI.ac</path> <path>res/DDRMI.ac</path>
<!-- Lighting -->
<animation>
<name>DDRMI inside illumination</name>
<type>material</type>
<object-name>ddrmi_inside</object-name>
<object-name>ddrmi_pointer_1_vor</object-name>
<object-name>ddrmi_pointer_1_adf</object-name>
<object-name>ddrmi_pointer_2_vor</object-name>
<object-name>ddrmi_pointer_2_adf</object-name>
<object-name>ddrmi_vor_adf_flag_1</object-name>
<object-name>ddrmi_vor_adf_flag_2</object-name>
<object-name>ddrmi_hdg</object-name>
<emission>
<red>0.50</red>
<green>0.35</green>
<blue>0.2</blue>
<factor-prop>controls/lighting/main-panel-norm</factor-prop>
</emission>
</animation>
<!-- heading and pointer --> <!-- heading and pointer -->
<animation> <animation>
<name>Heading rotate</name> <name>Heading rotate</name>
@ -174,12 +154,10 @@
</axis> </axis>
</animation> </animation>
<!-- Lighting -->
<animation> <animation>
<name>Panel lighting</name> <name>DDRMI inside illumination</name>
<type>material</type> <type>material</type>
<object-name>ddrmi_body</object-name>
<object-name>ddrmi_vor_adf_select_1</object-name>
<object-name>ddrmi_vor_adf_select_2</object-name>
<object-name>ddrmi_pointer_1</object-name> <object-name>ddrmi_pointer_1</object-name>
<object-name>ddrmi_pointer_2</object-name> <object-name>ddrmi_pointer_2</object-name>
<object-name>ddrmi_inside</object-name> <object-name>ddrmi_inside</object-name>
@ -190,11 +168,88 @@
<object-name>ddrmi_vor_adf_flag_1</object-name> <object-name>ddrmi_vor_adf_flag_1</object-name>
<object-name>ddrmi_vor_adf_flag_2</object-name> <object-name>ddrmi_vor_adf_flag_2</object-name>
<object-name>ddrmi_hdg</object-name> <object-name>ddrmi_hdg</object-name>
<!-- <emission>
<red>0.50</red>
<green>0.35</green>
<blue>0.2</blue>
<factor-prop>controls/lighting/main-panel-norm</factor-prop>
</emission> -->
<condition>
<not>
<and>
<greater-than>
<property>sim/model/lights/dome-light</property>
<value>0</value>
</greater-than>
<less-than>
<property>controls/lighting/main-panel-norm</property>
<value>0.25</value>
</less-than>
</and>
</not>
</condition>
<emission> <emission>
<red>0.50</red>
<green>0.35</green>
<blue>0.2</blue>
<factor-prop>controls/lighting/main-panel-norm</factor-prop>
</emission>
</animation>
<animation>
<name>Panel lighting (dome)</name>
<type>material</type>
<object-name>ddrmi_dme1_screen</object-name>
<object-name>ddrmi_dme2_screen</object-name>
<object-name>ddrmi_pointer_1</object-name>
<object-name>ddrmi_pointer_2</object-name>
<object-name>ddrmi_inside</object-name>
<object-name>ddrmi_pointer_1_vor</object-name>
<object-name>ddrmi_pointer_1_adf</object-name>
<object-name>ddrmi_pointer_2_vor</object-name>
<object-name>ddrmi_pointer_2_adf</object-name>
<object-name>ddrmi_vor_adf_flag_1</object-name>
<object-name>ddrmi_vor_adf_flag_2</object-name>
<object-name>ddrmi_hdg</object-name>
<!-- <emission>
<red>0.3</red> <red>0.3</red>
<green>0.3</green> <green>0.3</green>
<blue>0.3</blue> <blue>0.3</blue>
<factor-prop>sim/model/lights/dome-light</factor-prop> <factor-prop>sim/model/lights/dome-light</factor-prop>
</emission> -->
<condition>
<and>
<not>
<greater-than>
<property>controls/lighting/main-panel-norm</property>
<value>0.25</value>
</greater-than>
</not>
<greater-than>
<property>sim/model/lights/dome-light</property>
<value>0</value>
</greater-than>
</and>
</condition>
<emission>
<red>0.20</red>
<green>0.20</green>
<blue>0.20</blue>
<factor-prop>sim/model/lights/dome-light</factor-prop>
</emission>
</animation>
<animation>
<name>DDRMI body lighting</name>
<type>material</type>
<object-name>ddrmi_body</object-name>
<object-name>ddrmi_vor_adf_select_1</object-name>
<object-name>ddrmi_vor_adf_select_2</object-name>
<emission>
<red>0.2</red>
<green>0.2</green>
<blue>0.2</blue>
<factor-prop>sim/model/lights/dome-light</factor-prop>
</emission> </emission>
</animation> </animation>
@ -205,6 +260,9 @@
<object-name>ddrmi_vor_adf_select_2</object-name> <object-name>ddrmi_vor_adf_select_2</object-name>
<object-name>ddrmi_pointer_1</object-name> <object-name>ddrmi_pointer_1</object-name>
<object-name>ddrmi_pointer_2</object-name> <object-name>ddrmi_pointer_2</object-name>
<object-name>ddrmi_inside</object-name>
<object-name>ddrmi_vor_adf_flag_1</object-name>
<object-name>ddrmi_vor_adf_flag_2</object-name>
</effect> </effect>
<effect> <effect>

35
Models/Instruments/PFD/PFD.nas
View file

@ -216,7 +216,7 @@ var canvas_PFD_base = {
return me; return me;
}, },
getKeys: func() { getKeys: func() {
return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_ctr_msg","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr", return ["FMA_man","FMA_manmode","FMA_flxmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_ctr_msg","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr",
"FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1", "FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1",
"FMA_Middle2","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank", "FMA_Middle2","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank",
"AI_bank_lim","AI_bank_lim_X","AI_pitch_lim","AI_pitch_lim_X","AI_slipskid","AI_horizon","AI_horizon_ground","AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber", "AI_bank_lim","AI_bank_lim_X","AI_pitch_lim","AI_pitch_lim_X","AI_slipskid","AI_horizon","AI_horizon_ground","AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber",
@ -360,23 +360,28 @@ var canvas_PFD_base = {
if (athr.getValue() == 1 and (state1_act == "TOGA" or state1_act == "MCT" or state1_act == "MAN THR" or state2_act == "TOGA" or state2_act == "MCT" or state2_act == "MAN THR") and eng_out.getValue() != 1 and alpha_floor_act != 1 and if (athr.getValue() == 1 and (state1_act == "TOGA" or state1_act == "MCT" or state1_act == "MAN THR" or state2_act == "TOGA" or state2_act == "MCT" or state2_act == "MAN THR") and eng_out.getValue() != 1 and alpha_floor_act != 1 and
toga_lk_act != 1) { toga_lk_act != 1) {
me["FMA_man"].show(); me["FMA_man"].show();
me["FMA_manmode"].show();
if (state1_act == "TOGA" or state2_act == "TOGA") { if (state1_act == "TOGA" or state2_act == "TOGA") {
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_man_box"].show(); me["FMA_man_box"].show();
me["FMA_manmode"].show();
me["FMA_flxmode"].hide();
me["FMA_manmode"].setText("TOGA"); me["FMA_manmode"].setText("TOGA");
me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078);
} else if ((state1_act == "MAN THR" and thr1_act >= 0.83) or (state2_act == "MAN THR" and thr2_act >= 0.83)) { } else if ((state1_act == "MAN THR" and thr1_act >= 0.83) or (state2_act == "MAN THR" and thr2_act >= 0.83)) {
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_man_box"].show(); me["FMA_man_box"].show();
me["FMA_manmode"].show();
me["FMA_flxmode"].hide();
me["FMA_manmode"].setText("THR"); me["FMA_manmode"].setText("THR");
me["FMA_man_box"].setColor(0.7333,0.3803,0); me["FMA_man_box"].setColor(0.7333,0.3803,0);
} else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act != "FLX") { } else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act != "FLX") {
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_man_box"].show(); me["FMA_man_box"].show();
me["FMA_manmode"].show();
me["FMA_flxmode"].hide();
me["FMA_manmode"].setText("MCT"); me["FMA_manmode"].setText("MCT");
me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078);
} else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act == "FLX") { } else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act == "FLX") {
@ -384,29 +389,35 @@ var canvas_PFD_base = {
me["FMA_man_box"].hide(); me["FMA_man_box"].hide();
me["FMA_flx_box"].show(); me["FMA_flx_box"].show();
me["FMA_flxtemp"].show(); me["FMA_flxtemp"].show();
me["FMA_manmode"].setText("FLX "); me["FMA_manmode"].hide();
me["FMA_flxmode"].show();
me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078);
} else if ((state1_act == "MAN THR" and thr1_act < 0.83) or (state2_act == "MAN THR" and thr2_act < 0.83)) { } else if ((state1_act == "MAN THR" and thr1_act < 0.83) or (state2_act == "MAN THR" and thr2_act < 0.83)) {
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_man_box"].show(); me["FMA_man_box"].show();
me["FMA_manmode"].show();
me["FMA_flxmode"].hide();
me["FMA_manmode"].setText("THR"); me["FMA_manmode"].setText("THR");
me["FMA_man_box"].setColor(0.7333,0.3803,0); me["FMA_man_box"].setColor(0.7333,0.3803,0);
} }
} else if (athr.getValue() == 1 and (state1_act == "TOGA" or (state1_act == "MCT" and thrust_limit_act == "FLX") or (state1_act == "MAN THR" and thr1_act >= 0.83) or state2_act == "TOGA" or (state2_act == "MCT" and } else if (athr.getValue() == 1 and (state1_act == "TOGA" or (state1_act == "MCT" and thrust_limit_act == "FLX") or (state1_act == "MAN THR" and thr1_act >= 0.83) or state2_act == "TOGA" or (state2_act == "MCT" and
thrust_limit_act == "FLX") or (state2_act == "MAN THR" and thr2_act >= 0.83)) and eng_out.getValue() == 1 and alpha_floor_act != 1 and toga_lk_act != 1) { thrust_limit_act == "FLX") or (state2_act == "MAN THR" and thr2_act >= 0.83)) and eng_out.getValue() == 1 and alpha_floor_act != 1 and toga_lk_act != 1) {
me["FMA_man"].show(); me["FMA_man"].show();
me["FMA_manmode"].show();
if (state1_act == "TOGA" or state2_act == "TOGA") { if (state1_act == "TOGA" or state2_act == "TOGA") {
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_man_box"].show(); me["FMA_man_box"].show();
me["FMA_manmode"].show();
me["FMA_flxmode"].hide();
me["FMA_manmode"].setText("TOGA"); me["FMA_manmode"].setText("TOGA");
me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078);
} else if ((state1_act == "MAN THR" and thr1_act >= 0.83) or (state2_act == "MAN THR" and thr2_act >= 0.83)) { } else if ((state1_act == "MAN THR" and thr1_act >= 0.83) or (state2_act == "MAN THR" and thr2_act >= 0.83)) {
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_man_box"].show(); me["FMA_man_box"].show();
me["FMA_manmode"].show();
me["FMA_flxmode"].hide();
me["FMA_manmode"].setText("THR"); me["FMA_manmode"].setText("THR");
me["FMA_man_box"].setColor(0.7333,0.3803,0); me["FMA_man_box"].setColor(0.7333,0.3803,0);
} else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act == "FLX") { } else if ((state1_act == "MCT" or state2_act == "MCT") and thrust_limit_act == "FLX") {
@ -414,7 +425,8 @@ var canvas_PFD_base = {
me["FMA_man_box"].hide(); me["FMA_man_box"].hide();
me["FMA_flx_box"].show(); me["FMA_flx_box"].show();
me["FMA_flxtemp"].show(); me["FMA_flxtemp"].show();
me["FMA_manmode"].setText("FLX "); me["FMA_manmode"].hide();
me["FMA_flxmode"].show();
me["FMA_man_box"].setColor(0.8078,0.8039,0.8078); me["FMA_man_box"].setColor(0.8078,0.8039,0.8078);
} }
} else { } else {
@ -423,6 +435,7 @@ var canvas_PFD_base = {
me["FMA_man_box"].hide(); me["FMA_man_box"].hide();
me["FMA_flx_box"].hide(); me["FMA_flx_box"].hide();
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
me["FMA_flxmode"].hide();
} }
if ((state1_act == "CL" and state2_act != "CL") or (state1_act != "CL" and state2_act == "CL") and eng_out.getValue() != 1) { if ((state1_act == "CL" and state2_act != "CL") or (state1_act != "CL" and state2_act == "CL") and eng_out.getValue() != 1) {
@ -870,12 +883,24 @@ var canvas_PFD_base = {
me["ILS_HDG_L"].hide(); me["ILS_HDG_L"].hide();
me["CRS_pointer"].show(); me["CRS_pointer"].show();
} else if (magnetic_hdg_dif < -23.62 and magnetic_hdg_dif >= -180) { } else if (magnetic_hdg_dif < -23.62 and magnetic_hdg_dif >= -180) {
if (int(magnetic_hdg) < 10) {
me["ILS_left"].setText(sprintf("00%1.0f", int(magnetic_hdg)));
} else if (int(magnetic_hdg) < 100) {
me["ILS_left"].setText(sprintf("0%2.0f", int(magnetic_hdg)));
} else {
me["ILS_left"].setText(sprintf("%3.0f", int(magnetic_hdg))); me["ILS_left"].setText(sprintf("%3.0f", int(magnetic_hdg)));
}
me["ILS_HDG_L"].show(); me["ILS_HDG_L"].show();
me["ILS_HDG_R"].hide(); me["ILS_HDG_R"].hide();
me["CRS_pointer"].hide(); me["CRS_pointer"].hide();
} else if (magnetic_hdg_dif > 23.62 and magnetic_hdg_dif <= 180) { } else if (magnetic_hdg_dif > 23.62 and magnetic_hdg_dif <= 180) {
if (int(magnetic_hdg) < 10) {
me["ILS_right"].setText(sprintf("00%1.0f", int(magnetic_hdg)));
} else if (int(magnetic_hdg) < 100) {
me["ILS_right"].setText(sprintf("0%2.0f", int(magnetic_hdg)));
} else {
me["ILS_right"].setText(sprintf("%3.0f", int(magnetic_hdg))); me["ILS_right"].setText(sprintf("%3.0f", int(magnetic_hdg)));
}
me["ILS_HDG_R"].show(); me["ILS_HDG_R"].show();
me["ILS_HDG_L"].hide(); me["ILS_HDG_L"].hide();
me["CRS_pointer"].hide(); me["CRS_pointer"].hide();

8165
Models/Instruments/PFD/res/pfd.svg
View file

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

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 293 KiB

2
Nasal/Systems/save.nas
View file

@ -33,10 +33,12 @@ var default = [
# efis # efis
"/instrumentation/efis[0]/inputs/range-nm", "/instrumentation/efis[0]/inputs/range-nm",
"/instrumentation/efis[0]/nd/display-mode", "/instrumentation/efis[0]/nd/display-mode",
"/instrumentation/efis[0]/mfd/pnl_mode-num", # The model
"/instrumentation/efis[0]/input/lh-vor-adf", "/instrumentation/efis[0]/input/lh-vor-adf",
"/instrumentation/efis[0]/input/rh-vor-adf", "/instrumentation/efis[0]/input/rh-vor-adf",
"/instrumentation/efis[1]/inputs/range-nm", "/instrumentation/efis[1]/inputs/range-nm",
"/instrumentation/efis[1]/nd/display-mode", "/instrumentation/efis[1]/nd/display-mode",
"/instrumentation/efis[1]/mfd/pnl_mode-num", # The model
"/instrumentation/efis[1]/input/lh-vor-adf", "/instrumentation/efis[1]/input/lh-vor-adf",
"/instrumentation/efis[1]/input/rh-vor-adf", "/instrumentation/efis[1]/input/rh-vor-adf",
# parking brake # parking brake

1
Systems/a320-electrical.xml
View file

@ -376,6 +376,7 @@
<default value="/systems/electrical/some-electric-thingie/rat-deploy"/> <default value="/systems/electrical/some-electric-thingie/rat-deploy"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/instrumentation/airspeed-indicator/indicated-speed-kt gt 100 /instrumentation/airspeed-indicator/indicated-speed-kt gt 100
/sim/time/elapsed-sec gt 30
/systems/electrical/bus/ac-1 eq 0 /systems/electrical/bus/ac-1 eq 0
/systems/electrical/bus/ac-2 eq 0 /systems/electrical/bus/ac-2 eq 0
/controls/electrical/switches/emer-elec-man-on eq 0 /controls/electrical/switches/emer-elec-man-on eq 0

2
revision.txt
View file

@ -1 +1 @@
20 21