Added updated data profiles and new Custom Data Types

APM Copter.xml → DashWare-dataprofiles/DataProfiles/APM Copter.xml

@@ -20,8 +20,7 @@
     <MathCalculator mathOperation="Divide" parameter="1000" useConstantParameter="True">
       <InputColumns>
         <InputColumn>Time_NoNull</InputColumn>
-        <InputColumn>
-        </InputColumn>
+        <InputColumn></InputColumn>
       </InputColumns>
       <OutputColumns>
         <OutputColumn>iTime</OutputColumn>
@@ -61,6 +60,25 @@
         <OutputColumn>iAltitude (m)</OutputColumn>
       </OutputColumns>
     </LinearInterpolator>
+    <LinearInterpolator filterValues="False" standardDevCeiling="5">
+      <InputColumns>
+        <InputColumn>GPS_Alt</InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>i_Sea_Altitude (m)</OutputColumn>
+      </OutputColumns>
+    </LinearInterpolator>
+    <AscentDescentCalculator>
+      <InputColumns>
+        <InputColumn>iAltitude (m)</InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>Total Ascent Meters</OutputColumn>
+        <OutputColumn>Total Descent Meters</OutputColumn>
+        <OutputColumn>Ground-Based Altitude Min</OutputColumn>
+        <OutputColumn>Ground-Based Altitude Max</OutputColumn>
+      </OutputColumns>
+    </AscentDescentCalculator>
     <DistanceConverter inputUnit="Meters" outputUnit="Feet">
       <InputColumns>
         <InputColumn>iAltitude (m)</InputColumn>
@@ -69,6 +87,14 @@
         <OutputColumn>iAltitude (feet)</OutputColumn>
       </OutputColumns>
     </DistanceConverter>
+    <DistanceConverter inputUnit="Meters" outputUnit="Feet">
+      <InputColumns>
+        <InputColumn>i_Sea_Altitude (m)</InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>i_Sea_Altitude (feet)</OutputColumn>
+      </OutputColumns>
+    </DistanceConverter>
     <UsePreviousValueCalculator>
       <InputColumns>
         <InputColumn>GPS_NSats</InputColumn>
@@ -77,6 +103,14 @@
         <OutputColumn>iNumSats</OutputColumn>
       </OutputColumns>
     </UsePreviousValueCalculator>
+    <UsePreviousValueCalculator>
+      <InputColumns>
+        <InputColumn>GPS_HDOP</InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>iHDop</OutputColumn>
+      </OutputColumns>
+    </UsePreviousValueCalculator>
     <DistanceTravelledCalculator inputUnit="Feet" outputUnit="Feet">
       <InputColumns>
         <InputColumn>GPS_iLon (feet)</InputColumn>
@@ -86,6 +120,14 @@
         <OutputColumn>iTotalDistance (feet)</OutputColumn>
       </OutputColumns>
     </DistanceTravelledCalculator>
+    <DistanceConverter inputUnit="Feet" outputUnit="Meters">
+      <InputColumns>
+        <InputColumn>iTotalDistance (feet)</InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>iTotalDistance Meters</OutputColumn>
+      </OutputColumns>
+    </DistanceConverter>
     <DistanceConverter inputUnit="Feet" outputUnit="Miles">
       <InputColumns>
         <InputColumn>iTotalDistance (feet)</InputColumn>
@@ -170,8 +212,6 @@
     <MathCalculator mathOperation="Divide" parameter="100" useConstantParameter="True">
       <InputColumns>
         <InputColumn>iGroundSpeed (cm/s)</InputColumn>
-        <InputColumn>
-        </InputColumn>
       </InputColumns>
       <OutputColumns>
         <OutputColumn>iGroundSpeed (m/s)</OutputColumn>
@@ -237,6 +277,16 @@
         <OutputColumn>iThrottle (%/100)</OutputColumn>
       </OutputColumns>
     </MathCalculator>
+    <MathCalculator mathOperation="Divide" parameter="10" useConstantParameter="True">
+      <InputColumns>
+        <InputColumn>iThrottle (%*1000)</InputColumn>
+        <InputColumn>
+        </InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>iThrottle (%)</OutputColumn>
+      </OutputColumns>
+    </MathCalculator>
     <MathCalculator mathOperation="Multiply" parameter="0" useConstantParameter="False">
       <InputColumns>
         <InputColumn>iThrottle (%/100)</InputColumn>
@@ -407,10 +457,28 @@
         <OutputColumn>iAbsoluteSpeed (kph)</OutputColumn>
       </OutputColumns>
     </MathCalculator>
+    <MathCalculator mathOperation="Divide" parameter="100" useConstantParameter="True">
+      <InputColumns>
+        <InputColumn>CURR_Curr</InputColumn>
+        <InputColumn>
+        </InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>iAmpere</OutputColumn>
+      </OutputColumns>
+    </MathCalculator>
+    <AveragingCalculator parameter="1" mode="Simple" direction="Backwards">
+      <InputColumns>
+        <InputColumn>iAmpere</InputColumn>
+      </InputColumns>
+      <OutputColumns>
+        <OutputColumn>iCurrent</OutputColumn>
+      </OutputColumns>
+    </AveragingCalculator>
   </Calculators>
   <ColumnMappings>
     <ColumnMapping inputColumnText="iTime" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="&lt;Required&gt;" dataType="Data Running Time, Seconds" />
-    <ColumnMapping inputColumnText="GPS_iLon" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Longitude / X Position (Degrees)" />
+	<ColumnMapping inputColumnText="GPS_iLon" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Longitude / X Position (Degrees)" />
     <ColumnMapping inputColumnText="GPS_iLat" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Latitude / Y Position (Degrees)" />
     <ColumnMapping inputColumnText="GPS_iLon (feet)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Longitude / X Position (Feet)" />
     <ColumnMapping inputColumnText="GPS_iLat (feet)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Latitude / Y Position (Feet)" />
@@ -419,9 +487,18 @@
     <ColumnMapping inputColumnText="iAbsoluteSpeed (kph)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Velocity" dataType="Air Speed (KPH)" />
     <ColumnMapping inputColumnText="iAltitude (m)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Ground-Based Altitude (Meters)" />
     <ColumnMapping inputColumnText="iAltitude (feet)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Ground-Based Altitude (Feet)" />
+    <ColumnMapping inputColumnText="Total Ascent Meters" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Total Ascent (Meters)" />
+    <ColumnMapping inputColumnText="Total Descent Meters" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Total Descent (Meters)" />
+    <ColumnMapping inputColumnText="Ground-Based Altitude Min" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Ground-Based Altitude Min (Meters)" />
+    <ColumnMapping inputColumnText="Ground-Based Altitude Max" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Ground-Based Altitude Max (Meters)" />
+    <ColumnMapping inputColumnText="i_Sea_Altitude (m)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Altitude / Z Position (Meters)" />
+    <ColumnMapping inputColumnText="i_Sea_Altitude (feet)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Altitude / Z Position (Feet)" />
     <ColumnMapping inputColumnText="iNumSats" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Satellite Count" />
+    <ColumnMapping inputColumnText="iHDop" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Satellite HDop" />
+    <ColumnMapping inputColumnText="CurrentMode" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Engine, Transmission" dataType="Flightmode" />
     <ColumnMapping inputColumnText="iThrottle (%)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Steering, Throttle, Brakes" dataType="Throttle Position" />
     <ColumnMapping inputColumnText="iTotalDistance (feet)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Distance (Feet)" />
+    <ColumnMapping inputColumnText="iTotalDistance Meters" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Distance (Meters)" />
     <ColumnMapping inputColumnText="iTotalDistance (miles)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Distance (Miles)" />
     <ColumnMapping inputColumnText="iRoll" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Roll" />
     <ColumnMapping inputColumnText="iPitch" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Pitch" />
@@ -432,12 +509,13 @@
     <ColumnMapping inputColumnText="iGroundSpeed (kph)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Velocity" dataType="Speed (KPH)" />
     <ColumnMapping inputColumnText="iEngine RPM" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Engine, Transmission" dataType="Engine RPM" />
     <ColumnMapping inputColumnText="iVoltage" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Engine, Transmission" dataType="Battery Voltage" />
-    <ColumnMapping inputColumnText="iRoll Desired" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Autopilot" dataType="Roll Demanded" />
-    <ColumnMapping inputColumnText="iPitch Desired" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Autopilot" dataType="Pitch Demanded" />
+    <ColumnMapping inputColumnText="iRoll Desired" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Generic" dataType="Other" />
+    <ColumnMapping inputColumnText="iPitch Desired" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Generic" dataType="Other" />
     <ColumnMapping inputColumnText="iStraightDistanceFromHome (m)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Distance from Beginning (Meters)" />
     <ColumnMapping inputColumnText="iStraightDistanceFromHome (feet)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Positional" dataType="Distance from Beginning (Feet)" />
     <ColumnMapping inputColumnText="iClimbRate (m/s)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Velocity" dataType="Vertical Speed (m/s)" />
     <ColumnMapping inputColumnText="iClimbRate (mph)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Velocity" dataType="Vertical Speed (MPH)" />
     <ColumnMapping inputColumnText="iClimbRate (kph)" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Velocity" dataType="Vertical Speed (KPH)" />
+    <ColumnMapping inputColumnText="iCurrent" inputColumnMatchMode="ExactMatch" inputColumnIgnoreCase="False" dataCategory="Engine, Transmission" dataType="Battery Ampere" />
   </ColumnMappings>
 </DataProfile>

DashWare-dataprofiles/Settings/CustomDataTypes.xml

@@ -0,0 +1,9 @@
+<DataTypes version="1">
+  <Category name="Positional">
+	<DataType>Satellite HDop</DataType>
+  </Category>
+  <Category name="Engine, Transmission">
+    <DataType>Flightmode</DataType>
+    <DataType>Battery Ampere</DataType>
+  </Category>
+</DataTypes>