Commit 83824c3e authored by garciay's avatar garciay
Browse files

Merge with C2C

parent ed2c66d5
Loading
Loading
Loading
Loading
+14 −13
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@

module ItsCam_TpFunctions {
    
    import from LibItsCommon_Pixits all;

    // LibCommon
    import from LibCommon_Sync all;
    import from LibCommon_VerdictControl all;
@@ -150,7 +152,7 @@ module ItsCam_TpFunctions {
                // Test adapter configuration
                
                // Preamble
                f_prInitialState();
                f_prInitialState(e_dynamicPosition1500m);
                camPort.clear;
                tc_ac.start;
                alt {
@@ -300,7 +302,7 @@ module ItsCam_TpFunctions {
                // Test adapter configuration
                
                // Preamble
                f_prInitialState();
                f_prInitialState(e_dynamicPosition1500m);
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(v_vehicleRole));
                camPort.clear;
@@ -2206,7 +2208,7 @@ module ItsCam_TpFunctions {
                    // Test adapter configuration
                    
                    // Preamble
                    f_prInitialState();
                    f_prInitialState(e_dynamicPosition1500m);
                    camPort.clear;
                    tc_ac.start;
                    alt {
@@ -2391,7 +2393,7 @@ module ItsCam_TpFunctions {
                // Test adapter configuration
                
                // Preamble
                f_prInitialState();
                f_prInitialState(e_dynamicPosition1500m);
                              
                tc_ac.start;
                alt {
@@ -2560,7 +2562,8 @@ module ItsCam_TpFunctions {
                // Test adapter configuration
                
                // Preamble
                f_prInitialState();
                f_prInitialState(e_dynamicPosition200m);
                
                camPort.clear;
                tc_ac.start;
                alt {
@@ -2579,16 +2582,14 @@ module ItsCam_TpFunctions {
                
                // Test Body
                v_expectedReferencePosition := f_computePositionUsingDistance(v_referencePosition, v_changePosValue);
                
                if (PICS_GNSS_SCENARIO_SUPPORT == false) {
                    f_utChangePosition(
                        valueof(
                            UtChangePosition: {
                f_utChangePosition ( valueof ( UtChangePosition: {
                                latitude := v_expectedReferencePosition.latitude - v_referencePosition.latitude,
                                longitude := v_expectedReferencePosition.longitude - v_referencePosition.longitude,
                                elevation := 0 
                            }
                    ));
                            elevation := 0 } ) );
                }
                
                t_genCam_dcc.timeout;
                t_genCam_dcc.start;
                alt {
@@ -2634,7 +2635,7 @@ module ItsCam_TpFunctions {
                // Test adapter configuration
                
                // Preamble
                f_prInitialState();
                f_prInitialState(e_dynamicPosition1500m);
                camPort.clear;
                tc_ac.start;
                alt {
@@ -2700,7 +2701,7 @@ module ItsCam_TpFunctions {
                // Test adapter configuration
                
                // Preamble
                f_prInitialState();
                f_prInitialState(e_dynamicPosition1500m);
                camPort.clear;
                tc_ac.start;
                alt {