diff options
Diffstat (limited to 'positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp')
| -rw-r--r-- | positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp | 155 |
1 files changed, 76 insertions, 79 deletions
diff --git a/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp b/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp index 77884cc3..0f4e5e62 100644 --- a/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp +++ b/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.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 @@ /*************************************************/ /* Global variable */ /*************************************************/ -//static VEHICLESENS_DATA_MASTER_EXT g_st_revext_l; // NOLINT(readability/nolint) +static VEHICLESENS_DATA_MASTER_EXT g_st_revext_l; // NOLINT(readability/nolint) /** * @brief @@ -38,14 +38,14 @@ * @param[in] none */ void VehicleSensInitRevExtl(void) { -// u_int16 *pus; -// -// memset(&g_st_revext_l, 0x00, sizeof(VEHICLESENS_DATA_MASTER_EXT)); -// g_st_revext_l.ul_did = POSHAL_DID_REV; -// g_st_revext_l.us_size = VEHICLE_DSIZE_REV_EXT_INIT; -// g_st_revext_l.uc_rcvflag = VEHICLE_RCVFLAG_OFF; -// pus = reinterpret_cast<u_int16 *>(g_st_revext_l.uc_data); -// memset(reinterpret_cast<void*>(pus), VEHICLE_DINIT_SNS_COUNTER, VEHICLE_DSIZE_REV_EXT); + u_int16 *pus; + + memset(&g_st_revext_l, 0x00, sizeof(VEHICLESENS_DATA_MASTER_EXT)); + g_st_revext_l.ul_did = POSHAL_DID_REV; + g_st_revext_l.us_size = VEHICLE_DSIZE_REV_EXT_INIT; + g_st_revext_l.uc_rcvflag = VEHICLE_RCVFLAG_OFF; + pus = reinterpret_cast<u_int16 *>(g_st_revext_l.uc_data); + memset(reinterpret_cast<void*>(pus), VEHICLE_DINIT_SNS_COUNTER, VEHICLE_DSIZE_REV_EXT); } /** @@ -56,39 +56,39 @@ void VehicleSensInitRevExtl(void) { * * @param[in] *pst_data : Pointer to the message data received by the direct line */ -//void VehicleSensSetRevExtlG(const LSDRV_LSDATA_G *pst_data) { -// VEHICLESENS_DATA_MASTER_EXT *pst_master; -// u_int16 us_start = 0; -// -// pst_master = &g_st_revext_l; -// -// /* Retrieve the location where the received one is stored */ -// us_start = gstPkgTempExt.start_point[5]; -// -// /* Stored in data master(Order of reception)*/ -// if (us_start >= VEHICLE_DKEEP_MAX) { -// /* Store the latest one at position 0 */ -// us_start = VEHICLE_DATA_POS_00; -// /* If you are discarding old data,,Set a flag */ -// gstPkgTempExt.data_break = VEHICLE_SNS_BREAK; -// } -// pst_master->ul_did = pst_data->ul_did; -// pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; -// pst_master->uc_data[us_start] = pst_data->uc_data[0]; -// -// /* Update next storage start position and latest data storage position */ -// us_start++; -// gstPkgTempExt.start_point[5] = us_start; -// -// /* Update data master size */ -// if (gstPkgTempExt.data_break == VEHICLE_SNS_BREAK) { -// /* Make the size of all extended data masters */ -// pst_master->us_size = VEHICLE_DSIZE_REV_EXT; -// } else { -// /* Add the size of one received data item */ -// pst_master->us_size = static_cast<u_int16>(pst_master->us_size + sizeof(u_int8)); -// } -//} +void VehicleSensSetRevExtlG(const LSDRV_LSDATA_G *pst_data) { + VEHICLESENS_DATA_MASTER_EXT *pst_master; + u_int16 us_start = 0; + + pst_master = &g_st_revext_l; + + /* Retrieve the location where the received one is stored */ + us_start = gstPkgTempExt.start_point[Rev]; + + /* Stored in data master(Order of reception)*/ + if (us_start >= VEHICLE_DKEEP_MAX) { + /* Store the latest one at position 0 */ + us_start = VEHICLE_DATA_POS_00; + /* If you are discarding old data,,Set a flag */ + gstPkgTempExt.data_break = VEHICLE_SNS_BREAK; + } + pst_master->ul_did = pst_data->ul_did; + pst_master->uc_rcvflag = VEHICLE_RCVFLAG_ON; + pst_master->uc_data[us_start] = pst_data->uc_data[0]; + + /* Update next storage start position and latest data storage position */ + us_start++; + gstPkgTempExt.start_point[Rev] = us_start; + + /* Update data master size */ + if (gstPkgTempExt.data_break == VEHICLE_SNS_BREAK) { + /* Make the size of all extended data masters */ + pst_master->us_size = VEHICLE_DSIZE_REV_EXT; + } else { + /* Add the size of one received data item */ + pst_master->us_size = static_cast<u_int16>(pst_master->us_size + sizeof(u_int8)); + } +} /** * @brief @@ -98,40 +98,37 @@ void VehicleSensInitRevExtl(void) { * * @param[in] *pst_data : Pointer to the data master acquisition destination */ -//void VehicleSensGetRevExtl(VEHICLESENS_DATA_MASTER_EXT *pst_data) { -// const VEHICLESENS_DATA_MASTER_EXT *pst_master; -// u_int16 us_data_cnt = 0; -// u_int16 us_cnt = 0; -// u_int16 us_loop_cnt = 0; -// -// /* Store the data master in the specified destination. */ -// pst_master = &g_st_revext_l; -// pst_data->ul_did = pst_master->ul_did; -// pst_data->us_size = pst_master->us_size; -// pst_data->uc_rcvflag = pst_master->uc_rcvflag; -// -// /* Checking whether the number of stored entries is looped */ -// if (gstPkgTempExt.data_break == VEHICLE_SNS_BREAK) { /* Ignore->MISRA-C++:2008 Rule 5-0-5 */ -// us_data_cnt = VEHICLE_DKEEP_MAX; -// } else { -// us_data_cnt = gstPkgTempExt.start_point[5]; -// } -// -// /* Acquire data from the newest data master */ -// for (us_cnt = 0; us_cnt < us_data_cnt; us_cnt++) { -// if (gstPkgTempExt.data_break == VEHICLE_SNS_BREAK) { -// /* Get information after loop */ -// if (gstPkgTempExt.start_point[5] > us_cnt) { -// pst_data->uc_data[us_cnt] = pst_master->uc_data[(gstPkgTempExt.start_point[5] - us_cnt - 1)]; -// us_loop_cnt++; -// } else { -// pst_data->uc_data[us_cnt] = pst_master->uc_data[(us_data_cnt - us_cnt - 1 + us_loop_cnt)]; -// } -// } else { -// if ((u_int32)(us_data_cnt - us_cnt) <= (u_int32)VEHICLE_DKEEP_MAX) { // LCOV_EXCL_BR_LINE 6: always true -// pst_data->uc_data[us_cnt] = pst_master->uc_data[(us_data_cnt - us_cnt - 1)]; -// } -// } -// } -//} +void VehicleSensGetRevExtl(VEHICLESENS_DATA_MASTER_EXT *pst_data) { + const VEHICLESENS_DATA_MASTER_EXT *pst_master; + uint16_t us_data_cnt = 0; // Number of data contained + uint16_t us_loop_cnt = 0; // 64 over index + + /* Store the data master in the specified destination. */ + pst_master = &g_st_revext_l; + pst_data->ul_did = pst_master->ul_did; + pst_data->us_size = pst_master->us_size; + pst_data->uc_rcvflag = pst_master->uc_rcvflag; + + /* Checking whether the number of stored entries is looped */ + if (gstPkgTempExt.data_break == VEHICLE_SNS_BREAK) { + us_data_cnt = VEHICLE_DKEEP_MAX; + } else { + us_data_cnt = gstPkgTempExt.start_point[Rev]; + } + + /* Acquire data from the newest data master */ + for (uint16_t us_cnt = 0; us_cnt < us_data_cnt; us_cnt++) { + if (gstPkgTempExt.data_break == VEHICLE_SNS_BREAK) { + /* Get information before loop */ + if (gstPkgTempExt.start_point[Rev] + us_cnt < VEHICLE_DKEEP_MAX) { + pst_data->uc_data[us_cnt] = pst_master->uc_data[(gstPkgTempExt.start_point[Rev] + us_cnt)]; + } else { + pst_data->uc_data[us_cnt] = pst_master->uc_data[us_loop_cnt]; + us_loop_cnt++; + } + } else { + pst_data->uc_data[us_cnt] = pst_master->uc_data[us_cnt]; + } + } +} |