From 9eaff4c00fa71abd0a4fca3b2eb64e4d411291d4 Mon Sep 17 00:00:00 2001
From: Federico Lolli <federico123579@gmail.com>
Date: Tue, 31 Oct 2023 13:51:29 +0100
Subject: [PATCH] [SensorData] made PressureSFDData inherit from PressureData
---
src/shared/sensors/SFD/PressureSFD.cpp | 9 +++++----
src/shared/sensors/SFD/PressureSFDData.h | 15 ++++++++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/shared/sensors/SFD/PressureSFD.cpp b/src/shared/sensors/SFD/PressureSFD.cpp
index 390378b14..7aead52a5 100644
--- a/src/shared/sensors/SFD/PressureSFD.cpp
+++ b/src/shared/sensors/SFD/PressureSFD.cpp
@@ -88,9 +88,10 @@ PressureSFDData PressureSFD::sampleImpl()
// update the timestamp based on the last sample
if (i == 0)
- data.timestamp = sample.pressureTimestamp;
+ data.pressureTimestamp = sample.pressureTimestamp;
else
- data.timestamp = std::max(data.timestamp, sample.pressureTimestamp);
+ data.pressureTimestamp =
+ std::max(data.pressureTimestamp, sample.pressureTimestamp);
}
// update the sliding window
@@ -109,8 +110,8 @@ PressureSFDData PressureSFD::sampleImpl()
processed_value = medianFilter.filter(processed_value);
processed_value = lowPassFilter.filter(processed_value);
- samples = sampleWindow.last();
- data.filteredPressure = processed_value;
+ samples = sampleWindow.last();
+ data.pressure = processed_value;
return data;
}
diff --git a/src/shared/sensors/SFD/PressureSFDData.h b/src/shared/sensors/SFD/PressureSFDData.h
index 50a271f21..5c6f7a373 100644
--- a/src/shared/sensors/SFD/PressureSFDData.h
+++ b/src/shared/sensors/SFD/PressureSFDData.h
@@ -26,15 +26,20 @@
#include <array>
-struct PressureSFDData
+namespace Boardcore
{
- uint64_t timestamp = 0;
- float filteredPressure = 0;
- static std::string header() { return "timestamp,filteredPressure"; }
+struct PressureSFDData : public PressureData
+{
+ static std::string header()
+ {
+ return "pressureTimestamp,filteredPressure\n";
+ }
void print(std::ostream& os) const
{
- os << timestamp << "," << filteredPressure << "\n";
+ os << pressureTimestamp << "," << pressure << "\n";
}
};
+
+} // namespace Boardcore
--
GitLab