Commit 3bcddd72 authored by berge's avatar berge
Browse files

Modified vehicle profiles

parent c5a340ef

asn1/CAM/CAM.asn

+4 −3
Original line number Original line Diff line number Diff line
@@ -60,12 +60,13 @@ CoopAwareness ::= SEQUENCE { 
	-- ITS station, this is defined in a separate document

	-- ITS station, this is defined in a separate document

	-- STF405: replace taggedList with profile as described in chapter 7.2

	-- STF405: replace taggedList with profile as described in chapter 7.2

	-- taggedList	SET SIZE(0..32) OF TaggedValue,

	-- taggedList	SET SIZE(0..32) OF TaggedValue,

	 commonParameters	BasicVehicle,

	 vehicleCommonParameters	VehicleCommonParameters,

	 profileDependent 			ProfileParameters OPTIONAL,

	 profileDependent 			ProfileParameters OPTIONAL,

	 ...

	 ...

	}

	}

	

	

ProfileParameters ::= CHOICE {

ProfileParameters ::= CHOICE {

	basicVehicle			NULL,

    emergencyVehicle        EmergencyVehicle,

    emergencyVehicle        EmergencyVehicle,

    publicTransportVehicle  PublicTransportVehicle,

    publicTransportVehicle  PublicTransportVehicle,

    ...

    ...
@@ -115,7 +116,7 @@ ProfileParameters ::= CHOICE { 
--	}

--	}





-- STF405: introduced as replacement for TaggedValue to reflect the profiles

-- STF405: introduced as replacement for TaggedValue to reflect the profiles

BasicVehicle ::= SEQUENCE {

VehicleCommonParameters ::= SEQUENCE {

     vehicleType                     VehicleType,

     vehicleType                     VehicleType,

     stationLength                   StationLength,

     stationLength                   StationLength,

     stationLengthConfidence         Confidence OPTIONAL,

     stationLengthConfidence         Confidence OPTIONAL,

asn1/DENM/DENM.asn

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ DEFINITIONS AUTOMATIC TAGS ::= 
BEGIN

BEGIN





IMPORTS 

IMPORTS 

    ItsPduHeader, Latitude, Longitude, Elevation, BasicVehicle, ProfileParameters, StationID, TimeStamp, ReferencePositionVehicle 

    ItsPduHeader, Latitude, Longitude, Elevation, VehicleCommonParameters, ProfileParameters, StationID, TimeStamp, ReferencePositionVehicle 

FROM CAM-PDU-Descriptions { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102637) cam (2) version1 (1) };

FROM CAM-PDU-Descriptions { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102637) cam (2) version1 (1) };





--STF405: all unnecessary tags have been removed

--STF405: all unnecessary tags have been removed
@@ -81,7 +81,7 @@ DecentralizedSituation::= SEQUENCE { 
	-- STF405: changed to profile based on the changes in the CAM module

	-- STF405: changed to profile based on the changes in the CAM module

	-- taggedList	SET SIZE(0..32) OF TaggedList OPTIONAL 

	-- taggedList	SET SIZE(0..32) OF TaggedList OPTIONAL 

	-- optional taggedlist with TaggedValue  OPTIONAL

	-- optional taggedlist with TaggedValue  OPTIONAL

	commonParameters	BasicVehicle OPTIONAL,

	vehicleCommonParameters	VehicleCommonParameters OPTIONAL,

	profile ProfileParameters    OPTIONAL

	profile ProfileParameters    OPTIONAL

}

}