From 97cf4f8c6024614e041bef27e8b2052b1088b10f Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Sat, 5 Dec 2020 12:32:12 +0000 Subject: [PATCH 1/5] A320-main.xml --- A320-main.xml | 219 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 205 insertions(+), 14 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index e71cfca1..a7b19a40 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -2513,18 +2513,18 @@ - /FMGC/keyboard-left - /FMGC/keyboard-right - - - sim/current-view/name - Walk View - - - sim/current-view/name - Walker Orbit View - - + /FMGC/keyboard-left + /FMGC/keyboard-right + + + sim/current-view/name + Walk View + + + sim/current-view/name + Walker Orbit View + + property-assign @@ -2659,6 +2659,65 @@ SHIFT-d Autopilot Disconnect + + property-assign + + + /FMGC/keyboard-left + /FMGC/keyboard-right + + + sim/current-view/name + Walk View + + + sim/current-view/name + Walker Orbit View + + + + + sim/walker/key-triggers/slide + 1 + + + property-assign + + /FMGC/keyboard-left + /FMGC/keyboard-right + + sim/walker/key-triggers/speed + sim/walker/speed-mps + + + property-multiply + + /FMGC/keyboard-left + /FMGC/keyboard-right + + sim/walker/key-triggers/speed + 2.5 + + + + property-assign + + /FMGC/keyboard-left + /FMGC/keyboard-right + + sim/walker/key-triggers/slide + 0 + + + property-assign + + /FMGC/keyboard-left + /FMGC/keyboard-right + + sim/walker/key-triggers/speed + sim/walker/speed-mps + + /FMGC/keyboard-left @@ -2675,8 +2734,22 @@ - /FMGC/keyboard-left - /FMGC/keyboard-right + + /FMGC/keyboard-left + /FMGC/keyboard-right + + + sim/current-view/name + Walk View + + + + + sim/current-view/name + Walker Orbit View + + + nasal - - - - property-assign - /controls/adirs/skip - 1 - - From fe8877c5c1f137b5abaad6c111615e6fabe7a33a Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Sun, 6 Dec 2020 14:59:58 +0000 Subject: [PATCH 3/5] Typo fix --- Nasal/Systems/hydraulics.nas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Nasal/Systems/hydraulics.nas b/Nasal/Systems/hydraulics.nas index cd9e5779..c3cb02c2 100644 --- a/Nasal/Systems/hydraulics.nas +++ b/Nasal/Systems/hydraulics.nas @@ -131,7 +131,7 @@ var HYD = { } else { if ((me.Brakes.mode.getValue() == 2 and me.Psi.green.getValue() < 2500) or me.Brakes.mode.getValue() == 0) { # Alternate Braking (Yellow OK + Antiskid ON + electric OK) - missing condition: BSCU OK-KO - if (me.Psi.yellow.getValue() >= 2500 and me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcess.getValue() >= 24)) { + if (me.Psi.yellow.getValue() >= 2500 and me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcEss.getValue() >= 24)) { if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { me.Brakes.leftPressPsi.setValue(me.Psi.yellow.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { @@ -144,7 +144,7 @@ var HYD = { } } else { # Alternate Braking (Yellow OK + Antiskid OFF + electric OK) - missing condition: BSCU OK-KO - if (me.Psi.yellow.getValue() >= 2500 and !me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcess.getValue() >= 24)) { + if (me.Psi.yellow.getValue() >= 2500 and !me.Brakes.askidSw.getValue() and (systems.ELEC.Bus.dc1.getValue() >= 24 or systems.ELEC.Bus.dc2.getValue() >= 24 or systems.ELEC.Bus.dcEss.getValue() >= 24)) { if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { me.Brakes.leftPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { @@ -157,7 +157,7 @@ var HYD = { } } else { # Alternate Braking (Yellow KO or Antiskid KO or electric KO) - missing condition: BSCU OK-KO - if (me.Brakes.accumPressPsi.getValue() < 1000 and (me.Psi.yellow.getValue() < 2500 or !me.Brakes.askidSw.getValue() or (systems.ELEC.Bus.dc1.getValue() < 24 and systems.ELEC.Bus.dc2.getValue() < 24 and systems.ELEC.Bus.dcess.getValue() < 24))) { + if (me.Brakes.accumPressPsi.getValue() < 1000 and (me.Psi.yellow.getValue() < 2500 or !me.Brakes.askidSw.getValue() or (systems.ELEC.Bus.dc1.getValue() < 24 and systems.ELEC.Bus.dc2.getValue() < 24 and systems.ELEC.Bus.dcEss.getValue() < 24))) { if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { me.Brakes.leftPressPsi.setValue(me.Brakes.accumPressPsi.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { From 830108dc8cb4af287b00367ffa911156841ec49a Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Sun, 6 Dec 2020 15:16:18 +0000 Subject: [PATCH 4/5] What was this --- Models/Instruments/IESI/IESI.nas | 2 -- 1 file changed, 2 deletions(-) diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index b0432cc8..4ad0a965 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -282,8 +282,6 @@ var showIESI = func { dlg.setCanvas(A320IESI.MainScreen.canvas); } -setlistener("", func() { if (A320IESI.MainScreen != nil) { A320IESI.MainScreen.updateQNH(notification); } }, 0, 0); - var roundabout = func(x) { var y = x - int(x); return y < 0.5 ? int(x) : 1 + int(x); From 72cebd9077a9995954ef306298301561e66bed76 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Wed, 9 Dec 2020 19:16:17 +0000 Subject: [PATCH 5/5] bugfix for simbrief parser --- Nasal/FMGC/SimbriefParser.nas | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Nasal/FMGC/SimbriefParser.nas b/Nasal/FMGC/SimbriefParser.nas index 47b2b640..c563d9aa 100644 --- a/Nasal/FMGC/SimbriefParser.nas +++ b/Nasal/FMGC/SimbriefParser.nas @@ -59,9 +59,9 @@ var SimbriefParser = { } if (size(result) == 0) { return nil; } - foreach (var test; result) { - if (math.abs(test.lat - coords.lat()) < 0.01666666666 and math.abs(test.lon - coords.lon()) < 0.01666666666) { - return test; + forindex (var test; result) { + if (math.abs(result[test].lat - coords.lat()) < 0.01666666666 and math.abs(result[test].lon - coords.lon()) < 0.01666666666) { + return result[test]; } } return nil; @@ -170,11 +170,13 @@ var SimbriefParser = { ofpFix.getNode("pos_lat").getValue(), ofpFix.getNode("pos_long").getValue()); - wp = me.tryFindByCoord(coords,ident,"fix"); - wp = me.tryFindByCoord(coords,ident,"nav"); - if (wp == nil) { + #wp = me.tryFindByCoord(coords,ident,"fix"); + #if (wp == nil) { + # wp = me.tryFindByCoord(coords,ident,"nav"); + #} + #if (wp == nil) { wp = createWP(coords, ident); - } + #} append(wps, wp); }