From 5080ae8c994eb21ca50f7e7fd620b4fbee28e3c4 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Tue, 6 Oct 2020 21:58:18 +0100
Subject: [PATCH] FG1000: Fuel Publisher and PanDown bug-fix

Previously the GenericFuelPublisher would barf if tank contents
weren't defined properly with numbers.

Also the XML and .ac files were inconsistent in their use of PANDown
vs PanDown.

Both spotted by Mark JOSEPH (ePilot). Now fixed.
---
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml       | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml       | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml       | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml       | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml        | 4 ++--
 Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.1.ac   | 2 +-
 Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.2.ac   | 2 +-
 Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.3.ac   | 2 +-
 Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.4.ac   | 2 +-
 .../FG1000/Nasal/Interfaces/GenericFuelPublisher.nas         | 5 +++--
 17 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
index 391b32a41..0b9d2870b 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
@@ -46,7 +46,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -99,7 +99,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
index 8fbba3844..50d5b06ab 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
@@ -46,7 +46,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -99,7 +99,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
index 04221697d..fe22cd6ed 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
@@ -46,7 +46,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -99,7 +99,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
index c9678ba90..f15792377 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
@@ -46,7 +46,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -99,7 +99,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
index 97ed90428..15ef4f49e 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
index ca99f7c29..786dd8276 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
index 0277dc1b6..698feaa9d 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
index 30d344e54..6569bcf9c 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
index e81fdeaee..37749cbd9 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
index 86daa9636..65ca4a053 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
index ea75ec205..d13920812 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
index 6345b79a4..dee28b9f1 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
@@ -58,7 +58,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
@@ -123,7 +123,7 @@
     <object-name>PANUp</object-name>
     <object-name>PANLeft</object-name>
     <object-name>PANRight</object-name>
-    <object-name>PanDown</object-name>
+    <object-name>PANDOWN</object-name>
     <object-name>DidectTo</object-name>
     <object-name>MENU</object-name>
     <object-name>FPL</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.1.ac b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.1.ac
index 50c03fb92..224e04b13 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.1.ac
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.1.ac
@@ -48872,7 +48872,7 @@ refs 4
 86 0.698556 0.475521
 kids 0
 OBJECT poly
-name "PanDown"
+name "PANDown"
 loc 0.0025526 -0.0225207 -0.1297603
 crease 61.0
 texture "FG1000.png"
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.2.ac b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.2.ac
index 8344f0e86..25f194afc 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.2.ac
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.2.ac
@@ -48872,7 +48872,7 @@ refs 4
 86 0.698556 0.475521
 kids 0
 OBJECT poly
-name "PanDown"
+name "PANDown"
 loc 0.0025553 -0.0225222 -0.1303993
 crease 61.0
 texture "FG1000.png"
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.3.ac b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.3.ac
index 4aa2322f5..156ad724b 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.3.ac
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.3.ac
@@ -48872,7 +48872,7 @@ refs 4
 86 0.698556 0.475521
 kids 0
 OBJECT poly
-name "PanDown"
+name "PANDown"
 loc 0.0025549 -0.0225220 -0.1303065
 crease 61.0
 texture "FG1000.png"
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.4.ac b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.4.ac
index 023c6dcc5..c01e5af88 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.4.ac
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/Model/GDU-104X.4.ac
@@ -48872,7 +48872,7 @@ refs 4
 86 0.698556 0.475521
 kids 0
 OBJECT poly
-name "PanDown"
+name "PANDown"
 loc 0.0025552 -0.0225222 -0.1303819
 crease 61.0
 texture "FG1000.png"
diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/Interfaces/GenericFuelPublisher.nas b/Aircraft/Instruments-3d/FG1000/Nasal/Interfaces/GenericFuelPublisher.nas
index ba82e96b1..d351bdf29 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/Interfaces/GenericFuelPublisher.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/Interfaces/GenericFuelPublisher.nas
@@ -37,6 +37,7 @@ var GenericFuelPublisher =
 
     foreach(var tank; tanks) {
       var actual = tank.getNode("level-gal_us", 1).getValue();
+      if ((actual == nil) or (! isnum(actual))) actual = 0;
       var indicatedNode = tank.getNode("fg1000-indicated-level-gal_us", 1);
       if (indicatedNode.getValue() == nil) indicatedNode.setValue(actual);
     }
@@ -53,9 +54,9 @@ var GenericFuelPublisher =
     foreach(var tank; tanks) {
       var indicatedNode = tank.getNode("fg1000-indicated-level-gal_us", 1);
       var fuel = indicatedNode.getValue();
-      if (fuel == nil) fuel = 0;
+      if ((fuel == nil) or (! isnum(fuel))) fuel = 0;
       var fuel_flow = getprop("/engines/engine[0]/fuel-flow-gph");
-      if (fuel_flow == nil)  fuel_flow = 0;
+      if ((fuel_flow == nil) or (! isnum(fuel_flow))) fuel_flow = 0;
       fuel = fuel - fuel_flow*me.deltaT/3600.0/2;
       indicatedNode.setValue(fuel);
       append(tank_data, {"FuelUSGal": fuel});