diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 09:06:18 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 09:06:18 +0900 |
commit | 00ab09fac9701443fdff616fdcc274809a03d4d7 (patch) | |
tree | 03aa078b69aa17d12c77f7d4b74cf6f3a93ffefd /positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp | |
parent | fa6fa9f4ee5486b30d223914e1a6e50d4d3adf71 (diff) |
vs-positioning branch 0.1sandbox/ToshikazuOhiwa/vs-positioning
Diffstat (limited to 'positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp')
-rw-r--r-- | positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp b/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp index da597e68..52cda83c 100644 --- a/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp +++ b/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_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. @@ -39,17 +39,17 @@ static VEHICLESENS_DATA_MASTER gstGpsTimeRaw_g; // NOLINT(readability/nolin * GPS time information data master initialization processing */ void VehicleSensInitGpsTimeRawG(void) { -// SENSOR_GPSTIME_RAW st_gps_time_raw; + SENSOR_GPSTIME_RAW st_gps_time_raw; memset(&gstGpsTimeRaw_g, 0x00, sizeof(VEHICLESENS_DATA_MASTER)); /** Data ID setting */ -// gstGpsTimeRaw_g.ul_did = POSHAL_DID_GPS_TIME_RAW; + gstGpsTimeRaw_g.ul_did = POSHAL_DID_GPS_TIME_RAW; /** Data size setting */ -// gstGpsTimeRaw_g.us_size = sizeof(SENSOR_GPSTIME_RAW); + gstGpsTimeRaw_g.us_size = sizeof(SENSOR_GPSTIME_RAW); /** Data content setting */ -// memset(&st_gps_time_raw, 0x00, sizeof(st_gps_time_raw)); -// memcpy(&gstGpsTimeRaw_g.uc_data[0], &st_gps_time_raw, sizeof(st_gps_time_raw)); + memset(&st_gps_time_raw, 0x00, sizeof(st_gps_time_raw)); + memcpy(&gstGpsTimeRaw_g.uc_data[0], &st_gps_time_raw, sizeof(st_gps_time_raw)); return; } @@ -62,29 +62,29 @@ void VehicleSensInitGpsTimeRawG(void) { * * @return u_int8 */ -//u_int8 VehicleSensSetGpsTimeRawG(const SENSOR_GPSTIME_RAW *pst_gps_time_raw) { -// u_int8 uc_ret; -// VEHICLESENS_DATA_MASTER *pst_master; -// -// pst_master = &gstGpsTimeRaw_g; -// -// /** With the contents of the current data master,Compare received data */ -// uc_ret = VehicleSensmemcmp(pst_master->uc_data, pst_gps_time_raw, sizeof(SENSOR_GPSTIME_RAW)); -// -// /** Received data is set in the data master. */ -// pst_master->ul_did = POSHAL_DID_GPS_TIME_RAW; -// pst_master->us_size = sizeof(SENSOR_GPSTIME_RAW); -// pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; -// memset(pst_master->uc_data, 0x00, sizeof(pst_master->uc_data)); -// memcpy(pst_master->uc_data, pst_gps_time_raw, sizeof(SENSOR_GPSTIME_RAW)); -// -// FRAMEWORKUNIFIEDLOG(ZONE_27, __FUNCTION__, -// "year=%04d, month=%02d, date=%02d, hour=%02d, minute=%02d, second=%02d, tdsts=%d", -// pst_gps_time_raw->utc.year, pst_gps_time_raw->utc.month, pst_gps_time_raw->utc.date, -// pst_gps_time_raw->utc.hour, pst_gps_time_raw->utc.minute, -// pst_gps_time_raw->utc.second, pst_gps_time_raw->tdsts); -// return(uc_ret); -//} +u_int8 VehicleSensSetGpsTimeRawG(const SENSOR_GPSTIME_RAW *pst_gps_time_raw) { + u_int8 uc_ret; + VEHICLESENS_DATA_MASTER *pst_master; + + pst_master = &gstGpsTimeRaw_g; + + /** With the contents of the current data master,Compare received data */ + uc_ret = VehicleSensmemcmp(pst_master->uc_data, pst_gps_time_raw, sizeof(SENSOR_GPSTIME_RAW)); + + /** Received data is set in the data master. */ + pst_master->ul_did = POSHAL_DID_GPS_TIME_RAW; + pst_master->us_size = sizeof(SENSOR_GPSTIME_RAW); + pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; + memset(pst_master->uc_data, 0x00, sizeof(pst_master->uc_data)); + memcpy(pst_master->uc_data, pst_gps_time_raw, sizeof(SENSOR_GPSTIME_RAW)); + + FRAMEWORKUNIFIEDLOG(ZONE_27, __FUNCTION__, + "year=%04d, month=%02d, date=%02d, hour=%02d, minute=%02d, second=%02d, tdsts=%d", + pst_gps_time_raw->utc.year, pst_gps_time_raw->utc.month, pst_gps_time_raw->utc.date, + pst_gps_time_raw->utc.hour, pst_gps_time_raw->utc.minute, + pst_gps_time_raw->utc.second, pst_gps_time_raw->tdsts); + return(uc_ret); +} /** * @brief @@ -92,16 +92,16 @@ void VehicleSensInitGpsTimeRawG(void) { * * @param[out] SENSOR_MSG_GPSDATA_DAT* */ -//void VehicleSensGetGpsTimeRawG(SENSOR_MSG_GPSDATA_DAT *pst_data) { -// const VEHICLESENS_DATA_MASTER *pst_master; -// -// pst_master = &gstGpsTimeRaw_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); -// -// return; -//} +void VehicleSensGetGpsTimeRawG(SENSOR_MSG_GPSDATA_DAT *pst_data) { + const VEHICLESENS_DATA_MASTER *pst_master; + + pst_master = &gstGpsTimeRaw_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); + + return; +} |