diff options
Diffstat (limited to 'positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp')
| -rw-r--r-- | positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp b/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp index 0a1676f4..8f842001 100644 --- a/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp +++ b/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ #include <vehicle_service/positioning_base_library.h> #include "VehicleSens_DataMaster.h" #include "VehicleSens_Common.h" -//#include "gps_hal.h" +#include "gps_hal.h" /*************************************************/ /* Global variable */ @@ -44,10 +44,10 @@ static VEHICLESENS_DATA_MASTER_GPS_FORMAT gstGps_CWORD82_FullBinary_g; // N ******************************************************************************/ void VehicleSensInitGps_CWORD82_FullBinaryG(void) { memset(&gstGps_CWORD82_FullBinary_g, 0x00, sizeof(VEHICLESENS_DATA_MASTER_GPS_FORMAT)); -// gstGps_CWORD82_FullBinary_g.ul_did = POSHAL_DID_GPS__CWORD82__FULLBINARY; + gstGps_CWORD82_FullBinary_g.ul_did = POSHAL_DID_GPS__CWORD82__FULLBINARY; /* _CWORD82_-only format with a fixed magic number */ /* GPS antenna connection information(1byte) + Sensor Counter(1byte) + 191 */ -// gstGps_CWORD82_FullBinary_g.us_size = (VEHICLE_DSIZE_GPS_ANTENNA + VEHICLE_DSIZE_SNS_COUNTER + GPS_CMD_FULLBIN_SZ); + gstGps_CWORD82_FullBinary_g.us_size = (VEHICLE_DSIZE_GPS_ANTENNA + VEHICLE_DSIZE_SNS_COUNTER + GPS_CMD_FULLBIN_SZ); } /******************************************************************************* @@ -59,24 +59,24 @@ void VehicleSensInitGps_CWORD82_FullBinaryG(void) { * RETURN : VEHICLESENS_EQ : No data change * VEHICLESENS_NEQ : Data change ******************************************************************************/ -//u_int8 VehicleSensSetGps_CWORD82_FullBinaryG(const SENSOR_MSG_GPSDATA_DAT *pst_data) { -// u_int8 uc_ret; -// VEHICLESENS_DATA_MASTER_GPS_FORMAT *pst_master; -// VehicleSensSetGpsVersion(pst_data); /* Pass the _CWORD82_ binary */ -// -// pst_master = &gstGps_CWORD82_FullBinary_g; -// -// /* Compare data master and received data */ -// uc_ret = VehicleSensmemcmp(pst_master->uc_data, pst_data->uc_data, pst_data->us_size); -// -// /* Received data is set in the data master. */ -// pst_master->ul_did = pst_data->ul_did; -// pst_master->us_size = pst_data->us_size; -// pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; -// memcpy(pst_master->uc_data, pst_data->uc_data, pst_data->us_size); -// -// return(uc_ret); -//} +u_int8 VehicleSensSetGps_CWORD82_FullBinaryG(const SENSOR_MSG_GPSDATA_DAT *pst_data) { + u_int8 uc_ret; + VEHICLESENS_DATA_MASTER_GPS_FORMAT *pst_master; + VehicleSensSetGpsVersion(pst_data); /* Pass the _CWORD82_ binary */ + + pst_master = &gstGps_CWORD82_FullBinary_g; + + /* Compare data master and received data */ + uc_ret = VehicleSensmemcmp(pst_master->uc_data, pst_data->uc_data, pst_data->us_size); + + /* Received data is set in the data master. */ + pst_master->ul_did = pst_data->ul_did; + pst_master->us_size = pst_data->us_size; + pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; + memcpy(pst_master->uc_data, pst_data->uc_data, pst_data->us_size); + + return(uc_ret); +} /******************************************************************************* * MODULE : VehicleSensGetGps_CWORD82_FullBinaryG @@ -86,14 +86,14 @@ void VehicleSensInitGps_CWORD82_FullBinaryG(void) { * NOTE : * RETURN : void ******************************************************************************/ -//void VehicleSensGetGps_CWORD82_FullBinaryG(SENSOR_MSG_GPSDATA_DAT *pst_data) { -// const VEHICLESENS_DATA_MASTER_GPS_FORMAT *pst_master; -// -// pst_master = &gstGps_CWORD82_FullBinary_g; -// -// /* Store the data master in the specified destination. */ -// pst_data->ul_did = pst_master->ul_did; -// pst_data->us_size = pst_master->us_size; -// pst_data->uc_rcv_flag = pst_master->uc_rcvflag; -// memcpy(pst_data->uc_data, pst_master->uc_data, pst_master->us_size); /* Ignore->MISRA-C++:2008 Rule 5-0-5 */ -//} +void VehicleSensGetGps_CWORD82_FullBinaryG(SENSOR_MSG_GPSDATA_DAT *pst_data) { + const VEHICLESENS_DATA_MASTER_GPS_FORMAT *pst_master; + + pst_master = &gstGps_CWORD82_FullBinary_g; + + /* Store the data master in the specified destination. */ + pst_data->ul_did = pst_master->ul_did; + pst_data->us_size = pst_master->us_size; + pst_data->uc_rcv_flag = pst_master->uc_rcvflag; + memcpy(pst_data->uc_data, pst_master->uc_data, pst_master->us_size); /* Ignore->MISRA-C++:2008 Rule 5-0-5 */ +} |