From f43dd867e77a5edabcdd784de6c651bb3f5c53f7 Mon Sep 17 00:00:00 2001 From: Davide Basso <davide.basso@skywarder.eu> Date: Wed, 7 Feb 2024 21:47:33 +0100 Subject: [PATCH] [Units] Fix timestamp being 0 --- src/shared/sensors/H3LIS331DL/H3LIS331DLData.h | 2 +- src/shared/sensors/LIS3DSH/LIS3DSHData.h | 1 - src/shared/sensors/SensorData.h | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h b/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h index 6ab962a74..27a3f9c2e 100644 --- a/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h +++ b/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h @@ -36,7 +36,7 @@ struct H3LIS331DLData : public AccelerometerData MeterPerSecondSquared(0)){}; H3LIS331DLData(uint64_t ts, float aX, float aY, float aZ) - : AccelerometerData(0, MeterPerSecondSquared(aX), + : AccelerometerData(ts, MeterPerSecondSquared(aX), MeterPerSecondSquared(aY), MeterPerSecondSquared(aZ)){}; diff --git a/src/shared/sensors/LIS3DSH/LIS3DSHData.h b/src/shared/sensors/LIS3DSH/LIS3DSHData.h index f650cd2d3..f2dfa77ae 100644 --- a/src/shared/sensors/LIS3DSH/LIS3DSHData.h +++ b/src/shared/sensors/LIS3DSH/LIS3DSHData.h @@ -27,7 +27,6 @@ namespace Boardcore { using namespace Units::Acceleration; -using namespace Units::Time; struct LIS3DSHData : public AccelerometerData, public TemperatureData { diff --git a/src/shared/sensors/SensorData.h b/src/shared/sensors/SensorData.h index dab8657e4..5d172388f 100644 --- a/src/shared/sensors/SensorData.h +++ b/src/shared/sensors/SensorData.h @@ -23,7 +23,6 @@ #pragma once #include <units/Acceleration.h> -#include <units/Time.h> #include <Eigen/Core> #include <ostream> @@ -121,7 +120,7 @@ struct AccelerometerData AccelerometerData(uint64_t timestamp, MeterPerSecondSquared x, MeterPerSecondSquared y, MeterPerSecondSquared z) - : accelerationTimestamp(0), accelerationX(x), accelerationY(y), + : accelerationTimestamp(timestamp), accelerationX(x), accelerationY(y), accelerationZ(z) { } -- GitLab