diff --git a/src/shared/sensors/SFD/PressureSFD.cpp b/src/shared/sensors/SFD/PressureSFD.cpp index 390378b149d587dab96d51f9db7dfa1d27e2ea71..7aead52a5a7703207ad187908bcd774336d280f3 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 50a271f211f5164355623e0c5f480a694b10ac6c..5c6f7a373205f3c2ec7bec645d7876719c015be0 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