summaryrefslogtreecommitdiffstats
path: root/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp')
-rw-r--r--positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp174
1 files changed, 85 insertions, 89 deletions
diff --git a/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp b/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp
index 8824c819..04e66b54 100644
--- a/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp
+++ b/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_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 Value *
*---------------------------------------------------------------------------------*/
-//static VEHICLESENS_DATA_MASTER_EXT g_st_pulsetime_ext_l; // NOLINT(readability/nolint)
+static VEHICLESENS_DATA_MASTER_EXT g_st_pulsetime_ext_l; // NOLINT(readability/nolint)
/**
* @brief
@@ -36,10 +36,10 @@
* Inter-pulse time data master initialization processing
*/
void VehicleSensInitPulseTimeExtl(void) {
-// (void)memset(reinterpret_cast<void *>(&g_st_pulsetime_ext_l), 0, sizeof(VEHICLESENS_DATA_MASTER_EXT));
-// g_st_pulsetime_ext_l.ul_did = POSHAL_DID_PULSE_TIME;
-// g_st_pulsetime_ext_l.us_size = VEHICLE_DSIZE_PULSE_TIME_EXT_INIT;
-// g_st_pulsetime_ext_l.uc_rcvflag = VEHICLE_RCVFLAG_OFF;
+ (void)memset(reinterpret_cast<void *>(&g_st_pulsetime_ext_l), 0, sizeof(VEHICLESENS_DATA_MASTER_EXT));
+ g_st_pulsetime_ext_l.ul_did = POSHAL_DID_PULSE_TIME;
+ g_st_pulsetime_ext_l.us_size = VEHICLE_DSIZE_PULSE_TIME_EXT_INIT;
+ g_st_pulsetime_ext_l.uc_rcvflag = VEHICLE_RCVFLAG_OFF;
}
/**
@@ -53,45 +53,45 @@ void VehicleSensInitPulseTimeExtl(void) {
* @return VEHICLESENS_EQ No data change<br>
* VEHICLESENS_NEQ Data change
*/
-//void VehicleSensSetPulseTimeExtlG(const LSDRV_LSDATA_G *pst_data) {
-// VEHICLESENS_DATA_MASTER_EXT *pst_master;
-// u_int16 us_size = 0;
-// u_int16 us_start = 0;
-// u_int16 us_cnt = 0;
-//
-// pst_master = &g_st_pulsetime_ext_l;
-// /* 4byte * (Number of data items + 32 data items) */
-// us_size = static_cast<u_int16>(sizeof(u_int32) * (1 + VEHICLE_SNS_INFO_PULSE_NUM));
-//
-// /* Retrieve the location where the received one is stored */
-// us_start = gstPkgTempExt.start_point[7];
-//
-// /* 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;
-// for (us_cnt = 0; us_cnt < us_size; us_cnt++) {
-// pst_master->uc_data[us_start * us_size + us_cnt] = (u_int8)(pst_data->uc_data[us_cnt]);
-// }
-//
-// /* Update next storage start position and latest data storage position */
-// us_start++;
-// gstPkgTempExt.start_point[7] = 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_PULSE_TIME_EXT;
-// } else {
-// /* Add the size of one received data item */
-// pst_master->us_size = static_cast<u_int16>(pst_master->us_size + us_size);
-// }
-//}
+void VehicleSensSetPulseTimeExtlG(const LSDRV_LSDATA_G *pst_data) {
+ VEHICLESENS_DATA_MASTER_EXT *pst_master;
+ u_int16 us_size = 0;
+ u_int16 us_start = 0;
+ u_int16 us_cnt = 0;
+
+ pst_master = &g_st_pulsetime_ext_l;
+ /* 4byte * (Number of data items + 32 data items) */
+ us_size = static_cast<u_int16>(sizeof(u_int32) * (1 + VEHICLE_SNS_INFO_PULSE_NUM));
+
+ /* Retrieve the location where the received one is stored */
+ us_start = gstPkgTempExt.start_point[PulseTime];
+
+ /* 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;
+ for (us_cnt = 0; us_cnt < us_size; us_cnt++) {
+ pst_master->uc_data[us_start * us_size + us_cnt] = (u_int8)(pst_data->uc_data[us_cnt]);
+ }
+
+ /* Update next storage start position and latest data storage position */
+ us_start++;
+ gstPkgTempExt.start_point[PulseTime] = 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_PULSE_TIME_EXT;
+ } else {
+ /* Add the size of one received data item */
+ pst_master->us_size = static_cast<u_int16>(pst_master->us_size + us_size);
+ }
+}
/**
* @brief
@@ -101,47 +101,43 @@ void VehicleSensInitPulseTimeExtl(void) {
*
* @param[in] Pointer to the data master acquisition destination
*/
-//void VehicleSensGetPulseTimeExtl(VEHICLESENS_DATA_MASTER_EXT *pst_data) {
-// const VEHICLESENS_DATA_MASTER_EXT *pst_master;
-// u_int16 us_size = 0;
-// 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_pulsetime_ext_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;
-//
-// /* Size of one data item: 4byte * (Number of data items + 32 data items) */
-// us_size = static_cast<u_int16>(sizeof(u_int32) * (1 + VEHICLE_SNS_INFO_PULSE_NUM));
-//
-// /* 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[7];
-// }
-//
-// /* Acquire data from the newest data master */
-// us_loop_cnt = 0;
-// 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[7] > us_cnt) {
-// memcpy(&pst_data->uc_data[us_cnt * us_size],
-// &pst_master->uc_data[(gstPkgTempExt.start_point[7] - us_cnt - 1) * us_size], us_size);
-// us_loop_cnt++;
-// } else {
-// memcpy(&pst_data->uc_data[us_cnt * us_size],
-// &pst_master->uc_data[(us_data_cnt - us_cnt - 1 + us_loop_cnt) * us_size], us_size);
-// }
-// } else {
-// if ((u_int32)(us_data_cnt - us_cnt) <= (u_int32)VEHICLE_DKEEP_MAX) { // LCOV_EXCL_BR_LINE 6: always true
-// memcpy(&pst_data->uc_data[us_cnt * us_size],
-// &pst_master->uc_data[(us_data_cnt - us_cnt - 1) * us_size], us_size);
-// }
-// }
-// }
-//}
+void VehicleSensGetPulseTimeExtl(VEHICLESENS_DATA_MASTER_EXT *pst_data) {
+ const VEHICLESENS_DATA_MASTER_EXT *pst_master;
+ u_int16 us_size = 0;
+ 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_pulsetime_ext_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;
+
+ /* Size of one data item: 4byte * (Number of data items + 32 data items) */
+ us_size = static_cast<u_int16>(sizeof(u_int32) * (1 + VEHICLE_SNS_INFO_PULSE_NUM));
+
+ /* 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[PulseTime];
+ }
+
+ /* Acquire data from the oldest 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[PulseTime] + us_cnt < VEHICLE_DKEEP_MAX) {
+ memcpy(&pst_data->uc_data[us_cnt * us_size],
+ &pst_master->uc_data[(gstPkgTempExt.start_point[PulseTime] + us_cnt) * us_size], us_size);
+ } else {
+ memcpy(&pst_data->uc_data[us_cnt * us_size],
+ &pst_master->uc_data[us_loop_cnt * us_size], us_size);
+ us_loop_cnt++;
+ }
+ } else {
+ memcpy(&pst_data->uc_data[us_cnt * us_size],
+ &pst_master->uc_data[us_cnt * us_size], us_size);
+ }
+ }
+}