Commit b07fc381 authored by András Wippelhauser's avatar András Wippelhauser
Browse files

Update OEMSpecific data to UInt16

parent 0d7dd10f

AVP_Commons.asn

+1 −4
Original line number Diff line number Diff line
@@ -12,10 +12,7 @@ UInt32 ::= INTEGER (0..4294967295) 


RollingCounter ::= UInt16



OEMSpecificContainer ::= SEQUENCE {

    ...

    -- Option: this is a discussion point, how we can implement this in ASN.1 the best way

}

OEMSpecificData ::= UInt16



WaypointIndex ::= UInt16

PCIM.asn

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ DEFINITIONS AUTOMATIC TAGS ::= BEGIN -- Park Control Infrastucture Message 


IMPORTS



RollingCounter, CentimetrePerSecond, HighResCurvature, GearEnum, WaypointIndex, Pose, ParkingControlE2EProtection

RollingCounter, CentimetrePerSecond, HighResCurvature, GearEnum, WaypointIndex, Pose, ParkingControlE2EProtection, OEMSpecificData

FROM AVP-Commons-PDU-Descriptions {

  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103882) avpCommons (5) major-version-1 (1) minor-version-1(1)

}
@@ -39,7 +39,7 @@ VehicleContainer ::= SEQUENCE { 
  driveCommand DriveCommand,                         	-- Contains commands for the automated drive.

  detectedVehiclePose DetectedVehiclePose OPTIONAL,  	-- Contains the most recent pose of the vehicle in the fixed infrastructure coordinate system.

  controlInterface ControlInterface,                 	-- Specifies which interface is used to control the vehicle.

  oemSpecific UInt16 OPTIONAL                       	-- OEM specific 16 bit container for special purposes.

  oemSpecific OEMSpecificData OPTIONAL                -- OEM specific 16 bit container for special purposes.

}



VidRequest ::= CHOICE {     -- We proposed a change here: now we are flexible with identification technologies

PCVM.asn

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ FROM ETSI-ITS-CDD { 
  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) 102894 cdd (2) major-version-3 (3) minor-version-1 (1)

}



RollingCounter, OEMSpecificContainer, GearEnum, CentimetrePerSecond, HighResCurvature, WaypointIndex, Pose, SessionMissionID, ParkingControlE2EProtection

RollingCounter, OEMSpecificData, GearEnum, CentimetrePerSecond, HighResCurvature, WaypointIndex, Pose, SessionMissionID, ParkingControlE2EProtection

FROM AVP-Commons-PDU-Descriptions {

  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103882) avpCommons (5) major-version-1 (1) minor-version-1(1)

}
@@ -32,7 +32,7 @@ Pcvm ::= SEQUENCE { 
  safeVehicleTypeConfirmation SafeVehicleTypeConfirmation OPTIONAL,	-- Functional Safety related container

  vehicleError VehicleError OPTIONAL,        						-- Optional error information. Depending on the given error, the infrastructure either tries to resolve the issue or aborts the mission.

  vehicleDebug VehicleDebug OPTIONAL,        						-- Optional debug information.

  oemSpecific OEMSpecificContainer OPTIONAL 						-- OEM specific 16 bit container for special purposes.

  oemSpecific OEMSpecificData OPTIONAL 						-- OEM specific 16 bit container for special purposes.

}



VehicleState ::= SEQUENCE {

xml/PCIM.asn1

+2 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ VehicleContainer ::= SEQUENCE { 
  driveCommand DriveCommand,                         	-- Contains commands for the automated drive.

  detectedVehiclePose DetectedVehiclePose OPTIONAL,  	-- Contains the most recent pose of the vehicle in the fixed infrastructure coordinate system.

  controlInterface ControlInterface,                 	-- Specifies which interface is used to control the vehicle.

  oemSpecific UInt16 OPTIONAL                       	-- OEM specific 16 bit container for special purposes.

  oemSpecific OEMSpecificData OPTIONAL                -- OEM specific 16 bit container for special purposes.

}



VidRequest ::= CHOICE {     -- We proposed a change here: now we are flexible with identification technologies
@@ -157,10 +157,7 @@ UInt32 ::= INTEGER (0..4294967295) 


RollingCounter ::= UInt16



OEMSpecificContainer ::= SEQUENCE {

    ...

    -- Option: this is a discussion point, how we can implement this in ASN.1 the best way

}

OEMSpecificData ::= UInt16



WaypointIndex ::= UInt16

xml/PCVM.asn1

+2 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Pcvm ::= SEQUENCE { 
  safeVehicleTypeConfirmation SafeVehicleTypeConfirmation OPTIONAL,	-- Functional Safety related container

  vehicleError VehicleError OPTIONAL,        						-- Optional error information. Depending on the given error, the infrastructure either tries to resolve the issue or aborts the mission.

  vehicleDebug VehicleDebug OPTIONAL,        						-- Optional debug information.

  oemSpecific OEMSpecificContainer OPTIONAL 						-- OEM specific 16 bit container for special purposes.

  oemSpecific OEMSpecificData OPTIONAL 						-- OEM specific 16 bit container for special purposes.

}



VehicleState ::= SEQUENCE {
@@ -116,10 +116,7 @@ UInt32 ::= INTEGER (0..4294967295) 


RollingCounter ::= UInt16



OEMSpecificContainer ::= SEQUENCE {

    ...

    -- Option: this is a discussion point, how we can implement this in ASN.1 the best way

}

OEMSpecificData ::= UInt16



WaypointIndex ::= UInt16