Skip to content
GitLab
Commit 5756754a authored by berge's avatar berge
Browse files

Fixed compilation issues with TestCast

parent ab0950fc
Expand all Hide whitespace changes
Inline Side-by-side
ttcn/CAM/LibItsCam_Templates.ttcn
View file @ 5756754a
......@@ -46,9 +46,9 @@ module LibItsCam_Templates {
}
}
/**
* @desc Change the heading
* @param p_offset Offset to the current heading
/**
* @desc Change the heading
* @param p_offset Offset to the current heading
*/
template (value) UtEvent m_changeHeading(Direction p_offset) := {
utCamEvent := {
......@@ -230,8 +230,8 @@ module LibItsCam_Templates {
} // end group Primitives
/**
* @desc Default Receive template for CAM PDU
/**
* @desc Default Receive template for CAM PDU
*/
template CamPdu mw_camMsg_any := {
header := {
......@@ -336,9 +336,9 @@ module LibItsCam_Templates {
group camAnyVehicle {
/**
/**
* @desc Receive template for CAM PDU for any vehicle
* @see mw_camMsg_any
* @see mw_camMsg_any
*/
template CamPdu mw_camMsg_anyVehicle
modifies mw_camMsg_any := {
......@@ -532,9 +532,9 @@ module LibItsCam_Templates {
group camBasicIrs {
/**
/**
* @desc Receive template for CAM PDU for road-side unit
* @see mw_camMsg_any
* @see mw_camMsg_any
*/
template CamPdu mw_camMsg_basicIrs
modifies mw_camMsg_any := {
......@@ -558,9 +558,9 @@ module LibItsCam_Templates {
group camBasicVehicle {
/**
/**
* @desc Receive template for CAM PDU for basic vehicle
* @see mw_camMsg_anyVehicle
* @see mw_camMsg_anyVehicle
*/
template CamPdu mw_camMsg_basicVehicle
modifies mw_camMsg_anyVehicle := {
......@@ -576,9 +576,9 @@ module LibItsCam_Templates {
group camEmergencyVehicle {
/**
/**
* @desc Receive template for CAM PDU for emergency vehicle
* @see mw_camMsg_anyVehicle
* @see mw_camMsg_anyVehicle
*/
template CamPdu mw_camMsg_emergencyVehicle
modifies mw_camMsg_anyVehicle := {
......@@ -626,9 +626,9 @@ module LibItsCam_Templates {
group camPublicTransportVehicle {
/**
/**
* @desc Receive template for CAM PDU for public transport vehicle
* @see mw_camMsg_anyVehicle
* @see mw_camMsg_anyVehicle
*/
template CamPdu mw_camMsg_publicTransportVehicle
modifies mw_camMsg_basicVehicle := {
......@@ -690,89 +690,89 @@ module LibItsCam_Templates {
group camExteriorLightsTemplates {
/**
* @desc Receive template for exterior lights with low beam lights off
/**
* @desc Receive template for exterior lights with low beam lights off
*/
template ExteriorLights mw_lowBeamLightsOff := complement(mw_lowBeamLightsOn) ;
template ExteriorLights mw_lowBeamLightsOff := complement(mw_lowBeamLightsOn, omit) ;
/**
* @desc Receive template for exterior lights with low beam lights on
/**
* @desc Receive template for exterior lights with low beam lights on
*/
template ExteriorLights mw_lowBeamLightsOn := '1*'B ;
/**
* @desc Receive template for exterior lights with high beam lights off
/**
* @desc Receive template for exterior lights with high beam lights off
*/
template ExteriorLights mw_highBeamLightsOff := complement(mw_highBeamLightsOn);
template ExteriorLights mw_highBeamLightsOff := complement(mw_highBeamLightsOn, omit);
/**
* @desc Receive template for exterior lights with high beam lights on
/**
* @desc Receive template for exterior lights with high beam lights on
*/
template ExteriorLights mw_highBeamLightsOn := '?1*'B ;
/**
* @desc Receive template for exterior lights with left turn signal off
/**
* @desc Receive template for exterior lights with left turn signal off
*/
template ExteriorLights mw_leftTurnSignalOff := complement(mw_leftTurnSignalOn);
template ExteriorLights mw_leftTurnSignalOff := complement(mw_leftTurnSignalOn, omit);
/**
* @desc Receive template for exterior lights with left turn signal on
/**
* @desc Receive template for exterior lights with left turn signal on
*/
template ExteriorLights mw_leftTurnSignalOn := '??1*'B ;
/**
* @desc Receive template for exterior lights with right turn signal off
/**
* @desc Receive template for exterior lights with right turn signal off
*/
template ExteriorLights mw_rightTurnSignalOff := complement(mw_rightTurnSignalOn);
/**
* @desc Receive template for exterior lights with right turn signal on
template ExteriorLights mw_rightTurnSignalOff := complement(mw_rightTurnSignalOn, omit);
/**
* @desc Receive template for exterior lights with right turn signal on
*/
template ExteriorLights mw_rightTurnSignalOn := '???1*'B ;
/**
* @desc Receive template for exterior lights with automatic light control off
/**
* @desc Receive template for exterior lights with automatic light control off
*/
template ExteriorLights mw_automaticLightControlOff := complement(mw_automaticLightControlOn);
/**
* @desc Receive template for exterior lights with automatic light control on
template ExteriorLights mw_automaticLightControlOff := complement(mw_automaticLightControlOn, omit);
/**
* @desc Receive template for exterior lights with automatic light control on
*/
template ExteriorLights mw_automaticLightControlOn := '????1*'B ;
/**
* @desc Receive template for exterior lights with day time running lights off
/**
* @desc Receive template for exterior lights with day time running lights off
*/
template ExteriorLights mw_daytimeRunningLightOff := complement(mw_daytimeRunningLightOn);
template ExteriorLights mw_daytimeRunningLightOff := complement(mw_daytimeRunningLightOn, omit);
/**
* @desc Receive template for exterior lights with day time running lights on
/**
* @desc Receive template for exterior lights with day time running lights on
*/
template ExteriorLights mw_daytimeRunningLightOn := '?????1*'B ;
/**
* @desc Receive template for exterior lights with fog lights off
/**
* @desc Receive template for exterior lights with fog lights off
*/
template ExteriorLights mw_fogLightOff := complement(mw_fogLightOn);
template ExteriorLights mw_fogLightOff := complement(mw_fogLightOn, omit);
/**
* @desc Receive template for exterior lights with fog lights on
/**
* @desc Receive template for exterior lights with fog lights on
*/
template ExteriorLights mw_fogLightOn := '??????1*'B ;
/**
* @desc Receive template for exterior lights with parking lights off
/**
* @desc Receive template for exterior lights with parking lights off
*/
template ExteriorLights mw_parkingLightsOff := complement(mw_parkingLightsOn);
template ExteriorLights mw_parkingLightsOff := complement(mw_parkingLightsOn, omit);
/**
* @desc Receive template for exterior lights with parking lights on
/**
* @desc Receive template for exterior lights with parking lights on
*/
template ExteriorLights mw_parkingLightsOn := '???????1'B ;
/**
* @desc Receive template for exterior lights with hazard lights on
/**
* @desc Receive template for exterior lights with hazard lights on
*/
template ExteriorLights mw_hazardConditionOn := '??11*'B ;
} // end group exteriorLights
} // end LibItsCam_Templates
\ No newline at end of file
} // end LibItsCam_Templates
ttcn/Common/LibItsExternal_TypesAndValues.ttcn 0 → 100644
View file @ 5756754a
/**
* @author ETSI / STF405
* @version $URL$
* $Id$
* @desc Module containing types and values for External protocols
*
*/
module LibItsExternal_TypesAndValues {
// LibCommon
import from LibCommon_DataStrings all;
group linkLayerConstants {
/**
* @desc Ethernet MAC address
*/
type Oct6 MacAddress;
const MacAddress c_llBroadcast := 'FFFFFFFFFFFF'O;
} // end linkLayerConstants
} // end LibItsIpv6OverGeoNetworking_TypesAndValues
\ No newline at end of file
ttcn/DENM/LibItsDenm_Templates.ttcn
View file @ 5756754a
This diff is collapsed.
ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn
View file @ 5756754a
......@@ -21,6 +21,7 @@ module LibItsGeoNetworking_Functions {
import from LibItsGeoNetworking_Templates all;
import from LibItsGeoNetworking_Pixits all;
import from LibItsGeoNetworking_Pics all;
import from LibItsExternal_TypesAndValues {type MacAddress};
group geoConfigurationFunctions {
......@@ -395,11 +396,11 @@ module LibItsGeoNetworking_Functions {
} // end f_cf04Down
/**
* @desc Behavior function for initializing component's variables and tables
* @param p_positionTable Table containing position vectors of all nodes
* @param p_areaTable Table containing all defined geoAreas
* @param p_componentName Name of the component
/**
* @desc Behavior function for initializing component's variables and tables
* @param p_positionTable Table containing position vectors of all nodes
* @param p_areaTable Table containing all defined geoAreas
* @param p_componentName Name of the component
*/
function f_initialiseComponent(
in PositionTable p_positionTable,
......@@ -413,8 +414,8 @@ module LibItsGeoNetworking_Functions {
} // end f_initialiseComponent
/**
* @desc Makes the simulated ITS node behave as a neighbour of IUT
/**
* @desc Makes the simulated ITS node behave as a neighbour of IUT
*/
function f_startBeingNeighbour() runs on ItsNt {
......@@ -437,11 +438,11 @@ module LibItsGeoNetworking_Functions {
group geoPositionFunctions {
/**
* @desc Add a position vector in position table
* @param p_positionTable Position table to be updated
* @param p_positionKey Reference key of the added position vector
* @param p_positionValue Added position vector
/**
* @desc Add a position vector in position table
* @param p_positionTable Position table to be updated
* @param p_positionKey Reference key of the added position vector
* @param p_positionValue Added position vector
*/
function f_addPosition(
inout PositionTable p_positionTable,
......@@ -455,10 +456,10 @@ module LibItsGeoNetworking_Functions {
};
}
/**
* @desc Get the position vector corresponding to a key
* @param p_positionKey Reference key of the searched position vector
* @return LongPosVector - The serached position vector
/**
* @desc Get the position vector corresponding to a key
* @param p_positionKey Reference key of the searched position vector
* @return LongPosVector - The serached position vector
*/
function f_getPosition(
in charstring p_positionKey
......@@ -480,13 +481,13 @@ module LibItsGeoNetworking_Functions {
return v_return;
}
/**
* @desc Compute a position based on reference point and distance factors
* @param p_refPosition Reference point
* @param p_longitudeFactor Number of PX_DISTANCE_UNIT applied for computing longitude
/**
* @desc Compute a position based on reference point and distance factors
* @param p_refPosition Reference point
* @param p_longitudeFactor Number of PX_DISTANCE_UNIT applied for computing longitude
* @param p_latitudeFactor Number of PX_DISTANCE_UNIT applied for computing latitude
* @return LongPosVector - Computed position
* @see PX_DISTANCE_UNIT
* @return LongPosVector - Computed position
* @see PX_DISTANCE_UNIT
*/
function f_computePosition(
in LongPosVector p_refPosition,
......@@ -561,10 +562,10 @@ module LibItsGeoNetworking_Functions {
return f_geoArea2GeoAnycastArea(f_getArea(p_areaName));
}
/**
* @desc Convert GeoArea type to GeoBroadcastArea
* @param p_area GeoArea to be converted
* @return GeoBroadcastArea
/**
* @desc Convert GeoArea type to GeoBroadcastArea
* @param p_area GeoArea to be converted
* @return GeoBroadcastArea
*/
function f_geoArea2GeoBroadcastArea(GeoArea p_area)
return GeoBroadcastArea {
......@@ -615,11 +616,11 @@ module LibItsGeoNetworking_Functions {
return v_anycastArea;
}
/**
* @desc Compute a square geoArea
* @param p_centerLongPosVector Center point of the square area
* @param p_distanceA Width of the square area in meters
* @return GeoArea - Computed geoArea
/**
* @desc Compute a square geoArea
* @param p_centerLongPosVector Center point of the square area
* @param p_distanceA Width of the square area in meters
* @return GeoArea - Computed geoArea
*/
function f_computeSquareArea(
in LongPosVector p_centerLongPosVector,
......@@ -669,12 +670,12 @@ module LibItsGeoNetworking_Functions {
return v_geoArea;
}
/**
* @desc Compute distance between two points
* @param p_pointA First point
* @param p_pointB Second point
* @return Computed distance in meters
* @see fx_computeDistance
/**
* @desc Compute distance between two points
* @param p_pointA First point
* @param p_pointB Second point
* @return Computed distance in meters
* @see fx_computeDistance
*/
function f_distance(
in LongPosVector p_pointA,
......@@ -719,8 +720,8 @@ module LibItsGeoNetworking_Functions {
}
}
/**
* @desc Neighbour default altstep (answers to LS Requests)
/**
* @desc Neighbour default altstep (answers to LS Requests)
*/
altstep a_neighbourDefault() runs on ItsNt {
......@@ -783,11 +784,11 @@ module LibItsGeoNetworking_Functions {
group geoGeoUnicastAltsteps {
/**
* @desc Receive GeoUnicast packet
* @param p_senderLongPosVec Expected sender position vector
* @param p_destinationShortPosVec Expected destination position vector
* @param p_seqNumber Expected sequence number
/**
* @desc Receive GeoUnicast packet
* @param p_senderLongPosVec Expected sender position vector
* @param p_destinationShortPosVec Expected destination position vector
* @param p_seqNumber Expected sequence number
*/
altstep a_receiveGeoUnicast(
in template (present) LongPosVector p_senderLongPosVec,
......@@ -1063,18 +1064,18 @@ module LibItsGeoNetworking_Functions {
/**
* @desc Brings the IUT into an initial state.
*/
function f_initialState() {
function f_initialState() runs on ItsAdapterComponent {
f_utInitializeIut(m_gnInitialize);
}
/**
* @desc Receive and reply to LS Requests
* @param p_reqSeqNumber Expected sequence number of the received LS Request
* @param p_gnAddress GN address expected in received LS Request
* @param p_repSrcPosVector Source position vector of the sent LS Response
* @param p_repSenderPosVector Sender position vector of the sent LS Response
/**
* @desc Receive and reply to LS Requests
* @param p_reqSeqNumber Expected sequence number of the received LS Request
* @param p_gnAddress GN address expected in received LS Request
* @param p_repSrcPosVector Source position vector of the sent LS Response
* @param p_repSenderPosVector Sender position vector of the sent LS Response
*/
function f_handleLocationService(
in template (present) UInt16 p_reqSeqNumber,
......@@ -1092,13 +1093,13 @@ module LibItsGeoNetworking_Functions {
}
/**
* @desc Send LS request and receive LS Reply
* @param p_reqSrcPosVector Source position vector of the sent LS Request
* @param p_reqSeqNumber Sequence number of the sent LS Request
* @param p_gnAddress GN address for which the LS Request is sent
* @param p_repSrcPosVector Expected source position vector in received LS Response
* @return FncRetCode
/**
* @desc Send LS request and receive LS Reply
* @param p_reqSrcPosVector Source position vector of the sent LS Request
* @param p_reqSeqNumber Sequence number of the sent LS Request
* @param p_gnAddress GN address for which the LS Request is sent
* @param p_repSrcPosVector Expected source position vector in received LS Response
* @return FncRetCode
*/
function f_processLocationService(
in template (value) LongPosVector p_reqSrcPosVector,
......@@ -1208,9 +1209,9 @@ module LibItsGeoNetworking_Functions {
}
/**
* @desc Triggers test adapter to send beacons for multiple neighbours
* @param p_numberOfNeighbour Number of neighbours to simulate
* @return FncRetCode
* @desc Triggers test adapter to send beacons for multiple neighbours
* @param p_numberOfNeighbour Number of neighbours to simulate
* @return FncRetCode
*/
function f_acStartBeaconingMultipleNeighbour(in integer p_numberOfNeighbour) runs on ItsNt return FncRetCode {
......@@ -1635,10 +1636,10 @@ module LibItsGeoNetworking_Functions {
group posVectorFunctions {
/**
* @desc Convert long position vector to short position vector
* @param p_longPosVector Long position vector to be converted
* @return Short position vector
/**
* @desc Convert long position vector to short position vector
* @param p_longPosVector Long position vector to be converted
* @return Short position vector
*/
function f_longPosVector2ShortPosVector(in LongPosVector p_longPosVector) return ShortPosVector {
var ShortPosVector v_shortPosVector;
......@@ -1653,17 +1654,17 @@ module LibItsGeoNetworking_Functions {
return v_shortPosVector;
}
/**
* @desc Get IUT's long position vector
* @return IUT's long position vector
/**
* @desc Get IUT's long position vector
* @return IUT's long position vector
*/
function f_getIutLongPosVector() runs on ItsAdapterComponent return LongPosVector {
return f_acGetLongPosVector(f_getIutGnLocalAddress());
}
/**
* @desc Get IUT's short position vector
* @return IUT's short position vector
/**
* @desc Get IUT's short position vector
* @return IUT's short position vector
*/
function f_getIutShortPosVector() runs on ItsAdapterComponent return ShortPosVector {
return f_longPosVector2ShortPosVector(f_getIutLongPosVector());
......@@ -1690,13 +1691,13 @@ module LibItsGeoNetworking_Functions {
group externalFunctions {
/**
* @desc External function to compute distance between two points
* @param p_latitudeA Latitude of first point
* @param p_longitudeA Longitude of first point
* @param p_latitudeB Latitude of second point
* @param p_longitudeB Longitude of second point
* @return Computed distance in meters
/**
* @desc External function to compute distance between two points
* @param p_latitudeA Latitude of first point
* @param p_longitudeA Longitude of first point
* @param p_latitudeB Latitude of second point
* @param p_longitudeB Longitude of second point
* @return Computed distance in meters
*/
external function fx_computeDistance(
in Int32 p_latitudeA, in Int32 p_longitudeA,
......@@ -1721,9 +1722,9 @@ module LibItsGeoNetworking_Functions {
out Int32 p_longitude
);
/**
* @desc External function to compute timestamp based on current time
* @return Unix-Epoch-Time mod 2^32
/**
* @desc External function to compute timestamp based on current time
* @return Unix-Epoch-Time mod 2^32
*/
external function fx_computeGnTimestamp() return UInt32;
}
......
ttcn/GeoNetworking/LibItsGeoNetworking_Pics.ttcn
View file @ 5756754a
......@@ -7,14 +7,13 @@
*/
module LibItsGeoNetworking_Pics {
import from LibItsGeoNetworking_TypesAndValues {type MacAddress;}
// LibCommon
import from LibCommon_BasicTypesAndValues all;
import from LibCommon_DataStrings all;
// LibIts
import from LibItsGeoNetworking_TypesAndValues all;
import from LibItsExternal_TypesAndValues {type MacAddress};
group geoNwPics {
......
ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn
View file @ 5756754a
......@@ -19,6 +19,7 @@ module LibItsGeoNetworking_Templates {
import from LibItsBtp_Templates all;
import from LibItsGeoNetworking_Pixits all;
import from LibItsCommon_TypesAndValues all;
import from LibItsExternal_TypesAndValues all;
group geoNwPrimitivesTemplates {
......@@ -399,6 +400,19 @@ module LibItsGeoNetworking_Templates {
payload := omit
}
/**
* @desc Send template for GeoNetworking PDU with octetstring payload
* @param p_header Header value of GeoNetworking message
* @param p_payload Octetstring payload
* @see m_geoNwPdu
*/
template (value) GeoNetworkingPacket m_geoNwPduWithOctetstringPayload(
in template (value) Header p_header,
in template (value) octetstring p_payload
) modifies m_geoNwPdu := {
payload := f_adaptPayload_m(valueof(p_payload))
}
/**
* @desc Send template for GeoNetworking PDU with payload
* @param p_header Header value of GeoNetworking message
......@@ -407,9 +421,9 @@ module LibItsGeoNetworking_Templates {
*/
template (value) GeoNetworkingPacket m_geoNwPduWithPayload(
in template (value) Header p_header,
in template (value) octetstring p_payload
in template (value) Payload p_payload
) modifies m_geoNwPdu := {
payload := f_adaptPayload_m(p_payload)
payload := p_payload
}
/**
......@@ -436,17 +450,30 @@ module LibItsGeoNetworking_Templates {
}
/**
* @desc Receive template for GeoNetworking PDU with payload
* @desc Receive template for GeoNetworking PDU with octetstring payload
* @param p_header Header value of GeoNetworking message
* @param p_payload Payload
* @param p_payload Octetstring payload
* @see mw_geoNwPdu
*/
template GeoNetworkingPacket mw_geoNwPduWithPayload(
template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
in template (present) Header p_header,
in template (present) octetstring p_payload
) modifies mw_geoNwPdu := {
payload := f_adaptPayload_mw(p_payload)
}
/**
* @desc Receive template for GeoNetworking PDU with payload
* @param p_header Header value of GeoNetworking message
* @param p_payload Payload
* @see mw_geoNwPdu
*/
template GeoNetworkingPacket mw_geoNwPduWithPayload(
in template (present) Header p_header,
in template (present) Payload p_payload