Commit be558b90 authored by garciay's avatar garciay
Browse files

STF507 Week#11: Merge GNSS support from C2C branch

parent f0c4ec73
......@@ -269,7 +269,10 @@ module ItsGeoNetworking_TpFunctions {
/**
* @desc TP Function for TC_GEONW_FDV_COH_BV_03
*/
function f_GEONW_FDV_COH_BV_03() runs on ItsGeoNetworking {
function f_GEONW_FDV_COH_BV_03(
in template (present) UInt8 p_hopLimit := f_getDefaultHopLimit(),
in template (present) Bit8 p_flags := f_isMobile()
) runs on ItsGeoNetworking {
// Local variables
var LongPosVector v_longPosVectorIut;
......@@ -300,7 +303,7 @@ module ItsGeoNetworking_TpFunctions {
tc_ac.start;
alt {
[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithHlAndFlags(mw_longPosVectorPosition_withDelta(v_longPosVectorIut), ?, f_getDefaultHopLimit(), f_isMobile())))) {
[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithHlAndFlags(mw_longPosVectorPosition_withDelta(v_longPosVectorIut), ?, p_hopLimit, p_flags)))) {
tc_ac.stop;
log("*** " & testcasename() & ": PASS: Correct GeoNetworking Common Header received ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
......@@ -1792,7 +1795,7 @@ module ItsGeoNetworking_TpFunctions {
}
// Test component configuration
f_cf01Up();
f_cf01Up();//FIXME ac change position, not used by C2C
v_longPosVectorIut := f_getPosition(c_compIut);
v_previouslongPosVectorIut := v_longPosVectorIut;
v_previouslongPosVectorIut.timestamp := ?;
......@@ -6706,7 +6709,7 @@ module ItsGeoNetworking_TpFunctions {
// Local variables
var ItsGeoNetworking v_nodeB;
var ItsGeoNetworking v_nodeC;
var integer v_distance := f_getCbfMaxCommunicationRange() - 10;
var float v_distance := int2float(f_getCbfMaxCommunicationRange() - 10);
var LongPosVector v_longPosVectorIut, v_longPosVectorNodeA;
// Test control
......@@ -6749,7 +6752,7 @@ module ItsGeoNetworking_TpFunctions {
* @param p_distanceToNodeA Distance between IUT and NodeA
* @param p_longPosVectorNodeA Position vector of NodeA
*/
function f_GEONW_PON_GUC_BV_06_nodeB(in integer p_distanceToNodeA, in LongPosVector p_longPosVectorNodeA) runs on ItsGeoNetworking {
function f_GEONW_PON_GUC_BV_06_nodeB(in float p_distanceToNodeA, in LongPosVector p_longPosVectorNodeA) runs on ItsGeoNetworking {
// Local variables
timer t_toCbf := (int2float(f_getGeoUnicastCbfMaxTime())
......@@ -7038,7 +7041,7 @@ module ItsGeoNetworking_TpFunctions {
// Local variables
var ItsGeoNetworking v_nodeB;
var ItsGeoNetworking v_nodeC;
var integer v_distance := f_getCbfMaxCommunicationRange() - 10;
var float v_distance := int2float(f_getCbfMaxCommunicationRange() - 10);
var LongPosVector v_longPosVectorIut, v_longPosVectorNodeA;
// Test control
......@@ -7202,7 +7205,7 @@ module ItsGeoNetworking_TpFunctions {
// Local variables
var ItsGeoNetworking v_nodeB;
var ItsGeoNetworking v_nodeC;
var integer v_distance := f_getCbfMaxCommunicationRange() - 10;
var float v_distance := int2float(f_getCbfMaxCommunicationRange() - 10);
var LongPosVector v_longPosVectorIut, v_longPosVectorNodeA;
// Test control
......
Markdown is supported
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