diff options
Diffstat (limited to 'positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp')
-rw-r--r-- | positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp b/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp index 02b30847..07075c09 100644 --- a/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp +++ b/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_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. @@ -37,20 +37,20 @@ static VEHICLESENS_DATA_MASTER gstLocationLonLat_g; // NOLINT(readability/nol @retval none *******************************************************************************/ void VehicleSensInitLocationLonLatG(void) { -// SENSORLOCATION_LONLATINFO_DAT st_lonlat; + SENSORLOCATION_LONLATINFO_DAT st_lonlat; memset(&gstLocationLonLat_g, 0x00, sizeof(VEHICLESENS_DATA_MASTER)); /** Data ID setting */ gstLocationLonLat_g.ul_did = VEHICLE_DID_LOCATION_LONLAT; /** Data size setting */ -// gstLocationLonLat_g.us_size = sizeof(SENSORLOCATION_LONLATINFO_DAT); + gstLocationLonLat_g.us_size = sizeof(SENSORLOCATION_LONLATINFO_DAT); /** Data content setting */ -// memset(&st_lonlat, 0x00, sizeof(st_lonlat)); -// st_lonlat.getMethod = SENSOR_GET_METHOD_GPS; -// st_lonlat.SyncCnt = 0x00; -// st_lonlat.isEnable = SENSORLOCATION_STATUS_DISABLE; -// memcpy(&gstLocationLonLat_g.uc_data[0], &st_lonlat, sizeof(st_lonlat)); + memset(&st_lonlat, 0x00, sizeof(st_lonlat)); + st_lonlat.getMethod = SENSOR_GET_METHOD_GPS; + st_lonlat.SyncCnt = 0x00; + st_lonlat.isEnable = SENSORLOCATION_STATUS_DISABLE; + memcpy(&gstLocationLonLat_g.uc_data[0], &st_lonlat, sizeof(st_lonlat)); } /**************************************************************************** @@ -63,24 +63,24 @@ void VehicleSensInitLocationLonLatG(void) { @retval VEHICLESENS_EQ : No data change @retval VEHICLESENS_NEQ : Data change *******************************************************************************/ -//u_int8 VehicleSensSetLocationLonLatG(const SENSORLOCATION_LONLATINFO_DAT *pst_lonlat) { -// u_int8 uc_ret; -// VEHICLESENS_DATA_MASTER *pst_master; -// -// pst_master = &gstLocationLonLat_g; -// -// /** With the contents of the current data master,Compare received data */ -// uc_ret = VehicleSensmemcmp(pst_master->uc_data, pst_lonlat, sizeof(SENSORLOCATION_LONLATINFO_DAT)); -// -// /** Received data is set in the data master. */ -// pst_master->ul_did = VEHICLE_DID_LOCATION_LONLAT; -// pst_master->us_size = sizeof(SENSORLOCATION_LONLATINFO_DAT); -// pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; -// memset(pst_master->uc_data, 0x00, sizeof(pst_master->uc_data)); -// memcpy(pst_master->uc_data, pst_lonlat, sizeof(SENSORLOCATION_LONLATINFO_DAT)); -// -// return(uc_ret); -//} +u_int8 VehicleSensSetLocationLonLatG(const SENSORLOCATION_LONLATINFO_DAT *pst_lonlat) { + u_int8 uc_ret; + VEHICLESENS_DATA_MASTER *pst_master; + + pst_master = &gstLocationLonLat_g; + + /** With the contents of the current data master,Compare received data */ + uc_ret = VehicleSensmemcmp(pst_master->uc_data, pst_lonlat, sizeof(SENSORLOCATION_LONLATINFO_DAT)); + + /** Received data is set in the data master. */ + pst_master->ul_did = VEHICLE_DID_LOCATION_LONLAT; + pst_master->us_size = sizeof(SENSORLOCATION_LONLATINFO_DAT); + pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; + memset(pst_master->uc_data, 0x00, sizeof(pst_master->uc_data)); + memcpy(pst_master->uc_data, pst_lonlat, sizeof(SENSORLOCATION_LONLATINFO_DAT)); + + return(uc_ret); +} /**************************************************************************** @brief VehicleSensGetLocationLonLatG<BR> |