Skip to content
GitLab
Commit bbfa7896 authored by tepelmann's avatar tepelmann
Browse files

Added TC_MTS_ACT_01, TC_MTS_ACT_02, TC_MTS_ACT_03, TC_MTS_ACT_04, TC_MTS_ACT_05.

parent 6399102e
Hide whitespace changes
Inline Side-by-side
ttcn/DCC/LibItsDcc_Functions.ttcn
View file @ bbfa7896
......@@ -162,14 +162,14 @@ module LibItsDcc_Functions {
alt {
[] rrxPort.receive(m_rrxInd(p_channel, ?)) -> value v_rrxInd {
v_frameReceivedCount := v_frameReceivedCount + 1;
if(match(v_rrxInd.measuredPower, m_expectedPowerWithDelta) and p_checkPower)
if(p_checkPower and match(v_rrxInd.measuredPower, m_expectedPowerWithDelta))
{ log("*** function " & __SCOPE__ & ": FAIL: The measured Tx power is different to the requested Tx power. ***");
setverdict(fail)}
tc_tOffCheck.start;
alt {
[] rrxPort.receive(m_rrxInd(p_channel, ?)) -> value v_rrxInd {
v_frameReceivedCount := v_frameReceivedCount + 1;
if(match(v_rrxInd.measuredPower, m_expectedPowerWithDelta) and p_checkPower)
if(p_checkPower and match(v_rrxInd.measuredPower, m_expectedPowerWithDelta))
{ log("*** function " & __SCOPE__ & ": FAIL: The measured Tx power is different to the requested Tx power. ***");
setverdict(fail)}
if(tc_tOffCheck.read < p_tOff)
......@@ -207,10 +207,10 @@ module LibItsDcc_Functions {
* @param p_checkPower If true, the power of the received signal will be checked
*/
function f_rRX_ExpectedFramesSentOn2Channels(float p_tOff,
integer p_expectedTxPower,
Channel p_channel_1,
Channel p_channel_2,
boolean p_checkPower := true) runs on ItsRrxDcc {
integer p_expectedTxPower,
Channel p_channel_1,
Channel p_channel_2,
boolean p_checkPower := true) runs on ItsRrxDcc {
var RrxInd v_rrxInd;
var integer v_frameReceivedCount := 0;
......@@ -236,7 +236,7 @@ module LibItsDcc_Functions {
v_channel_2 := true;
}
}
if(match(v_rrxInd.measuredPower, m_expectedPowerWithDelta) and p_checkPower)
if(p_checkPower and match(v_rrxInd.measuredPower, m_expectedPowerWithDelta))
{ log("*** function " & __SCOPE__ & ": FAIL: The measured Tx power is different to the requested Tx power. ***");
setverdict(fail)}
tc_tOffCheck.start;
......@@ -251,7 +251,7 @@ module LibItsDcc_Functions {
v_channel_2 := true;
}
}
if(match(v_rrxInd.measuredPower, m_expectedPowerWithDelta) and p_checkPower)
if(p_checkPower and match(v_rrxInd.measuredPower, m_expectedPowerWithDelta))
{ log("*** function " & __SCOPE__ & ": FAIL: The measured Tx power is different to the requested Tx power. ***");
setverdict(fail)}
if(tc_tOffCheck.read < p_tOff)
......
ttcn/DCC/LibItsDcc_Pixits.ttcn
View file @ bbfa7896
......@@ -287,23 +287,23 @@ module LibItsDcc_Pixits {
* @desc Give the content of Table 10.
* @see ETSI TS 102 917-2 Table 10
*/
modulepar ProfileChannelTimeAspects PIXIT_TABLE_10_TC_MTS_CCH_01 := {
modulepar ProfileChannelTimeChannelAspects PIXIT_TABLE_10_TC_MTS_CCH_01 := {
{ 1,
{
{ active, 5.0, 0.190, { relaxed, active, restrictive } },
{ restrictive, 4.0, 0.250, { relaxed, active, restrictive } }
{ active, { 5.0, 0.190, { relaxed, active, restrictive } } },
{ restrictive, { 4.0, 0.250, { relaxed, active, restrictive } } }
}
},
{ 2,
{
{ active, 5.0, 0.190, { active, restrictive } },
{ restrictive, 4.0, 0.250, { active, restrictive } }
{ active, { 5.0, 0.190, { active, restrictive } } },
{ restrictive, { 4.0, 0.250, { active, restrictive } } }
}
},
{ 3,
{
{ active, 5.0, 0.190, { restrictive } },
{ restrictive, 4.0, 0.250, { restrictive } }
{ active, { 5.0, 0.190, { restrictive } } },
{ restrictive, { 4.0, 0.250, { restrictive } } }
}
}
}
......@@ -403,6 +403,78 @@ module LibItsDcc_Pixits {
}
}
/**
* @desc Give the content of Table 12.
* @see ETSI TS 102 917-2 Table 12
*/
modulepar ProfileTimeChannelAspects PIXIT_TABLE_12_TC_MTS_ACT_01 := {
{ 2,
{
5.0, 0.190, { relaxed }
}
},
{ 3,
{
2.0, 0.500, { relaxed, active }
}
}
}
/**
* @desc Give the content of Table 13.
* @see ETSI TS 102 917-2 Table 13
*/
modulepar ChannelStates PIXIT_TABLE_13_TC_MTS_ACT_02 := {
relaxed,
active
}
/**
* @desc Give the content of Table 14.
* @see ETSI TS 102 917-2 Table 14
*/
modulepar ChannelStates PIXIT_TABLE_14_TC_MTS_ACT_03 := {
relaxed,
active,
restrictive
}
/**
* @desc Give the content of Table 15.
* @see ETSI TS 102 917-2 Table 15
*/
modulepar ProfileTimeAspects PIXIT_TABLE_15_TC_MTS_ACT_04 := {
{ 5, 2.0, 0.500 },
{ 6, 2.0, 0.500 },
{ 7, 1.0, 1.000 },
{ 8, 1.0, 1.000 }
}
/**
* @desc Give the content of Table 16.
* @see ETSI TS 102 917-2 Table 16
*/
modulepar ChannelProfileTimeAspects PIXIT_TABLE_16_TC_MTS_ACT_04 := {
{
active,
{
{ 5, 2.0, 0.500 },
{ 6, 2.0, 0.500 },
{ 7, 1.0, 1.000 },
{ 8, 0.5, 2.000 }
}
},
{
restrictive,
{
{ 5, 2.0, 0.500 },
{ 6, 2.0, 0.500 },
{ 7, 1.0, 1.000 },
{ 8, 0.5, 2.000 }
}
}
}
/**
* @desc Give the content of Table 22.
* @see ETSI TS 102 917-2 Table 22
......
ttcn/DCC/LibItsDcc_TypesAndValues.ttcn
View file @ bbfa7896
......@@ -97,39 +97,59 @@ module LibItsDcc_TypesAndValues {
type record of ProfileTimeAspect ProfileTimeAspects;
type record ChannelTimeAspect {
ChannelState cchState,
type record ChannelProfileTimeAspect {
ChannelState state,
record of ProfileTimeAspect aspects
}
type record of ChannelProfileTimeAspect ChannelProfileTimeAspects;
type record TimeChannelAspect {
float messageInterval, //in Hz
float tOff, //in ms
record of ChannelState sch1States
}
type record of ChannelTimeAspect ChannelTimeAspects;
type record ChannelTimeChannelAspect {
ChannelState cchState,
TimeChannelAspect aspect
}
type record of ChannelTimeChannelAspect ChannelTimeChannelAspects;
type record SingleChannelTimeAspect {
type record SingleChannelTimeChannelAspect {
ChannelState cchState,
SingleTimeChannelAspect aspect
}
type record SingleTimeChannelAspect {
float messageInterval, //in Hz
float tOff, //in ms
ChannelState sch1State
}
type record ProfileChannelTimeAspect {
type record ProfileChannelTimeChannelAspect {
ProfileType profile,
ChannelTimeAspects aspects
ChannelTimeChannelAspects aspects
}
type record ProfileSingleChannelTimeAspect {
type record ProfileTimeChannelAspect {
ProfileType profile,
SingleChannelTimeAspect aspect
TimeChannelAspect aspect
}
type record of ProfileChannelTimeAspect ProfileChannelTimeAspects;
type record ProfileSingleChannelTimeChannelAspect {
ProfileType profile,
SingleChannelTimeChannelAspect aspect
}
type record ProfileTimeChannelAspect {
type record ProfileSingleTimeChannelAspect {
ProfileType profile,
ChannelTimeAspect aspect
SingleTimeChannelAspect aspect
}
type record of ProfileChannelTimeChannelAspect ProfileChannelTimeChannelAspects;
type record of ProfileTimeChannelAspect ProfileTimeChannelAspects;
type record SingleChannelAspect {
......
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