From e046c7e9f4e66da70a8aef11bd7d394098cb4c9e Mon Sep 17 00:00:00 2001
From: Federico Lolli <federico.lolli@skywarder.eu>
Date: Tue, 31 Oct 2023 13:54:51 +0100
Subject: [PATCH] [Main-ADAController] now uses the pressure sample from SFD
---
.../Main/StateMachines/ADAController/ADAController.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/boards/Main/StateMachines/ADAController/ADAController.cpp b/src/boards/Main/StateMachines/ADAController/ADAController.cpp
index 475f8a224..9cfddaf69 100644
--- a/src/boards/Main/StateMachines/ADAController/ADAController.cpp
+++ b/src/boards/Main/StateMachines/ADAController/ADAController.cpp
@@ -64,7 +64,7 @@ void ADAController::update()
{
ModuleManager& modules = ModuleManager::getInstance();
PressureData barometerData =
- modules.get<Sensors>()->getStaticPressure1LastSample();
+ modules.get<Sensors>()->getSFDPressureLastSample();
// Get a snapshot of the situation. There is no need to synchronize because
// the getter are already thread safe with a PauseKernel
@@ -143,8 +143,7 @@ void ADAController::calibrate()
for (int i = 0; i < ADAConfig::CALIBRATION_SAMPLES_COUNT; i++)
{
- PressureData data =
- modules.get<Sensors>()->getStaticPressure1LastSample();
+ PressureData data = modules.get<Sensors>()->getSFDPressureLastSample();
pressure.add(data.pressure);
miosix::Thread::sleep(ADAConfig::CALIBRATION_SLEEP_TIME);
@@ -448,4 +447,4 @@ ADA::KalmanFilter::KalmanConfig ADAController::getADAKalmanConfig()
ADA::KalmanFilter::CVectorN(ada.getReferenceValues().refPressure, 0,
0)};
}
-} // namespace Main
\ No newline at end of file
+} // namespace Main
--
GitLab