From f2915d82b7b10246a33db0634825e85add2de242 Mon Sep 17 00:00:00 2001 From: Marco Correia Date: Mon, 31 May 2021 19:30:43 +0100 Subject: [PATCH] Get GPS from module : CPMs --- src/config.c | 2 -- src/cpm.c | 4 ++-- src/cpm.h | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/config.c b/src/config.c index 21564a5..f8b32ff 100644 --- a/src/config.c +++ b/src/config.c @@ -250,8 +250,6 @@ int facilities_config(void* facilities_s) { facilities->dissemination->T_GenCpmMax = config->facilities.cpm.rsu_obu_period_max; facilities->dissemination->radar_rotation = config->applications.its_center.rotation; facilities->dissemination->tmc_connect = config->facilities.cpm.tmc_connected; - facilities->dissemination->latitude = config->management.gps.latitude; - facilities->dissemination->longitude = config->management.gps.longitude; facilities->dissemination->int_radar = malloc(strlen(config->facilities.cpm.radar_interface)+1); strcpy(facilities->dissemination->int_radar,config->facilities.cpm.radar_interface); diff --git a/src/cpm.c b/src/cpm.c index da782e9..78933ca 100644 --- a/src/cpm.c +++ b/src/cpm.c @@ -415,8 +415,8 @@ void mk_cpm(facilities_t* facilities,CPM_t* cpm_tx, struct timespec* systemtime) cpm_tx->cpm.generationDeltaTime = generationDeltaTime; cpm_tx->cpm.cpmParameters.managementContainer.stationType = StationType_roadSideUnit; - cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.latitude = facilities->dissemination->latitude * 10000000; - cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.longitude = facilities->dissemination->longitude * 10000000; + cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.latitude = facilities->epv.space.latitude; + cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.longitude = facilities->epv.space.longitude; cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.positionConfidenceEllipse.semiMajorConfidence = 100; cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.positionConfidenceEllipse.semiMinorConfidence = 100; cpm_tx->cpm.cpmParameters.managementContainer.referencePosition.positionConfidenceEllipse.semiMajorOrientation = HeadingValue_wgs84North; diff --git a/src/cpm.h b/src/cpm.h index 3a46a60..f124d2a 100644 --- a/src/cpm.h +++ b/src/cpm.h @@ -136,11 +136,6 @@ typedef struct int64_t radar_rotation; -/* Fixed GPS coordenates */ - - double latitude; - double longitude; - } dissemination_t; /* Prototype Functions */