Commit d32f096e authored by tepelmann's avatar tepelmann
Browse files

Fixed usage of sizeof to correct usage of lengthof.

Using more flexible list types for SituationContainer/ActionID instead of arrays.
Moved definition of UtEventIndList from test system to types and values module.
Further T3doc.
parent dc249209
......@@ -67,8 +67,6 @@ module LibItsDenm_TestSystem {
} // End of group componentDefinitions
type record of UtEventInd UtEventIndList;
/**
* @desc Test component for ITS Facility layer
*/
......
......@@ -6,11 +6,11 @@
*
*/
module LibItsDenm_TypesAndValues {
//LibIts
import from DENM_PDU_Descriptions language "ASN.1:1997" all;
import from ITS_Container language "ASN.1:1997" all;
group actionTypes {
/**
......@@ -23,6 +23,19 @@ module LibItsDenm_TypesAndValues {
} // end group actionTypes
group otherTypes {
/**
* @desc List of SituationContainers used in behaviours
*/
type record of SituationContainer SituationContainerList;
/**
* @desc List of ActionIDs used in behaviours
*/
type record of ActionID ActionIDList;
}
group denmConstants {
const ItsPduHeader.protocolVersion c_protocolVersionDenm := 1;
......@@ -45,27 +58,20 @@ module LibItsDenm_TypesAndValues {
} // end group denmConstants
group denmTimeConstants {
// in milliseconds
const TimestampIts c_duration20000ms := 20000;
const TimestampIts c_duration40000ms := 40000;
const float c_eventFrequencyMultiplier := 0.1;
} // end denmTimeConstants
group utPrimitives {
/**
* @desc Upper Tester message to initialize DENM IUT
*/
type record UtInitialize {
}
/**
* @desc Upper Tester result message of the initialization request
*/
type boolean UtInitializeResult;
/**
* @desc Upper Tester message to trigger an action on DENM IUT
* @desc Upper Tester message to request triggering of an event at IUT
*/
type record UtTrigger {
TimestampIts detectionTime,
......@@ -80,10 +86,13 @@ module LibItsDenm_TypesAndValues {
TransmissionInterval transmissionInterval optional,
boolean keepAliveForwardingRequest optional
}
/**
* @desc Upper Tester result message of request of triggering of an event at IUT
*/
type ActionID UtTriggerResult;
/**
* @desc Upper Tester message to trigger an action on DENM IUT
* @desc Upper Tester message to update an event at IUT
*/
type record UtUpdate {
ActionID actionId,
......@@ -98,16 +107,22 @@ module LibItsDenm_TypesAndValues {
TransmissionInterval transmissionInterval optional,
boolean keepAliveForwardingRequest optional
}
/**
* @desc Upper Tester result message of an update request of an event on DENM IUT
*/
type ActionID UtUpdateResult;
/**
* @desc Upper Tester message to trigger an action on DENM IUT
* @desc Upper Tester message to request the termination of an event at IUT
*/
type record UtTermination {
ActionID actionId
}
/**
* @desc Upper Tester result message of termination of an event on DENM IUT
*/
type boolean UtTerminationResult;
/**
* @desc Upper Tester message to change the position of IUT. Values a relatives
*/
......@@ -116,6 +131,9 @@ module LibItsDenm_TypesAndValues {
integer longitude,
integer elevation
}
/**
* @desc Upper Tester result message of change position request of IUT
*/
type boolean UtChangePositionResult;
/**
......@@ -125,6 +143,11 @@ module LibItsDenm_TypesAndValues {
DENM denMsg
}
/**
* @desc List of Upper Tester messages to check event/status on DENM IUT
*/
type record of UtEventInd UtEventIndList;
} // end utPrimitives
}
with {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment