Skip to content

xid / specs

Go to a project
Toggle navigation
Toggle navigation pinning
32df3b73 by Skip Hines
Options

Merge branch 'ILP571' into 'master' 

ILP-571: Renamed macaddr to mac in HPE and SLAM XIDs

See merge request !5
2 parents 961352ef a90ed996
Inline Side-by-side
Showing 5 changed files with 168 additions and 11 deletions
HPE/V1.2/HpeWiFi.xid.xml
......@@ -25,7 +25,7 @@
<tag name="unit" value="-dBm"/>
<comment>RSS signal measured value(used as negative). </comment>
</elem>
<elem name ="macaddr" type="mac48" multiplicity="1">
<elem name ="mac" type="mac48" multiplicity="1">
<comment>Access point mac address</comment>
</elem>
</struct>
......
HPE/V1.2/XIDData.prop
......@@ -178,7 +178,7 @@ Idx.HPE.ReferenceData.format=1
Idx.HPE.Shape.type=1
Idx.HPE.Spheroid.radius=1
Idx.HPE.Spheroid.vert=2
Idx.HPE.WiFi.WiFiRss.macaddr=2
Idx.HPE.WiFi.WiFiRss.mac=2
Idx.HPE.WiFi.WiFiRss.rss=1
Idx.HPE.WiFi.WiFiRssExt.freq=2
Idx.HPE.WiFi.WiFiRssExt.ssid=1
......@@ -363,7 +363,7 @@ Off.HPE.ReferenceData.format=0
Off.HPE.Shape.type=0
Off.HPE.Spheroid.radius=25
Off.HPE.Spheroid.vert=29
Off.HPE.WiFi.WiFiRss.macaddr=10
Off.HPE.WiFi.WiFiRss.mac=10
Off.HPE.WiFi.WiFiRss.rss=9
Off.HPE.WiFi.WiFiRssExt.freq=49
Off.HPE.WiFi.WiFiRssExt.ssid=16
......@@ -405,6 +405,47 @@ Ord.HPE.StateInfo.shape=66
Ord.HPE.StateInfo.source=69
Ord.HPE.StateInfo.speed=67
Ord.HPE.TaskReport.status=128
Ord.Logging.ActionMsg.category=98
Ord.Logging.ActionMsg.id=96
Ord.Logging.ActionMsg.iid=99
Ord.Logging.ActionMsg.severity=97
Ord.Logging.AppMetrics.currentCount=81
Ord.Logging.AppMetrics.failureCount=86
Ord.Logging.AppMetrics.failurePeakTime=88
Ord.Logging.AppMetrics.failureTotalTime=87
Ord.Logging.AppMetrics.peakCount=82
Ord.Logging.AppMetrics.successCount=85
Ord.Logging.AppMetrics.successPeakTime=84
Ord.Logging.AppMetrics.successTotalTime=83
Ord.Logging.AppMetrics.totalCount=80
Ord.Logging.BatchPegCount.granularity=81
Ord.Logging.BatchPegCount.value=80
Ord.Logging.DebugInfo.file=64
Ord.Logging.DebugInfo.line=65
Ord.Logging.DebugInfo.thid=66
Ord.Logging.MessageBase.data=68
Ord.Logging.MessageBase.date=65
Ord.Logging.MessageBase.debug=69
Ord.Logging.MessageBase.info=67
Ord.Logging.MessageBase.source=66
Ord.Logging.MessageBase.type=64
Ord.Logging.Metric.metricType=64
Ord.Logging.Metric.name=65
Ord.Logging.MetricMsg.duration=81
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.taskid=112
Ord.Logging.TraceMsg.level=96
Ord.Logging.TransactionMsg.acctid=82
Ord.Logging.TransactionMsg.appid=84
Ord.Logging.TransactionMsg.devid=83
Ord.Logging.TransactionMsg.etid=81
Ord.Logging.TransactionMsg.tid=80
Ord.Logging.UsageMsg.uri=96
Ord.Tensor.Command.argument=66
Ord.Tensor.Command.etid=65
Ord.Tensor.Command.name=64
......@@ -484,6 +525,18 @@ Size.HPE.StateInfo=-1
Size.HPE.TaskReport=-1
Size.HPE.WiFi.WiFiRss=16
Size.HPE.WiFi.WiFiRssExt=57
Size.Logging.ActionMsg=-1
Size.Logging.AppMetrics=-1
Size.Logging.BatchPegCount=-1
Size.Logging.DebugInfo=-1
Size.Logging.MessageBase=-1
Size.Logging.Metric=-1
Size.Logging.MetricMsg=-1
Size.Logging.PegCount=-1
Size.Logging.TaskReport=-1
Size.Logging.TraceMsg=-1
Size.Logging.TransactionMsg=-1
Size.Logging.UsageMsg=-1
Size.Tensor.Command=-1
Size.Tensor.CommandApi.Execute.Input=-1
Size.Tensor.CommandApi.Execute.Output=-1
......
ILP/V1.2/XIDData.prop
......@@ -178,7 +178,7 @@ Idx.HPE.ReferenceData.format=1
Idx.HPE.Shape.type=1
Idx.HPE.Spheroid.radius=1
Idx.HPE.Spheroid.vert=2
Idx.HPE.WiFi.WiFiRss.macaddr=2
Idx.HPE.WiFi.WiFiRss.mac=2
Idx.HPE.WiFi.WiFiRss.rss=1
Idx.HPE.WiFi.WiFiRssExt.freq=2
Idx.HPE.WiFi.WiFiRssExt.ssid=1
......@@ -363,7 +363,7 @@ Off.HPE.ReferenceData.format=0
Off.HPE.Shape.type=0
Off.HPE.Spheroid.radius=25
Off.HPE.Spheroid.vert=29
Off.HPE.WiFi.WiFiRss.macaddr=10
Off.HPE.WiFi.WiFiRss.mac=10
Off.HPE.WiFi.WiFiRss.rss=9
Off.HPE.WiFi.WiFiRssExt.freq=49
Off.HPE.WiFi.WiFiRssExt.ssid=16
......@@ -410,6 +410,7 @@ Ord.ILP.CalculateInput.confidence=84
Ord.ILP.CalculateInput.durSession=81
Ord.ILP.CalculateInput.dynamics=82
Ord.ILP.CalculateInput.maxEstimates=85
Ord.ILP.CalculateInput.obsSetXmf=91
Ord.ILP.CalculateInput.obsSetXmfFmt=88
Ord.ILP.CalculateInput.observations=89
Ord.ILP.CalculateInput.rankEstimate=83
......
SLAM/V1.0/ReferenceData.xid.xml
......@@ -104,7 +104,7 @@
<elem name="ssid" type="HPE.WiFi.SSID" multiplicity="1">
<comment>ssid of the access point</comment>
</elem>
<elem name ="macaddr" type="mac48" multiplicity="1">
<elem name ="mac" type="mac48" multiplicity="1">
<comment>the mac address of the access point</comment>
</elem>
......@@ -112,7 +112,7 @@
<struct name="BluetoothRefPoint" type="RFRefPoint" rttkey="SLAM.RefPointType.Bluetooth">
<elem name ="macaddr" type="Tensor.string" multiplicity="1">
<elem name ="mac" type="Tensor.string" multiplicity="1">
<comment>the mac address of the access point</comment>
</elem>
......
SLAM/V1.0/XIDData.prop
......@@ -4,6 +4,10 @@ Idx.GeoSpatial.BoundingBox.latmax=2
Idx.GeoSpatial.BoundingBox.latmin=1
Idx.GeoSpatial.BoundingBox.lonmax=4
Idx.GeoSpatial.BoundingBox.lonmin=3
Idx.GeoSpatial.Event.SpeedInfo.azimuth=3
Idx.GeoSpatial.Event.SpeedInfo.horizontal=1
Idx.GeoSpatial.Event.SpeedInfo.uncertainty=4
Idx.GeoSpatial.Event.SpeedInfo.vertical=2
Idx.GeoSpatial.PositionECEF.alt=3
Idx.GeoSpatial.PositionECEF.lat=1
Idx.GeoSpatial.PositionECEF.lon=2
......@@ -187,7 +191,7 @@ Idx.HPE.ReferenceData.format=1
Idx.HPE.Shape.type=1
Idx.HPE.Spheroid.radius=1
Idx.HPE.Spheroid.vert=2
Idx.HPE.WiFi.WiFiRss.macaddr=2
Idx.HPE.WiFi.WiFiRss.mac=2
Idx.HPE.WiFi.WiFiRss.rss=1
Idx.HPE.WiFi.WiFiRssExt.freq=2
Idx.HPE.WiFi.WiFiRssExt.ssid=1
......@@ -211,6 +215,10 @@ Off.GeoSpatial.BoundingBox.latmax=4
Off.GeoSpatial.BoundingBox.latmin=0
Off.GeoSpatial.BoundingBox.lonmax=12
Off.GeoSpatial.BoundingBox.lonmin=8
Off.GeoSpatial.Event.SpeedInfo.azimuth=8
Off.GeoSpatial.Event.SpeedInfo.horizontal=0
Off.GeoSpatial.Event.SpeedInfo.uncertainty=12
Off.GeoSpatial.Event.SpeedInfo.vertical=4
Off.GeoSpatial.PositionECEF.alt=16
Off.GeoSpatial.PositionECEF.lat=0
Off.GeoSpatial.PositionECEF.lon=8
......@@ -394,7 +402,7 @@ Off.HPE.ReferenceData.format=0
Off.HPE.Shape.type=0
Off.HPE.Spheroid.radius=25
Off.HPE.Spheroid.vert=29
Off.HPE.WiFi.WiFiRss.macaddr=10
Off.HPE.WiFi.WiFiRss.mac=10
Off.HPE.WiFi.WiFiRss.rss=9
Off.HPE.WiFi.WiFiRssExt.freq=49
Off.HPE.WiFi.WiFiRssExt.ssid=16
......@@ -418,10 +426,61 @@ Ord.GeoSpatial.AddressInfo.PostalCode=68
Ord.GeoSpatial.AddressInfo.StateRegion=67
Ord.GeoSpatial.AddressInfo.address1=64
Ord.GeoSpatial.AddressInfo.address2=65
Ord.GeoSpatial.Arc.direction=98
Ord.GeoSpatial.Arc.inner=97
Ord.GeoSpatial.Arc.opening=99
Ord.GeoSpatial.Arc.outer=96
Ord.GeoSpatial.Arc3D.direction=115
Ord.GeoSpatial.Arc3D.height=112
Ord.GeoSpatial.Arc3D.inner=114
Ord.GeoSpatial.Arc3D.opening=116
Ord.GeoSpatial.Arc3D.outer=113
Ord.GeoSpatial.ArcBand.direction=101
Ord.GeoSpatial.ArcBand.major_inner=97
Ord.GeoSpatial.ArcBand.major_outer=96
Ord.GeoSpatial.ArcBand.minor_inner=99
Ord.GeoSpatial.ArcBand.minor_outer=98
Ord.GeoSpatial.ArcBand.opening=102
Ord.GeoSpatial.ArcBand.orient=100
Ord.GeoSpatial.ArcBand3D.direction=113
Ord.GeoSpatial.ArcBand3D.height=112
Ord.GeoSpatial.ArcBand3D.opening=115
Ord.GeoSpatial.ArcBand3D.radius=117
Ord.GeoSpatial.ArcBand3D.tilt=114
Ord.GeoSpatial.ArcBand3D.vopening=116
Ord.GeoSpatial.Circle.radius=96
Ord.GeoSpatial.ContactInfo.email=66
Ord.GeoSpatial.ContactInfo.givenname=64
Ord.GeoSpatial.ContactInfo.phone=67
Ord.GeoSpatial.ContactInfo.surname=65
Ord.GeoSpatial.Ellipse.major=96
Ord.GeoSpatial.Ellipse.minor=97
Ord.GeoSpatial.Ellipse.orient=98
Ord.GeoSpatial.Ellipsoid.major=112
Ord.GeoSpatial.Ellipsoid.minor=113
Ord.GeoSpatial.Ellipsoid.orient=114
Ord.GeoSpatial.Ellipsoid.vert=115
Ord.GeoSpatial.Event.data=68
Ord.GeoSpatial.Event.epoch=65
Ord.GeoSpatial.Event.infoEvent=1
Ord.GeoSpatial.Event.infoProducer=2
Ord.GeoSpatial.Event.location=66
Ord.GeoSpatial.Event.speed=67
Ord.GeoSpatial.Event.uuid=64
Ord.GeoSpatial.EventProducer.Notify.Data.event=80
Ord.GeoSpatial.EventProducer.RequestInfo.Output.producer=80
Ord.GeoSpatial.GeoObject.address=84
Ord.GeoSpatial.GeoObject.bounds=80
Ord.GeoSpatial.GeoObject.floorMax=82
Ord.GeoSpatial.GeoObject.floorMin=81
Ord.GeoSpatial.GeoObject.shape=83
Ord.GeoSpatial.GeoObject.validBegin=85
Ord.GeoSpatial.GeoObject.validEnd=86
Ord.GeoSpatial.Location.address=83
Ord.GeoSpatial.Location.confidence=82
Ord.GeoSpatial.Location.floor=84
Ord.GeoSpatial.Location.shape=80
Ord.GeoSpatial.Location.veracity=81
Ord.GeoSpatial.Object.data=70
Ord.GeoSpatial.Object.description=69
Ord.GeoSpatial.Object.name=68
......@@ -429,6 +488,9 @@ Ord.GeoSpatial.Object.typeObject=64
Ord.GeoSpatial.Object.uriClassifier=67
Ord.GeoSpatial.Object.uriExternal=66
Ord.GeoSpatial.Object.uuid=65
Ord.GeoSpatial.Point2D.lat=80
Ord.GeoSpatial.Point2D.lon=81
Ord.GeoSpatial.Point3D.alt=96
Ord.GeoSpatial.PointOfInterest.address=69
Ord.GeoSpatial.PointOfInterest.confidence=68
Ord.GeoSpatial.PointOfInterest.contact=70
......@@ -436,6 +498,15 @@ Ord.GeoSpatial.PointOfInterest.description=66
Ord.GeoSpatial.PointOfInterest.floor=65
Ord.GeoSpatial.PointOfInterest.name=64
Ord.GeoSpatial.PointOfInterest.position=67
Ord.GeoSpatial.Polygon.points=97
Ord.GeoSpatial.Polygon.units=96
Ord.GeoSpatial.Polygon3D.points=113
Ord.GeoSpatial.Polygon3D.units=112
Ord.GeoSpatial.Polygon3D.vert=114
Ord.GeoSpatial.ProducerInfo.events=80
Ord.GeoSpatial.Shape.type=64
Ord.GeoSpatial.Spheroid.radius=112
Ord.GeoSpatial.Spheroid.vert=113
Ord.HPE.Estimate.confidence=69
Ord.HPE.Estimate.epoch=68
Ord.HPE.Estimate.obstype=66
......@@ -444,6 +515,7 @@ Ord.HPE.Estimate.shape=70
Ord.HPE.Estimate.source=65
Ord.HPE.Estimate.tic=67
Ord.HPE.Estimate.veracity=71
Ord.HPE.Gnss.AcqAssistSet.assist=64
Ord.HPE.Gnss.AcqAssistSet.data=64
Ord.HPE.Gnss.ConstellationData.almanacs=66
Ord.HPE.Gnss.ConstellationData.constellation=64
......@@ -479,11 +551,17 @@ Ord.Logging.ActionMsg.iid=99
Ord.Logging.ActionMsg.severity=97
Ord.Logging.AppMetrics.currentCount=81
Ord.Logging.AppMetrics.failureCount=86
Ord.Logging.AppMetrics.failurePeakTime=88
Ord.Logging.AppMetrics.failureTotalTime=87
Ord.Logging.AppMetrics.peakCount=82
Ord.Logging.AppMetrics.peakTime=84
Ord.Logging.AppMetrics.successCount=85
Ord.Logging.AppMetrics.successPeakTime=84
Ord.Logging.AppMetrics.successTotalTime=83
Ord.Logging.AppMetrics.totalCount=80
Ord.Logging.AppMetrics.totalTime=83
Ord.Logging.BatchPegCount.granularity=81
Ord.Logging.BatchPegCount.value=80
Ord.Logging.DebugInfo.file=64
Ord.Logging.DebugInfo.line=65
Ord.Logging.DebugInfo.thid=66
......@@ -510,7 +588,7 @@ Ord.Logging.TransactionMsg.devid=83
Ord.Logging.TransactionMsg.etid=81
Ord.Logging.TransactionMsg.tid=80
Ord.Logging.UsageMsg.uri=96
Ord.SLAM.BluetoothRefPoint.macaddr=96
Ord.SLAM.BluetoothRefPoint.mac=97
Ord.SLAM.CellularRefPoint.antenna=97
Ord.SLAM.CellularRefPoint.cid=96
Ord.SLAM.GenericRFRefPoint.uri=96
......@@ -628,7 +706,7 @@ Ord.SLAM.TileService.FindTilesByRefId.Input.refids=80
Ord.SLAM.TileService.FindTilesByRefId.Input.signaltype=82
Ord.SLAM.TileService.FindTilesByRefId.Output.tiles=80
Ord.SLAM.TileSet.tiles=64
Ord.SLAM.WifiRefPoint.macaddr=97
Ord.SLAM.WifiRefPoint.mac=98
Ord.SLAM.WifiRefPoint.ssid=96
Ord.Tensor.Command.argument=66
Ord.Tensor.Command.etid=65
......@@ -652,6 +730,9 @@ Ord.Tensor.OutputBase.errinfo=67
Ord.Tensor.OutputBase.etid=65
Ord.Tensor.OutputBase.resultcode=66
Ord.Tensor.VoidType.reserved=64
SID.GeoSpatial.EventProducer.Notify.Data=4242
SID.GeoSpatial.EventProducer.RequestInfo.Input=4240
SID.GeoSpatial.EventProducer.RequestInfo.Output=4241
SID.SLAM.Probe.Submit.Input=4146
SID.SLAM.Survey.Download.Input=4146
SID.SLAM.Survey.Download.Output=4147
......@@ -671,11 +752,32 @@ SID.SLAM.TileService.FindTilesByRefId.Output=4170
SID.Tensor.CommandApi.Execute.Input=256
SID.Tensor.CommandApi.Execute.Output=257
Size.GeoSpatial.AddressInfo=-1
Size.GeoSpatial.Arc3D=-1
Size.GeoSpatial.Arc=-1
Size.GeoSpatial.ArcBand3D=-1
Size.GeoSpatial.ArcBand=-1
Size.GeoSpatial.BoundingBox=24
Size.GeoSpatial.Circle=-1
Size.GeoSpatial.ContactInfo=-1
Size.GeoSpatial.Ellipse=-1
Size.GeoSpatial.Ellipsoid=-1
Size.GeoSpatial.Event.SpeedInfo=16
Size.GeoSpatial.Event=-1
Size.GeoSpatial.EventProducer.Notify.Data=-1
Size.GeoSpatial.EventProducer.RequestInfo.Input=-1
Size.GeoSpatial.EventProducer.RequestInfo.Output=-1
Size.GeoSpatial.GeoObject=-1
Size.GeoSpatial.Location=-1
Size.GeoSpatial.Object=-1
Size.GeoSpatial.Point2D=-1
Size.GeoSpatial.Point3D=-1
Size.GeoSpatial.PointOfInterest=-1
Size.GeoSpatial.Polygon3D=-1
Size.GeoSpatial.Polygon=-1
Size.GeoSpatial.PositionECEF=24
Size.GeoSpatial.ProducerInfo=-1
Size.GeoSpatial.Shape=-1
Size.GeoSpatial.Spheroid=-1
Size.HPE.Arc3D=45
Size.HPE.Arc=33
Size.HPE.ArcBand3D=49
......@@ -733,6 +835,7 @@ Size.HPE.WiFi.WiFiRss=16
Size.HPE.WiFi.WiFiRssExt=57
Size.Logging.ActionMsg=-1
Size.Logging.AppMetrics=-1
Size.Logging.BatchPegCount=-1
Size.Logging.DebugInfo=-1
Size.Logging.MessageBase=-1
Size.Logging.Metric=-1
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!