Merge branch 'ILP704' into 'master'

ILP-704 Changed SSID array type to uint8_t to avoid clients having to convert f… See merge request !6

Merge branch 'ILP704' into 'master'
ILP-704 Changed SSID array type to uint8_t to avoid clients having to convert f… See merge request !6
Mike Mathews
Showing 10 changed files with 29 additions and 13 deletions
GeoSpatial/V1.0/Events.xid.xml
GeoSpatial/V1.0/XIDData.prop
HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml
HPE/V1.2/XIDData.prop
ILP/V1.2/IlpAnalysisApi.xid.xml
ILP/V1.2/XIDData.prop
SLAM/V1.0/ProbeApi.xid.xml
SLAM/V1.0/ReferenceData.xid.xml
SLAM/V1.0/SurveyApi.xid.xml
SLAM/V1.0/XIDData.prop
--- a/GeoSpatial/V1.0/Events.xid.xml
View file @82cee84
+++ b/GeoSpatial/V1.0/Events.xid.xml
View file @82cee84
@@ -83,7 +83,7 @@
      <elem name="speed" type="SpeedInfo" multiplicity="0..1">
        <comment>Optional speed information of the associated object at the time the event occurred.</comment>
      </elem>
-      <elem name="data" type="Tensor.raw" multiplicity="0..1">
+      <elem name="eventdata" type="Tensor.raw" multiplicity="0..1">
        <comment>Optional event data in the same wireline format as the event structure.   The type of this information is dependent on the associate event information.</comment>
      </elem>
    </struct>
--- a/GeoSpatial/V1.0/XIDData.prop
View file @82cee84
+++ b/GeoSpatial/V1.0/XIDData.prop
View file @82cee84
@@ -71,11 +71,11 @@ 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.eventdata=68
 Ord.GeoSpatial.Event.speed=67
 Ord.GeoSpatial.Event.uuid=64
 Ord.GeoSpatial.EventProducer.Notify.Data.event=80
@@ -92,8 +92,8 @@ Ord.GeoSpatial.Location.confidence=82
 Ord.GeoSpatial.Location.floor=84
 Ord.GeoSpatial.Location.shape=80
 Ord.GeoSpatial.Location.veracity=81
-Ord.GeoSpatial.Object.miscdata=70
 Ord.GeoSpatial.Object.description=69
+Ord.GeoSpatial.Object.miscdata=70
 Ord.GeoSpatial.Object.name=68
 Ord.GeoSpatial.Object.typeObject=64
 Ord.GeoSpatial.Object.uriClassifier=67
--- a/HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml
View file @82cee84
+++ b/HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml
View file @82cee84
@@ -19,7 +19,7 @@
            <comment>Traditional 6 byte (EU48) mac address.</comment>
        </array>
-        <array name="SSID" type="int8" size="33">
+        <array name="SSID" type="uint8" size="33">
          <comment>ssid string of wifi access point</comment>
        </array>
--- a/HPE/V1.2/XIDData.prop
View file @82cee84
+++ b/HPE/V1.2/XIDData.prop
View file @82cee84
@@ -371,6 +371,7 @@ Off.HPE.WiFi.WiFiRssExt.uncert=53
 Ord.HPE.Estimate.confidence=69
 Ord.HPE.Estimate.epoch=68
 Ord.HPE.Estimate.floor=72
+Ord.HPE.Estimate.floorLabel=73
 Ord.HPE.Estimate.obstype=66
 Ord.HPE.Estimate.result=64
 Ord.HPE.Estimate.shape=70
--- a/ILP/V1.2/IlpAnalysisApi.xid.xml
View file @82cee84
+++ b/ILP/V1.2/IlpAnalysisApi.xid.xml
View file @82cee84
@@ -310,7 +310,7 @@
        <comment>
          Operation Reports analysis results.
        </comment>
-        <input name="data" type="DataSetResults" sid="0x1062"/>
+        <input name="input" type="DataSetResults" sid="0x1062"/>
      </operation>
    </interface>
--- a/ILP/V1.2/XIDData.prop
View file @82cee84
+++ b/ILP/V1.2/XIDData.prop
View file @82cee84
@@ -566,9 +566,8 @@ Ord.ILP.Analysis.Analyzer.Execute.Input.spec=85
 Ord.ILP.Analysis.Analyzer.Execute.Output.dataSetsFiltered=81
 Ord.ILP.Analysis.Analyzer.Execute.Output.results=80
 Ord.ILP.Analysis.Analyzer.Services.Output.uriServices=80
-Ord.ILP.Analysis.DataSet.data=81
-Ord.ILP.Analysis.DataSet.testdata=81
 Ord.ILP.Analysis.DataSet.returnFilteredData=82
+Ord.ILP.Analysis.DataSet.testdata=81
 Ord.ILP.Analysis.DataSet.uriServices=83
 Ord.ILP.Analysis.DataSet.uuidData=80
 Ord.ILP.Analysis.DataSetResults.durationExecution=81
@@ -584,14 +583,19 @@ Ord.ILP.Analysis.ResultRecord.data=83
 Ord.ILP.Analysis.ResultRecord.enuErr=75
 Ord.ILP.Analysis.ResultRecord.enuErrVel=77
 Ord.ILP.Analysis.ResultRecord.enuEstVel=76
+Ord.ILP.Analysis.ResultRecord.enuUncert=84
+Ord.ILP.Analysis.ResultRecord.enuVelErr=87
+Ord.ILP.Analysis.ResultRecord.enuVelEst=86
 Ord.ILP.Analysis.ResultRecord.epoch=65
 Ord.ILP.Analysis.ResultRecord.floor=79
 Ord.ILP.Analysis.ResultRecord.floorErr=81
 Ord.ILP.Analysis.ResultRecord.floorLabel=82
+Ord.ILP.Analysis.ResultRecord.floorTruth=85
 Ord.ILP.Analysis.ResultRecord.floorUncert=80
 Ord.ILP.Analysis.ResultRecord.index=64
 Ord.ILP.Analysis.ResultRecord.llaEst=74
 Ord.ILP.Analysis.ResultRecord.llaTruth=73
+Ord.ILP.Analysis.ResultRecord.miscdata=88
 Ord.ILP.Analysis.ResultRecord.resultcode=66
 Ord.ILP.Analysis.ResultRecord.source=68
 Ord.ILP.Analysis.ResultRecord.stateErr=72
@@ -607,6 +611,7 @@ Ord.ILP.Analysis.ServiceResults.uriService=83
 Ord.ILP.Analysis.Specification.contact=82
 Ord.ILP.Analysis.Specification.createDate=80
 Ord.ILP.Analysis.Specification.datasets=83
+Ord.ILP.Analysis.Specification.extendedResults=84
 Ord.ILP.Analysis.Specification.modifiedDate=81
 Ord.ILP.Analysis.Statistics.cep50=65
 Ord.ILP.Analysis.Statistics.cep68=66
@@ -621,8 +626,14 @@ Ord.ILP.Analysis.Statistics.meanEnuVelUncert=76
 Ord.ILP.Analysis.Statistics.meanFloor=78
 Ord.ILP.Analysis.Statistics.meanState=71
 Ord.ILP.Analysis.Statistics.meanStateErr=72
+Ord.ILP.Analysis.Statistics.outliers=81
+Ord.ILP.Analysis.Statistics.rmsEnuErr=82
+Ord.ILP.Analysis.Statistics.rmsEnuUncert=83
+Ord.ILP.Analysis.Statistics.rmsEnuVelErr=85
+Ord.ILP.Analysis.Statistics.rmsEnuVelUncert=84
 Ord.ILP.Analysis.Statistics.rmsFloorErr=80
 Ord.ILP.Analysis.Statistics.rmsFloorUncert=79
+Ord.ILP.Analysis.Statistics.rmsStateErr=86
 Ord.ILP.Analysis.Statistics.rmserr=70
 Ord.ILP.Analysis.Statistics.rmsuncert=69
 Ord.ILP.CalculateInput.confidence=84
--- a/SLAM/V1.0/ProbeApi.xid.xml
View file @82cee84
+++ b/SLAM/V1.0/ProbeApi.xid.xml
View file @82cee84
@@ -77,7 +77,7 @@
          a business or public entity that has associated contact information.
        </comment>
      </elem>
-      <elem name="data" multiplicity ="0..1" type="Tensor.json">
+      <elem name="miscdata" multiplicity ="0..1" type="Tensor.json">
        <comment>Optional other information describing this probe location in json format.</comment>
      </elem>
    </struct>
--- a/SLAM/V1.0/ReferenceData.xid.xml
View file @82cee84
+++ b/SLAM/V1.0/ReferenceData.xid.xml
View file @82cee84
@@ -74,7 +74,7 @@
      <elem name="validend" type="datetime" multiplicity="1">
        <comment>time stamp of the ending of the valid period</comment>
      </elem>
-      <elem name ="data" type="Tensor.json" multiplicity="0..1">
+      <elem name ="miscdata" type="Tensor.json" multiplicity="0..1">
        <comment>json formatted data specific to the device</comment>
      </elem>
      <elem name="floor" multiplicity ="0..1" type="int8" >
--- a/SLAM/V1.0/SurveyApi.xid.xml
View file @82cee84
+++ b/SLAM/V1.0/SurveyApi.xid.xml
View file @82cee84
@@ -63,6 +63,9 @@
      <elem name="dateend" type="datetime" multiplicity="0..1">
        <comment>Last date and time of when this survey is valid.  Do not define if unknown.</comment>
      </elem>
+      <elem name="miscdata" type="json" multiplicity ="0..1">
+        <comment>Optional other information describing this survey in json format.</comment>
+      </elem>
    </struct>
--- a/SLAM/V1.0/XIDData.prop
View file @82cee84
+++ b/SLAM/V1.0/XIDData.prop
View file @82cee84
@@ -469,11 +469,11 @@ 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.miscdata=68
 Ord.GeoSpatial.Event.speed=67
 Ord.GeoSpatial.Event.uuid=64
 Ord.GeoSpatial.EventProducer.Notify.Data.event=80
@@ -490,8 +490,8 @@ 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.miscdata=70
 Ord.GeoSpatial.Object.name=68
 Ord.GeoSpatial.Object.typeObject=64
 Ord.GeoSpatial.Object.uriClassifier=67
@@ -609,9 +609,9 @@ Ord.SLAM.Probe.Submit.Input.probes=83
 Ord.SLAM.Probe.Submit.Input.sourceInfo=82
 Ord.SLAM.ProbeRecord.address=69
 Ord.SLAM.ProbeRecord.contact=70
-Ord.SLAM.ProbeRecord.data=71
 Ord.SLAM.ProbeRecord.description=68
 Ord.SLAM.ProbeRecord.floor=65
+Ord.SLAM.ProbeRecord.miscdata=71
 Ord.SLAM.ProbeRecord.name=67
 Ord.SLAM.ProbeRecord.observations=66
 Ord.SLAM.ProbeRecord.state=64
@@ -625,9 +625,9 @@ Ord.SLAM.ProbeSourceInfo.osNameVer=67
 Ord.SLAM.RFRefPoint.attenuation=81
 Ord.SLAM.RFRefPoint.freq=82
 Ord.SLAM.RFRefPoint.txpwr=80
-Ord.SLAM.RefPoint.data=71
 Ord.SLAM.RefPoint.floor=72
 Ord.SLAM.RefPoint.id=65
+Ord.SLAM.RefPoint.miscdata=71
 Ord.SLAM.RefPoint.position=66
 Ord.SLAM.RefPoint.type=64
 Ord.SLAM.RefPoint.usestatus=68
@@ -684,6 +684,7 @@ Ord.SLAM.SurveyInfo.dateend=73
 Ord.SLAM.SurveyInfo.datestart=72
 Ord.SLAM.SurveyInfo.flrmax=65
 Ord.SLAM.SurveyInfo.flrmin=66
+Ord.SLAM.SurveyInfo.miscdata=74
 Ord.SLAM.SurveyInfo.name=64
 Ord.SLAM.SurveyRecord.floor=65
 Ord.SLAM.SurveyRecord.observations=66