Created discrete DO_FENCE_ENABLE waypoint for Plane in Flight Plan sc…

…reen. Modified text bubble in Plane and Copter to include Sat Count, HDOP, and Voltage.
AhmedSoliman3 · Mar 3, 2020 · 117a032 · 117a032
1 parent ab88b30
commit 117a032
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Common.cs b/Common.cs
@@ -31,8 +31,8 @@ public static GMapMarker getMAVMarker(MAVState MAV)
                     MAV.cs.radius * CurrentState.multiplierdist)
                 {
                     ToolTipText = MAV.cs.alt.ToString("0") + CurrentState.AltUnit + " | " + (int)MAV.cs.airspeed +
-                                  CurrentState.SpeedUnit + " | id:" + (int)MAV.sysid,
-                    ToolTipMode = MarkerTooltipMode.Always
+                                  CurrentState.SpeedUnit + " | id:" + (int)MAV.sysid + " | Sats:" + (int)MAV.cs.satcount + " | HDOP:" + (float)MAV.cs.gpshdop + " | Volts: " + (float)MAV.cs.battery_voltage, 
+                    ToolTipMode = MarkerTooltipMode.Always 
                 });
             }
             else if (MAV.aptype == MAVLink.MAV_TYPE.GROUND_ROVER)
@@ -79,7 +79,12 @@ public static GMapMarker getMAVMarker(MAVState MAV)
                 }
 
                 return (new GMapMarkerQuad(portlocation, MAV.cs.yaw,
-                    MAV.cs.groundcourse, MAV.cs.nav_bearing, MAV.sysid));
+                        MAV.cs.groundcourse, MAV.cs.nav_bearing, MAV.sysid)
+                {
+                    ToolTipText = MAV.cs.alt.ToString("0") + CurrentState.AltUnit + " | " + (int)MAV.cs.airspeed +
+                                 CurrentState.SpeedUnit + " | id:" + (int)MAV.sysid + " | Sats:" + (int)MAV.cs.satcount + " | HDOP:" + (float)MAV.cs.gpshdop + " | Volts: " + (float)MAV.cs.battery_voltage,
+                    ToolTipMode = MarkerTooltipMode.Always
+                });
             }
             else if (MAV.aptype == MAVLink.MAV_TYPE.COAXIAL)
             {

diff --git a/mavcmd.xml b/mavcmd.xml
@@ -565,6 +565,15 @@
       <Y></Y>
       <Z></Z>
     </DO_PARACHUTE>
+    <DO_FENCE_ENABLE>
+      <P1>Disable(0)/Enable(1)/Disable Floor Only(2)</P1>
+      <P2></P2>
+      <P3></P3>
+      <P4></P4>
+      <X></X>
+      <Y></Y>
+      <Z></Z>
+    </DO_FENCE_ENABLE>
   </APM>
   <!-- -->
   <APRover>