From 3e39eaedfa88a595e08ebe455ebb280158ede119 Mon Sep 17 00:00:00 2001
From: Meir Michanie <meirm@riunx.com>
Date: Fri, 8 Jul 2016 18:13:15 +0300
Subject: [PATCH] Added Nas function that calculates distance and bearing to
 target.

---
 HUD.xml             | 15 ++++++---------
 MQ-9-JSBSim-set.xml |  4 ++++
 MQ-9-JSBSim.xml     |  2 +-
 Nasal/Crash.nas     |  0
 Nasal/ENAV.nas      |  0
 Nasal/Engine.nas    |  0
 Nasal/HUD.nas       |  0
 Nasal/Lights.nas    |  0
 Nasal/Liveries.nas  |  0
 Nasal/Radar.nas     |  0
 Nasal/Tracking.nas  | 37 +++++++++++++++++++++++++++++++++++++
 Nasal/Tyresmoke.nas |  0
 12 files changed, 48 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 Nasal/Crash.nas
 mode change 100755 => 100644 Nasal/ENAV.nas
 mode change 100755 => 100644 Nasal/Engine.nas
 mode change 100755 => 100644 Nasal/HUD.nas
 mode change 100755 => 100644 Nasal/Lights.nas
 mode change 100755 => 100644 Nasal/Liveries.nas
 mode change 100755 => 100644 Nasal/Radar.nas
 create mode 100644 Nasal/Tracking.nas
 mode change 100755 => 100644 Nasal/Tyresmoke.nas

diff --git a/HUD.xml b/HUD.xml
index 7790ed8..5f5cdea 100755
--- a/HUD.xml
+++ b/HUD.xml
@@ -305,12 +305,11 @@
 		<width>1</width>
 		<height>1</height>
 		<input>
-			<property>/orientation/heading-deg</property>
+			<property>/tracking/bearing</property>
             <factor>1.0</factor>
 		</input>
-		<format>%3.2f</format>
+		<format>BRG   %3.2f</format>
 		<halign>left</halign>
-		<prefix>BRG </prefix>
 	</label>
 
 	<label>
@@ -320,12 +319,11 @@
 		<width>1</width>
 		<height>1</height>
 		<input>
-			<property>/position/altitude-agl-ft</property>
+			<property>/tracking/rng-km</property>
             <factor>1.0</factor>
 		</input>
-		<format>%3.4f</format>
+		<format>RNG   %3.2f</format>
 		<halign>left</halign>
-		<prefix>RNG </prefix>
 	</label>
 
 	<label>
@@ -335,12 +333,11 @@
 		<width>1</width>
 		<height>1</height>
 		<input>
-			<property>/position/altitude-agl-ft</property>
+			<property>/tracking/rng-nml</property>
             <factor>1.0</factor>
 		</input>
-		<format>%3.4f</format>
+		<format>RNG   %3.2f</format>
 		<halign>left</halign>
-		<prefix>RNG </prefix>
 	</label>
 
 	<label>
diff --git a/MQ-9-JSBSim-set.xml b/MQ-9-JSBSim-set.xml
index 3acc05a..dab4504 100755
--- a/MQ-9-JSBSim-set.xml
+++ b/MQ-9-JSBSim-set.xml
@@ -463,6 +463,10 @@
 			<file>Aircraft/MQ-9/Nasal/Crash.nas</file>
 		</Crash>
 		
+		<Tracking>
+			<file>Aircraft/MQ-9/Nasal/Tracking.nas</file>
+		</Tracking>
+
 		<Turret>
 			<file>Aircraft/MQ-9/Nasal/Turret.nas</file>
 		</Turret>
diff --git a/MQ-9-JSBSim.xml b/MQ-9-JSBSim.xml
index 5139d31..1a6672a 100644
--- a/MQ-9-JSBSim.xml
+++ b/MQ-9-JSBSim.xml
@@ -85,7 +85,7 @@
      <z>   -10.82 </z>
    </location>
    <pointmass name="Payload">
-    <description> 4039.89 LBS should bring model up to entered max weight</description>
+    <description> 4039.89 LBS + full (1280 LBS) fuel should bring model up to entered max weight</description>
     <weight unit="LBS">   2019.94 </weight>
     <location name="POINTMASS" unit="IN">
       <x> 207.84 </x>
diff --git a/Nasal/Crash.nas b/Nasal/Crash.nas
old mode 100755
new mode 100644
diff --git a/Nasal/ENAV.nas b/Nasal/ENAV.nas
old mode 100755
new mode 100644
diff --git a/Nasal/Engine.nas b/Nasal/Engine.nas
old mode 100755
new mode 100644
diff --git a/Nasal/HUD.nas b/Nasal/HUD.nas
old mode 100755
new mode 100644
diff --git a/Nasal/Lights.nas b/Nasal/Lights.nas
old mode 100755
new mode 100644
diff --git a/Nasal/Liveries.nas b/Nasal/Liveries.nas
old mode 100755
new mode 100644
diff --git a/Nasal/Radar.nas b/Nasal/Radar.nas
old mode 100755
new mode 100644
diff --git a/Nasal/Tracking.nas b/Nasal/Tracking.nas
new file mode 100644
index 0000000..84dd982
--- /dev/null
+++ b/Nasal/Tracking.nas
@@ -0,0 +1,37 @@
+#Place holder
+var getTrackData = func {
+#                me.ac = geo.aircraft_position();
+#                me.distance = me.ac.distance_to(me.coord);
+#                me.bearing = me.ac.course_to(me.coord);
+
+#                var dalt = alt - me.ac.alt();
+#                var ac_hdg = getprop("/orientation/heading-deg");
+#                var ac_pitch = getprop("/orientation/pitch-deg");
+#                var ac_contact_dist = getprop("/systems/refuel/contact-radius-m");
+#                var elev = math.atan2(dalt, me.distance) * R2D;
+#
+
+# print("My test module got loaded!");
+#var broken = func {
+ var rngM=110000.0;
+ var brg=0.0;
+# 
+var tgt=geo.click_position();
+if (tgt != nil){
+	var ac=geo.aircraft_position();
+	var distance = ac.distance_to(tgt);
+        var bearing =ac.course_to(tgt);
+ #setprop("/tracking/test",tgt.lat());
+ 	rngM=distance;
+	brg=bearing;
+}
+#
+# # finally, write the result to the property tree using the setprop() call
+ #setprop("tracking/engine[0]/egt-degc", degC);
+ setprop("/tracking/rng-km", rngM * 0.001);
+ setprop("/tracking/rng-nml", rngM * 0.000539957);
+ setprop("/tracking/bearing",brg);
+}
+
+setlistener("sim/signals/click", getTrackData,1);
+#settimer(getTrackData, 0.1);
diff --git a/Nasal/Tyresmoke.nas b/Nasal/Tyresmoke.nas
old mode 100755
new mode 100644