ILP-53 : fixed HPE names and units in Usage

Skip Hines
Showing 4 changed files with 38 additions and 38 deletions
HPE/V1.2/HpeBLE.xid.xml
HPE/V1.2/HpeCore.xid.xml
HPE/V1.2/HpeUsage.xid.xml
HPE/V1.2/XIDData.prop
--- a/HPE/V1.2/HpeBLE.xid.xml
View file @c896200
+++ b/HPE/V1.2/HpeBLE.xid.xml
View file @c896200
@@ -15,6 +15,8 @@
        <using namespace="Tensor"/>
        <using namespace="HPE"/>
        <struct name="BLERss" type="ObservationEpoch" pack="true" rttkey="HPE.ObservationType.BLE_RSS">
            <comment>Base BLE Observiation with Recieved Signal Strength (RSS).</comment>
            <elem name ="mac" type="mac48" multiplicity="1">
@@ -27,16 +29,33 @@
            </elem>
        </struct>
-        <struct name="BLERssExt" type="BLERss" pack="true" rttkey="HPE.ObservationType.BLE_RSS_TX">
+        <struct name="BLERssExt" type="BLERss" pack="true" rttkey="HPE.ObservationType.BLE_RSS_EXT">
-            <comment>BLE Ext Observation that adds Transmit power to base BLERss.</comment>
+            <comment>BLE Ext Observation adds extended BLE information.</comment>
-            <comment>Tx is available with iBeacon and Eddystone.</comment>
+            <elem name ="Tx" type="int8" multiplicity="1" default="0">
-            <elem name ="Tx" type="int8" multiplicity="1">
                 <tag name="unit" value="±dBm"/>
                <comment>Transmit power level.</comment>
+                <comment>If not available, encode 0.</comment>
+            </elem>
+            <elem name ="channel" type="uint8" multiplicity="1" default="255">
+                <comment>Bluetooth channel number (e.g. 37,38,39 are BLE advertisement channels)</comment>
+                <comment>If not available, encode 255.</comment>
            </elem>
        </struct>
        <!--
+        <struct name="Beacon" pack="true">
+            <elem name ="mac" type="mac48" multiplicity="1">
+                <comment>Every BLE advertisement's PDU has a MAC address</comment>
+            </elem>
+            <elem name ="rss" type="uint8" multiplicity="1" default="0">
+                <tag name="unit" value="-dBm"/>
+                <comment>Recieved signal strength value (used as negative).</comment>
+                <comment>If not available, encode 0.</comment>
+            </elem>
+        </struct>
+        -->
+        <!--
        <struct name="iBeacon" type="BLERss" pack="true" rttkey="HPE.ObservationType.iBeacon">
            <comment>observation</comment>
            <elem name ="Tx" type="int8" multiplicity="1">
--- a/HPE/V1.2/HpeCore.xid.xml
View file @c896200
+++ b/HPE/V1.2/HpeCore.xid.xml
View file @c896200
@@ -103,7 +103,7 @@
            </literal>
            <literal name="WIFI_RSS_EXT" value="22"/>
-            <literal name="BLE_RSS_TX" value="23"/>
+            <literal name="BLE_RSS_EXT" value="23"/>
        </enum>
        <array name="ObservationTypeArray" type="ObservationType"/>
--- a/HPE/V1.2/HpeUsage.xid.xml
View file @c896200
+++ b/HPE/V1.2/HpeUsage.xid.xml
View file @c896200
@@ -55,29 +55,11 @@
      </struct>
      <!--TaskReport Msg-->
-      <struct name="TaskReport"  type="Logging.UsageMsg" rttkey='"tpf://hpe/taskrpt"'>
+      <struct name="TaskReport"  type="Logging.TaskReport" rttkey='"tpf://hpe/taskrpt"'>
        <comment>
          Message reports processing task result data.  Tasks are any computational elem
          within the HPE including calculators, converters, estimators.
        </comment>
-        <elem name="taskid" type="string" multiplicity="1"> 
-          <comment>
-            The unique tasks identifier. A source may have multiple tasks, this field assigns
- 	    an identifier that uniquely characterizes what the task was that was accomplished.
-          </comment>
-        </elem>
-        <elem name="start" type="datetime" multiplicity="1"> 
-          <comment>
-            The start time at which the processor is used.
-          </comment>
-        </elem>
-        <elem name="duration" type="uint16" multiplicity="1">
-          <tag name="unit" value="msec"/>
-          <comment>
-            The duration of the processing in msec.  This is not meant to be a high
-            resolution duration monitoring, implement a metric counter for precise timing data.
-          </comment>
-        </elem>
        <elem name="status" type="ProcessingStatus" multiplicity="1">
          <comment>The result of the processor use, typically success or failure.</comment>
        </elem>
@@ -91,13 +73,13 @@
        <elem name="position" type="HPE.Spheroid" multiplicity="1">
          <comment>The 2D/3D position reported. </comment>
        </elem>
-        <elem name="speed" type="int16" multiplicity="1">
+        <elem name="speed" type="float32" multiplicity="1">
-          <tag name="unit" value="cm/sec"/>
+          <tag name="unit" value="m/sec"/>
          <comment>The observed speed.  O if not known.</comment>
        </elem>
-        <elem name="heading" type="int16" multiplicity="1">
+        <elem name="azimuth" type="float32" multiplicity="0..1">
            <tag name="unit" value="degrees"/>
-          <comment>Observed heading relative true north (azimuth).</comment>
+            <comment>Azimuth heading of the device in degrees (true North)</comment>
        </elem>
        <elem name="veracity" type="byte" multiplicity="1">
          <comment>
@@ -106,12 +88,12 @@
            If no veracity scoring is performed, this will have a value of 255
          </comment>
        </elem>
-        <elem name="confidence" type="byte" multiplicity="1">
+        <elem name="confidence" type="float32" multiplicity="1">
-          <comment>The estimate confidence.  Valid range is 0 to 100</comment>
+          <comment>The estimate confidence.  Valid range is 0.0 to 1.0</comment>
        </elem>
        <elem name="calctype" type="string" multiplicity="1">
          <comment>
-  	        Positioning calculation stereo type specifier (hybrid, cellular, slam, etc.).  If not defined set to "".
+  	        Positioning calculation stereotype specifier (hybrid, cellular, slam, etc.).  If not defined set to "".
 	        </comment>
        </elem>
        <elem name="obstype" type="ObservationType" multiplicity="1">
--- a/HPE/V1.2/XIDData.prop
View file @c896200
+++ b/HPE/V1.2/XIDData.prop
View file @c896200
@@ -23,6 +23,7 @@ Idx.HPE.ArcBand3D.vopening=5
 Idx.HPE.BLE.BLERss.mac=1
 Idx.HPE.BLE.BLERss.rss=2
 Idx.HPE.BLE.BLERssExt.Tx=1
+Idx.HPE.BLE.BLERssExt.channel=2
 Idx.HPE.Cellular.AntennaSpec.RTTCalib=10
 Idx.HPE.Cellular.AntennaSpec.RTTCalibUncert=11
 Idx.HPE.Cellular.AntennaSpec.TxPower=8
@@ -207,6 +208,7 @@ Off.HPE.ArcBand3D.vopening=41
 Off.HPE.BLE.BLERss.mac=9
 Off.HPE.BLE.BLERss.rss=15
 Off.HPE.BLE.BLERssExt.Tx=16
+Off.HPE.BLE.BLERssExt.channel=17
 Off.HPE.Cellular.AntennaSpec.RTTCalib=42
 Off.HPE.Cellular.AntennaSpec.RTTCalibUncert=46
 Off.HPE.Cellular.AntennaSpec.TxPower=26
@@ -387,9 +389,9 @@ Ord.HPE.ObservationReport.directive=114
 Ord.HPE.ObservationReport.observations=112
 Ord.HPE.ObservationReport.refdata=113
 Ord.HPE.ObservationSet.observations=64
+Ord.HPE.PositionReport.azimuth=114
 Ord.HPE.PositionReport.calctype=117
 Ord.HPE.PositionReport.confidence=116
-Ord.HPE.PositionReport.heading=114
 Ord.HPE.PositionReport.obstype=118
 Ord.HPE.PositionReport.position=112
 Ord.HPE.PositionReport.speed=113
@@ -402,10 +404,7 @@ Ord.HPE.StateInfo.epoch=64
 Ord.HPE.StateInfo.shape=66
 Ord.HPE.StateInfo.source=69
 Ord.HPE.StateInfo.speed=67
-Ord.HPE.TaskReport.duration=114
+Ord.HPE.TaskReport.status=128
-Ord.HPE.TaskReport.start=113
-Ord.HPE.TaskReport.status=115
-Ord.HPE.TaskReport.taskid=112
 Ord.Logging.ActionMsg.category=98
 Ord.Logging.ActionMsg.id=96
 Ord.Logging.ActionMsg.iid=99
@@ -433,8 +432,8 @@ Ord.Logging.MetricMsg.metrics=82
 Ord.Logging.MetricMsg.start=80
 Ord.Logging.PegCount.value=80
 Ord.Logging.TaskReport.duration=114
+Ord.Logging.TaskReport.result=115
 Ord.Logging.TaskReport.start=113
-Ord.Logging.TaskReport.status=115
 Ord.Logging.TaskReport.taskid=112
 Ord.Logging.TraceMsg.level=96
 Ord.Logging.TransactionMsg.acctid=82
@@ -472,7 +471,7 @@ Size.HPE.Arc=33
 Size.HPE.ArcBand3D=49
 Size.HPE.ArcBand=45
 Size.HPE.BLE.BLERss=16
-Size.HPE.BLE.BLERssExt=17
+Size.HPE.BLE.BLERssExt=18
 Size.HPE.Cellular.AntennaSpec=50
 Size.HPE.Cellular.CellAntReferenceData=95
 Size.HPE.Cellular.CellId=12