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

Merge branch 'master' into sounds

Browse source
This commit is contained in:
legoboyvdlp R 2019-05-17 21:22:27 +01:00
commit 6497f72a3b
8 changed files with 243 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Models/FlightDeck/a320.flightdeck.xml
View file

@ -459,6 +459,10 @@
<object-name>ecam_c_b_led</object-name> <object-name>ecam_c_b_led</object-name>
<object-name>ecam_el_dc_led</object-name> <object-name>ecam_el_dc_led</object-name>
<object-name>ecam_sts_led</object-name> <object-name>ecam_sts_led</object-name>
<object-name>engine_fault_1</object-name>
<object-name>engine_fault_2</object-name>
<object-name>engine_fire_1</object-name>
<object-name>engine_fire_2</object-name>
<object-name>exped_led</object-name> <object-name>exped_led</object-name>
<object-name>hdg-text-test</object-name> <object-name>hdg-text-test</object-name>
<object-name>qnh-test</object-name> <object-name>qnh-test</object-name>

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

@ -1268,7 +1268,7 @@ var canvas_lowerECAM_elec = {
# TODO add correct A # TODO add correct A
if (dc1.getValue() < 25) { if (dc1.getValue() < 25) {
me["ESSTR-group"].show(); me["ESSTR-group"].show();
me["ESSTR-Volt"].setText(sprintf("%s", math.round(dc_essgetValue()))); me["ESSTR-Volt"].setText(sprintf("%s", math.round(dc_ess.getValue())));
if (dc_ess.getValue() < 25 or dc_ess.getValue() > 31) { if (dc_ess.getValue() < 25 or dc_ess.getValue() > 31) {
me["ESSTR-Volt"].setColor(0.7333,0.3803,0); me["ESSTR-Volt"].setColor(0.7333,0.3803,0);

444
Models/Instruments/Pedestal_up/res/Pedestal_up.ac
View file

@ -14554,9 +14554,9 @@ SURF 0X0
mat 1 mat 1
refs 4 refs 4
0 0.800057 0.332447 0 0.800057 0.332447
3 0.64241 0.332447
2 0.64241 0.588943
1 0.800057 0.588943 1 0.800057 0.588943
2 0.64241 0.588943
3 0.64241 0.332447
kids 0 kids 0
OBJECT poly OBJECT poly
name "atc_stby" name "atc_stby"
@ -18514,6 +18514,11 @@ refs 4
SURF 0X12 SURF 0X12
mat 2 mat 2
refs 2 refs 2
129 0 0
130 0 0
SURF 0X12
mat 2
refs 2
133 0 0 133 0 0
128 0 0 128 0 0
SURF 0X12 SURF 0X12
@ -18521,11 +18526,6 @@ mat 2
refs 2 refs 2
127 0 0 127 0 0
294 0 0 294 0 0
SURF 0X12
mat 2
refs 2
129 0 0
130 0 0
kids 0 kids 0
OBJECT poly OBJECT poly
name "dummy_2" name "dummy_2"
@ -20239,8 +20239,8 @@ name "ECAM"
kids 38 kids 38
OBJECT poly OBJECT poly
name "ecam_air_data" name "ecam_air_data"
data 14 data 18
CU1_curve_.024 ecam_air_data.mesh
crease 40.0 crease 40.0
texture "ECAM.png" texture "ECAM.png"
texrep 1 1 texrep 1 1
@ -23146,8 +23146,8 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "ecam_att_hdg" name "ecam_att_hdg"
data 14 data 17
CU1_curve_.559 ecam_att_hdg.mesh
crease 40.0 crease 40.0
texture "ECAM.png" texture "ECAM.png"
texrep 1 1 texrep 1 1
@ -38947,13 +38947,13 @@ refs 4
SURF 0X12 SURF 0X12
mat 3 mat 3
refs 2 refs 2
450 0 0 431 0 0
437 0 0 432 0 0
SURF 0X12 SURF 0X12
mat 3 mat 3
refs 2 refs 2
431 0 0 450 0 0
432 0 0 437 0 0
kids 0 kids 0
OBJECT poly OBJECT poly
name "ecam_brt_lower" name "ecam_brt_lower"
@ -41003,8 +41003,8 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "ecam_brt_upper" name "ecam_brt_upper"
data 23 data 19
ecam_brt_upper.mesh.002 ecam_brt_upper.mesh
crease 40.0 crease 40.0
texture "ECAM.png" texture "ECAM.png"
texrep 1 1 texrep 1 1
@ -45289,8 +45289,8 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "ecam_eis_dmc" name "ecam_eis_dmc"
data 14 data 17
CU1_curve_.025 ecam_eis_dmc.mesh
crease 40.0 crease 40.0
texture "ECAM.png" texture "ECAM.png"
texrep 1 1 texrep 1 1
@ -52025,8 +52025,8 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "ecam_nd_xfr" name "ecam_nd_xfr"
data 14 data 16
CU1_curve_.026 ecam_nd_xfr.mesh
crease 40.0 crease 40.0
texture "ECAM.png" texture "ECAM.png"
texrep 1 1 texrep 1 1
@ -77057,8 +77057,58 @@ refs 24
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
396 0 0 312 0 0
397 0 0 313 0 0
SURF 0X12
mat 7
refs 2
372 0 0
373 0 0
SURF 0X12
mat 7
refs 2
448 0 0
449 0 0
SURF 0X12
mat 7
refs 2
374 0 0
375 0 0
SURF 0X12
mat 7
refs 2
377 0 0
378 0 0
SURF 0X12
mat 7
refs 2
450 0 0
451 0 0
SURF 0X12
mat 7
refs 2
379 0 0
380 0 0
SURF 0X12
mat 7
refs 2
385 0 0
386 0 0
SURF 0X12
mat 7
refs 2
392 0 0
393 0 0
SURF 0X12
mat 7
refs 2
393 0 0
394 0 0
SURF 0X12
mat 7
refs 2
318 0 0
319 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77067,13 +77117,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
440 0 0 319 0 0
441 0 0 320 0 0
SURF 0X12
mat 7
refs 2
432 0 0
433 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77097,6 +77142,91 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
410 0 0
411 0 0
SURF 0X12
mat 7
refs 2
275 0 0
276 0 0
SURF 0X12
mat 7
refs 2
320 0 0
321 0 0
SURF 0X12
mat 7
refs 2
277 0 0
278 0 0
SURF 0X12
mat 7
refs 2
415 0 0
416 0 0
SURF 0X12
mat 7
refs 2
282 0 0
283 0 0
SURF 0X12
mat 7
refs 2
417 0 0
418 0 0
SURF 0X12
mat 7
refs 2
421 0 0
422 0 0
SURF 0X12
mat 7
refs 2
287 0 0
288 0 0
SURF 0X12
mat 7
refs 2
324 0 0
325 0 0
SURF 0X12
mat 7
refs 2
432 0 0
433 0 0
SURF 0X12
mat 7
refs 2
297 0 0
298 0 0
SURF 0X12
mat 7
refs 2
434 0 0
435 0 0
SURF 0X12
mat 7
refs 2
299 0 0
300 0 0
SURF 0X12
mat 7
refs 2
301 0 0
302 0 0
SURF 0X12
mat 7
refs 2
326 0 0
327 0 0
SURF 0X12
mat 7
refs 2
441 0 0
442 0 0
SURF 0X12
mat 7
refs 2
270 0 0 270 0 0
271 0 0 271 0 0
SURF 0X12 SURF 0X12
@ -77287,8 +77417,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
417 0 0 309 0 0
418 0 0 310 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77377,8 +77507,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
421 0 0 335 0 0
422 0 0 336 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77387,8 +77517,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
335 0 0 345 0 0
336 0 0 346 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77417,8 +77547,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
345 0 0 355 0 0
346 0 0 356 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77427,8 +77557,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
355 0 0 347 0 0
356 0 0 348 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77442,11 +77572,6 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
362 0 0
363 0 0
SURF 0X12
mat 7
refs 2
361 0 0 361 0 0
362 0 0 362 0 0
SURF 0X12 SURF 0X12
@ -77457,6 +77582,11 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
362 0 0
363 0 0
SURF 0X12
mat 7
refs 2
366 0 0 366 0 0
367 0 0 367 0 0
SURF 0X12 SURF 0X12
@ -77557,33 +77687,33 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
297 0 0
298 0 0
SURF 0X12
mat 7
refs 2
391 0 0 391 0 0
392 0 0 392 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
395 0 0
396 0 0
SURF 0X12
mat 7
refs 2
394 0 0 394 0 0
395 0 0 395 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
395 0 0
396 0 0
SURF 0X12
mat 7
refs 2
389 0 0
390 0 0
SURF 0X12
mat 7
refs 2
398 0 0 398 0 0
399 0 0 399 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
299 0 0 399 0 0
300 0 0 400 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77612,13 +77742,13 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
399 0 0 404 0 0
400 0 0 405 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
404 0 0 396 0 0
405 0 0 397 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77752,13 +77882,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
307 0 0 442 0 0
308 0 0 443 0 0
SURF 0X12
mat 7
refs 2
446 0 0
447 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77767,6 +77892,11 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
446 0 0
447 0 0
SURF 0X12
mat 7
refs 2
447 0 0 447 0 0
448 0 0 448 0 0
SURF 0X12 SURF 0X12
@ -77782,8 +77912,8 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
309 0 0 440 0 0
310 0 0 441 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77817,6 +77947,11 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
307 0 0
308 0 0
SURF 0X12
mat 7
refs 2
460 0 0 460 0 0
413 0 0 413 0 0
SURF 0X12 SURF 0X12
@ -77827,118 +77962,33 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
459 0 0
460 0 0
SURF 0X12
mat 7
refs 2
312 0 0
313 0 0
SURF 0X12
mat 7
refs 2
448 0 0
449 0 0
SURF 0X12
mat 7
refs 2
450 0 0
451 0 0
SURF 0X12
mat 7
refs 2
442 0 0
443 0 0
SURF 0X12
mat 7
refs 2
441 0 0
442 0 0
SURF 0X12
mat 7
refs 2
318 0 0
319 0 0
SURF 0X12
mat 7
refs 2
319 0 0
320 0 0
SURF 0X12
mat 7
refs 2
415 0 0
416 0 0
SURF 0X12
mat 7
refs 2
320 0 0
321 0 0
SURF 0X12
mat 7
refs 2
324 0 0
325 0 0
SURF 0X12
mat 7
refs 2
326 0 0
327 0 0
SURF 0X12
mat 7
refs 2
444 0 0
445 0 0
SURF 0X12
mat 7
refs 2
282 0 0
283 0 0
SURF 0X12
mat 7
refs 2
334 0 0
335 0 0
SURF 0X12
mat 7
refs 2
337 0 0
338 0 0
SURF 0X12
mat 7
refs 2
410 0 0
411 0 0
SURF 0X12
mat 7
refs 2
343 0 0 343 0 0
344 0 0 344 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
459 0 0
460 0 0
SURF 0X12
mat 7
refs 2
344 0 0 344 0 0
345 0 0 345 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
347 0 0
348 0 0
SURF 0X12
mat 7
refs 2
301 0 0
302 0 0
SURF 0X12
mat 7
refs 2
349 0 0 349 0 0
350 0 0 350 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
277 0 0 334 0 0
278 0 0 335 0 0
SURF 0X12
mat 7
refs 2
444 0 0
445 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
@ -77947,73 +77997,23 @@ refs 2
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
287 0 0
288 0 0
SURF 0X12
mat 7
refs 2
357 0 0 357 0 0
358 0 0 358 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
275 0 0
276 0 0
SURF 0X12
mat 7
refs 2
358 0 0 358 0 0
359 0 0 359 0 0
SURF 0X12 SURF 0X12
mat 7 mat 7
refs 2 refs 2
337 0 0
338 0 0
SURF 0X12
mat 7
refs 2
364 0 0 364 0 0
317 0 0 317 0 0
SURF 0X12
mat 7
refs 2
372 0 0
373 0 0
SURF 0X12
mat 7
refs 2
374 0 0
375 0 0
SURF 0X12
mat 7
refs 2
377 0 0
378 0 0
SURF 0X12
mat 7
refs 2
379 0 0
380 0 0
SURF 0X12
mat 7
refs 2
385 0 0
386 0 0
SURF 0X12
mat 7
refs 2
389 0 0
390 0 0
SURF 0X12
mat 7
refs 2
434 0 0
435 0 0
SURF 0X12
mat 7
refs 2
392 0 0
393 0 0
SURF 0X12
mat 7
refs 2
393 0 0
394 0 0
kids 0 kids 0
OBJECT poly OBJECT poly
name "engine_fault_1" name "engine_fault_1"

2
Models/Instruments/Radio/Radio1.xml
View file

@ -219,7 +219,7 @@
<object-name>radio_exchange</object-name> <object-name>radio_exchange</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>true</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>rmp.transfer(1);</script> <script>rmp.transfer(1);</script>

2
Models/Instruments/Radio/Radio2.xml
View file

@ -219,7 +219,7 @@
<object-name>radio_exchange</object-name> <object-name>radio_exchange</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>true</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>rmp.transfer(2);</script> <script>rmp.transfer(2);</script>

8
Models/Instruments/Radio/res/Radio.ac
View file

@ -22,9 +22,9 @@ SURF 0X0
mat 1 mat 1
refs 4 refs 4
0 0.924845 0.951366 0 0.924845 0.951366
1 0.924845 0.974681
2 0.99963 0.974681
3 0.99963 0.951366 3 0.99963 0.951366
2 0.99963 0.974681
1 0.924845 0.974681
kids 0 kids 0
OBJECT poly OBJECT poly
name "radio_adf" name "radio_adf"
@ -17595,9 +17595,9 @@ SURF 0X0
mat 1 mat 1
refs 4 refs 4
1 1.000099 0.999363 1 1.000099 0.999363
0 1.000099 0.975954
3 0.925013 0.975954
2 0.925013 0.999363 2 0.925013 0.999363
3 0.925013 0.975954
0 1.000099 0.975954
kids 0 kids 0
OBJECT poly OBJECT poly
name "radio_vhf1" name "radio_vhf1"

18
Nasal/rmp.nas
View file

@ -70,37 +70,37 @@ var rmpUpdate = func() {
# SEL lights # SEL lights
if (chan_rmp1_v == "vhf2" or chan_rmp1_v == "vhf3" or chan_rmp1_v == "hf1" or chan_rmp1_v == "hf2" or chan_rmp2_v == "vhf1" or chan_rmp2_v == "vhf3" or chan_rmp2_v == "hf1" or chan_rmp2_v == "hf2" or chan_rmp3_v == "vhf1" or chan_rmp3_v == "vhf2") { if (chan_rmp1_v == "vhf2" or chan_rmp1_v == "vhf3" or chan_rmp1_v == "hf1" or chan_rmp1_v == "hf2" or chan_rmp2_v == "vhf1" or chan_rmp2_v == "vhf3" or chan_rmp2_v == "hf1" or chan_rmp2_v == "hf2" or chan_rmp3_v == "vhf1" or chan_rmp3_v == "vhf2") {
if (sel_light_rmp1.getBoolValue() != 1) { if (!sel_light_rmp1.getBoolValue()) {
sel_light_rmp1.setBoolValue(1); sel_light_rmp1.setBoolValue(1);
} }
if (sel_light_rmp2.getBoolValue() != 1) { if (!sel_light_rmp2.getBoolValue()) {
sel_light_rmp2.setBoolValue(1); sel_light_rmp2.setBoolValue(1);
} }
if (sel_light_rmp3.getBoolValue() != 1) { if (!sel_light_rmp3.getBoolValue()) {
sel_light_rmp3.setBoolValue(1); sel_light_rmp3.setBoolValue(1);
} }
} else { } else {
if (sel_light_rmp1.getBoolValue() != 0) { if (sel_light_rmp1.getBoolValue()) {
sel_light_rmp1.setBoolValue(0); sel_light_rmp1.setBoolValue(0);
} }
if (sel_light_rmp2.getBoolValue() != 0) { if (sel_light_rmp2.getBoolValue()) {
sel_light_rmp2.setBoolValue(0); sel_light_rmp2.setBoolValue(0);
} }
if (sel_light_rmp3.getBoolValue() != 0) { if (sel_light_rmp3.getBoolValue()) {
sel_light_rmp3.setBoolValue(0); sel_light_rmp3.setBoolValue(0);
} }
} }
# Disable AM mode if not in HF # Disable AM mode if not in HF
if (chan_rmp1_v != "hf1" and chan_rmp1_v != "hf2" and am_mode_rmp1.getBoolValue() == 1) { if (chan_rmp1_v != "hf1" and chan_rmp1_v != "hf2" and am_mode_rmp1.getBoolValue()) {
am_mode_rmp1.setBoolValue(0); am_mode_rmp1.setBoolValue(0);
} }
if (chan_rmp2_v != "hf1" and chan_rmp2_v != "hf2" and am_mode_rmp2.getBoolValue() == 1) { if (chan_rmp2_v != "hf1" and chan_rmp2_v != "hf2" and am_mode_rmp2.getBoolValue()) {
am_mode_rmp2.setBoolValue(0); am_mode_rmp2.setBoolValue(0);
} }
if (chan_rmp3_v != "hf1" and chan_rmp3_v != "hf2" and am_mode_rmp3.getBoolValue() == 1) { if (chan_rmp3_v != "hf1" and chan_rmp3_v != "hf2" and am_mode_rmp3.getBoolValue()) {
am_mode_rmp3.setBoolValue(0); am_mode_rmp3.setBoolValue(0);
} }
} }

2
revision.txt
View file

@ -1 +1 @@
4790 4792