summaryrefslogtreecommitdiffstats
path: root/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp')
-rw-r--r--positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp144
1 files changed, 70 insertions, 74 deletions
diff --git a/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp b/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp
index 2a3bc74b..86c8f499 100644
--- a/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp
+++ b/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_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.
@@ -46,7 +46,7 @@ void VehicleSensInitSpeedPulseExtl(void) {
u_int16 *pus;
memset(&gstSpeedPulseExt_l, 0x00, sizeof(VEHICLESENS_DATA_MASTER_EXT));
-// gstSpeedPulseExt_l.ul_did = POSHAL_DID_SPEED_PULSE;
+ gstSpeedPulseExt_l.ul_did = POSHAL_DID_SPEED_PULSE;
gstSpeedPulseExt_l.us_size = VEHICLE_DSIZE_SPEED_PULSE_EXT_INIT;
pus = reinterpret_cast<u_int16 *>(gstSpeedPulseExt_l.uc_data);
@@ -62,43 +62,43 @@ void VehicleSensInitSpeedPulseExtl(void) {
* RETURN : VEHICLESENS_EQ : No data change
* VEHICLESENS_NEQ : Data change
******************************************************************************/
-//void VehicleSensSetSpeedPulseExtlG(const LSDRV_LSDATA_G *pst_data) {
-// VEHICLESENS_DATA_MASTER_EXT *pst_master;
-// u_int16 us_start = 0;
-// u_int16 us_size = 0;
-// u_int16 us_cnt = 0;
-//
-// pst_master = &gstSpeedPulseExt_l;
-// us_size = static_cast<u_int16>(sizeof(u_int16) * 10); /* Size of one data item: 2byte * 10 data items */
-//
-// /* Retrieve the location where the received one is stored */
-// us_start = gstPkgTempExt.start_point[1];
-//
-// /* 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[1] = 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_SPEED_PULSE_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 VehicleSensSetSpeedPulseExtlG(const LSDRV_LSDATA_G *pst_data) {
+ VEHICLESENS_DATA_MASTER_EXT *pst_master;
+ u_int16 us_start = 0;
+ u_int16 us_size = 0;
+ u_int16 us_cnt = 0;
+
+ pst_master = &gstSpeedPulseExt_l;
+ us_size = static_cast<u_int16>(sizeof(u_int16) * 10); /* Size of one data item: 2byte * 10 data items */
+
+ /* Retrieve the location where the received one is stored */
+ us_start = gstPkgTempExt.start_point[SpeedPulse];
+
+ /* 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[SpeedPulse] = 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_SPEED_PULSE_EXT;
+ } else {
+ /* Add the size of one received data item */
+ pst_master->us_size = static_cast<u_int16>(pst_master->us_size + us_size);
+ }
+}
/*******************************************************************************
* MODULE : VehicleSensGetSpeedPulseExtl
@@ -109,46 +109,42 @@ void VehicleSensInitSpeedPulseExtl(void) {
* RETURN : void
******************************************************************************/
void VehicleSensGetSpeedPulseExtl(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;
+ const VEHICLESENS_DATA_MASTER_EXT *pst_master;
+ uint16_t 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 = &gstSpeedPulseExt_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;
- /* Store the data master in the specified destination. */
- pst_master = &gstSpeedPulseExt_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;
+ us_size = static_cast<u_int16>(sizeof(u_int16) * 10); /* Size of one data item: 2byte * 10 data items */
- us_size = static_cast<u_int16>(sizeof(u_int16) * 10); /* Size of one data item: 2byte * 10 data items */
+ /* 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[SpeedPulse];
+ }
- /* Checking whether the number of stored entries is looped */
+ /* 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) {
- us_data_cnt = VEHICLE_DKEEP_MAX;
+ /* Get information before loop */
+ if (gstPkgTempExt.start_point[SpeedPulse] + us_cnt < VEHICLE_DKEEP_MAX) {
+ memcpy(&pst_data->uc_data[us_cnt * us_size],
+ &pst_master->uc_data[(gstPkgTempExt.start_point[SpeedPulse] + 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 {
- us_data_cnt = gstPkgTempExt.start_point[1];
- }
-
- /* 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[1] > us_cnt) {
- memcpy(&pst_data->uc_data[us_cnt * us_size],
- &pst_master->uc_data[(gstPkgTempExt.start_point[1] - 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);
- }
- }
+ memcpy(&pst_data->uc_data[us_cnt * us_size],
+ &pst_master->uc_data[us_cnt * us_size], us_size);
}
+ }
}
#endif