From 07216d3e4474947213a4568e570fc06ee670744a Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 14 May 2019 12:33:51 +0100 Subject: [PATCH 1/5] SD ELEC: bugfix --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 2 +- revision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 01c44084..21cf6d4e 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -1268,7 +1268,7 @@ var canvas_lowerECAM_elec = { # TODO add correct A if (dc1.getValue() < 25) { 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) { me["ESSTR-Volt"].setColor(0.7333,0.3803,0); diff --git a/revision.txt b/revision.txt index 618d4d62..bb59c55b 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4790 \ No newline at end of file +4791 \ No newline at end of file From 453fa34d6eebadfadd78f5360da7250832076db9 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 15 May 2019 17:21:44 +0100 Subject: [PATCH 2/5] Bugfix: radio xfer should not be repeatable --- Models/Instruments/Radio/Radio1.xml | 2 +- Models/Instruments/Radio/Radio2.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml index d491a195..b02ee02c 100644 --- a/Models/Instruments/Radio/Radio1.xml +++ b/Models/Instruments/Radio/Radio1.xml @@ -219,7 +219,7 @@ radio_exchange - true + false nasal diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml index eb23f637..ac130a18 100644 --- a/Models/Instruments/Radio/Radio2.xml +++ b/Models/Instruments/Radio/Radio2.xml @@ -219,7 +219,7 @@ radio_exchange - true + false nasal From 23717ec9b3b3e511a5ad7b89b2013cc7ccfe39db Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 15 May 2019 17:25:13 +0100 Subject: [PATCH 3/5] RMP: getBoolValue() doesn't need to have == 1 or != 1 --- Nasal/rmp.nas | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Nasal/rmp.nas b/Nasal/rmp.nas index 8cc18bd1..cb82cea1 100644 --- a/Nasal/rmp.nas +++ b/Nasal/rmp.nas @@ -70,37 +70,37 @@ var rmpUpdate = func() { # 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 (sel_light_rmp1.getBoolValue() != 1) { + if (!sel_light_rmp1.getBoolValue()) { sel_light_rmp1.setBoolValue(1); } - if (sel_light_rmp2.getBoolValue() != 1) { + if (!sel_light_rmp2.getBoolValue()) { sel_light_rmp2.setBoolValue(1); } - if (sel_light_rmp3.getBoolValue() != 1) { + if (!sel_light_rmp3.getBoolValue()) { sel_light_rmp3.setBoolValue(1); } } else { - if (sel_light_rmp1.getBoolValue() != 0) { + if (sel_light_rmp1.getBoolValue()) { sel_light_rmp1.setBoolValue(0); } - if (sel_light_rmp2.getBoolValue() != 0) { + if (sel_light_rmp2.getBoolValue()) { sel_light_rmp2.setBoolValue(0); } - if (sel_light_rmp3.getBoolValue() != 0) { + if (sel_light_rmp3.getBoolValue()) { sel_light_rmp3.setBoolValue(0); } } # 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); } - 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); } - 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); } } From 19af3617e3461baad4470841b51db80ca809c4f7 Mon Sep 17 00:00:00 2001 From: TH-555 Date: Thu, 16 May 2019 21:06:39 +0200 Subject: [PATCH 4/5] VC: Normal face orientation fixed --- Models/FlightDeck/a320.flightdeck.xml | 4 + .../Pedestal_up/res/Pedestal_up.ac | 444 +++++++++--------- Models/Instruments/Radio/res/Radio.ac | 8 +- revision.txt | 2 +- 4 files changed, 231 insertions(+), 227 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 38fc4af3..9e200508 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -468,6 +468,10 @@ terr_on_nd_on ver.fmgc vs-text-test + engine_fire_1 + engine_fault_1 + engine_fire_2 + engine_fault_2 controls/switches/annun-test diff --git a/Models/Instruments/Pedestal_up/res/Pedestal_up.ac b/Models/Instruments/Pedestal_up/res/Pedestal_up.ac index 04d01ff2..27065183 100644 --- a/Models/Instruments/Pedestal_up/res/Pedestal_up.ac +++ b/Models/Instruments/Pedestal_up/res/Pedestal_up.ac @@ -14554,9 +14554,9 @@ SURF 0X0 mat 1 refs 4 0 0.800057 0.332447 -3 0.64241 0.332447 -2 0.64241 0.588943 1 0.800057 0.588943 +2 0.64241 0.588943 +3 0.64241 0.332447 kids 0 OBJECT poly name "atc_stby" @@ -18514,6 +18514,11 @@ refs 4 SURF 0X12 mat 2 refs 2 +129 0 0 +130 0 0 +SURF 0X12 +mat 2 +refs 2 133 0 0 128 0 0 SURF 0X12 @@ -18521,11 +18526,6 @@ mat 2 refs 2 127 0 0 294 0 0 -SURF 0X12 -mat 2 -refs 2 -129 0 0 -130 0 0 kids 0 OBJECT poly name "dummy_2" @@ -20239,8 +20239,8 @@ name "ECAM" kids 38 OBJECT poly name "ecam_air_data" -data 14 -CU1_curve_.024 +data 18 +ecam_air_data.mesh crease 40.0 texture "ECAM.png" texrep 1 1 @@ -23146,8 +23146,8 @@ refs 4 kids 0 OBJECT poly name "ecam_att_hdg" -data 14 -CU1_curve_.559 +data 17 +ecam_att_hdg.mesh crease 40.0 texture "ECAM.png" texrep 1 1 @@ -38947,13 +38947,13 @@ refs 4 SURF 0X12 mat 3 refs 2 -450 0 0 -437 0 0 +431 0 0 +432 0 0 SURF 0X12 mat 3 refs 2 -431 0 0 -432 0 0 +450 0 0 +437 0 0 kids 0 OBJECT poly name "ecam_brt_lower" @@ -41003,8 +41003,8 @@ refs 4 kids 0 OBJECT poly name "ecam_brt_upper" -data 23 -ecam_brt_upper.mesh.002 +data 19 +ecam_brt_upper.mesh crease 40.0 texture "ECAM.png" texrep 1 1 @@ -45289,8 +45289,8 @@ refs 4 kids 0 OBJECT poly name "ecam_eis_dmc" -data 14 -CU1_curve_.025 +data 17 +ecam_eis_dmc.mesh crease 40.0 texture "ECAM.png" texrep 1 1 @@ -52025,8 +52025,8 @@ refs 4 kids 0 OBJECT poly name "ecam_nd_xfr" -data 14 -CU1_curve_.026 +data 16 +ecam_nd_xfr.mesh crease 40.0 texture "ECAM.png" texrep 1 1 @@ -77057,8 +77057,58 @@ refs 24 SURF 0X12 mat 7 refs 2 -396 0 0 -397 0 0 +312 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 mat 7 refs 2 @@ -77067,13 +77117,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -440 0 0 -441 0 0 -SURF 0X12 -mat 7 -refs 2 -432 0 0 -433 0 0 +319 0 0 +320 0 0 SURF 0X12 mat 7 refs 2 @@ -77097,6 +77142,91 @@ refs 2 SURF 0X12 mat 7 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 271 0 0 SURF 0X12 @@ -77287,8 +77417,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -417 0 0 -418 0 0 +309 0 0 +310 0 0 SURF 0X12 mat 7 refs 2 @@ -77377,8 +77507,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -421 0 0 -422 0 0 +335 0 0 +336 0 0 SURF 0X12 mat 7 refs 2 @@ -77387,8 +77517,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -335 0 0 -336 0 0 +345 0 0 +346 0 0 SURF 0X12 mat 7 refs 2 @@ -77417,8 +77547,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -345 0 0 -346 0 0 +355 0 0 +356 0 0 SURF 0X12 mat 7 refs 2 @@ -77427,8 +77557,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -355 0 0 -356 0 0 +347 0 0 +348 0 0 SURF 0X12 mat 7 refs 2 @@ -77442,11 +77572,6 @@ refs 2 SURF 0X12 mat 7 refs 2 -362 0 0 -363 0 0 -SURF 0X12 -mat 7 -refs 2 361 0 0 362 0 0 SURF 0X12 @@ -77457,6 +77582,11 @@ refs 2 SURF 0X12 mat 7 refs 2 +362 0 0 +363 0 0 +SURF 0X12 +mat 7 +refs 2 366 0 0 367 0 0 SURF 0X12 @@ -77557,33 +77687,33 @@ refs 2 SURF 0X12 mat 7 refs 2 -297 0 0 -298 0 0 -SURF 0X12 -mat 7 -refs 2 391 0 0 392 0 0 SURF 0X12 mat 7 refs 2 -395 0 0 -396 0 0 -SURF 0X12 -mat 7 -refs 2 394 0 0 395 0 0 SURF 0X12 mat 7 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 399 0 0 SURF 0X12 mat 7 refs 2 -299 0 0 -300 0 0 +399 0 0 +400 0 0 SURF 0X12 mat 7 refs 2 @@ -77612,13 +77742,13 @@ refs 2 SURF 0X12 mat 7 refs 2 -399 0 0 -400 0 0 +404 0 0 +405 0 0 SURF 0X12 mat 7 refs 2 -404 0 0 -405 0 0 +396 0 0 +397 0 0 SURF 0X12 mat 7 refs 2 @@ -77752,13 +77882,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -307 0 0 -308 0 0 -SURF 0X12 -mat 7 -refs 2 -446 0 0 -447 0 0 +442 0 0 +443 0 0 SURF 0X12 mat 7 refs 2 @@ -77767,6 +77892,11 @@ refs 2 SURF 0X12 mat 7 refs 2 +446 0 0 +447 0 0 +SURF 0X12 +mat 7 +refs 2 447 0 0 448 0 0 SURF 0X12 @@ -77782,8 +77912,8 @@ refs 2 SURF 0X12 mat 7 refs 2 -309 0 0 -310 0 0 +440 0 0 +441 0 0 SURF 0X12 mat 7 refs 2 @@ -77817,6 +77947,11 @@ refs 2 SURF 0X12 mat 7 refs 2 +307 0 0 +308 0 0 +SURF 0X12 +mat 7 +refs 2 460 0 0 413 0 0 SURF 0X12 @@ -77827,118 +77962,33 @@ refs 2 SURF 0X12 mat 7 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 344 0 0 SURF 0X12 mat 7 refs 2 +459 0 0 +460 0 0 +SURF 0X12 +mat 7 +refs 2 344 0 0 345 0 0 SURF 0X12 mat 7 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 350 0 0 SURF 0X12 mat 7 refs 2 -277 0 0 -278 0 0 +334 0 0 +335 0 0 +SURF 0X12 +mat 7 +refs 2 +444 0 0 +445 0 0 SURF 0X12 mat 7 refs 2 @@ -77947,73 +77997,23 @@ refs 2 SURF 0X12 mat 7 refs 2 -287 0 0 -288 0 0 -SURF 0X12 -mat 7 -refs 2 357 0 0 358 0 0 SURF 0X12 mat 7 refs 2 -275 0 0 -276 0 0 -SURF 0X12 -mat 7 -refs 2 358 0 0 359 0 0 SURF 0X12 mat 7 refs 2 +337 0 0 +338 0 0 +SURF 0X12 +mat 7 +refs 2 364 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 OBJECT poly name "engine_fault_1" diff --git a/Models/Instruments/Radio/res/Radio.ac b/Models/Instruments/Radio/res/Radio.ac index 36423d9f..b987caa0 100644 --- a/Models/Instruments/Radio/res/Radio.ac +++ b/Models/Instruments/Radio/res/Radio.ac @@ -22,9 +22,9 @@ SURF 0X0 mat 1 refs 4 0 0.924845 0.951366 -1 0.924845 0.974681 -2 0.99963 0.974681 3 0.99963 0.951366 +2 0.99963 0.974681 +1 0.924845 0.974681 kids 0 OBJECT poly name "radio_adf" @@ -17595,9 +17595,9 @@ SURF 0X0 mat 1 refs 4 1 1.000099 0.999363 -0 1.000099 0.975954 -3 0.925013 0.975954 2 0.925013 0.999363 +3 0.925013 0.975954 +0 1.000099 0.975954 kids 0 OBJECT poly name "radio_vhf1" diff --git a/revision.txt b/revision.txt index bb59c55b..e6f6bbaa 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4791 \ No newline at end of file +4792 \ No newline at end of file From 846005a217e5a82e468eed85b552cd1bd314a818 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Thu, 16 May 2019 16:16:03 -0400 Subject: [PATCH 5/5] Sim: Formatting --- Models/FlightDeck/a320.flightdeck.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 9e200508..0e6c4a65 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -459,6 +459,10 @@ ecam_c_b_led ecam_el_dc_led ecam_sts_led + engine_fault_1 + engine_fault_2 + engine_fire_1 + engine_fire_2 exped_led hdg-text-test qnh-test @@ -468,10 +472,6 @@ terr_on_nd_on ver.fmgc vs-text-test - engine_fire_1 - engine_fault_1 - engine_fire_2 - engine_fault_2 controls/switches/annun-test