Skip to content

Commit

Permalink
Merge pull request #51 from CDOT-CV/j2735/conform-to-2020-standard
Browse files Browse the repository at this point in the history
Conform to J2735 2020 Standard
  • Loading branch information
drewjj authored Jan 16, 2024
2 parents f14a82d + ea6d468 commit 851204d
Show file tree
Hide file tree
Showing 34 changed files with 585 additions and 571 deletions.
48 changes: 24 additions & 24 deletions data/TIM_Message_Testing_Files/TIM_BroadcastSampleOutput.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/archive/TimTestGeometry.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "0",
"msgID": "RoadSignID",
"position": {
Expand All @@ -23,7 +23,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "bob",
Expand Down
4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/archive/TimTestPath_LL.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "0",
"msgID": "RoadSignID",
"position": {
Expand All @@ -23,7 +23,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "835",
"priority": "2",
"sspLocationRights": "0",
"notUsed1": "0",
"regions": [
{
"name": "SpeedLimit",
Expand Down
4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/archive/TimTestPath_XY.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "1",
"notUsed": "0",
"frameType": "1",
"msgID": "RoadSignID",
"position": {
Expand All @@ -23,7 +23,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "835",
"priority": "2",
"sspLocationRights": "0",
"notUsed1": "0",
"regions": [
{
"name": "SpeedLimit",
Expand Down
4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/archive/TimTestoldRegion.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "1",
"msgID": "RoadSignID",
"position": {
Expand All @@ -23,7 +23,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "835",
"priority": "2",
"sspLocationRights": "0",
"notUsed1": "0",
"regions": [
{
"name": "SpeedLimit",
Expand Down
4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/archive/testExitService.json
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@
]
},
"content": {
"sspMsgRights1": "1",
"sspMsgRights2": "2",
"notUsed2": "0",
"notUsed3": "0",
"contentType": {
"advisory": [],
"workZone": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -62,7 +62,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "bob",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -75,7 +75,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "bob",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"startDateTime": "2018-06-11T10:00-06:00",
"durationTime": 2000,
"frameType": "advisory",
"sspTimRights": "1",
"notUsed": "0",
"msgId": {
"roadSignID": {
"mutcdCode": "warning",
Expand All @@ -60,7 +60,7 @@
}
},
"priority": "5",
"sspLocationRights": "1",
"notUsed1": "0",
"regions": [
{
"name": "southbound_Timberline_20_30_RSU-192.168.0.100",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"startDateTime": "2018-06-11T10:00-06:00",
"durationTime": 2000,
"frameType": "advisory",
"sspTimRights": "1",
"notUsed": "0",
"msgId": {
"roadSignID": {
"mutcdCode": "warning",
Expand All @@ -60,7 +60,7 @@
}
},
"priority": "5",
"sspLocationRights": "1",
"notUsed1": "0",
"regions": [
{
"name": "southbound_Timberline_20_30_RSU-192.168.0.100",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"startDateTime": "2018-04-18T11:20-06:00",
"durationTime": 2000,
"frameType": "advisory",
"sspTimRights": "1",
"notUsed": "0",
"msgId": {
"roadSignID": {
"mutcdCode": "warning",
Expand All @@ -36,7 +36,7 @@
}
},
"priority": "5",
"sspLocationRights": "1",
"notUsed1": "0",
"regions": [
{
"name": "southbound_Timberline_20_30_RSU-192.168.0.100",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -75,7 +75,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "bob",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -59,7 +59,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "bob",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"urlB": "null",
"dataframes": [
{
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -59,7 +59,7 @@
"startDateTime": "2017-12-01T17:47:11-05:00",
"durationTime": "22",
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "bob",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
{
"startDateTime": "2017-08-02T22:25:00.000Z",
"durationTime": 1,
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -62,7 +62,7 @@
}
},
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "Testing TIM",
Expand Down
4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/tim_path_multiRSU_hexCRC.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{
"startDateTime": "2017-08-02T22:25:00.000Z",
"durationTime": 1,
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -75,7 +75,7 @@
}
},
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "Testing TIM",
Expand Down
4 changes: 2 additions & 2 deletions data/TIM_Message_Testing_Files/tim_path_singleRSU.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{
"startDateTime": "2017-08-02T22:25:00.000Z",
"durationTime": 1,
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -59,7 +59,7 @@
}
},
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "Testing TIM",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{
"startDateTime": "2017-08-02T22:25:00.000Z",
"durationTime": 1,
"sspTimRights": "0",
"notUsed": "0",
"frameType": "advisory",
"msgId": {
"roadSignID": {
Expand All @@ -46,7 +46,7 @@
}
},
"priority": "0",
"sspLocationRights": "3",
"notUsed1": "0",
"regions": [
{
"name": "Testing TIM",
Expand Down
2 changes: 1 addition & 1 deletion data/dnMsg.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"metadata":{"securityResultCode":"success","recordGeneratedBy":"OBU","receivedMessageDetails":{"locationData":{"elevation":1372.4,"heading":297.3,"latitude":40.5655211,"speed":0.46,"longitude":-105.0323263},"rxSource":"NA"},"schemaVersion":6,"payloadType":"us.dot.its.jpo.ode.model.OdeTimPayload","serialId":{"recordId":0,"serialNumber":14742,"streamId":"801780cb-d91d-444b-8f4d-9c44fe27f5ea","bundleSize":1,"bundleId":73},"sanitized":false,"recordGeneratedAt":"2018-05-02T16:47:45.603Z","recordType":"dnMsg","logFileName":"dnMsg.gz","odeReceivedAt":"2019-04-09T18:08:17.818Z"},"payload":{"data":{"MessageFrame":{"messageId":31,"value":{"TravelerInformation":{"timeStamp":174827,"packetID":"D3BAFF020000000000","dataFrames":{"TravelerDataFrame":{"regions":{"GeographicalPath":{"anchor":{"elevation":14742,"lat":405662581,"long":-1050326099},"laneWidth":400,"directionality":{"forward":""},"description":{"path":{"offset":{"xy":{"nodes":{"NodeXY":[{"delta":{"node-LatLon":{"lon":-1050329714,"lat":405662567}}},{"delta":{"node-LatLon":{"lon":-1050335237,"lat":405662769}}},{"delta":{"node-LatLon":{"lon":-1050335993,"lat":405663179}}},{"delta":{"node-LatLon":{"lon":-1050336397,"lat":405664057}}},{"delta":{"node-LatLon":{"lon":-1050336440,"lat":405667220}}},{"delta":{"node-LatLon":{"lon":-1050336660,"lat":405671451}}},{"delta":{"node-LatLon":{"lon":-1050336938,"lat":405672504}}},{"delta":{"node-LatLon":{"lon":-1050337672,"lat":405672940}}}]}}}}},"direction":1111111111111111}},"duratonTime":2880,"sspMsgRights1":1,"sspMsgRights2":1,"sspTimRights":1,"sspLocationRights":1,"frameType":{"advisory":""},"msgId":{"furtherInfoID":"0214"},"startTime":174826,"priority":7,"content":{"advisory":{"SEQUENCE":[{"item":{"itis":532}},{"item":{"itis":531}},{"item":{"text":"User Initiated Distress"}},{"item":{"text":"Vehicle-Class: Unknown"}}]}}}},"msgCnt":51}}}},"dataType":"TravelerInformation"}}
{"metadata":{"securityResultCode":"success","recordGeneratedBy":"OBU","receivedMessageDetails":{"locationData":{"elevation":1372.4,"heading":297.3,"latitude":40.5655211,"speed":0.46,"longitude":-105.0323263},"rxSource":"NA"},"schemaVersion":6,"payloadType":"us.dot.its.jpo.ode.model.OdeTimPayload","serialId":{"recordId":0,"serialNumber":14742,"streamId":"801780cb-d91d-444b-8f4d-9c44fe27f5ea","bundleSize":1,"bundleId":73},"sanitized":false,"recordGeneratedAt":"2018-05-02T16:47:45.603Z","recordType":"dnMsg","logFileName":"dnMsg.gz","odeReceivedAt":"2019-04-09T18:08:17.818Z"},"payload":{"data":{"MessageFrame":{"messageId":31,"value":{"TravelerInformation":{"timeStamp":174827,"packetID":"D3BAFF020000000000","dataFrames":{"TravelerDataFrame":{"regions":{"GeographicalPath":{"anchor":{"elevation":14742,"lat":405662581,"long":-1050326099},"laneWidth":400,"directionality":{"forward":""},"description":{"path":{"offset":{"xy":{"nodes":{"NodeXY":[{"delta":{"node-LatLon":{"lon":-1050329714,"lat":405662567}}},{"delta":{"node-LatLon":{"lon":-1050335237,"lat":405662769}}},{"delta":{"node-LatLon":{"lon":-1050335993,"lat":405663179}}},{"delta":{"node-LatLon":{"lon":-1050336397,"lat":405664057}}},{"delta":{"node-LatLon":{"lon":-1050336440,"lat":405667220}}},{"delta":{"node-LatLon":{"lon":-1050336660,"lat":405671451}}},{"delta":{"node-LatLon":{"lon":-1050336938,"lat":405672504}}},{"delta":{"node-LatLon":{"lon":-1050337672,"lat":405672940}}}]}}}}},"direction":1111111111111111}},"durationTime":2880,"notUsed2":0,"notUsed3":0,"notUsed":0,"notUsed1":0,"frameType":{"advisory":""},"msgId":{"furtherInfoID":"0214"},"startTime":174826,"priority":7,"content":{"advisory":{"SEQUENCE":[{"item":{"itis":532}},{"item":{"itis":531}},{"item":{"text":"User Initiated Distress"}},{"item":{"text":"Vehicle-Class: Unknown"}}]}}}},"msgCnt":51}}}},"dataType":"TravelerInformation"}}
10 changes: 5 additions & 5 deletions data/rxMsg_TIM_Asn1DecoderOutput.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<packetID>00000000003616371F</packetID>
<dataFrames>
<TravelerDataFrame>
<sspTimRights>1</sspTimRights>
<notUsed>0</notUsed>
<frameType>
<advisory/>
</frameType>
Expand All @@ -70,9 +70,9 @@
</msgId>
<startYear>2017</startYear>
<startTime>359511</startTime>
<duratonTime>10080</duratonTime>
<durationTime>10080</durationTime>
<priority>6</priority>
<sspLocationRights>1</sspLocationRights>
<notUsed1>0</notUsed1>
<regions>
<GeographicalPath>
<anchor>
Expand Down Expand Up @@ -116,8 +116,8 @@
</description>
</GeographicalPath>
</regions>
<sspMsgRights1>1</sspMsgRights1>
<sspMsgRights2>1</sspMsgRights2>
<notUsed2>0</notUsed2>
<notUsed3>0</notUsed3>
<content>
<advisory>
<SEQUENCE>
Expand Down
Loading

0 comments on commit 851204d

Please sign in to comment.