From 2c6609d3ae52f755425624426323fa907105386d Mon Sep 17 00:00:00 2001 From: Emilio Corigliano <emilio.corigliano@skywarder.eu> Date: Sat, 3 Aug 2024 12:11:32 +0200 Subject: [PATCH] [Sensors] Turning sampleImpl methods protected instead of private or public --- src/shared/sensors/analog/AnalogLoadCell.h | 1 + src/shared/sensors/analog/BatteryVoltageSensor.h | 1 + src/shared/sensors/analog/CurrentSensor.h | 1 + src/shared/sensors/analog/Pitot/Pitot.h | 1 + src/shared/sensors/analog/TrafagPressureSensor.h | 3 ++- src/shared/sensors/analog/TwoPointAnalogLoadCell.h | 3 ++- src/shared/sensors/analog/pressure/AnalogPressureSensor.h | 2 +- .../analog/pressure/SoftwareDifferentialPressureSensor.h | 1 + 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/shared/sensors/analog/AnalogLoadCell.h b/src/shared/sensors/analog/AnalogLoadCell.h index 24287b8b0..54586d200 100644 --- a/src/shared/sensors/analog/AnalogLoadCell.h +++ b/src/shared/sensors/analog/AnalogLoadCell.h @@ -52,6 +52,7 @@ public: void updateOffset(float offset) { this->offset += offset; } +protected: AnalogLoadCellData sampleImpl() override { ADCData adcData = getVoltage(); diff --git a/src/shared/sensors/analog/BatteryVoltageSensor.h b/src/shared/sensors/analog/BatteryVoltageSensor.h index 54c34d354..cc5153ef4 100644 --- a/src/shared/sensors/analog/BatteryVoltageSensor.h +++ b/src/shared/sensors/analog/BatteryVoltageSensor.h @@ -53,6 +53,7 @@ public: bool selfTest() override { return true; }; +protected: ///< Converts the adc voltage value to battery voltage BatteryVoltageSensorData sampleImpl() override { diff --git a/src/shared/sensors/analog/CurrentSensor.h b/src/shared/sensors/analog/CurrentSensor.h index 035e2bbf7..d871b9182 100644 --- a/src/shared/sensors/analog/CurrentSensor.h +++ b/src/shared/sensors/analog/CurrentSensor.h @@ -50,6 +50,7 @@ public: bool selfTest() override { return true; }; +protected: ///< Converts the voltage value to pressure CurrentData sampleImpl() override { diff --git a/src/shared/sensors/analog/Pitot/Pitot.h b/src/shared/sensors/analog/Pitot/Pitot.h index bbcacee52..97e32249e 100644 --- a/src/shared/sensors/analog/Pitot/Pitot.h +++ b/src/shared/sensors/analog/Pitot/Pitot.h @@ -55,6 +55,7 @@ public: ReferenceValues getReferenceValues() { return reference; } +protected: PitotData sampleImpl() override { float totalPressure = getTotalPressure(); diff --git a/src/shared/sensors/analog/TrafagPressureSensor.h b/src/shared/sensors/analog/TrafagPressureSensor.h index 7292b70de..730b42116 100644 --- a/src/shared/sensors/analog/TrafagPressureSensor.h +++ b/src/shared/sensors/analog/TrafagPressureSensor.h @@ -58,13 +58,14 @@ public: bool selfTest() override { return true; } -private: +protected: PressureData sampleImpl() override { auto voltage = getVoltage(); return {voltage.voltageTimestamp, voltageToPressure(voltage.voltage)}; } +private: float voltageToPressure(float voltage) { // First convert voltage to current diff --git a/src/shared/sensors/analog/TwoPointAnalogLoadCell.h b/src/shared/sensors/analog/TwoPointAnalogLoadCell.h index e2efa14dc..107a6164f 100644 --- a/src/shared/sensors/analog/TwoPointAnalogLoadCell.h +++ b/src/shared/sensors/analog/TwoPointAnalogLoadCell.h @@ -76,7 +76,7 @@ public: dynamicOffset += value; } -private: +protected: LoadCellData sampleImpl() override { auto voltage = getVoltage(); @@ -86,6 +86,7 @@ private: return {voltage.voltageTimestamp, mass - dynamicOffset}; } +private: std::function<ADCData()> getVoltage; // std::atomic<float> does not support += diff --git a/src/shared/sensors/analog/pressure/AnalogPressureSensor.h b/src/shared/sensors/analog/pressure/AnalogPressureSensor.h index f13d5159b..d2af62c59 100644 --- a/src/shared/sensors/analog/pressure/AnalogPressureSensor.h +++ b/src/shared/sensors/analog/pressure/AnalogPressureSensor.h @@ -59,6 +59,7 @@ public: void updateOffset(float offset) { this->offset += offset; } +protected: AnalogPressureData sampleImpl() override { AnalogPressureData pressure; @@ -81,7 +82,6 @@ public: return pressure; } -protected: ///< Conversion function from volts to pascals. virtual float voltageToPressure(float voltage) = 0; diff --git a/src/shared/sensors/analog/pressure/SoftwareDifferentialPressureSensor.h b/src/shared/sensors/analog/pressure/SoftwareDifferentialPressureSensor.h index 84c9bf2e4..2b5c840fa 100644 --- a/src/shared/sensors/analog/pressure/SoftwareDifferentialPressureSensor.h +++ b/src/shared/sensors/analog/pressure/SoftwareDifferentialPressureSensor.h @@ -60,6 +60,7 @@ public: bool selfTest() override { return true; }; +protected: /** * @return the difference between the two pressure values */ -- GitLab