Skip to content

xid / specs

Go to a project
Toggle navigation
Toggle navigation pinning
c8962007 by Skip Hines
Options

ILP-53 : fixed HPE names and units in Usage

1 parent af2a5650
Inline Side-by-side
Showing 4 changed files with 40 additions and 40 deletions
HPE/V1.2/HpeBLE.xid.xml
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
15 <using namespace="Tensor"/> 15 <using namespace="Tensor"/>
16 <using namespace="HPE"/> 16 <using namespace="HPE"/>
17 17
18
19
18 <struct name="BLERss" type="ObservationEpoch" pack="true" rttkey="HPE.ObservationType.BLE_RSS"> 20 <struct name="BLERss" type="ObservationEpoch" pack="true" rttkey="HPE.ObservationType.BLE_RSS">
19 <comment>Base BLE Observiation with Recieved Signal Strength (RSS).</comment> 21 <comment>Base BLE Observiation with Recieved Signal Strength (RSS).</comment>
20 <elem name ="mac" type="mac48" multiplicity="1"> 22 <elem name ="mac" type="mac48" multiplicity="1">
...@@ -27,16 +29,33 @@ ...@@ -27,16 +29,33 @@
27 </elem> 29 </elem>
28 </struct> 30 </struct>
29 31
30 <struct name="BLERssExt" type="BLERss" pack="true" rttkey="HPE.ObservationType.BLE_RSS_TX"> 32 <struct name="BLERssExt" type="BLERss" pack="true" rttkey="HPE.ObservationType.BLE_RSS_EXT">
31 <comment>BLE Ext Observation that adds Transmit power to base BLERss.</comment> 33 <comment>BLE Ext Observation adds extended BLE information.</comment>
32 <comment>Tx is available with iBeacon and Eddystone.</comment> 34 <elem name ="Tx" type="int8" multiplicity="1" default="0">
33 <elem name ="Tx" type="int8" multiplicity="1">
34 <tag name="unit" value="±dBm"/> 35 <tag name="unit" value="±dBm"/>
35 <comment>Transmit power level.</comment> 36 <comment>Transmit power level.</comment>
37 <comment>If not available, encode 0.</comment>
38 </elem>
39 <elem name ="channel" type="uint8" multiplicity="1" default="255">
40 <comment>Bluetooth channel number (e.g. 37,38,39 are BLE advertisement channels)</comment>
41 <comment>If not available, encode 255.</comment>
36 </elem> 42 </elem>
37 </struct> 43 </struct>
38 44
39 <!-- 45 <!--
46 <struct name="Beacon" pack="true">
47 <elem name ="mac" type="mac48" multiplicity="1">
48 <comment>Every BLE advertisement's PDU has a MAC address</comment>
49 </elem>
50 <elem name ="rss" type="uint8" multiplicity="1" default="0">
51 <tag name="unit" value="-dBm"/>
52 <comment>Recieved signal strength value (used as negative).</comment>
53 <comment>If not available, encode 0.</comment>
54 </elem>
55 </struct>
56 -->
57
58 <!--
40 <struct name="iBeacon" type="BLERss" pack="true" rttkey="HPE.ObservationType.iBeacon"> 59 <struct name="iBeacon" type="BLERss" pack="true" rttkey="HPE.ObservationType.iBeacon">
41 <comment>observation</comment> 60 <comment>observation</comment>
42 <elem name ="Tx" type="int8" multiplicity="1"> 61 <elem name ="Tx" type="int8" multiplicity="1">
......
HPE/V1.2/HpeCore.xid.xml
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </literal> 103 </literal>
104 104
105 <literal name="WIFI_RSS_EXT" value="22"/> 105 <literal name="WIFI_RSS_EXT" value="22"/>
106 <literal name="BLE_RSS_TX" value="23"/> 106 <literal name="BLE_RSS_EXT" value="23"/>
107 </enum> 107 </enum>
108 108
109 <array name="ObservationTypeArray" type="ObservationType"/> 109 <array name="ObservationTypeArray" type="ObservationType"/>
......
HPE/V1.2/HpeUsage.xid.xml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 14
15 <namespace name="HPE"> 15 <namespace name="HPE">
16 <using namespace="Tensor"/> 16 <using namespace="Tensor"/>
17 <using namespace="Logging"/> 17 <using namespace="Logging"/>
18 18
19 <!--Initialization Report Msg--> 19 <!--Initialization Report Msg-->
20 <struct name="InitializationReport" type="Logging.UsageMsg" rttkey='"tpf://hpe/initrpt"'> 20 <struct name="InitializationReport" type="Logging.UsageMsg" rttkey='"tpf://hpe/initrpt"'>
...@@ -55,29 +55,11 @@ ...@@ -55,29 +55,11 @@
55 </struct> 55 </struct>
56 56
57 <!--TaskReport Msg--> 57 <!--TaskReport Msg-->
58 <struct name="TaskReport" type="Logging.UsageMsg" rttkey='"tpf://hpe/taskrpt"'> 58 <struct name="TaskReport" type="Logging.TaskReport" rttkey='"tpf://hpe/taskrpt"'>
59 <comment> 59 <comment>
60 Message reports processing task result data. Tasks are any computational elem 60 Message reports processing task result data. Tasks are any computational elem
61 within the HPE including calculators, converters, estimators. 61 within the HPE including calculators, converters, estimators.
62 </comment> 62 </comment>
63 <elem name="taskid" type="string" multiplicity="1">
64 <comment>
65 The unique tasks identifier. A source may have multiple tasks, this field assigns
66 an identifier that uniquely characterizes what the task was that was accomplished.
67 </comment>
68 </elem>
69 <elem name="start" type="datetime" multiplicity="1">
70 <comment>
71 The start time at which the processor is used.
72 </comment>
73 </elem>
74 <elem name="duration" type="uint16" multiplicity="1">
75 <tag name="unit" value="msec"/>
76 <comment>
77 The duration of the processing in msec. This is not meant to be a high
78 resolution duration monitoring, implement a metric counter for precise timing data.
79 </comment>
80 </elem>
81 <elem name="status" type="ProcessingStatus" multiplicity="1"> 63 <elem name="status" type="ProcessingStatus" multiplicity="1">
82 <comment>The result of the processor use, typically success or failure.</comment> 64 <comment>The result of the processor use, typically success or failure.</comment>
83 </elem> 65 </elem>
...@@ -91,13 +73,13 @@ ...@@ -91,13 +73,13 @@
91 <elem name="position" type="HPE.Spheroid" multiplicity="1"> 73 <elem name="position" type="HPE.Spheroid" multiplicity="1">
92 <comment>The 2D/3D position reported. </comment> 74 <comment>The 2D/3D position reported. </comment>
93 </elem> 75 </elem>
94 <elem name="speed" type="int16" multiplicity="1"> 76 <elem name="speed" type="float32" multiplicity="1">
95 <tag name="unit" value="cm/sec"/> 77 <tag name="unit" value="m/sec"/>
96 <comment>The observed speed. O if not known.</comment> 78 <comment>The observed speed. O if not known.</comment>
97 </elem> 79 </elem>
98 <elem name="heading" type="int16" multiplicity="1"> 80 <elem name="azimuth" type="float32" multiplicity="0..1">
99 <tag name="unit" value="degrees"/> 81 <tag name="unit" value="degrees"/>
100 <comment>Observed heading relative true north (azimuth).</comment> 82 <comment>Azimuth heading of the device in degrees (true North)</comment>
101 </elem> 83 </elem>
102 <elem name="veracity" type="byte" multiplicity="1"> 84 <elem name="veracity" type="byte" multiplicity="1">
103 <comment> 85 <comment>
...@@ -106,12 +88,12 @@ ...@@ -106,12 +88,12 @@
106 If no veracity scoring is performed, this will have a value of 255 88 If no veracity scoring is performed, this will have a value of 255
107 </comment> 89 </comment>
108 </elem> 90 </elem>
109 <elem name="confidence" type="byte" multiplicity="1"> 91 <elem name="confidence" type="float32" multiplicity="1">
110 <comment>The estimate confidence. Valid range is 0 to 100</comment> 92 <comment>The estimate confidence. Valid range is 0.0 to 1.0</comment>
111 </elem> 93 </elem>
112 <elem name="calctype" type="string" multiplicity="1"> 94 <elem name="calctype" type="string" multiplicity="1">
113 <comment> 95 <comment>
114 Positioning calculation stereo type specifier (hybrid, cellular, slam, etc.). If not defined set to "". 96 Positioning calculation stereotype specifier (hybrid, cellular, slam, etc.). If not defined set to "".
115 </comment> 97 </comment>
116 </elem> 98 </elem>
117 <elem name="obstype" type="ObservationType" multiplicity="1"> 99 <elem name="obstype" type="ObservationType" multiplicity="1">
......
HPE/V1.2/XIDData.prop
...@@ -23,6 +23,7 @@ Idx.HPE.ArcBand3D.vopening=5 ...@@ -23,6 +23,7 @@ Idx.HPE.ArcBand3D.vopening=5
23 Idx.HPE.BLE.BLERss.mac=1 23 Idx.HPE.BLE.BLERss.mac=1
24 Idx.HPE.BLE.BLERss.rss=2 24 Idx.HPE.BLE.BLERss.rss=2
25 Idx.HPE.BLE.BLERssExt.Tx=1 25 Idx.HPE.BLE.BLERssExt.Tx=1
26 Idx.HPE.BLE.BLERssExt.channel=2
26 Idx.HPE.Cellular.AntennaSpec.RTTCalib=10 27 Idx.HPE.Cellular.AntennaSpec.RTTCalib=10
27 Idx.HPE.Cellular.AntennaSpec.RTTCalibUncert=11 28 Idx.HPE.Cellular.AntennaSpec.RTTCalibUncert=11
28 Idx.HPE.Cellular.AntennaSpec.TxPower=8 29 Idx.HPE.Cellular.AntennaSpec.TxPower=8
...@@ -207,6 +208,7 @@ Off.HPE.ArcBand3D.vopening=41 ...@@ -207,6 +208,7 @@ Off.HPE.ArcBand3D.vopening=41
207 Off.HPE.BLE.BLERss.mac=9 208 Off.HPE.BLE.BLERss.mac=9
208 Off.HPE.BLE.BLERss.rss=15 209 Off.HPE.BLE.BLERss.rss=15
209 Off.HPE.BLE.BLERssExt.Tx=16 210 Off.HPE.BLE.BLERssExt.Tx=16
211 Off.HPE.BLE.BLERssExt.channel=17
210 Off.HPE.Cellular.AntennaSpec.RTTCalib=42 212 Off.HPE.Cellular.AntennaSpec.RTTCalib=42
211 Off.HPE.Cellular.AntennaSpec.RTTCalibUncert=46 213 Off.HPE.Cellular.AntennaSpec.RTTCalibUncert=46
212 Off.HPE.Cellular.AntennaSpec.TxPower=26 214 Off.HPE.Cellular.AntennaSpec.TxPower=26
...@@ -387,9 +389,9 @@ Ord.HPE.ObservationReport.directive=114 ...@@ -387,9 +389,9 @@ Ord.HPE.ObservationReport.directive=114
387 Ord.HPE.ObservationReport.observations=112 389 Ord.HPE.ObservationReport.observations=112
388 Ord.HPE.ObservationReport.refdata=113 390 Ord.HPE.ObservationReport.refdata=113
389 Ord.HPE.ObservationSet.observations=64 391 Ord.HPE.ObservationSet.observations=64
392 Ord.HPE.PositionReport.azimuth=114
390 Ord.HPE.PositionReport.calctype=117 393 Ord.HPE.PositionReport.calctype=117
391 Ord.HPE.PositionReport.confidence=116 394 Ord.HPE.PositionReport.confidence=116
392 Ord.HPE.PositionReport.heading=114
393 Ord.HPE.PositionReport.obstype=118 395 Ord.HPE.PositionReport.obstype=118
394 Ord.HPE.PositionReport.position=112 396 Ord.HPE.PositionReport.position=112
395 Ord.HPE.PositionReport.speed=113 397 Ord.HPE.PositionReport.speed=113
...@@ -402,10 +404,7 @@ Ord.HPE.StateInfo.epoch=64 ...@@ -402,10 +404,7 @@ Ord.HPE.StateInfo.epoch=64
402 Ord.HPE.StateInfo.shape=66 404 Ord.HPE.StateInfo.shape=66
403 Ord.HPE.StateInfo.source=69 405 Ord.HPE.StateInfo.source=69
404 Ord.HPE.StateInfo.speed=67 406 Ord.HPE.StateInfo.speed=67
405 Ord.HPE.TaskReport.duration=114 407 Ord.HPE.TaskReport.status=128
406 Ord.HPE.TaskReport.start=113
407 Ord.HPE.TaskReport.status=115
408 Ord.HPE.TaskReport.taskid=112
409 Ord.Logging.ActionMsg.category=98 408 Ord.Logging.ActionMsg.category=98
410 Ord.Logging.ActionMsg.id=96 409 Ord.Logging.ActionMsg.id=96
411 Ord.Logging.ActionMsg.iid=99 410 Ord.Logging.ActionMsg.iid=99
...@@ -433,8 +432,8 @@ Ord.Logging.MetricMsg.metrics=82 ...@@ -433,8 +432,8 @@ Ord.Logging.MetricMsg.metrics=82
433 Ord.Logging.MetricMsg.start=80 432 Ord.Logging.MetricMsg.start=80
434 Ord.Logging.PegCount.value=80 433 Ord.Logging.PegCount.value=80
435 Ord.Logging.TaskReport.duration=114 434 Ord.Logging.TaskReport.duration=114
435 Ord.Logging.TaskReport.result=115
436 Ord.Logging.TaskReport.start=113 436 Ord.Logging.TaskReport.start=113
437 Ord.Logging.TaskReport.status=115
438 Ord.Logging.TaskReport.taskid=112 437 Ord.Logging.TaskReport.taskid=112
439 Ord.Logging.TraceMsg.level=96 438 Ord.Logging.TraceMsg.level=96
440 Ord.Logging.TransactionMsg.acctid=82 439 Ord.Logging.TransactionMsg.acctid=82
...@@ -472,7 +471,7 @@ Size.HPE.Arc=33 ...@@ -472,7 +471,7 @@ Size.HPE.Arc=33
472 Size.HPE.ArcBand3D=49 471 Size.HPE.ArcBand3D=49
473 Size.HPE.ArcBand=45 472 Size.HPE.ArcBand=45
474 Size.HPE.BLE.BLERss=16 473 Size.HPE.BLE.BLERss=16
475 Size.HPE.BLE.BLERssExt=17 474 Size.HPE.BLE.BLERssExt=18
476 Size.HPE.Cellular.AntennaSpec=50 475 Size.HPE.Cellular.AntennaSpec=50
477 Size.HPE.Cellular.CellAntReferenceData=95 476 Size.HPE.Cellular.CellAntReferenceData=95
478 Size.HPE.Cellular.CellId=12 477 Size.HPE.Cellular.CellId=12
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!