From 879deba025a54d3a9e3fe0b1a7b4875ee6315aa1 Mon Sep 17 00:00:00 2001 From: vezza Date: Mon, 30 Nov 2020 00:08:21 +0100 Subject: [PATCH 1/9] Hydraulic and brake system improvements - loss of braking if no hydraulic pressure; - code restyling; --- Models/FlightDeck/a320.flightdeck.xml | 2 +- Nasal/Systems/hydraulics.nas | 42 +++++++++++++++------------ Systems/a320-fcs.xml | 12 ++++---- Systems/a320-hydraulic.xml | 32 ++++++++++++++++++-- 4 files changed, 62 insertions(+), 26 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 2d6e31c2..8e1cd12a 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -428,7 +428,7 @@ rotate brakes_accum_psi - systems/hydraulic/brakes/accumulator-pressure-psi + systems/hydraulic/yellow-accumulator-psi 00 700-20 diff --git a/Nasal/Systems/hydraulics.nas b/Nasal/Systems/hydraulics.nas index 5d40f9fc..cd9e5779 100644 --- a/Nasal/Systems/hydraulics.nas +++ b/Nasal/Systems/hydraulics.nas @@ -7,7 +7,7 @@ var rcont = 0; var HYD = { Brakes: { - accumPressPsi: props.globals.initNode("/systems/hydraulic/brakes/accumulator-pressure-psi", 0, "INT"), + accumPressPsi: props.globals.initNode("/systems/hydraulic/yellow-accumulator-psi-cmd", 0, "INT"), leftPressPsi: props.globals.initNode("/systems/hydraulic/brakes/pressure-left-psi", 0, "INT"), rightPressPsi: props.globals.initNode("/systems/hydraulic/brakes/pressure-right-psi", 0, "INT"), askidSw: props.globals.initNode("/systems/hydraulic/brakes/askidnwssw", 1, "BOOL"), @@ -91,9 +91,6 @@ var HYD = { } else { me.Brakes.askidSw.setBoolValue(0); #false } - if (me.Psi.yellow.getValue() > 0 and me.Brakes.accumPressPsi.getValue() < 3000 and me.Psi.yellow.getValue() > me.Brakes.accumPressPsi.getValue()) { - me.Brakes.accumPressPsi.setValue(me.Brakes.accumPressPsi.getValue() + 50); - } # Decrease accumPressPsi when green and yellow hydraulic's aren't pressurized if (me.Brakes.leftbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { @@ -106,13 +103,11 @@ var HYD = { } else { rcont = 0; } - if ((me.Psi.green.getValue() == 0) and (me.Psi.yellow.getValue() == 0) and (me.Brakes.accumPressPsi.getValue()) > 0) { + if (me.Psi.yellow.getValue() < me.Brakes.accumPressPsi.getValue() and me.Brakes.accumPressPsi.getValue() > 0) { if (lcont == 1) { - #me.Brakes.accumPressPsi.setValue(me.Brakes.accumPressPsi.getValue() - (35 * me.Brakes.leftbrake.getValue())); me.Brakes.accumPressPsi.setValue(me.Brakes.accumPressPsi.getValue() - 200); } if (rcont == 1) { - #me.Brakes.accumPressPsi.setValue(me.Brakes.accumPressPsi.getValue() - (35 * me.Brakes.leftbrake.getValue())); me.Brakes.accumPressPsi.setValue(me.Brakes.accumPressPsi.getValue() - 200); } if (me.Brakes.accumPressPsi.getValue() < 0) { @@ -124,52 +119,63 @@ var HYD = { if (me.Brakes.mode.getValue() == 1 or (me.Brakes.mode.getValue() == 2 and me.Psi.green.getValue() >= 2500)) { # Normal braking - Green OK if (me.Brakes.leftbrake.getValue() > 0) { - me.Brakes.leftPressPsi.setValue(props.globals.getValue("/systems/hydraulic/green-psi-ptu")); + me.Brakes.leftPressPsi.setValue(me.Psi.green.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { me.Brakes.leftPressPsi.setValue(0); } if (me.Brakes.rightbrake.getValue() > 0) { - me.Brakes.rightPressPsi.setValue(props.globals.getValue("/systems/hydraulic/green-psi-ptu")); + me.Brakes.rightPressPsi.setValue(me.Psi.green.getValue() * pts.Fdm.JSBsim.Fcs.brake[1].getValue()); } else { me.Brakes.rightPressPsi.setValue(0); } } 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 props.globals.getValue("/systems/electrical/serviceable")) { + 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(props.globals.getValue("/systems/hydraulic/yellow-psi-ptu")); + me.Brakes.leftPressPsi.setValue(me.Psi.yellow.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { me.Brakes.leftPressPsi.setValue(0); } if (me.Brakes.rightbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { - me.Brakes.rightPressPsi.setValue(props.globals.getValue("/systems/hydraulic/yellow-psi-ptu")); + me.Brakes.rightPressPsi.setValue(me.Psi.yellow.getValue() * pts.Fdm.JSBsim.Fcs.brake[1].getValue()); } else { me.Brakes.rightPressPsi.setValue(0); } } 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 props.globals.getValue("/systems/electrical/serviceable")) { + 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); + me.Brakes.leftPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { me.Brakes.leftPressPsi.setValue(0); } if (me.Brakes.rightbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { - me.Brakes.rightPressPsi.setValue(1000); + me.Brakes.rightPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[1].getValue()); } else { me.Brakes.rightPressPsi.setValue(0); } } else { # Alternate Braking (Yellow KO or Antiskid KO or electric KO) - missing condition: BSCU OK-KO - if (me.Psi.yellow.getValue() < 2500 or !me.Brakes.askidSw.getValue() or !props.globals.getValue("/systems/electrical/serviceable")) { + 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()); + me.Brakes.leftPressPsi.setValue(me.Brakes.accumPressPsi.getValue() * pts.Fdm.JSBsim.Fcs.brake[0].getValue()); } else { me.Brakes.leftPressPsi.setValue(0); } if (me.Brakes.rightbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { - me.Brakes.rightPressPsi.setValue(me.Brakes.accumPressPsi.getValue()); + me.Brakes.rightPressPsi.setValue(me.Brakes.accumPressPsi.getValue() * pts.Fdm.JSBsim.Fcs.brake[1].getValue()); + } else { + me.Brakes.rightPressPsi.setValue(0); + } + } else { + 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 { + me.Brakes.leftPressPsi.setValue(0); + } + if (me.Brakes.rightbrake.getValue() > 0 or me.Brakes.mode.getValue() == 0) { + me.Brakes.rightPressPsi.setValue(1000 * pts.Fdm.JSBsim.Fcs.brake[1].getValue()); } else { me.Brakes.rightPressPsi.setValue(0); } diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 76bd273b..aedce979 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1172,11 +1172,13 @@ - - + + + /systems/hydraulic/green-psi ge 2500 + /systems/hydraulic/yellow-psi ge 1000 + /systems/hydraulic/yellow-accumulator-psi gt 0 + + fcs/brake-avail diff --git a/Systems/a320-hydraulic.xml b/Systems/a320-hydraulic.xml index 89113580..097c3c47 100644 --- a/Systems/a320-hydraulic.xml +++ b/Systems/a320-hydraulic.xml @@ -386,7 +386,7 @@ - + /systems/hydraulic/yellow-psi-cmd /systems/hydraulic/sys-incr-rate @@ -397,6 +397,34 @@ /systems/hydraulic/yellow-psi 0.9 + + + + + + + /systems/hydraulic/yellow-psi + 0 + + + /systems/hydraulic/yellow-psi + /systems/hydraulic/yellow-accumulator-psi-cmd + + + + /systems/hydraulic/yellow-psi + /systems/hydraulic/yellow-accumulator-psi-cmd + + /systems/hydraulic/yellow-accumulator-psi-cmd + + + + + + /systems/hydraulic/yellow-accumulator-psi-cmd + /systems/hydraulic/sys-incr-rate + /systems/hydraulic/sys-decr-rate + @@ -510,7 +538,7 @@ /controls/gear/brake-parking ne 1 - /systems/hydraulic/brakes/accumulator-pressure-psi ge 0 + /systems/hydraulic/yellow-accumulator-psi-cmd ge 0 From 52b853ff0683121e6360215f242f79391dabe8f6 Mon Sep 17 00:00:00 2001 From: Wesley <69126784+C-FWES@users.noreply.github.com> Date: Sun, 29 Nov 2020 19:36:15 -0500 Subject: [PATCH 2/9] Correct typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38206505..53eeea83 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # A320-family A very advanced simulation of the Airbus A320 Family for FlightGear. -- Flight Dyanmics: Josh Davidson (Octal450) +- Flight Dynamics: Josh Davidson (Octal450) - Systems: Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp), merspieler, Matthew Maring (mattmaring) - Displays: Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp), merspieler, Matthew Maring (mattmaring) - 3D/Textures: Thorsten Herrmann (TH-555), Semir Gebran (CaptB) From 78f4f8ff6353273277741b4cad49cec23a1f460c Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Tue, 1 Dec 2020 11:25:31 -0500 Subject: [PATCH 3/9] Control: Fix the trim --- Nasal/Libraries/controls-override.nas | 6 +++--- Systems/a320-fcs.xml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Nasal/Libraries/controls-override.nas b/Nasal/Libraries/controls-override.nas index 0d1ec0ed..89f2b05f 100644 --- a/Nasal/Libraries/controls-override.nas +++ b/Nasal/Libraries/controls-override.nas @@ -79,10 +79,10 @@ controls.flapsDown = func(step) { } controls.elevatorTrim = func(d) { - if (systems.HYD.Psi.green.getValue() >= 1500) { - slewProp("/controls/flight/elevator-trim", d * 0.0185); # Rate in JSB normalized (0.125 / 13.5) + if (systems.HYD.Psi.green.getValue() >= 1500 or systems.HYD.Psi.yellow.getValue() >= 1500) { + slewProp("/controls/flight/elevator-trim", d * 0.0185); # Rate in JSB normalized (0.25 / 13.5) } else { - slewProp("/controls/flight/elevator-trim", d * 0.0092) # Rate in JSB normalized (0.125 / 13.5) + slewProp("/controls/flight/elevator-trim", d * 0.0092) # Handcranking? } } diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index aedce979..07f04250 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -372,12 +372,13 @@ - + /systems/failures/fctl/ths-jam eq 1 /systems/hydraulic/yellow-psi ge 1500 /systems/hydraulic/green-psi ge 1500 + /systems/acconfig/autoconfig-running eq 1 From 2477187dc7a62277bd922e7d33ff4ebc092188dd Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Fri, 4 Dec 2020 18:34:52 +0000 Subject: [PATCH 4/9] Lower ECAM: display of gross weight now comes from FMGC. So it is dashed in phase 1, and also in future will be inaccurate if you enter bad ZFW --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index cfc1cc34..cbfddbc6 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -510,12 +510,21 @@ var canvas_lowerECAM_base = { me["UTCh"].setText(sprintf("%02d", hour.getValue())); me["UTCm"].setText(sprintf("%02d", minute.getValue())); - me.gwStore = pts.Fdm.JSBsim.Inertia.weightLbs.getValue(); + if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and ecam.phaseNode.getValue() != 1) { + if (acconfig_weight_kgs.getValue()) { + me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); + } else { + me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000, 100))); + } + me["GW"].setColor(0.0509,0.7529,0.2941); + } else { + me["GW"].setText(sprintf("%s", "-----")); + me["GW"].setColor(0.0901,0.6039,0.7176); + } + if (acconfig_weight_kgs.getValue()) { - me["GW"].setText(sprintf("%s", math.round(math.round(me.gwStore * LBS2KGS, 100)))); me["GW-weight-unit"].setText("KG"); } else { - me["GW"].setText(sprintf("%s", math.round(me.gwStore, 100))); me["GW-weight-unit"].setText("LBS"); } }, From 97cf4f8c6024614e041bef27e8b2052b1088b10f Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Sat, 5 Dec 2020 12:32:12 +0000 Subject: [PATCH 5/9] 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 7/9] 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 8/9] 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 9/9] 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); }