From e1851b48333e6fcac2844f727209c36e2cc0f9a5 Mon Sep 17 00:00:00 2001
From: Fredrik Arvidsson <fredrik@arvidssons.org>
Date: Tue, 18 Jun 2013 20:58:43 +0200
Subject: [PATCH] OP-1005 Fixes default configuration files to set altitude and
 speed factor.

---
 .../default_configurations/Developer.xml      | 28 ++---------------
 .../default_configurations/OpenPilotGCS.xml   | 30 ++-----------------
 .../OpenPilotGCS_wide.xml                     | 30 ++-----------------
 3 files changed, 8 insertions(+), 80 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
index d04c74168..126696f0d 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
@@ -1781,32 +1781,6 @@
         </data>
       </default>
     </OPMapGadget>
-    <PFDGadget>
-      <raw>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <beSmooth>false</beSmooth>
-          <dialFile>%%DATAPATH%%pfd/default/pfd.svg</dialFile>
-          <hqFonts>false</hqFonts>
-          <useOpenGLFlag>false</useOpenGLFlag>
-        </data>
-      </raw>
-      <smooth>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <beSmooth>true</beSmooth>
-          <dialFile>%%DATAPATH%%pfd/default/pfd.svg</dialFile>
-          <hqFonts>false</hqFonts>
-          <useOpenGLFlag>false</useOpenGLFlag>
-        </data>
-      </smooth>
-    </PFDGadget>
     <PfdQmlGadget>
       <NoTerrain>
         <configInfo>
@@ -1816,12 +1790,14 @@
         <data>
           <actualPositionUsed>false</actualPositionUsed>
           <altitude>2000</altitude>
+          <altitudeFactor>1</altitudeFactor>
           <cacheOnly>false</cacheOnly>
           <earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
           <latitude>46.6715</latitude>
           <longitude>10.1589</longitude>
           <openGLEnabled>true</openGLEnabled>
           <qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
+          <speedFactor>1</speedFactor>
           <terrainEnabled>false</terrainEnabled>
         </data>
       </NoTerrain>
diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
index bee98b3e0..4f4666e0c 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
@@ -1819,33 +1819,7 @@
           <useOpenGL>true</useOpenGL>
         </data>
       </default>
-    </OPMapGadget>
-    <PFDGadget>
-      <raw>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <beSmooth>false</beSmooth>
-          <dialFile>%%DATAPATH%%pfd/default/pfd.svg</dialFile>
-          <hqFonts>false</hqFonts>
-          <useOpenGLFlag>false</useOpenGLFlag>
-        </data>
-      </raw>
-      <smooth>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <beSmooth>true</beSmooth>
-          <dialFile>%%DATAPATH%%pfd/default/pfd.svg</dialFile>
-          <hqFonts>false</hqFonts>
-          <useOpenGLFlag>false</useOpenGLFlag>
-        </data>
-      </smooth>
-    </PFDGadget>
+    </OPMapGadget>    
     <PfdQmlGadget>
       <NoTerrain>
         <configInfo>
@@ -1855,12 +1829,14 @@
         <data>
           <actualPositionUsed>false</actualPositionUsed>
           <altitude>2000</altitude>
+          <altitudeFactor>1</altitudeFactor>
           <cacheOnly>false</cacheOnly>
           <earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
           <latitude>46.6715</latitude>
           <longitude>10.1589</longitude>
           <openGLEnabled>true</openGLEnabled>
           <qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
+          <speedFactor>1</speedFactor>
           <terrainEnabled>false</terrainEnabled>
         </data>
       </NoTerrain>
diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
index bd99b9685..eaabdd8e5 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
@@ -1797,33 +1797,7 @@
           <useOpenGL>true</useOpenGL>
         </data>
       </default>
-    </OPMapGadget>
-    <PFDGadget>
-      <raw>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <beSmooth>false</beSmooth>
-          <dialFile>%%DATAPATH%%pfd/default/pfd.svg</dialFile>
-          <hqFonts>false</hqFonts>
-          <useOpenGLFlag>false</useOpenGLFlag>
-        </data>
-      </raw>
-      <smooth>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <beSmooth>true</beSmooth>
-          <dialFile>%%DATAPATH%%pfd/default/pfd.svg</dialFile>
-          <hqFonts>false</hqFonts>
-          <useOpenGLFlag>false</useOpenGLFlag>
-        </data>
-      </smooth>
-    </PFDGadget>
+    </OPMapGadget>    
     <PfdQmlGadget>
       <NoTerrain>
         <configInfo>
@@ -1833,12 +1807,14 @@
         <data>
           <actualPositionUsed>false</actualPositionUsed>
           <altitude>2000</altitude>
+          <altitudeFactor>1</altitudeFactor>
           <cacheOnly>false</cacheOnly>
           <earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
           <latitude>46.6715</latitude>
           <longitude>10.1589</longitude>
           <openGLEnabled>true</openGLEnabled>
           <qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
+          <speedFactor>1</speedFactor>
           <terrainEnabled>false</terrainEnabled>
         </data>
       </NoTerrain>