TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.es.av.it.pt/its/it2s-itss-facilities

This commit is contained in:
emanuel 2021-09-09 12:05:57 +01:00
parent 53ec48c1e7 1502a698d4
commit 388298d80d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpm.c
View File

@ -34,14 +34,13 @@
#endif #endif
#define PI 3.141592654 #define PI 3.141592654
#define MAX_OBJ_RADAR 255
/* Variables */ /* Variables */
float roadRotationSin; float roadRotationSin;
float roadRotationCos; float roadRotationCos;
long history_list[MAX_OBJ_RADAR][5]; long history_list[NOF_OBJECTS][5];
int valid_array[MAX_OBJ_RADAR]; int valid_array[NOF_OBJECTS];
S_ETHERNET_CONNECTION_T s_socket; S_ETHERNET_CONNECTION_T s_socket;
S_INTERFACE_CONNECTION_T raw_socket; S_INTERFACE_CONNECTION_T raw_socket;
@ -158,7 +157,7 @@ dissemination_t* dissemination_init(){
int dissemination_check(dissemination_t* dissemination, it2s_tender_epv_t* epv, int f) { int dissemination_check(dissemination_t* dissemination, it2s_tender_epv_t* epv, int f) {
int rv = 1; int rv;
uint64_t now = it2s_tender_get_clock(epv); uint64_t now = it2s_tender_get_clock(epv);
@ -519,7 +518,7 @@ static int mk_cpm(facilities_t* facilities, uint8_t *bdr_oer, uint32_t *bdr_len,
long euclidian_dist, abs_speed, abs_speed_hist, angle, angle_hist, angle_diff; long euclidian_dist, abs_speed, abs_speed_hist, angle, angle_hist, angle_diff;
int j = 0, rv = 0; int j = 0, rv = 0;
int temp[MAX_OBJ_RADAR]; int temp[NOF_OBJECTS];
cpm_tx->header.protocolVersion = PROTOCOL_VERSION; cpm_tx->header.protocolVersion = PROTOCOL_VERSION;