From 0d77be9e9ccb58b2e74fefebeaf780b144c26177 Mon Sep 17 00:00:00 2001
From: Federico Mandelli <federico.mandelli@skywarder.eu>
Date: Wed, 17 Jul 2024 18:07:38 +0200
Subject: [PATCH] [AnalogLoadCell] Changed so that now it does not need to be
added to the sensor manager
---
.../MockupMain/Sensors/AnalogLoadCellSensor.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/boards/MockupMain/Sensors/AnalogLoadCellSensor.h b/src/boards/MockupMain/Sensors/AnalogLoadCellSensor.h
index 7ae23c826..3aa25b97f 100644
--- a/src/boards/MockupMain/Sensors/AnalogLoadCellSensor.h
+++ b/src/boards/MockupMain/Sensors/AnalogLoadCellSensor.h
@@ -47,13 +47,6 @@ public:
bool selfTest() override { return true; }
-private:
- Boardcore::LoadCellData sampleImpl() override
- {
- auto voltage = getVoltage();
- return {voltage.voltageTimestamp, -voltageToMass(voltage.voltage)};
- }
-
float voltageToMass(float voltage)
{
// Two point calibration
@@ -63,6 +56,13 @@ private:
return scale * voltage + offset;
}
+private:
+ Boardcore::LoadCellData sampleImpl() override
+ {
+ auto voltage = getVoltage();
+ return {voltage.voltageTimestamp, -voltageToMass(voltage.voltage)};
+ }
+
std::function<Boardcore::ADCData()> getVoltage;
float p0Voltage;
--
GitLab