Commit ae95cd32 authored by urhahne's avatar urhahne
Browse files

changes requested by Embotec

parent 256960a6
Loading
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -156,10 +156,8 @@ HighResCurvature ::= INTEGER {
 *
 * The value shall be set to:
 * - `-32 766` to indicate that the rotational speed is equal to or greater than 3.2766 [rad/s] to the right,
 * - `n` (`n > -32 766` and `n <= 0`) to indicate that the rotation is clockwise (i.e. to the right) and is equal to or less than n x 0,01 rad/s, 
      and greater than (n-1) x 0,01 rad/s,
 * - `n` (`n > 0` and `n < 32 766`) to indicate that the rotation is anti-clockwise (i.e. to the left) and is equal to or less than n x 0,01 rad/s, 
      and greater than (n-1) x 0,01 rad/s,
 * - `n` (`n > -32 766` and `n <= 0`) to indicate that the rotation is clockwise (i.e. to the right) and is equal to or less than n x 0,01 rad/s, and greater than (n-1) x 0,01 rad/s,
 * - `n` (`n > 0` and `n < 32 766`) to indicate that the rotation is anti-clockwise (i.e. to the left) and is equal to or less than n x 0,01 rad/s, and greater than (n-1) x 0,01 rad/s,
 * - `32 766` to indicate that the rotational speed is greater than 3.2765 rad/second to the left,
 * - `32 767` to indicate that the information is not available.
 * 
@@ -262,6 +260,13 @@ VidVehicleStateEnum ::= ENUMERATED {
*/
SessionMissionID ::= IA5String (SIZE(17..32)) 

/** 
 * This DE serves for the identification of specified vehicle
 * The value be freely selected as a string of 1 to 17 characters. 
 *
*/
VehicleID ::= IA5String (SIZE(1..17)) 

/** 
 * This DE represents a detailed description.
 * It can serve to generate a more extensive, user-friendly description e.g. of an error. 
+23 −16
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ DEFINITIONS AUTOMATIC TAGS ::= BEGIN -- Park Control Infrastucture Message

IMPORTS

RollingCounter, Centimetre, HighResCurvature, GearEnum, WaypointIndex, Pose, ParkingControlE2EProtection, OEMSpecificData, SessionMissionID, UInt8, UInt16, UInt32, UInt64
RollingCounter, Centimetre, HighResCurvature, GearEnum, WaypointIndex, Pose, ParkingControlE2EProtection, OEMSpecificData, SessionMissionID, VehicleID, UInt8, UInt16, UInt32, UInt64
FROM AVP-Commons {
  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103882) avpCommons (5) major-version-1 (1) minor-version-1(1)
}
@@ -62,6 +62,10 @@ Pcim ::= SEQUENCE {
 * @field missionID: It is a unique identifier that is known by the infrastructure and 
 *        the vehicle side at the same time. It identifies a subtask within a sessionID.
 *
 * @field vehicleID: It is a unique identifier that is known by the infrastructure and vehicle The vehicle needs to know its own vehicleID.
 *        This can serve as a safety check for the RVO regarding vehicle parameters, as it receives them from the vehicle backend, 
 *        and it can then verify that it is communicating to the right vehicle through PCVM (as the vehicle sends its vehicleID there).     
 *
 * @field rollingCounterFromPcvm: It serves as a mirror of the rolling counter that was 
 *        received with the latest PCVM of the corresponding vehicle. 
 *
@@ -90,6 +94,7 @@ VehicleContainer ::= SEQUENCE {
  msgGenerationTime  TimestampIts OPTIONAL,
  sessionID SessionMissionID,							
  missionID SessionMissionID OPTIONAL,           															
  vehicleID VehicleID OPTIONAL,           															
  rollingCounterFromPcvm RollingCounter,             	
  vehicleIdentification VidRequest OPTIONAL,         	
  drivingPermission DrivingPermission OPTIONAL,      	
@@ -131,9 +136,9 @@ VidRequest ::= CHOICE {
 *
*/
Blinking ::= SEQUENCE {
  vidRvoPublicKey UInt64,					 -- Public Key used by RVO to derive vehicle identification secret
  codeLength UInt8,                          -- Value that indicated how many bits (8 - 20) from the seed shall be used for blinking. 
  currentState VidRequestStateEnum           -- current authorization request status  
  vidRvoPublicKey UInt64,					 
  codeLength UInt8,                          
  currentState VidRequestStateEnum           
}

/** 
@@ -156,10 +161,10 @@ Blinking ::= SEQUENCE {
*/
DrivingPermission ::= SEQUENCE {
  expirationTime TimestampIts,         
  velocityMax VelocityComponentValue,  -- Maximum allowed vehicle velocity.
  curvatureMin HighResCurvature,       -- Right curvature bounds.
  curvatureMax HighResCurvature,       -- Left curvature bounds.
  checksum UInt32                      -- See safety checksum calculation
  velocityMax VelocityComponentValue,  
  curvatureMin HighResCurvature,       
  curvatureMax HighResCurvature,       
  checksum UInt32                      
}

/** 
@@ -393,14 +398,16 @@ DriveCommandActionEnum ::= ENUMERATED {
 * - 1 - `destination-reached`	- Vehicle has reached its destinations.  ,
 * - 2 - `infrastructure-error`	- Error in infrastructure detected. ,
 * - 3 - `vehicle-error`		- Vehicle has sent an error code. ,
 * - 4 - `backend`				- Error in backend.
 * - 4 - `backend`				- Error in backend. ,
 * - 5 - `vehicle-identification-error`   - Either a wrong or no code was detected. Even with a crash of the camera, there is an error.
 */
 TerminateReasonEnum ::= ENUMERATED {
  proceed(0),               
  destination-reached(1),   
  infrastructure-error(2),   
  vehicle-error(3),         
  backend(4)                
  backend(4),
  vehicle-identification-error(5)                
}

/**
@@ -476,13 +483,13 @@ VehicleDirIndicatorEnum ::= ENUMERATED {
 * - 0 - `undefined`	            - Default value, Vid request is not active. ,
 * - 1 - `flashing`		            - The infrastructure is prepared and waiting for the Subject Vehicle to flash the code.  ,
 * - 2 - `successful`	            - The Subject Vehicle was recognized correctly and the identification is completed.  ,
 * - 3 - `new-code`		- A new Subject Vehicle identification cycle was started.
 * - 3 - `prepare-for-new-code`		- A new Subject Vehicle identification cycle was started.
 */
VidRequestStateEnum ::= ENUMERATED {
  undefined(0), 	
  flashing(1), 		
  successful(2), 	
  new-code(3) 		
  prepare-for-new-code(3) 		
}

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

IMPORTS

RollingCounter, OEMSpecificData, GearEnum, Centimetre, RadPerSecond, HighResCurvature, WaypointIndex, Pose, SessionMissionID, Description, ParkingControlE2EProtection, VidVehicleStateEnum , UInt8, UInt16, UInt32, UInt64, Millisecond16, SafetyViolationsEnum 
RollingCounter, OEMSpecificData, GearEnum, Centimetre, RadPerSecond, HighResCurvature, WaypointIndex, Pose, SessionMissionID, VehicleID, Description, ParkingControlE2EProtection, VidVehicleStateEnum , UInt8, UInt16, UInt32, UInt64, Millisecond16, SafetyViolationsEnum 
FROM AVP-Commons {
  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103882) avpCommons (5) major-version-1 (1) minor-version-1(1)
}
@@ -45,6 +45,8 @@ PCVM ::= SEQUENCE {
  * 
  * @field missionID: Represents a 32 character mission ID.
  *
  * @field vehicleID: It is a unique identifier that is known by the infrastructure and the specific vehicle
  * 
  * @field rollingCounterFromPcim: Represents the rolling counter of last received PCIM.
  * 
  * @field vehicleState: Relevant vehicle state information.
@@ -69,6 +71,7 @@ Pcvm ::= SEQUENCE {
  msgGenerationTime  TimestampIts OPTIONAL,
  sessionID SessionMissionID,												
  missionID SessionMissionID OPTIONAL,
  vehicleID VehicleID OPTIONAL,                 					
  rollingCounterFromPcim RollingCounter,     						
  vehicleState VehicleState,                 						
  vidResponse VidResponse OPTIONAL,