Commit 7eec4f49 authored by Yann Garcia's avatar Yann Garcia
Browse files

Intermediate merge before starting TTF T05x

parents 0b447bc2 d699a649

README.md

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ $ git checkout devel 
 ITS Release 2



```sh

$ git checkout ttf_t036

$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS

```



- Execute the installation script to setup the correct environment:

TS.ITS_TTF_T036.code-workspace

0 → 100644
+106 −0
Original line number Diff line number Diff line 
{

	"folders": [

		{

			"path": "."

		},

		{

			"path": "../../frameworks/titan/titan.core"

		},

		{

			"path": "../../frameworks/fsmsggen"

		}

	],

	"settings": {

		"files.associations": {

			"array": "cpp",

			"bit": "cpp",

			"*.tcc": "cpp",

			"cctype": "cpp",

			"chrono": "cpp",

			"clocale": "cpp",

			"cmath": "cpp",

			"condition_variable": "cpp",

			"cstdint": "cpp",

			"cstdio": "cpp",

			"cstdlib": "cpp",

			"ctime": "cpp",

			"cwchar": "cpp",

			"cwctype": "cpp",

			"deque": "cpp",

			"map": "cpp",

			"unordered_map": "cpp",

			"vector": "cpp",

			"exception": "cpp",

			"fstream": "cpp",

			"functional": "cpp",

			"initializer_list": "cpp",

			"iomanip": "cpp",

			"iosfwd": "cpp",

			"iostream": "cpp",

			"istream": "cpp",

			"limits": "cpp",

			"memory": "cpp",

			"mutex": "cpp",

			"new": "cpp",

			"optional": "cpp",

			"ostream": "cpp",

			"ratio": "cpp",

			"sstream": "cpp",

			"stdexcept": "cpp",

			"streambuf": "cpp",

			"string": "cpp",

			"string_view": "cpp",

			"system_error": "cpp",

			"thread": "cpp",

			"type_traits": "cpp",

			"tuple": "cpp",

			"typeinfo": "cpp",

			"utility": "cpp",

			"atomic": "cpp",

			"bitset": "cpp",

			"codecvt": "cpp",

			"cstdarg": "cpp",

			"cstddef": "cpp",

			"cstring": "cpp",

			"algorithm": "cpp",

			"filesystem": "cpp",

			"iterator": "cpp",

			"memory_resource": "cpp",

			"numeric": "cpp",

			"random": "cpp",

			"regex": "cpp",

			"set": "cpp",

			"shared_mutex": "cpp",

			"cinttypes": "cpp",

			"*.inc": "c",

			"provider.h": "c",

			"sizes.h": "c",

			"compare": "cpp",

			"complex": "cpp",

			"concepts": "cpp",

			"list": "cpp",

			"numbers": "cpp",

			"semaphore": "cpp",

			"stop_token": "cpp",

			"hash_map": "cpp",

			"mqtt.h": "c",

			"gps.h": "c",

			"unistd.h": "c",

			"msggen_mec.h": "c",

			"system.h": "c",

			"netfwd": "cpp",

			"msggen_comm.h": "c",

			"time.h": "c",

			"pthread.h": "c",

			"msggen.h": "c",

			"uri_port_utils.h": "c",

			"uppertester.h": "c"

		},

		"java.compile.nullAnalysis.mode": "automatic"

	},

	"extensions": {

		"recommendations": [

			"nokia.ttcn3"

		]

	}

}
 
 No newline at end of file

ccsrc/Externals/LibItsCommon_externals.cc

+38 −37
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ namespace LibItsCommon__Functions { 
      rlong2; //((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin((double)p__latitude))*(180.0/M_PI);

  }



  /*       * @desc    External function to compute radius of a given circular area

  /*

   * @desc    External function to compute radius of a given circular area

   * @param   p_squareMeters  Square meters of an circular area

   * @return  Computed radius in meters

   fx_computeRadiusFromCircularArea(in float p_squareMeters) return float;

ccsrc/Ports/LibIts_ports/AdapterControlPort.hh

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#ifdef LibItsGeoNetworking__TestSystem_HH

#include "AdapterControlPort_GN.hh"

#endif

#ifdef LibItsCru__TestSystem_HH

#ifdef LibItsVru__TestSystem_HH

#include "AdapterControlPort_VRU.hh"

#endif

#ifdef LibItsCps__TestSystem_HH

ccsrc/Ports/LibIts_ports/CPS_ports/UpperTesterPort_CPS.cc

+12 −3
Original line number Diff line number Diff line
@@ -71,6 +71,15 @@ namespace LibItsCps__TestSystem { 
    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::outgoing_send(const LibItsCps__TypesAndValues::UtCpmTrigger &send_par) {

    loggers::get_instance().log_msg(">>> UpperTesterPort_Cps::outgoing_send: ", send_par);



    float duration;

    loggers::get_instance().set_start_time(_time_key);

    static_cast<uppertester_cps_layer*>(_layer)->sendMsg(send_par, _layer_params);

    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::receiveMsg(const Base_Type &p_ind, const params &p_params) {

    loggers::get_instance().log_msg(">>> UpperTesterPort_Cps::receive_msg: ", p_ind);

    // Sanity check