Commit d5dbce2a authored by kovacsa's avatar kovacsa
Browse files

asn.1 update

parent b0f45147

asn1/CAM/CAM.asn

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

BEGIN





--	The root data frame for cooperative awareness messages

--	The root data frame for cooperative awareness messages

CoopAwareness ::= SEQUENCE {





ItsPduHeader ::= SEQUENCE {

	-- protocolVersion fixed to 0

	-- protocolVersion fixed to 0

	protocolVersion		INTEGER(0..255),

	protocolVersion		INTEGER(0..255),
@@ -18,6 +18,12 @@ CoopAwareness ::= SEQUENCE { 
	-- milliseconds elapsed since midnight January 1st, 1970 UTC

	-- milliseconds elapsed since midnight January 1st, 1970 UTC

	generationTime	TimeStamp,

	generationTime	TimeStamp,

	

	

	cam	CoopAwareness



}



CoopAwareness ::= SEQUENCE {



    -- STF405: introduced type StationID

    -- STF405: introduced type StationID

	stationID	StationID,

	stationID	StationID,

asn1/DENM/DENM.asn

+17 −10
Original line number Original line Diff line number Diff line
@@ -12,18 +12,25 @@ FROM CAM-PDU-Descriptions { itu-t (0) identified-organization (4) etsi (0) itsDo 




--STF405: all unnecessary tags have been removed

--STF405: all unnecessary tags have been removed





--STF405: doubled defined, renamed

--DecentralizedSituation ::= SEQUENCE {

DecentralizedEnvironmentalNotificationMessage ::= SEQUENCE {





	-- protocol version number of the DENM

ItsPduHeader ::= SEQUENCE {

	-- protocolVersion fixed to 0

	protocolVersion		INTEGER(0..255),

	protocolVersion		INTEGER(0..255),





	-- unique message type identifier assigned to the DENM		

	-- message type ID associated to DENM = 1

	messageID	INTEGER(0..255),	-- 1 byte 

	messageID 		INTEGER(0..255),





	-- time at which an originator  ITS  station generates the DENM

	-- milliseconds elapsed since midnight January 1st, 1970 UTC

	generationTime	TimeStamp,		--  6 byte

	generationTime	TimeStamp,

	

	denm	DecentralizedEnvironmentalNotificationMessage



}





--STF405: doubled defined, renamed

--DecentralizedSituation ::= SEQUENCE {

DecentralizedEnvironmentalNotificationMessage ::= SEQUENCE {

	

	

	management	DecentralizedSituationManagement,	--  container with DEN management and version control

	management	DecentralizedSituationManagement,	--  container with DEN management and version control

	situation	DecentralizedSituation,  			-- container with event description, incl. type, severity

	situation	DecentralizedSituation,  			-- container with event description, incl. type, severity
@@ -271,7 +278,7 @@ Waypoint ::= SEQUENCE{ 
	ptLat 	Latitude,							--a 4 bytes value 

	ptLat 	Latitude,							--a 4 bytes value 

	ptLong 	Longitude,						--a 4 bytes value

	ptLong 	Longitude,						--a 4 bytes value

--STF405: type name is made consistent with CAM definitions

--STF405: type name is made consistent with CAM definitions

--	ptAlt 	Altitude,							--a 2 bytes value

--	ptAlt 	Altitude,

	ptAlt 	Elevation,

	ptAlt 	Elevation,

	...

	...

	--STF405: removed repetition

	--STF405: removed repetition