diff --git a/src/shared/sensors/LIS3DSH/LIS3DSH.h b/src/shared/sensors/LIS3DSH/LIS3DSH.h index aebb40fbdbfe9d49732704fdb0f630a36cc7e6ba..fab14f67c839739e03b889911416a1d26a599fc6 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 ab382c5e82f29515cece58db97c52ee38d578a9a..b4d6dc8217b6556fa58203f73ee8338c9c873b54 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 e8811b30138dc008400024c8d691607c88fb5f77..70c53be715a114ca4ff21114f87ecc51ddce8435 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;