From a786526128431fe16fcb31f12dae2d508f4479de Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Fri, 30 Sep 2022 19:27:43 +0200
Subject: [PATCH] [Sensor] isStarted now checks all sensors
---
src/boards/Main/Sensors/Sensors.cpp | 8 +-------
src/boards/Payload/Sensors/Sensors.cpp | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/boards/Main/Sensors/Sensors.cpp b/src/boards/Main/Sensors/Sensors.cpp
index c4400b33d..ae8b09871 100644
--- a/src/boards/Main/Sensors/Sensors.cpp
+++ b/src/boards/Main/Sensors/Sensors.cpp
@@ -55,13 +55,7 @@ bool Sensors::start()
return sensorManager->start();
}
-bool Sensors::isStarted()
-{
- return sensorManager->getSensorInfo(bmx160).isInitialized &&
- sensorManager->getSensorInfo(ms5803).isInitialized &&
- sensorManager->getSensorInfo(ubxGps).isInitialized;
- // return sensorManager->areAllSensorsInitialized();
-}
+bool Sensors::isStarted() { return sensorManager->areAllSensorsInitialized(); }
void Sensors::setPitotData(Boardcore::PitotData data)
{
diff --git a/src/boards/Payload/Sensors/Sensors.cpp b/src/boards/Payload/Sensors/Sensors.cpp
index b4b24d5e8..b98e956ea 100644
--- a/src/boards/Payload/Sensors/Sensors.cpp
+++ b/src/boards/Payload/Sensors/Sensors.cpp
@@ -58,13 +58,7 @@ bool Sensors::start()
return sensorManager->start();
}
-bool Sensors::isStarted()
-{
- return sensorManager->getSensorInfo(bmx160).isInitialized &&
- sensorManager->getSensorInfo(ms5803).isInitialized &&
- sensorManager->getSensorInfo(ubxGps).isInitialized;
- // return sensorManager->areAllSensorsInitialized();
-}
+bool Sensors::isStarted() { return sensorManager->areAllSensorsInitialized(); }
BMX160Data Sensors::getBMX160LastSample()
{
--
GitLab