Replaced defined constants from LibItsCommon_TypesAndValues with the mapped... (2787761c) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Templates.ttcn

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -185,12 +185,12 @@ module LibItsCam_Templates {
	latitude := f_integer2Latitude(f_getTsLatitude()),		latitude := f_integer2Latitude(f_getTsLatitude()),
	longitude := f_integer2Longitude(f_getTsLongitude()),		longitude := f_integer2Longitude(f_getTsLongitude()),
	positionConfidenceEllipse := {		positionConfidenceEllipse := {
	semiMajorConfidence := c_semiAxisLengthOneCentimeter,		semiMajorConfidence := SemiAxisLength_oneCentimeter_,
	semiMinorConfidence := c_semiAxisLengthOneCentimeter,		semiMinorConfidence := SemiAxisLength_oneCentimeter_,
	semiMajorOrientation := c_headingValue_wgs84North		semiMajorOrientation := HeadingValue_wgs84North_
	},		},
	altitude := {		altitude := {
	altitudeValue := c_altitudeValue_seaLevel,		altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
	altitudeConfidence := unavailable		altitudeConfidence := unavailable
	}		}
	}		}
	@@ -534,13 +534,13 @@ module LibItsCam_Templates {
	generationDeltaTime := p_generationTime,		generationDeltaTime := p_generationTime,
	camParameters := {		camParameters := {
	basicContainer := {		basicContainer := {
	stationType := c_stationType_passengerCar,		stationType := StationType_passengerCar_,
	referencePosition := p_referencePosition		referencePosition := p_referencePosition
	},		},
	highFrequencyContainer := {		highFrequencyContainer := {
	basicVehicleContainerHighFrequency := {		basicVehicleContainerHighFrequency := {
	heading := {		heading := {
	headingValue := c_headingValue_wgs84North, //0		headingValue := HeadingValue_wgs84North_, //0
	headingConfidence := 10		headingConfidence := 10
	},		},
	speed := {		speed := {
	@@ -554,16 +554,16 @@ module LibItsCam_Templates {
	},		},
	vehicleWidth := 21,		vehicleWidth := 21,
	longitudinalAcceleration := {		longitudinalAcceleration := {
	longitudinalAccelerationValue := c_longitudinalAccelerationValue_unavailable,		longitudinalAccelerationValue := LongitudinalAccelerationValue_unavailable_,
	longitudinalAccelerationConfidence := c_accelerationConfidence_unavailable		longitudinalAccelerationConfidence := AccelerationConfidence_unavailable_
	},		},
	curvature := {		curvature := {
	curvatureValue := c_curvatureValue_straight,		curvatureValue := CurvatureValue_straight_,
	curvatureConfidence := unavailable		curvatureConfidence := unavailable
	},		},
	curvatureCalculationMode := yawRateUsed,		curvatureCalculationMode := yawRateUsed,
	yawRate := {		yawRate := {
	yawRateValue := c_yawRateValue_straight,		yawRateValue := YawRateValue_straight_,
	yawRateConfidence := unavailable		yawRateConfidence := unavailable
	},		},
	accelerationControl := omit,		accelerationControl := omit,
	@@ -597,7 +597,7 @@ module LibItsCam_Templates {
	lowFrequencyContainer := {		lowFrequencyContainer := {
	basicVehicleContainerLowFrequency := {		basicVehicleContainerLowFrequency := {
	vehicleRole := default_,		vehicleRole := default_,
	exteriorLights := c_exteriorLights_daytimeRunningLightsOn,		exteriorLights := ExteriorLights_daytimeRunningLightsOn_,
	pathHistory := {}		pathHistory := {}
	}		}
	}		}

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

+0 −77

Original line number	Original line	Diff line number	Diff line
	@@ -58,83 +58,6 @@ module LibItsCommon_TypesAndValues {
	encode "UpperTester"		encode "UpperTester"
	}		}

	group commonConstants {

	const AltitudeValue c_seaLevel := 0;
	const AltitudeValue c_oneMeter := 1;

	const SemiAxisLength c_semiAxisLengthOneCentimeter := 1;
	const SemiAxisLength c_semiAxisLengthUnavailable := 4095;

	// DENM
	const HeadingConfidence c_headingConfidence_withinZeroPointOneDegree := 1;
	const HeadingValue c_headingValue_wgs84North := 0;

	// CAM
	const AltitudeValue c_altitudeValue_seaLevel := 0;

	const StationType c_stationType_passengerCar := 5;

	const LongitudinalAccelerationValue c_longitudinalAccelerationValue_unavailable := 161;

	const AccelerationConfidence c_accelerationConfidence_unavailable := 102;

	const CurvatureValue c_curvatureValue_straight := 0;

	const YawRateValue c_yawRateValue_straight := 0;

	const ExteriorLights c_exteriorLights_daytimeRunningLightsOn := '00000100'B;



	/**
	* @remark check this values
	*/
	group causeCodes {

	const CauseCodeType c_causeReserved := 0;
	const CauseCodeType c_causeTrafficCondition := 1;
	const CauseCodeType c_causeAccident := 2;
	const CauseCodeType c_causeRoadworks := 3;
	const CauseCodeType c_causeAdverseWeatherCondition_Adhesion := 6;
	const CauseCodeType c_causeHazardousLocation_SurfaceCondition := 9;
	const CauseCodeType c_causeHazardousLocation_ObstacleOnTheRoad := 10;
	const CauseCodeType c_causeHazardousLocation_AnimalOnTheRoad := 11;
	const CauseCodeType c_causeHumanPresenceOnTheRoad := 12;
	const CauseCodeType c_causeWrongWayDriving := 14;
	const CauseCodeType c_causeRescueAndRecoveryWorkInProgress := 15;
	const CauseCodeType c_causeAdverseWeatherCondition_ExtremeWeatherCondition := 17;
	const CauseCodeType c_causeAdverseWeatherCondition_Visibility := 18;
	const CauseCodeType c_causeAdverseWeatherCondition_Precipitation := 19;
	const CauseCodeType c_causeSlowVehicle := 26;
	const CauseCodeType c_causeDangerousEndOfQueue := 27;
	const CauseCodeType c_causeVehicleBreakdown := 91;
	const CauseCodeType c_causePostCrash := 92;
	const CauseCodeType c_causeHumanProblem := 93;
	const CauseCodeType c_causeStationaryVehicle := 94;
	const CauseCodeType c_causeEmergencyVehicleApproaching := 95;
	const CauseCodeType c_causeHazardousLocation_DangerousCurve := 96;
	const CauseCodeType c_causeCollisionRisk := 97;
	const CauseCodeType c_causeSignalViolation := 98;
	const CauseCodeType c_causeDangerousSituation := 99;

	} // end group causeCodes

	/**
	* @remark check this values
	*/
	group subCauseCodes {

	const SubCauseCodeType c_subCauseCode_Unavailable := 0;

	const VehicleBreakdownSubCauseCode c_vehicleBreakDownSubCauseCode_engineProblem := 3;
	const SlowVehicleSubCauseCode c_slowVehicleSubCauseCode_convoy := 5;

	} // end group subCauseCodes


	} // end commonConstants

	}		}
	with {		with {
	encode "LibItsCommon"		encode "LibItsCommon"

ttcn/DENM/LibItsDenm_Templates.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -341,8 +341,8 @@ module LibItsDenm_Templates {
	* @param p_semiMajorOrientation The major orientation (Default: HeadingValue_wgs84North)		* @param p_semiMajorOrientation The major orientation (Default: HeadingValue_wgs84North)
	*/		*/
	template (value) PosConfidenceEllipse m_posConfidenceEllipse(		template (value) PosConfidenceEllipse m_posConfidenceEllipse(
	template (value) SemiAxisLength p_semiMajorConfidence := c_semiAxisLengthOneCentimeter,		template (value) SemiAxisLength p_semiMajorConfidence := SemiAxisLength_oneCentimeter_,
	template (value) SemiAxisLength p_semiMinorConfidence := c_semiAxisLengthOneCentimeter,		template (value) SemiAxisLength p_semiMinorConfidence := SemiAxisLength_oneCentimeter_,
	template (value) HeadingValue p_semiMajorOrientation := HeadingValue_wgs84North		template (value) HeadingValue p_semiMajorOrientation := HeadingValue_wgs84North
	) := {		) := {
	semiMajorConfidence := p_semiMajorConfidence,		semiMajorConfidence := p_semiMajorConfidence,
	@@ -356,7 +356,7 @@ module LibItsDenm_Templates {
	* @param p_altitudeConfidence The confidence of the elevation (Default: within one meter)		* @param p_altitudeConfidence The confidence of the elevation (Default: within one meter)
	*/		*/
	template (value) Altitude m_altitude(		template (value) Altitude m_altitude(
	template (value) AltitudeValue p_altitudeValue := c_seaLevel,		template (value) AltitudeValue p_altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
	template (value) AltitudeConfidence p_altitudeConfidence := alt_000_01		template (value) AltitudeConfidence p_altitudeConfidence := alt_000_01
	) := {		) := {
	altitudeValue := p_altitudeValue,		altitudeValue := p_altitudeValue,

Admin message