From cfb73879c1f7325b3d132f5a800f4333824b9915 Mon Sep 17 00:00:00 2001
From: Davide Basso <davide.basso@skywarder.eu>
Date: Tue, 20 Feb 2024 19:26:26 +0100
Subject: [PATCH] [Units] Remove global namespace
---
src/shared/sensors/LIS3DSH/LIS3DSH.h | 2 ++
src/shared/sensors/LIS3DSH/LIS3DSHData.h | 3 ++-
src/tests/sensors/calibration/test-calibration-benchmark.cpp | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/shared/sensors/LIS3DSH/LIS3DSH.h b/src/shared/sensors/LIS3DSH/LIS3DSH.h
index aebb40fbd..fab14f67c 100644
--- a/src/shared/sensors/LIS3DSH/LIS3DSH.h
+++ b/src/shared/sensors/LIS3DSH/LIS3DSH.h
@@ -352,6 +352,8 @@ private:
*/
AccelerometerData readAccelData()
{
+ using namespace Units::Acceleration;
+
AccelerometerData accelData;
SPITransaction spi(spiSlave);
diff --git a/src/shared/sensors/LIS3DSH/LIS3DSHData.h b/src/shared/sensors/LIS3DSH/LIS3DSHData.h
index ab382c5e8..b4d6dc821 100644
--- a/src/shared/sensors/LIS3DSH/LIS3DSHData.h
+++ b/src/shared/sensors/LIS3DSH/LIS3DSHData.h
@@ -26,10 +26,11 @@
namespace Boardcore
{
-using namespace Units::Acceleration;
struct LIS3DSHData : public AccelerometerData, public TemperatureData
{
+ using MeterPerSecondSquared = Units::Acceleration::MeterPerSecondSquared;
+
LIS3DSHData()
: AccelerometerData{0, MeterPerSecondSquared(0),
MeterPerSecondSquared(0), MeterPerSecondSquared(0)},
diff --git a/src/tests/sensors/calibration/test-calibration-benchmark.cpp b/src/tests/sensors/calibration/test-calibration-benchmark.cpp
index e8811b301..70c53be71 100644
--- a/src/tests/sensors/calibration/test-calibration-benchmark.cpp
+++ b/src/tests/sensors/calibration/test-calibration-benchmark.cpp
@@ -39,6 +39,7 @@
using namespace Boardcore;
using namespace miosix;
+using namespace Units::Acceleration;
/* using volatile so that the compiler won't optimize out the variable */
volatile AccelerometerData testData;
--
GitLab