Commit de805961 authored by berge's avatar berge
Browse files

Fixed neighbour default deactivation

parent aa58297d

ttcn/CAM/LibItsCam_Templates.ttcn

+0 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ module LibItsCam_Templates { 
                }

                }

            }

            }

            

            

            //TODO not clear which parameter type to use

            /**

            /**

             * @desc Set the length and width precision

             * @desc Set the length and width precision

             * @param p_precision The precision to set

             * @param p_precision The precision to set

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+3 −3
Original line number Original line Diff line number Diff line
@@ -384,7 +384,7 @@ module LibItsGeoNetworking_Functions { 
        

        

        function f_startBeingNeighbour() runs on ItsNt {

        function f_startBeingNeighbour() runs on ItsNt {

            

            

            activate(a_neighbourDefault());

            vc_neighbourDefault := activate(a_neighbourDefault());

            f_acTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));

            f_acTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));

            

            

        } // end f_startBeingNeighbour

        } // end f_startBeingNeighbour
@@ -392,8 +392,7 @@ module LibItsGeoNetworking_Functions { 
        function f_stopBeingNeighbour() runs on ItsNt  {

        function f_stopBeingNeighbour() runs on ItsNt  {

            

            

            f_acTriggerEvent(m_stopBeaconing);

            f_acTriggerEvent(m_stopBeaconing);

            deactivate; // FIXME: probably too brutal

            deactivate(vc_neighbourDefault); 

            activate(a_default());

            

            

        } // end f_stopBeingNeighbour

        } // end f_stopBeingNeighbour
@@ -838,6 +837,7 @@ module LibItsGeoNetworking_Functions { 
        }

        }

        

        

        function f_prNeighbour() runs on ItsNt {

        function f_prNeighbour() runs on ItsNt {

            f_prDefault();

            f_startBeingNeighbour();        

            f_startBeingNeighbour();        

        }

        }

ttcn/LibIts_Interface.ttcn

+1 −0
Original line number Original line Diff line number Diff line
@@ -143,6 +143,7 @@ module LibIts_Interface { 
            var PositionTable vc_positionTable := {};

            var PositionTable vc_positionTable := {};

            var GeoAreaTable vc_areaTable := {};

            var GeoAreaTable vc_areaTable := {};

            var charstring vc_componentName := "";

            var charstring vc_componentName := "";

            var default vc_neighbourDefault;

            

            

            //variables for Gn6

            //variables for Gn6

            var GvlTable vc_gvlTable := {};

            var GvlTable vc_gvlTable := {};