forked from usdot-jpo-ode/asn1_codec
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change *.patch files to LF line endings, and add .gitattributes file …
…to try to prevent git from changing them
- Loading branch information
Showing
4 changed files
with
27 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| *.patch text | ||
| *.patch eol=lf |
10 changes: 5 additions & 5 deletions
10
asn1c_combined/j2735-asn-files/2024/asn-edits/RoadUserChargingReportMessage.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| --- J3217-R-RoadUserChargingReportMsg-2024-rel-v1.1.asn 2024-02-22 14:49:42.000000000 -0700 | ||
| +++ J3217-R-RoadUserChargingReportMsg-2024-rel-v1.1.asn.EDITED 2024-11-17 00:19:57.157916800 -0700 | ||
| @@ -98 +98,2 @@ | ||
| - VehicleId | ||
| + -- EDITED | ||
| + TumVehicleId | ||
| - VehicleId | ||
| + -- EDITED | ||
| + TumVehicleId | ||
| @@ -144 +145 @@ | ||
| - vehicleID VehicleId, -- From J3217 TUM | ||
| + vehicleID TumVehicleId, -- From J3217 TUM, EDITED | ||
| - vehicleID VehicleId, -- From J3217 TUM | ||
| + vehicleID TumVehicleId, -- From J3217 TUM, EDITED |
20 changes: 10 additions & 10 deletions
20
asn1c_combined/j2735-asn-files/2024/asn-edits/RoadWeatherMessage.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| --- J2945-3-RoadWeatherMessage-2024-rel-v2.1.asn 2024-03-25 13:58:52.000000000 -0600 | ||
| +++ J2945-3-RoadWeatherMessage-2024-rel-v2.1.asn.EDITED 2024-11-17 00:22:05.128855100 -0700 | ||
| @@ -136 +136 @@ | ||
| - citizenReport SnapShot, | ||
| + citizenReport RwmSnapShot, -- EDITED | ||
| - citizenReport SnapShot, | ||
| + citizenReport RwmSnapShot, -- EDITED | ||
| @@ -141 +141 @@ | ||
| - snapShot SnapShot, | ||
| + snapShot RwmSnapShot, -- EDITED | ||
| - snapShot SnapShot, | ||
| + snapShot RwmSnapShot, -- EDITED | ||
| @@ -222,2 +222,4 @@ | ||
| - | ||
| -SnapShot ::= SEQUENCE { | ||
| +-- EDITED | ||
| +-- Name changed to avoid conflict with "Snapshot", lowercase S, in module ProveVehicleData per | ||
| +-- this https://github.com/vlm/asn1c/issues/420 | ||
| +RwmSnapShot ::= SEQUENCE { | ||
| - | ||
| -SnapShot ::= SEQUENCE { | ||
| +-- EDITED | ||
| +-- Name changed to avoid conflict with "Snapshot", lowercase S, in module ProveVehicleData per | ||
| +-- this https://github.com/vlm/asn1c/issues/420 | ||
| +RwmSnapShot ::= SEQUENCE { |
20 changes: 10 additions & 10 deletions
20
asn1c_combined/j2735-asn-files/2024/asn-edits/TollUsageMessage.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| --- J3217-TollUsageMsg-2024-rel-v1.1.asn 2024-02-21 17:09:52.000000000 -0700 | ||
| +++ J3217-TollUsageMsg-2024-rel-v1.1.asn.EDITED 2024-11-17 00:18:53.773971300 -0700 | ||
| @@ -157 +157 @@ | ||
| - vehicleId VehicleId, | ||
| + vehicleId TumVehicleId, | ||
| @@ -184 +184,3 @@ | ||
| -VehicleId ::= SEQUENCE { | ||
| +-- EDITED to avoid conflict with "VehicleID" in "Common" module. | ||
| +-- Name changed VehicleId -> TumVehicleId | ||
| +TumVehicleId ::= SEQUENCE { | ||
| --- J3217-TollUsageMsg-2024-rel-v1.1.asn 2024-02-21 17:09:52.000000000 -0700 | ||
| +++ J3217-TollUsageMsg-2024-rel-v1.1.asn.EDITED 2024-11-17 00:18:53.773971300 -0700 | ||
| @@ -157 +157 @@ | ||
| - vehicleId VehicleId, | ||
| + vehicleId TumVehicleId, | ||
| @@ -184 +184,3 @@ | ||
| -VehicleId ::= SEQUENCE { | ||
| +-- EDITED to avoid conflict with "VehicleID" in "Common" module. | ||
| +-- Name changed VehicleId -> TumVehicleId | ||
| +TumVehicleId ::= SEQUENCE { |