From af69f1d4705bcfb534dc3fdadc4efdbbb9c92b64 Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Sun, 25 Sep 2022 17:29:21 +0200
Subject: [PATCH] [ADA][NAS] Now using static pressure instead of internal
sensor
---
.../Main/StateMachines/ADAController/ADAController.cpp | 3 +--
.../Main/StateMachines/NASController/NASController.cpp | 7 ++++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/boards/Main/StateMachines/ADAController/ADAController.cpp b/src/boards/Main/StateMachines/ADAController/ADAController.cpp
index 039f38910..b72730bf3 100644
--- a/src/boards/Main/StateMachines/ADAController/ADAController.cpp
+++ b/src/boards/Main/StateMachines/ADAController/ADAController.cpp
@@ -56,8 +56,7 @@ bool ADAController::start()
void ADAController::update()
{
- Boardcore::MS5803Data barometerData =
- Sensors::getInstance().getMS5803LastSample();
+ auto barometerData = Sensors::getInstance().getStaticPressureLastSample();
switch (status.state)
{
diff --git a/src/boards/Main/StateMachines/NASController/NASController.cpp b/src/boards/Main/StateMachines/NASController/NASController.cpp
index 04f71543e..2cc7b63b6 100644
--- a/src/boards/Main/StateMachines/NASController/NASController.cpp
+++ b/src/boards/Main/StateMachines/NASController/NASController.cpp
@@ -58,9 +58,10 @@ void NASController::update()
{
auto imuData =
Sensors::getInstance().getBMX160WithCorrectionLastSample();
- auto gpsData = Sensors::getInstance().getUbxGpsLastSample();
- auto pressureData = Sensors::getInstance().getMS5803LastSample();
- auto pitotData = Sensors::getInstance().getPitotLastSample();
+ auto gpsData = Sensors::getInstance().getUbxGpsLastSample();
+ auto pressureData =
+ Sensors::getInstance().getStaticPressureLastSample();
+ auto pitotData = Sensors::getInstance().getPitotLastSample();
// Predict step
nas.predictGyro(imuData);
--
GitLab