diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml index 7d083f2f..487bb745 100644 --- a/A320-200-CFM-set.xml +++ b/A320-200-CFM-set.xml @@ -1,6 +1,6 @@  - + diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index dfdd8f9d..808e1c6a 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -1,6 +1,6 @@ - + @@ -291,6 +291,7 @@ + diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 0f56650d..bad44fbb 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -1,6 +1,6 @@  - + diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index b163338b..1582b6ba 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -1,6 +1,6 @@ - + @@ -290,6 +290,7 @@ + diff --git a/A320-main.xml b/A320-main.xml index c51a069e..175f20ef 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -1,6 +1,6 @@  - + @@ -704,9 +704,16 @@ 0 1500 + + IDLE + + + IDLE + 0 T/O + 0 0 0 30 diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml index 38cf286a..82a75aa2 100644 --- a/A320neo-CFM-set.xml +++ b/A320neo-CFM-set.xml @@ -1,6 +1,6 @@  - + diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 5bd45e99..618a0f69 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -1,6 +1,6 @@ - + @@ -290,6 +290,7 @@ + diff --git a/A320neo-PW-set.xml b/A320neo-PW-set.xml index 94b1d1c1..ff3df945 100644 --- a/A320neo-PW-set.xml +++ b/A320neo-PW-set.xml @@ -1,6 +1,6 @@  - + diff --git a/A320neo-PW.xml b/A320neo-PW.xml index 7c5fd87f..d0bca6ca 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -1,6 +1,6 @@ - + @@ -290,6 +290,7 @@ + diff --git a/A32X-Checklists.xml b/A32X-Checklists.xml index f87f4a35..e4012c64 100644 --- a/A32X-Checklists.xml +++ b/A32X-Checklists.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml index 89bac5ad..c05b3d5f 100644 --- a/AircraftConfig/about.xml +++ b/AircraftConfig/about.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/ac_init.xml b/AircraftConfig/ac_init.xml index 639fff17..d0f48f96 100644 --- a/AircraftConfig/ac_init.xml +++ b/AircraftConfig/ac_init.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 0b0e9aac..24f976d3 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -1,7 +1,7 @@ # Aircraft Config Center # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var spinning = maketimer(0.05, func { var spinning = getprop("/systems/acconfig/spinning"); diff --git a/AircraftConfig/announce.xml b/AircraftConfig/announce.xml index e56c3a40..bcf35ea6 100644 --- a/AircraftConfig/announce.xml +++ b/AircraftConfig/announce.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/du-quality.xml b/AircraftConfig/du-quality.xml index 631f08b9..324aa09a 100644 --- a/AircraftConfig/du-quality.xml +++ b/AircraftConfig/du-quality.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/error-mismatch.xml b/AircraftConfig/error-mismatch.xml index f9cd0fd7..0da348de 100644 --- a/AircraftConfig/error-mismatch.xml +++ b/AircraftConfig/error-mismatch.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml index 2f821e17..1c64299b 100644 --- a/AircraftConfig/fail.xml +++ b/AircraftConfig/fail.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/fbw.xml b/AircraftConfig/fbw.xml index a6d27ca3..c1dd291b 100644 --- a/AircraftConfig/fbw.xml +++ b/AircraftConfig/fbw.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/fuel.xml b/AircraftConfig/fuel.xml index bc80e904..eae97207 100644 --- a/AircraftConfig/fuel.xml +++ b/AircraftConfig/fuel.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml index c92062a9..3d37f24e 100644 --- a/AircraftConfig/groundservices.xml +++ b/AircraftConfig/groundservices.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml index b81e3e66..40650b24 100644 --- a/AircraftConfig/help.xml +++ b/AircraftConfig/help.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/load-flightplan.xml b/AircraftConfig/load-flightplan.xml index 99049b7e..039e7748 100644 --- a/AircraftConfig/load-flightplan.xml +++ b/AircraftConfig/load-flightplan.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index 618a2c61..af3fb034 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/psload.xml b/AircraftConfig/psload.xml index 64cb9823..cfd08e3a 100644 --- a/AircraftConfig/psload.xml +++ b/AircraftConfig/psload.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/psloaded.xml b/AircraftConfig/psloaded.xml index 5cf632a9..6b975d9c 100644 --- a/AircraftConfig/psloaded.xml +++ b/AircraftConfig/psloaded.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/rendering.xml b/AircraftConfig/rendering.xml index 8cf032ca..f58c5263 100644 --- a/AircraftConfig/rendering.xml +++ b/AircraftConfig/rendering.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/simbrief.xml b/AircraftConfig/simbrief.xml index 322311a8..74972ee0 100644 --- a/AircraftConfig/simbrief.xml +++ b/AircraftConfig/simbrief.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/update.xml b/AircraftConfig/update.xml index eac413fc..6208f6a3 100644 --- a/AircraftConfig/update.xml +++ b/AircraftConfig/update.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/updated.xml b/AircraftConfig/updated.xml index bebe9186..10e5aee0 100644 --- a/AircraftConfig/updated.xml +++ b/AircraftConfig/updated.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml index 049dbc94..97936fcd 100644 --- a/AircraftConfig/welcome.xml +++ b/AircraftConfig/welcome.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/direct.xml b/Engines/direct.xml index 807e2736..afbe7478 100644 --- a/Engines/direct.xml +++ b/Engines/direct.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/leap1a26_1.xml b/Engines/leap1a26_1.xml index 6c0f6a2d..341efa9e 100644 --- a/Engines/leap1a26_1.xml +++ b/Engines/leap1a26_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/leap1a26_2.xml b/Engines/leap1a26_2.xml index 4a1f280a..567259c0 100644 --- a/Engines/leap1a26_2.xml +++ b/Engines/leap1a26_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/pw1127g_1.xml b/Engines/pw1127g_1.xml index d029a9a2..930f813b 100644 --- a/Engines/pw1127g_1.xml +++ b/Engines/pw1127g_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/pw1127g_2.xml b/Engines/pw1127g_2.xml index 3a7c3f2e..fc0a0016 100644 --- a/Engines/pw1127g_2.xml +++ b/Engines/pw1127g_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/v2527-a5_1.xml b/Engines/v2527-a5_1.xml index 63235edf..909707fc 100644 --- a/Engines/v2527-a5_1.xml +++ b/Engines/v2527-a5_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/v2527-a5_2.xml b/Engines/v2527-a5_2.xml index 330ee4fa..50cd8b80 100644 --- a/Engines/v2527-a5_2.xml +++ b/Engines/v2527-a5_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 57ed5157..799cf69d 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -1,6 +1,6 @@ - + A320-200-CFM diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index e6da3858..801b823f 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -1,6 +1,6 @@  - + A320-200-IAE diff --git a/Models/A320-common.xml b/Models/A320-common.xml index 3ec1feed..da51d87e 100644 --- a/Models/A320-common.xml +++ b/Models/A320-common.xml @@ -1,6 +1,6 @@ - + A320-200 diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml index f69fbbc4..c47437ab 100644 --- a/Models/A320neo-CFM.xml +++ b/Models/A320neo-CFM.xml @@ -1,6 +1,6 @@ - + A320neo-CFM diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index 9f4f6df7..a32748df 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -1,6 +1,6 @@ - + A320neo-PW diff --git a/Models/Effects/enginefire.xml b/Models/Effects/enginefire.xml index dd9221ac..702085c3 100644 --- a/Models/Effects/enginefire.xml +++ b/Models/Effects/enginefire.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/tire-smoke-left.xml b/Models/Effects/tire-smoke-left.xml index 4001ac6e..f7fc449f 100644 --- a/Models/Effects/tire-smoke-left.xml +++ b/Models/Effects/tire-smoke-left.xml @@ -1,6 +1,6 @@  - + diff --git a/Models/Effects/tire-smoke-right.xml b/Models/Effects/tire-smoke-right.xml index 85087e08..f7165183 100644 --- a/Models/Effects/tire-smoke-right.xml +++ b/Models/Effects/tire-smoke-right.xml @@ -1,6 +1,6 @@  - + diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml index 75b92db5..fedc5462 100644 --- a/Models/Engines/NEO/LeapXLeft.xml +++ b/Models/Engines/NEO/LeapXLeft.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml index c3cc291e..3d270b5d 100644 --- a/Models/Engines/NEO/LeapXRight.xml +++ b/Models/Engines/NEO/LeapXRight.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml index 48535219..ba83f5b0 100644 --- a/Models/Engines/NEO/PW1100GLeft.xml +++ b/Models/Engines/NEO/PW1100GLeft.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml index 6386eec8..0df73006 100644 --- a/Models/Engines/NEO/PW1100GRight.xml +++ b/Models/Engines/NEO/PW1100GRight.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml index 35f6f0f0..ffb04ba2 100644 --- a/Models/Engines/XMLs/a320.cfm.xml +++ b/Models/Engines/XMLs/a320.cfm.xml @@ -1,6 +1,6 @@ - + Aircraft/A320-family/Models/Engines/Models/CFM56.ac diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml index 54c7cb17..3399bd0b 100644 --- a/Models/Engines/XMLs/a320.v2500.xml +++ b/Models/Engines/XMLs/a320.v2500.xml @@ -1,6 +1,6 @@ - + Aircraft/A320-family/Models/Engines/Models/IAEV2500.ac diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 96196fb3..d84340fa 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -1,6 +1,6 @@  - + diff --git a/Models/Fuselages/A320/fuselage.xml b/Models/Fuselages/A320/fuselage.xml index fe922d30..15f826be 100644 --- a/Models/Fuselages/A320/fuselage.xml +++ b/Models/Fuselages/A320/fuselage.xml @@ -1,6 +1,6 @@ - + Fuselage diff --git a/Models/Instruments/Audio/Audio1.xml b/Models/Instruments/Audio/Audio1.xml index c4ba9360..ac920fb2 100644 --- a/Models/Instruments/Audio/Audio1.xml +++ b/Models/Instruments/Audio/Audio1.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Audio/Audio2.xml b/Models/Instruments/Audio/Audio2.xml index d42c9714..e1625327 100644 --- a/Models/Instruments/Audio/Audio2.xml +++ b/Models/Instruments/Audio/Audio2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/DCDU/DCDU.nas b/Models/Instruments/DCDU/DCDU.nas index dae9ce1a..452179fd 100644 --- a/Models/Instruments/DCDU/DCDU.nas +++ b/Models/Instruments/DCDU/DCDU.nas @@ -1,6 +1,6 @@ # A3XX DCDU -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var DCDU = nil; var DCDU_test = nil; diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index 63415808..3e43a133 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -1,6 +1,6 @@ # A3XX IESI -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # props.nas nodes var iesi_init = props.globals.initNode("/instrumentation/iesi/iesi-init", 0, "BOOL"); diff --git a/Models/Instruments/IESI/IESI.xml b/Models/Instruments/IESI/IESI.xml index 4705e023..05cc7508 100644 --- a/Models/Instruments/IESI/IESI.xml +++ b/Models/Instruments/IESI/IESI.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 8279b809..23be7029 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -1,6 +1,6 @@ # A3XX Lower ECAM Canvas -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var lowerECAM_apu = nil; var lowerECAM_bleed = nil; diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml index 3c034eab..c8da3b4e 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index 074c2dcc..93607e23 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Copyright (c) 2020 Matthew Maring (mattmaring) var MCDU_1 = nil; @@ -851,7 +851,7 @@ var canvas_MCDU_base = { me["Simple_R2"].setText(sprintf("%-10s",(doorR1_pos.getValue() > 0.1) ? "OPEN" : "CLOSED")); me["Simple_R3S"].setText(sprintf("%-10s",(doorL4_pos.getValue() > 0.1) ? "OPEN" : "CLOSED")); me["Simple_R3"].setText(sprintf("%-10s",(doorR4_pos.getValue() > 0.1) ? "OPEN" : "CLOSED")); - me["Simple_R4S"].setText(sprintf("%-10s",sprintf("%03.3f",pts.Velocities.groundspeed.getValue()))); + me["Simple_R4S"].setText(sprintf("%-10s",sprintf("%03.3f",pts.Velocities.groundspeedKt.getValue()))); me["Simple_R4"].setText(sprintf("%-10s",sprintf("%03.1f",fmgc.FMGCInternal.fob))); } else if (page == "AOCCONFIG") { diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml index 1b7c9182..01cee4bc 100644 --- a/Models/Instruments/MCDU/MCDU1.xml +++ b/Models/Instruments/MCDU/MCDU1.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml index 78516b3e..061f6f66 100644 --- a/Models/Instruments/MCDU/MCDU2.xml +++ b/Models/Instruments/MCDU/MCDU2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ND/ND_L.xml b/Models/Instruments/ND/ND_L.xml index 309de176..d857f821 100644 --- a/Models/Instruments/ND/ND_L.xml +++ b/Models/Instruments/ND/ND_L.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ND/ND_R.xml b/Models/Instruments/ND/ND_R.xml index 05da0651..d2a4aa4c 100644 --- a/Models/Instruments/ND/ND_R.xml +++ b/Models/Instruments/ND/ND_R.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ND/canvas/A3XX_ND.nas b/Models/Instruments/ND/canvas/A3XX_ND.nas index b690c788..67bfc872 100644 --- a/Models/Instruments/ND/canvas/A3XX_ND.nas +++ b/Models/Instruments/ND/canvas/A3XX_ND.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var get_local_path = func(file){ var aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1]; diff --git a/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas b/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas index 31985136..aa231017 100644 --- a/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas +++ b/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var A3XXRouteDriver = { new: func(){ diff --git a/Models/Instruments/ND/canvas/ND.nas b/Models/Instruments/ND/canvas/ND.nas index 5fe845d3..e9356047 100644 --- a/Models/Instruments/ND/canvas/ND.nas +++ b/Models/Instruments/ND/canvas/ND.nas @@ -1,6 +1,6 @@ # A3XX ND Canvas -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) io.include("A3XX_ND.nas"); diff --git a/Models/Instruments/ND/canvas/framework/canvas.nas b/Models/Instruments/ND/canvas/framework/canvas.nas index 402dff60..76e95261 100644 --- a/Models/Instruments/ND/canvas/framework/canvas.nas +++ b/Models/Instruments/ND/canvas/framework/canvas.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var assert_m = canvas.assert_m; diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas index 01569ad3..a17cee75 100644 --- a/Models/Instruments/ND/canvas/framework/navdisplay.nas +++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Override FGDATA/Nasal/canvas/map/navdisplay.mfd diff --git a/Models/Instruments/ND/canvas/helpers.nas b/Models/Instruments/ND/canvas/helpers.nas index 5a8f473f..0f54fb47 100644 --- a/Models/Instruments/ND/canvas/helpers.nas +++ b/Models/Instruments/ND/canvas/helpers.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var SymbolPainter = { aircraft_dir: nil, diff --git a/Models/Instruments/ND/canvas/loaders.nas b/Models/Instruments/ND/canvas/loaders.nas index e8cb8782..ff1f368e 100644 --- a/Models/Instruments/ND/canvas/loaders.nas +++ b/Models/Instruments/ND/canvas/loaders.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var version = getprop("sim/version/flightgear"); var v = split(".", version); diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas index 037ebaf4..f347d045 100644 --- a/Models/Instruments/ND/canvas/style.nas +++ b/Models/Instruments/ND/canvas/style.nas @@ -2,7 +2,7 @@ # Joshua Davidson (Octal450) # Based on work by artix -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var ALWAYS = func 1; var NOTHING = func nil; diff --git a/Models/Instruments/ND/canvas/wxr_api.xml b/Models/Instruments/ND/canvas/wxr_api.xml index adeb3edc..ea6282a7 100644 --- a/Models/Instruments/ND/canvas/wxr_api.xml +++ b/Models/Instruments/ND/canvas/wxr_api.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index ced234bf..26c97fcd 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml index fa2021b5..8a0f0cfe 100644 --- a/Models/Instruments/OHpanel/OHpanelEPR.xml +++ b/Models/Instruments/OHpanel/OHpanelEPR.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml index 655894f7..5a892f14 100644 --- a/Models/Instruments/OHpanel/SteepAppr.xml +++ b/Models/Instruments/OHpanel/SteepAppr.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 4020ee91..2e93f345 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -1,5 +1,5 @@ # A3XX PFD -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var PFD_1 = nil; var PFD_2 = nil; @@ -46,7 +46,7 @@ var eng0_state = props.globals.getNode("/engines/engine[0]/state", 1); var eng1_state = props.globals.getNode("/engines/engine[1]/state", 1); var alpha_floor = props.globals.getNode("/fdm/jsbsim/fadec/alpha-floor", 1); var toga_lk = props.globals.getNode("/fdm/jsbsim/fadec/toga-lk", 1); -var thrust_limit = props.globals.getNode("/controls/engines/thrust-limit", 1); +var thrust_limit = props.globals.getNode("/fdm/jsbsim/fadec/limit/active-mode", 1); var flex = props.globals.getNode("/fdm/jsbsim/fadec/limit/flex-temp", 1); var lvr_clb = props.globals.getNode("/fdm/jsbsim/fadec/lvrclb", 1); var throt_box = props.globals.getNode("/modes/pfd/fma/throttle-mode-box", 1); diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index 13feac39..9517a932 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 56ff758d..a05c97fa 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index e99f8539..8f9108a0 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -1045,7 +1045,7 @@ input = { # fadec alphaFloor: "/fdm/jsbsim/fadec/alpha-floor", eprLimit: "/fdm/jsbsim/fadec/limit/active-epr", - thrustLimit: "/controls/engines/thrust-limit", + thrustLimit: "/fdm/jsbsim/fadec/limit/active-mode", n1Limit: "/fdm/jsbsim/fadec/limit/active-n1", flexTemp: "/fdm/jsbsim/fadec/limit/flex-temp", fadecPower1: "/systems/fadec/powered1", diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml index d2faf06f..bef4818d 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/beacon.xml b/Models/Lights/ALS/beacon.xml index a1057529..6c966637 100644 --- a/Models/Lights/ALS/beacon.xml +++ b/Models/Lights/ALS/beacon.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/greennav.xml b/Models/Lights/ALS/greennav.xml index 96b859d9..966746ea 100644 --- a/Models/Lights/ALS/greennav.xml +++ b/Models/Lights/ALS/greennav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/landinglightL.xml b/Models/Lights/ALS/landinglightL.xml index 015878a5..bc9c79b2 100644 --- a/Models/Lights/ALS/landinglightL.xml +++ b/Models/Lights/ALS/landinglightL.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/landinglightR.xml b/Models/Lights/ALS/landinglightR.xml index 7689bc57..0290d4b8 100644 --- a/Models/Lights/ALS/landinglightR.xml +++ b/Models/Lights/ALS/landinglightR.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/left-strobe.xml b/Models/Lights/ALS/left-strobe.xml index ae89339c..4713f2bf 100644 --- a/Models/Lights/ALS/left-strobe.xml +++ b/Models/Lights/ALS/left-strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/rednav.xml b/Models/Lights/ALS/rednav.xml index 144760e8..c86c9af9 100644 --- a/Models/Lights/ALS/rednav.xml +++ b/Models/Lights/ALS/rednav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/right-strobe.xml b/Models/Lights/ALS/right-strobe.xml index bda82a36..9c86ef10 100644 --- a/Models/Lights/ALS/right-strobe.xml +++ b/Models/Lights/ALS/right-strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/tail-strobe.xml b/Models/Lights/ALS/tail-strobe.xml index dfb7357a..f882efec 100644 --- a/Models/Lights/ALS/tail-strobe.xml +++ b/Models/Lights/ALS/tail-strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/tailnav.xml b/Models/Lights/ALS/tailnav.xml index 352f81b0..188db558 100644 --- a/Models/Lights/ALS/tailnav.xml +++ b/Models/Lights/ALS/tailnav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/taxilight.xml b/Models/Lights/ALS/taxilight.xml index 4321678b..74bad91a 100644 --- a/Models/Lights/ALS/taxilight.xml +++ b/Models/Lights/ALS/taxilight.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/turnoffL.xml b/Models/Lights/ALS/turnoffL.xml index 368c0b3c..e5e556af 100644 --- a/Models/Lights/ALS/turnoffL.xml +++ b/Models/Lights/ALS/turnoffL.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/turnoffR.xml b/Models/Lights/ALS/turnoffR.xml index 628b6aa7..66da00ce 100644 --- a/Models/Lights/ALS/turnoffR.xml +++ b/Models/Lights/ALS/turnoffR.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/beacon.xml b/Models/Lights/beacon.xml index abf920ba..59faaa20 100644 --- a/Models/Lights/beacon.xml +++ b/Models/Lights/beacon.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/greennav.xml b/Models/Lights/greennav.xml index 2d4a9e21..b1edd17d 100644 --- a/Models/Lights/greennav.xml +++ b/Models/Lights/greennav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/light-cone.xml b/Models/Lights/light-cone.xml index 14fdf3e6..800b7f84 100644 --- a/Models/Lights/light-cone.xml +++ b/Models/Lights/light-cone.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/rednav.xml b/Models/Lights/rednav.xml index 37b69a47..358f2249 100644 --- a/Models/Lights/rednav.xml +++ b/Models/Lights/rednav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/strobe.xml b/Models/Lights/strobe.xml index ab56500d..48f352c3 100644 --- a/Models/Lights/strobe.xml +++ b/Models/Lights/strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/tailnav.xml b/Models/Lights/tailnav.xml index 64f2ed18..b74fef38 100644 --- a/Models/Lights/tailnav.xml +++ b/Models/Lights/tailnav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/tailstrobe.xml b/Models/Lights/tailstrobe.xml index c9935374..a6b5d469 100644 --- a/Models/Lights/tailstrobe.xml +++ b/Models/Lights/tailstrobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml b/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml index 8b1f885c..dd1887b9 100644 --- a/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml +++ b/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml index 0fcb9614..a5999bb1 100644 --- a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml +++ b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Catering/warning-light.xml b/Models/Services/Catering/warning-light.xml index 8f0ad9e5..86454bb6 100644 --- a/Models/Services/Catering/warning-light.xml +++ b/Models/Services/Catering/warning-light.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/De-Icing/volvo_deicing_truck.xml b/Models/Services/De-Icing/volvo_deicing_truck.xml index 170548ed..556c9e9d 100644 --- a/Models/Services/De-Icing/volvo_deicing_truck.xml +++ b/Models/Services/De-Icing/volvo_deicing_truck.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Stairs/stairs.xml b/Models/Services/Stairs/stairs.xml index f7c6ee08..a83d34e8 100644 --- a/Models/Services/Stairs/stairs.xml +++ b/Models/Services/Stairs/stairs.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Wings/a320.sharklets.xml b/Models/Wings/a320.sharklets.xml index 87ca5dc5..42e2e0a9 100644 --- a/Models/Wings/a320.sharklets.xml +++ b/Models/Wings/a320.sharklets.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Wings/a320.winglets.xml b/Models/Wings/a320.winglets.xml index f1cee1a2..3b6e552e 100644 --- a/Models/Wings/a320.winglets.xml +++ b/Models/Wings/a320.winglets.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml index c98b139b..40422404 100644 --- a/Models/Wings/a320.wings.cfm.xml +++ b/Models/Wings/a320.wings.cfm.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml index b519572d..f7d7e27a 100644 --- a/Models/Wings/a320.wings.iae.xml +++ b/Models/Wings/a320.wings.iae.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml index 2b76b957..9e2ca174 100644 --- a/Models/Wings/a320.wings.neocfm.xml +++ b/Models/Wings/a320.wings.neocfm.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml index 7d466c6e..2e1321d9 100644 --- a/Models/Wings/a320.wings.neopw.xml +++ b/Models/Wings/a320.wings.neopw.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320neo.sharklets.xml b/Models/Wings/a320neo.sharklets.xml index f819313d..71155813 100644 --- a/Models/Wings/a320neo.sharklets.xml +++ b/Models/Wings/a320neo.sharklets.xml @@ -1,6 +1,6 @@ - + diff --git a/Nasal/ECAM/ECAM-main.nas b/Nasal/ECAM/ECAM-main.nas index bf56df2a..caf5ebaa 100644 --- a/Nasal/ECAM/ECAM-main.nas +++ b/Nasal/ECAM/ECAM-main.nas @@ -1,7 +1,7 @@ # A3XX ECAM # Joshua Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2020 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) +# Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) var ap_active = 0; var athr_active = 0; diff --git a/Nasal/Effects/icing.nas b/Nasal/Effects/icing.nas index ac417807..28bbbaa2 100644 --- a/Nasal/Effects/icing.nas +++ b/Nasal/Effects/icing.nas @@ -1,7 +1,7 @@ # A3XX Icing System # Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ### Ice sensitive components definition. diff --git a/Nasal/FBW/it-fbw.nas b/Nasal/FBW/it-fbw.nas index ab6fe620..d2567db3 100644 --- a/Nasal/FBW/it-fbw.nas +++ b/Nasal/FBW/it-fbw.nas @@ -1,7 +1,7 @@ # Airbus A3XX FBW/Flight Control Computer System # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var mmoIAS = 0; var cas = 0; diff --git a/Nasal/FMGC/FCU.nas b/Nasal/FMGC/FCU.nas index f7a30caa..0e03b355 100644 --- a/Nasal/FMGC/FCU.nas +++ b/Nasal/FMGC/FCU.nas @@ -1,5 +1,5 @@ # A3XX FCU -# Copyright (c) 2020 Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp) +# Copyright (c) 2021 Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp) # Nodes var fd1 = props.globals.getNode("/it-autoflight/output/fd1", 1); diff --git a/Nasal/FMGC/FMGC-b.nas b/Nasal/FMGC/FMGC-b.nas index 616d1451..4025043e 100644 --- a/Nasal/FMGC/FMGC-b.nas +++ b/Nasal/FMGC/FMGC-b.nas @@ -1,6 +1,6 @@ # A3XX FMGC Autopilot # Based off IT-AUTOFLIGHT System Controller V4.0.X -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Initialize all used variables and property nodes # Sim diff --git a/Nasal/FMGC/FMGC-c.nas b/Nasal/FMGC/FMGC-c.nas index 7578c343..5cb7354c 100644 --- a/Nasal/FMGC/FMGC-c.nas +++ b/Nasal/FMGC/FMGC-c.nas @@ -1,5 +1,5 @@ # A3XX FMGC/Autoflight -# Copyright (c) 2020 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) +# Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) var at = nil; var athr = nil; diff --git a/Nasal/FMGC/FMGC.nas b/Nasal/FMGC/FMGC.nas index 187d94eb..0acd4fed 100644 --- a/Nasal/FMGC/FMGC.nas +++ b/Nasal/FMGC/FMGC.nas @@ -1,5 +1,5 @@ # A3XX FMGC/Autoflight -# Copyright (c) 2020 Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp), and Matthew Maring (mattmaring) +# Copyright (c) 2021 Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp), and Matthew Maring (mattmaring) ################## # Init Functions # @@ -602,7 +602,7 @@ var masterFMGC = maketimer(0.2, func { n1_right = pts.Engines.Engine.n1Actual[1].getValue(); modelat = Modes.PFD.FMA.rollMode.getValue(); mode = Modes.PFD.FMA.pitchMode.getValue(); - gs = pts.Velocities.groundspeed.getValue(); + gs = pts.Velocities.groundspeedKt.getValue(); alt = pts.Instrumentation.Altimeter.indicatedFt.getValue(); # cruiseft = FMGCInternal.crzFt; # cruiseft_b = FMGCInternal.crzFt - 200; diff --git a/Nasal/FMGC/flightplan-waypoints.nas b/Nasal/FMGC/flightplan-waypoints.nas index a7808639..46818106 100644 --- a/Nasal/FMGC/flightplan-waypoints.nas +++ b/Nasal/FMGC/flightplan-waypoints.nas @@ -1,5 +1,5 @@ # A3XX FMGC Waypoint database -# Copyright (c) 2020 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) +# Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) var nilTree = { "latitude": 0, diff --git a/Nasal/FMGC/flightplan.nas b/Nasal/FMGC/flightplan.nas index cb71f578..2c2000cd 100644 --- a/Nasal/FMGC/flightplan.nas +++ b/Nasal/FMGC/flightplan.nas @@ -1,5 +1,5 @@ # A3XX FMGC Flightplan Driver -# Copyright (c) 2020 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) +# Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) var wpDep = nil; var wpArr = nil; diff --git a/Nasal/FMGC/mcdu-messages.nas b/Nasal/FMGC/mcdu-messages.nas index b3274ff5..cd5058a7 100644 --- a/Nasal/FMGC/mcdu-messages.nas +++ b/Nasal/FMGC/mcdu-messages.nas @@ -1,5 +1,5 @@ # A3XX FMGC MCDU Message Generator and Control -# Copyright (c) 2020 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) +# Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath (legoboyvdlp) var TypeIMessage = { new: func(msgText, isInhibit = 0) { diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas index 24dbb3a6..a7b2588f 100644 --- a/Nasal/Libraries/buttons.nas +++ b/Nasal/Libraries/buttons.nas @@ -1,7 +1,7 @@ # A3XX Buttons # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var OnLt = props.globals.getNode("/controls/switches/emerCallLtO"); var CallLt = props.globals.getNode("/controls/switches/emerCallLtC"); diff --git a/Nasal/Libraries/controls-override.nas b/Nasal/Libraries/controls-override.nas index 89f2b05f..33d1210a 100644 --- a/Nasal/Libraries/controls-override.nas +++ b/Nasal/Libraries/controls-override.nas @@ -1,7 +1,7 @@ # A320 Main Libraries # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ############ # Controls # diff --git a/Nasal/Libraries/custom-views.nas b/Nasal/Libraries/custom-views.nas index 230647e8..79755e8e 100644 --- a/Nasal/Libraries/custom-views.nas +++ b/Nasal/Libraries/custom-views.nas @@ -1,5 +1,5 @@ # Custom view positions -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ######### # Views # diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas index 5dddf09b..79f3ff86 100644 --- a/Nasal/Libraries/libraries.nas +++ b/Nasal/Libraries/libraries.nas @@ -1,7 +1,7 @@ # A320 Main Libraries # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) print("------------------------------------------------"); print("Copyright (c) 2016-2020 Josh Davidson (Octal450)"); diff --git a/Nasal/Libraries/property-tree-setup.nas b/Nasal/Libraries/property-tree-setup.nas index e6872d48..09504292 100644 --- a/Nasal/Libraries/property-tree-setup.nas +++ b/Nasal/Libraries/property-tree-setup.nas @@ -1,5 +1,5 @@ # A320 Property Tree Setup -# Copyright (c) 2020 Josh Davidson (Octal450) and Jonathan Redpath +# Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath # Nodes organized like property tree, except when lots of identical (example: Gear wow), where vectors are used to make it easier # Anything that says Temp is set by another file to avoid multiple getValue calls # Usage Example: pts.Class.SubClass.node.getValue() @@ -78,6 +78,7 @@ var Engines = { thrust: [props.globals.getNode("/engines/engine[0]/thrust-lb"), props.globals.getNode("/engines/engine[1]/thrust-lb")], reverser: [props.globals.getNode("/engines/engine[0]/reverser-pos-norm"), props.globals.getNode("/engines/engine[1]/reverser-pos-norm")], state: [props.globals.getNode("/engines/engine[0]/state"), props.globals.getNode("/engines/engine[1]/state")], + stateTemp: [0, 0], }, }; @@ -139,6 +140,7 @@ var Gear = { position: [props.globals.getNode("/gear/gear[0]/position-norm"), props.globals.getNode("/gear/gear[1]/position-norm"), props.globals.getNode("/gear/gear[2]/position-norm")], rollspeed: [props.globals.getNode("/gear/gear[0]/rollspeed-ms"), props.globals.getNode("/gear/gear[1]/rollspeed-ms"), props.globals.getNode("/gear/gear[2]/rollspeed-ms")], wow: [props.globals.getNode("/gear/gear[0]/wow"), props.globals.getNode("/gear/gear[1]/wow"), props.globals.getNode("/gear/gear[2]/wow")], + wowTemp: [0, 0, 0], }; var Instrumentation = { @@ -254,13 +256,13 @@ var Sim = { deltaRealtimeSec: props.globals.getNode("/sim/time/delta-realtime-sec"), elapsedSec: props.globals.getNode("/sim/time/elapsed-sec"), gmtString: props.globals.getNode("/sim/time/gmt-string"), - UTC: { + Utc: { day: props.globals.getNode("/sim/time/utc/day"), month: props.globals.getNode("/sim/time/utc/month"), year: props.globals.getNode("/sim/time/utc/year"), }, }, - Version: props.globals.getNode("/sim/version/flightgear"), + version: props.globals.getNode("/sim/version/flightgear"), View: { Config: { defaultFieldOfViewDeg: props.globals.getNode("/sim/view/config/default-field-of-view-deg", 1), @@ -269,8 +271,8 @@ var Sim = { }; var Velocities = { - airspeed: props.globals.getNode("/velocities/airspeed-kt"), - groundspeed: props.globals.getNode("/velocities/groundspeed-kt"), + airspeedKt: props.globals.getNode("/velocities/airspeed-kt"), + groundspeedKt: props.globals.getNode("/velocities/groundspeed-kt"), mach: props.globals.getNode("/velocities/mach"), }; diff --git a/Nasal/Libraries/shake.nas b/Nasal/Libraries/shake.nas index eb9e8091..8173f45b 100644 --- a/Nasal/Libraries/shake.nas +++ b/Nasal/Libraries/shake.nas @@ -1,6 +1,6 @@ # A3XX Shaking -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var shakeEffectA3XX = props.globals.initNode("/systems/shake/effect", 0, "BOOL"); var shakeA3XX = props.globals.initNode("/systems/shake/shaking", 0, "DOUBLE"); diff --git a/Nasal/Libraries/sounds.nas b/Nasal/Libraries/sounds.nas index fabe002d..bf255528 100644 --- a/Nasal/Libraries/sounds.nas +++ b/Nasal/Libraries/sounds.nas @@ -1,7 +1,7 @@ # A320 Main Libraries # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ########## # Sounds # diff --git a/Nasal/Libraries/zoom-views.nas b/Nasal/Libraries/zoom-views.nas index 62cd2ea0..3b53d43f 100644 --- a/Nasal/Libraries/zoom-views.nas +++ b/Nasal/Libraries/zoom-views.nas @@ -1,5 +1,5 @@ # Octal's Distance Zooming -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Based on PropertyRule file by onox var distance = 0; diff --git a/Nasal/MCDU/ARRIVAL.nas b/Nasal/MCDU/ARRIVAL.nas index d5343a17..6f59ca07 100644 --- a/Nasal/MCDU/ARRIVAL.nas +++ b/Nasal/MCDU/ARRIVAL.nas @@ -76,7 +76,7 @@ var arrivalPage = { if (fmgc.flightPlanController.flightplans[2].approach != nil) { me.selectedApproach = fmgc.flightPlanController.flightplans[2].approach; - version = pts.Sim.Version.getValue(); + version = pts.Sim.version.getValue(); if (version == "2020.2.0" or version == "2020.2.1" or version == "2020.3.0") { if (fmgc.flightPlanController.flightplans[2].approach_trans != nil) { me.selectedVIA = fmgc.flightPlanController.flightplans[2].approach_trans; @@ -101,7 +101,7 @@ var arrivalPage = { } else { if (fmgc.flightPlanController.flightplans[me.computer].approach != nil) { me.selectedApproach = fmgc.flightPlanController.flightplans[me.computer].approach; - version = pts.Sim.Version.getValue(); + version = pts.Sim.version.getValue(); if (version == "2020.2.0" or version == "2020.2.1" or version == "2020.3.0") { if (fmgc.flightPlanController.flightplans[me.computer].approach_trans != nil) { me.selectedVIA = fmgc.flightPlanController.flightplans[me.computer].approach_trans; @@ -111,7 +111,7 @@ var arrivalPage = { } } elsif (fmgc.flightPlanController.flightplans[2].approach != nil) { me.selectedApproach = fmgc.flightPlanController.flightplans[2].approach; - version = pts.Sim.Version.getValue(); + version = pts.Sim.version.getValue(); if (version == "2020.2.0" or version == "2020.2.1" or version == "2020.3.0") { if (fmgc.flightPlanController.flightplans[2].approach_trans != nil) { me.selectedVIA = fmgc.flightPlanController.flightplans[2].approach_trans; @@ -237,7 +237,7 @@ var arrivalPage = { }, updateActiveVIAs: func() { - version = pts.Sim.Version.getValue(); + version = pts.Sim.version.getValue(); if (version != "2020.2.0" and version != "2020.2.1" and version != "2020.3.0") { return; } if (me.selectedVIA == "NO VIA") { @@ -509,7 +509,7 @@ var arrivalPage = { canvas_mcdu.pageSwitch[me.computer].setBoolValue(0); }, updateVIAs: func() { - version = pts.Sim.Version.getValue(); + version = pts.Sim.version.getValue(); if (version != "2020.2.0" and version != "2020.2.1" and version != "2020.3.0") { return; } if (me.selectedApproach == nil or me.activePage != 2) { me.clearVias(); @@ -753,7 +753,7 @@ var arrivalPage = { }, arrPushbuttonLeft: func(index) { if (index == 2 and me.activePage == 1 and me.selectedApproach != nil) { - version = pts.Sim.Version.getValue(); + version = pts.Sim.version.getValue(); if (version != "2020.2.0" and version != "2020.2.1" and version != "2020.3.0") { return; } me.oldPage = me.activePage; me.activePage = 2; diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas index 8093bcc3..a707ea1f 100644 --- a/Nasal/MCDU/DATA.nas +++ b/Nasal/MCDU/DATA.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var dataInput = func(key, i) { if (key == "L1") { diff --git a/Nasal/MCDU/FLIGHTLOG.nas b/Nasal/MCDU/FLIGHTLOG.nas index cffe7bd4..07b13c1b 100644 --- a/Nasal/MCDU/FLIGHTLOG.nas +++ b/Nasal/MCDU/FLIGHTLOG.nas @@ -135,7 +135,7 @@ var lastgsrestart = 0; var waitingOOOIChange = maketimer(1, func(){ # 1sec precision var phase = fmgc.FMGCInternal.phase; - var gs = pts.Velocities.groundspeed.getValue(); + var gs = pts.Velocities.groundspeedKt.getValue(); var gear0 = pts.Gear.wow[0].getBoolValue(); #print(sprintf("OOOI check: %d %d %.2f %s",expectedOOOIState,phase,gs,gear0)); diff --git a/Nasal/MCDU/INITA.nas b/Nasal/MCDU/INITA.nas index 9d048ea0..f5c32123 100644 --- a/Nasal/MCDU/INITA.nas +++ b/Nasal/MCDU/INITA.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Copyright (c) 2020 Matthew Maring (mattmaring) var initInputA = func(key, i) { diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas index b045625c..52062268 100644 --- a/Nasal/MCDU/MCDU.nas +++ b/Nasal/MCDU/MCDU.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Copyright (c) 2020 Matthew Maring (mattmaring) var pageNode = [props.globals.getNode("/MCDU[0]/page"), props.globals.getNode("/MCDU[1]/page")]; diff --git a/Nasal/MCDU/PERFTO.nas b/Nasal/MCDU/PERFTO.nas index ced6d403..1c428e9d 100644 --- a/Nasal/MCDU/PERFTO.nas +++ b/Nasal/MCDU/PERFTO.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) # Copyright (c) 2020 Matthew Maring (mattmaring) # VMCA 109.5 at 0ft diff --git a/Nasal/MCDU/RADNAV.nas b/Nasal/MCDU/RADNAV.nas index 316fb799..3ff1d756 100644 --- a/Nasal/MCDU/RADNAV.nas +++ b/Nasal/MCDU/RADNAV.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var radnavInput = func(key, i) { var scratchpad = mcdu_scratchpad.scratchpads[i].scratchpad; diff --git a/Nasal/MCDU/STATUS.nas b/Nasal/MCDU/STATUS.nas index 754cac62..4cf8f195 100644 --- a/Nasal/MCDU/STATUS.nas +++ b/Nasal/MCDU/STATUS.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (Octal450), Jonathan Redpath, and Matthew Maring (mattmaring) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var statusInput = func(key, i) { if (key == "L3") { diff --git a/Nasal/Panels/clock.nas b/Nasal/Panels/clock.nas index 8cfcea5e..537a7d73 100644 --- a/Nasal/Panels/clock.nas +++ b/Nasal/Panels/clock.nas @@ -222,9 +222,9 @@ var start_loop = maketimer(0.1, func { chrono.etString.setValue("88 88"); clock.elapsedString.setValue("88:88"); } else { - day = pts.Sim.Time.UTC.day.getValue(); - month = pts.Sim.Time.UTC.month.getValue(); - year = pts.Sim.Time.UTC.year.getValue(); + day = pts.Sim.Time.Utc.day.getValue(); + month = pts.Sim.Time.Utc.month.getValue(); + year = pts.Sim.Time.Utc.year.getValue(); # Clock UTC_date = sprintf("%02d %02d %02d", month, day, substr(sprintf("%2d", year),1,2)); diff --git a/Nasal/Panels/efis.nas b/Nasal/Panels/efis.nas index 218032d8..5306ee93 100644 --- a/Nasal/Panels/efis.nas +++ b/Nasal/Panels/efis.nas @@ -1,5 +1,5 @@ # A3XX EFIS Controller -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var mode = "NAV"; var rng = 20; diff --git a/Nasal/Systems/ADIRS/ADR.nas b/Nasal/Systems/ADIRS/ADR.nas index 08d6d57d..43de30a9 100644 --- a/Nasal/Systems/ADIRS/ADR.nas +++ b/Nasal/Systems/ADIRS/ADR.nas @@ -148,7 +148,7 @@ var ADIRU = { alignLoop: func() { me._roll = pts.Orientation.roll.getValue(); me._pitch = pts.Orientation.pitch.getValue(); - me._gs = pts.Velocities.groundspeed.getValue(); + me._gs = pts.Velocities.groundspeedKt.getValue(); # todo use IR values if (me._gs > 5 or abs(me._pitch) > 5 or abs(me._roll) > 10) { diff --git a/Nasal/Systems/Comm/CPDLC.nas b/Nasal/Systems/Comm/CPDLC.nas index d145e758..09c63b75 100644 --- a/Nasal/Systems/Comm/CPDLC.nas +++ b/Nasal/Systems/Comm/CPDLC.nas @@ -1,7 +1,7 @@ # A3XX CPDLC # Jonathan Redpath -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var CPDLCmessage = { new: func(text, response = 0) { var cpdlcMessage = {parents: [CPDLCmessage] }; diff --git a/Nasal/Systems/Comm/Dictionary.nas b/Nasal/Systems/Comm/Dictionary.nas index 8d9e2655..cd2dc3cd 100644 --- a/Nasal/Systems/Comm/Dictionary.nas +++ b/Nasal/Systems/Comm/Dictionary.nas @@ -1,7 +1,7 @@ # A3XX Dictionary # Jonathan Redpath -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var DictionaryItemObj = { new: func(item, string) { var DI = {parents: [DictionaryItemObj]}; diff --git a/Nasal/Systems/Comm/HF.nas b/Nasal/Systems/Comm/HF.nas index 3440d4d6..ea92df77 100644 --- a/Nasal/Systems/Comm/HF.nas +++ b/Nasal/Systems/Comm/HF.nas @@ -1,7 +1,7 @@ # A3XX High Frequency Radio # Jonathan Redpath -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var highFrequencyRadio = { overrideDataLink: 0, diff --git a/Nasal/Systems/Comm/Notification.nas b/Nasal/Systems/Comm/Notification.nas index 5d01f494..0e7c6516 100644 --- a/Nasal/Systems/Comm/Notification.nas +++ b/Nasal/Systems/Comm/Notification.nas @@ -1,7 +1,7 @@ # A3XX Notification System # Jonathan Redpath -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var defaultServer = "https://www.aviationweather.gov/adds/dataserver_current/httpparam?dataSource=metars&requestType=retrieve&format=xml&mostRecent=true&hoursBeforeNow=12&stationString="; var result = nil; diff --git a/Nasal/Systems/Engines/engines-cfm.nas b/Nasal/Systems/Engines/engines-cfm.nas index 1219f967..c668b98e 100644 --- a/Nasal/Systems/Engines/engines-cfm.nas +++ b/Nasal/Systems/Engines/engines-cfm.nas @@ -1,7 +1,7 @@ # A3XX IAE V2500 Engine # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ##################### # Initializing Vars # diff --git a/Nasal/Systems/Engines/engines-common.nas b/Nasal/Systems/Engines/engines-common.nas index eda5c733..00f39a20 100644 --- a/Nasal/Systems/Engines/engines-common.nas +++ b/Nasal/Systems/Engines/engines-common.nas @@ -1,5 +1,5 @@ # A3XX Engine Control -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var manStart = [props.globals.initNode("/controls/engines/engine[0]/man-start", 0, "BOOL"),props.globals.initNode("/controls/engines/engine[1]/man-start", 0, "BOOL")]; var lastIgniter = [props.globals.getNode("/controls/engines/engine[0]/last-igniter"),props.globals.initNode("/controls/engines/engine[1]/last-igniter")]; diff --git a/Nasal/Systems/Engines/engines-iae.nas b/Nasal/Systems/Engines/engines-iae.nas index 6f3959e7..18415a4d 100644 --- a/Nasal/Systems/Engines/engines-iae.nas +++ b/Nasal/Systems/Engines/engines-iae.nas @@ -1,7 +1,7 @@ # A3XX IAE V2500 Engine # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ##################### # Initializing Vars # diff --git a/Nasal/Systems/brakesystem.nas b/Nasal/Systems/brakesystem.nas index b460b2cc..407417bc 100755 --- a/Nasal/Systems/brakesystem.nas +++ b/Nasal/Systems/brakesystem.nas @@ -1,7 +1,7 @@ # A3XX Autobrake and Braking # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) ########################################################################## @@ -169,7 +169,7 @@ var BrakeSystem = R_Thrust = 0; if (notification.gear1Wow) { - var V1 = pts.Velocities.groundspeed.getValue(); + var V1 = pts.Velocities.groundspeedKt.getValue(); var Mass = pts.Fdm.JSBsim.Inertia.weightLbs.getValue() * me.ScalingDivisor; # absorb some kinetic energy: @@ -376,7 +376,7 @@ var Autobrake = { }, arm_autobrake: func(mode) { me._wow0 = pts.Gear.wow[0].getBoolValue(); - me._gnd_speed = pts.Velocities.groundspeed.getValue(); + me._gnd_speed = pts.Velocities.groundspeedKt.getValue(); if (mode == 0) { # OFF absChk.stop(); if (me.active.getBoolValue()) { @@ -402,7 +402,7 @@ var Autobrake = { }, loop: func() { me._wow0 = pts.Gear.wow[0].getBoolValue(); - me._gnd_speed = pts.Velocities.groundspeed.getValue(); + me._gnd_speed = pts.Velocities.groundspeedKt.getValue(); me._mode = me.mode.getValue(); me._active = me.active.getBoolValue(); if (me._gnd_speed > 72) { diff --git a/Nasal/Systems/fadec-cfm.nas b/Nasal/Systems/fadec-cfm.nas index 7d0dbfb5..dc34cdb2 100644 --- a/Nasal/Systems/fadec-cfm.nas +++ b/Nasal/Systems/fadec-cfm.nas @@ -1,5 +1,5 @@ # A3XX CFM FADEC -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var powerAvailTemp = nil; var master1 = nil; diff --git a/Nasal/Systems/fadec-common.nas b/Nasal/Systems/fadec-common.nas index d7a89c79..f4e7e441 100644 --- a/Nasal/Systems/fadec-common.nas +++ b/Nasal/Systems/fadec-common.nas @@ -10,14 +10,16 @@ if (pts.Options.eng.getValue() == "IAE") { var FADEC = { alphaFloor: props.globals.getNode("/fdm/jsbsim/fadec/alpha-floor"), clbReduc: props.globals.getNode("/fdm/jsbsim/fadec/clbreduc-ft"), - detentOut: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/detent-out", 1), props.globals.getNode("/fdm/jsbsim/fadec/control-2/detent-out", 1)], - detentOutTemp: [0, 0], + detent: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/detent", 1), props.globals.getNode("/fdm/jsbsim/fadec/control-2/detent", 1)], + detentTemp: [0, 0], detentText: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/detent-text"), props.globals.getNode("/fdm/jsbsim/fadec/control-2/detent-text")], detentTextTemp: [0, 0], engOut: props.globals.getNode("/fdm/jsbsim/fadec/eng-out"), Limit: { activeEpr: props.globals.getNode("/fdm/jsbsim/fadec/limit/active-epr"), activeMode: props.globals.getNode("/fdm/jsbsim/fadec/limit/active-mode"), + activeModeInt: props.globals.getNode("/fdm/jsbsim/fadec/limit/active-mode-int"), # 0 TOGA, 1 MCT, 2 CL, 3 FLX, 4 MREV + activeModeIntTemp: 0, activeN1: props.globals.getNode("/fdm/jsbsim/fadec/limit/active-n1"), flexActive: props.globals.getNode("/fdm/jsbsim/fadec/limit/flex-active"), flexActiveCmd: props.globals.getNode("/fdm/jsbsim/fadec/limit/flex-active-cmd"), @@ -26,7 +28,6 @@ var FADEC = { lvrClb: props.globals.getNode("/fdm/jsbsim/fadec/lvrclb"), lvrClbStatus: 0, togaLk: props.globals.getNode("/fdm/jsbsim/fadec/toga-lk"), - thrustLimit: props.globals.getNode("/controls/engines/thrust-limit"), Lock: { thrLockAlert: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-alert"), thrLockCmd: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked"), @@ -39,6 +40,7 @@ var FADEC = { init: func() { me.engOut.setBoolValue(0); me.Limit.activeMode.setBoolValue("TOGA"); + me.Limit.activeModeInt.setValue(0); me.Limit.flexActive.setBoolValue(0); me.Limit.flexActiveCmd.setBoolValue(0); systems.FADEC_S.init(); @@ -52,12 +54,12 @@ var FADEC = { } }, cancelFlex: func() { - if (me.detentOut[0].getValue() != 4 and me.detentOut[1].getValue() != 4 and !pts.Gear.wow[1].getValue() and !pts.Gear.wow[2].getValue()) { + if (me.detent[0].getValue() != 4 and me.detent[1].getValue() != 4 and !pts.Gear.wow[1].getValue() and !pts.Gear.wow[2].getValue()) { me.Limit.flexActive.setBoolValue(0); } }, idleAthrOff: func() { - if (me.detentOut[0].getValue() == 0 and me.detentOut[1].getValue() == 0) { # And not in TOGA LK and not in ALPHA FLOOR + if (me.detent[0].getValue() == 0 and me.detent[1].getValue() == 0) { # And not in TOGA LK and not in ALPHA FLOOR if (fmgc.Input.athr.getValue() and pts.Position.gearAglFt.getValue() > 50) { fcu.athrOff("soft"); } else { @@ -66,17 +68,17 @@ var FADEC = { } }, updateDetent: func(n) { - me.detentOutTemp[n] = me.detentOut[n].getValue(); - if (me.detentOutTemp[n] == 6) { + me.detentTemp[n] = me.detent[n].getValue(); + if (me.detentTemp[n] == 6) { me.manThrAboveMct[n] = 1; me.detentText[n].setValue("TOGA"); if (!fmgc.Output.athr.getBoolValue() and me.canEngageAthr()) { fmgc.Input.athr.setValue(1); } - } else if (me.detentOutTemp[n] == 5) { + } else if (me.detentTemp[n] == 5) { me.manThrAboveMct[n] = 1; me.detentText[n].setValue("MAN THR"); - } else if (me.detentOutTemp[n] == 4) { + } else if (me.detentTemp[n] == 4) { me.manThrAboveMct[n] = 0; me.detentText[n].setValue("MCT"); if (me.engOut.getValue() != 1 and me.Limit.flexActive.getBoolValue()) { @@ -84,29 +86,43 @@ var FADEC = { fmgc.Input.athr.setValue(1); } } - } else if (me.detentOutTemp[n] == 3) { + } else if (me.detentTemp[n] == 3) { me.manThrAboveMct[n] = 0; me.detentText[n].setValue("MAN THR"); - } else if (me.detentOutTemp[n] == 2) { + } else if (me.detentTemp[n] == 2) { me.manThrAboveMct[n] = 0; me.detentText[n].setValue("CL"); - } else if (me.detentOutTemp[n] == 1) { + } else if (me.detentTemp[n] == 1) { me.manThrAboveMct[n] = 0; me.detentText[n].setValue("MAN"); - } else if (me.detentOutTemp[n] == 0) { + } else if (me.detentTemp[n] == 0) { me.manThrAboveMct[n] = 0; me.detentText[n].setValue("IDLE"); me.idleAthrOff(); } - if (me.detentOutTemp[n] != 4) { + if (me.detentTemp[n] != 4) { if (me.Limit.flexActiveCmd.getBoolValue()) { me.cancelFlex(); } } }, loop: func() { - FADEC_S.loop(); + FADEC_S.loop(); # Update engine specific elements + pts.Engines.Engine.stateTemp[0] = pts.Engines.Engine.state[0].getValue(); + pts.Engines.Engine.stateTemp[1] = pts.Engines.Engine.state[1].getValue(); + pts.Gear.wowTemp[1] = pts.Gear.wow[1].getValue(); + pts.Gear.wowTemp[2] = pts.Gear.wow[2].getValue(); + + if (me.Limit.flexActiveCmd.getBoolValue() and !me.n1Mode[0].getValue() and !me.n1Mode[1].getValue() and pts.Gear.wowTemp[1] and pts.Gear.wowTemp[2] and pts.Velocities.groundspeedKt.getValue() < 40 and (pts.Engines.Engine.stateTemp[0] == 3 or pts.Engines.Engine.stateTemp[1] == 3)) { + if (!me.Limit.flexActive.getBoolValue()) { + me.Limit.flexActive.setBoolValue(1); + } + } else if (!me.Limit.flexActiveCmd.getBoolValue() or pts.Engines.Engine.stateTemp[0] != 3 or pts.Engines.Engine.stateTemp[1] != 3) { + if (me.Limit.flexActive.getBoolValue()) { + me.Limit.flexActive.setBoolValue(0); + } + } }, thrustFlash: func() { me.detentTextTemp[0] = systems.FADEC.detentText[0].getValue(); @@ -143,13 +159,30 @@ var FADEC = { } } }, + updateTxt: func() { + me.Limit.activeModeIntTemp = me.Limit.activeModeInt.getValue(); + if (me.Limit.activeModeIntTemp == 0) { + me.Limit.activeMode.setValue("TOGA"); + } else if (me.Limit.activeModeIntTemp == 1) { + me.Limit.activeMode.setValue("MCT"); + } else if (me.Limit.activeModeIntTemp == 2) { + me.Limit.activeMode.setValue("CLB"); + } else if (me.Limit.activeModeIntTemp == 3) { + me.Limit.activeMode.setValue("FLX"); + } else if (me.Limit.activeModeIntTemp == 4) { + me.Limit.activeMode.setValue("MREV"); + } + }, }; var thrustFlashT = maketimer(0.5, FADEC, FADEC.thrustFlash); -setlistener("/fdm/jsbsim/fadec/control-1/detent-out", func { +setlistener("/fdm/jsbsim/fadec/control-1/detent", func() { FADEC.updateDetent(0); }, 0, 0); -setlistener("/fdm/jsbsim/fadec/control-2/detent-out", func { +setlistener("/fdm/jsbsim/fadec/control-2/detent", func() { FADEC.updateDetent(1); }, 0, 0); +setlistener("/fdm/jsbsim/fadec/limit/active-mode-int", func() { + FADEC.updateTxt(); +}, 0, 0); diff --git a/Nasal/Systems/fadec-iae.nas b/Nasal/Systems/fadec-iae.nas index 4bf6d889..b6717b0e 100644 --- a/Nasal/Systems/fadec-iae.nas +++ b/Nasal/Systems/fadec-iae.nas @@ -1,5 +1,5 @@ # A3XX IAE FADEC -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var powerAvailTemp = nil; var master1 = nil; diff --git a/Nasal/Systems/fire.nas b/Nasal/Systems/fire.nas index d7c74a47..13aeb390 100644 --- a/Nasal/Systems/fire.nas +++ b/Nasal/Systems/fire.nas @@ -1,7 +1,7 @@ # A3XX Fire System # Jonathan Redpath -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var elapsedTime = props.globals.getNode("/sim/time/elapsed-sec"); var apuTestBtn = props.globals.getNode("/controls/fire/apu-test-btn", 1); diff --git a/Nasal/Systems/fuel.nas b/Nasal/Systems/fuel.nas index a1933063..026124aa 100644 --- a/Nasal/Systems/fuel.nas +++ b/Nasal/Systems/fuel.nas @@ -1,7 +1,7 @@ # A3XX Fuel System # Joshua Davidson (Octal450) -# Copyright (c) 2020 Josh Davidson (Octal450) +# Copyright (c) 2021 Josh Davidson (Octal450) var FUEL = { offset1: 0, diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index fe68d7f3..405f7404 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1,4 +1,4 @@ - + diff --git a/Sounds/v2500-sound.xml b/Sounds/v2500-sound.xml index d4da2317..f61c38ca 100644 --- a/Sounds/v2500-sound.xml +++ b/Sounds/v2500-sound.xml @@ -1,4 +1,4 @@ - + diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index 0aa7c0e9..bedd2dc6 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml index 160c7dfa..ca2d58b7 100644 --- a/Systems/a320-cfm56-5b4-engine-fadec.xml +++ b/Systems/a320-cfm56-5b4-engine-fadec.xml @@ -10,6 +10,7 @@ fadec/limit/rated-thrust fadec/limit/min-n1 fadec/limit/max-n1 + fadec/limit/active-epr /controls/engines/engine[0]/throttle-lever @@ -171,18 +172,6 @@ - - - - fadec/limit/toga - - 18.9 0 - 104.0 1 - -
- - - fadec/limit/flex-rated-temp -fadec/limit/flex-temp @@ -257,23 +246,11 @@ - - - - fadec/limit/mct - - 18.9 0 - 104.0 1 - -
- - - fadec/limit/toga-ref - 0.9 + 0.91 @@ -294,31 +271,22 @@ - - - - - fadec/limit/climb - - 18.9 0 - 104.0 1 - -
- - + + /controls/engines/engine[0]/throttle + 20 + + - + - @@ -460,17 +428,19 @@ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/idle-t - fadec/control-1/detent-out + + /controls/engines/engine[1]/throttle + 20 + + - + - @@ -612,9 +582,9 @@ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/idle-t - fadec/control-2/detent-out + @@ -633,6 +603,70 @@ + + + + + fadec/control-1/detent + fadec/control-2/detent + + + + + + + + /engines/engine[0]/state ne 3 + /engines/engine[1]/state ne 3 + + + position/wow eq 0 + + + + + + + /controls/engines/engine[0]/reverse-cmd eq 1 + /controls/engines/engine[1]/reverse-cmd eq 1 + + + + fadec/max-detent le 2 + fadec/limit/eng-off-wow-switch eq 0 + + + fadec/max-detent eq 4 + fadec/limit/flex-active eq 1 + fadec/limit/eng-off-wow-switch eq 0 + + + fadec/max-detent le 4 + fadec/limit/flex-active eq 1 + fadec/limit/eng-off-wow-switch eq 1 + + + fadec/max-detent le 4 + fadec/limit/flex-active ne 1 + fadec/limit/eng-off-wow-switch eq 0 + + + + + + + fadec/limit/active-mode-int eq 0 + + + fadec/limit/active-mode-int eq 1 + fadec/limit/active-mode-int eq 3 + + + fadec/limit/active-mode-int eq 2 + + diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml new file mode 100644 index 00000000..b2746f3b --- /dev/null +++ b/Systems/a320-cockpit.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/Systems/a320-external-reactions.xml b/Systems/a320-external-reactions.xml index 5e95f632..30dc3f6e 100644 --- a/Systems/a320-external-reactions.xml +++ b/Systems/a320-external-reactions.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-fbw.xml b/Systems/a320-fbw.xml index 7ae53c6f..1d3940c4 100644 --- a/Systems/a320-fbw.xml +++ b/Systems/a320-fbw.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index da4b077a..5f1ea204 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-fwc-phases.xml b/Systems/a320-fwc-phases.xml index d72e1c1a..44be70b8 100644 --- a/Systems/a320-fwc-phases.xml +++ b/Systems/a320-fwc-phases.xml @@ -191,21 +191,21 @@ /controls/engines/engine[0]/throttle ge 0.779 - fadec/flex-active eq 1 + fadec/limit/flex-active eq 1 /controls/engines/engine[0]/throttle ge 0.99 - fadec/flex-active eq 0 + fadec/limit/flex-active eq 0 /controls/engines/engine[1]/throttle ge 0.779 - fadec/flex-active eq 1 + fadec/limit/flex-active eq 1 /controls/engines/engine[1]/throttle ge 0.99 - fadec/flex-active eq 0 + fadec/limit/flex-active eq 0 diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml index 1ee6fc85..c56da154 100644 --- a/Systems/a320-fwc.xml +++ b/Systems/a320-fwc.xml @@ -2640,25 +2640,25 @@ /ECAM/warnings/logic/eng/new-retard-logic ne 1 - fadec/flex-active eq 0 + fadec/limit/flex-active eq 0 /ECAM/warnings/logic/eng/thr-lever-2-mct-output eq 1 /ECAM/warnings/logic/eng/thr-lever-2-mcl-mct-output eq 1 - fadec/flex-active eq 1 + fadec/limit/flex-active eq 1 /ECAM/warnings/logic/eng/thr-lever-2-mcl-mct-output eq 1 - fadec/flex-active eq 0 + fadec/limit/flex-active eq 0 /ECAM/warnings/logic/eng/thr-lever-1-mct-output eq 1 /ECAM/warnings/logic/eng/thr-lever-1-mcl-mct-output eq 1 - fadec/flex-active eq 1 + fadec/limit/flex-active eq 1 /ECAM/warnings/logic/eng/thr-lever-1-mcl-mct-output eq 1 diff --git a/Systems/a320-ground-reactions.xml b/Systems/a320-ground-reactions.xml index 0610658c..d0dbd216 100644 --- a/Systems/a320-ground-reactions.xml +++ b/Systems/a320-ground-reactions.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-libraries.xml b/Systems/a320-libraries.xml index c1deb0d6..84d45f2f 100644 --- a/Systems/a320-libraries.xml +++ b/Systems/a320-libraries.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-metrics.xml b/Systems/a320-metrics.xml index 5084da43..50dcbfe8 100644 --- a/Systems/a320-metrics.xml +++ b/Systems/a320-metrics.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml index 92f41dbb..ef9ef380 100644 --- a/Systems/a320-spoiler.xml +++ b/Systems/a320-spoiler.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/cfm56-sound.xml b/Systems/cfm56-sound.xml index 2fd60e55..41a5b428 100644 --- a/Systems/cfm56-sound.xml +++ b/Systems/cfm56-sound.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml index 9aca49cd..7a127d71 100644 --- a/Systems/ecam-proprules.xml +++ b/Systems/ecam-proprules.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml index 06bcd645..e14006d2 100644 --- a/Systems/fadec-cfm.xml +++ b/Systems/fadec-cfm.xml @@ -1,6 +1,6 @@ - + @@ -216,7 +216,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -257,7 +257,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -333,7 +333,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -383,7 +383,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -442,7 +442,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -551,7 +551,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -601,7 +601,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -660,7 +660,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -748,7 +748,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -815,7 +815,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -865,7 +865,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -928,7 +928,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -995,7 +995,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1045,7 +1045,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1169,7 +1169,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -1226,7 +1226,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml index 3b6f285f..1d453fea 100644 --- a/Systems/fadec-iae.xml +++ b/Systems/fadec-iae.xml @@ -1,6 +1,6 @@ - + @@ -311,7 +311,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -418,7 +418,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -489,7 +489,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -529,7 +529,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -605,7 +605,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -655,7 +655,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -714,7 +714,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -823,7 +823,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -873,7 +873,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -932,7 +932,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1020,7 +1020,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1087,7 +1087,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1137,7 +1137,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1200,7 +1200,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1267,7 +1267,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1317,7 +1317,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -1559,7 +1559,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX @@ -1616,7 +1616,7 @@ - /controls/engines/thrust-limit + /fdm/jsbsim/fadec/limit/active-mode FLX diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml index 201c4133..6f7dca58 100644 --- a/Systems/fbw-pitch.xml +++ b/Systems/fbw-pitch.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/flight-recorder.xml b/Systems/flight-recorder.xml index ae3f52c0..a36e3356 100644 --- a/Systems/flight-recorder.xml +++ b/Systems/flight-recorder.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index 28d26a6c..193f4260 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index 2d3ab56a..3c82e56c 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml index eca41fc3..1157677f 100644 --- a/Systems/fmgc-thrust.xml +++ b/Systems/fmgc-thrust.xml @@ -1,6 +1,6 @@ - + @@ -185,7 +185,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -308,7 +308,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -433,7 +433,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -544,7 +544,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 @@ -633,7 +633,7 @@ 1 - /fdm/jsbsim/fadec/flex-active + /fdm/jsbsim/fadec/limit/flex-active 0 diff --git a/Systems/glass-effect.xml b/Systems/glass-effect.xml index 5d6f5d69..d6dba82f 100644 --- a/Systems/glass-effect.xml +++ b/Systems/glass-effect.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml index f8910b0f..8b4f5b76 100644 --- a/Systems/instrumentation.xml +++ b/Systems/instrumentation.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/leapx-sound.xml b/Systems/leapx-sound.xml index 07efae21..c0f86d3a 100644 --- a/Systems/leapx-sound.xml +++ b/Systems/leapx-sound.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/libraries.xml b/Systems/libraries.xml index 082d22d0..114d6ed2 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/lower-ecam.xml b/Systems/lower-ecam.xml index e89b1be9..188d542f 100644 --- a/Systems/lower-ecam.xml +++ b/Systems/lower-ecam.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/pfd.xml b/Systems/pfd.xml index 733054dc..7c66e40c 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/sound-common.xml b/Systems/sound-common.xml index eabc0903..a6cb9df8 100644 --- a/Systems/sound-common.xml +++ b/Systems/sound-common.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml index d5fdfde3..607af68f 100644 --- a/Systems/upper-ecam.xml +++ b/Systems/upper-ecam.xml @@ -1,6 +1,6 @@ - + @@ -388,7 +388,7 @@ - /fdm/jsbsim/fadec/n1/toga-lim + /fdm/jsbsim/fadec/limit/toga 20.0-131 50.0 -64100.0 48 diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml index 8dffabc4..44acd15e 100644 --- a/Systems/v2500-sound.xml +++ b/Systems/v2500-sound.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/dialogs/a3xx-autoflight-dlg.xml b/gui/dialogs/a3xx-autoflight-dlg.xml index c9002aa0..dbc4c50a 100644 --- a/gui/dialogs/a3xx-autoflight-dlg.xml +++ b/gui/dialogs/a3xx-autoflight-dlg.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/dialogs/mcdu1-dlg.xml b/gui/dialogs/mcdu1-dlg.xml index c914f6fe..fb8ea23a 100644 --- a/gui/dialogs/mcdu1-dlg.xml +++ b/gui/dialogs/mcdu1-dlg.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/dialogs/mcdu2-dlg.xml b/gui/dialogs/mcdu2-dlg.xml index cac9ea9b..c258158b 100644 --- a/gui/dialogs/mcdu2-dlg.xml +++ b/gui/dialogs/mcdu2-dlg.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/it-gui.xml b/gui/it-gui.xml index ddbe6793..494e04e0 100644 --- a/gui/it-gui.xml +++ b/gui/it-gui.xml @@ -2,7 +2,7 @@ - +