From 6cb39ba01f320e10b2632de2da48e080a1f5eb58 Mon Sep 17 00:00:00 2001 From: Davide Mor <davide.mor@skywarder.eu> Date: Fri, 5 Jul 2024 23:17:31 +0200 Subject: [PATCH] [Sensors] Fixed improper locking behaviour in Sensor --- src/shared/sensors/Sensor.h | 2 +- src/tests/test-sensormanager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/sensors/Sensor.h b/src/shared/sensors/Sensor.h index 1b5e83bd0..f26781e0a 100644 --- a/src/shared/sensors/Sensor.h +++ b/src/shared/sensors/Sensor.h @@ -120,7 +120,7 @@ public: /** * @return last available sample from this sensor */ - virtual const Data& getLastSample() + virtual Data getLastSample() { miosix::Lock<miosix::FastMutex> l(mutex); return lastSample; diff --git a/src/tests/test-sensormanager.cpp b/src/tests/test-sensormanager.cpp index 644d70ae6..1b4f55c5d 100644 --- a/src/tests/test-sensormanager.cpp +++ b/src/tests/test-sensormanager.cpp @@ -81,7 +81,7 @@ public: SensorData sampleImpl() { return SensorData(); } - const SensorData& getLastSample() override + SensorData getLastSample() override { this->lastSample = originalSensor->getLastSample(); this->lastSample.pressure += offset; @@ -163,7 +163,7 @@ public: return sensor->getFifoElement(index); } - const FIFOData& getLastSample() override + FIFOData getLastSample() override { if (index < FifoSize - 1) { -- GitLab