From 416cc90998d58f9808867466d2aa24c8f238a790 Mon Sep 17 00:00:00 2001
From: Davide Basso <davide.basso@skywarder.eu>
Date: Thu, 8 May 2025 09:32:26 +0200
Subject: [PATCH] [Parafoil] Fix cppcheck warnings
---
.../FlightStatsRecorder.cpp | 26 +++----------------
.../FlightStatsRecorder/FlightStatsRecorder.h | 11 +-------
.../AltitudeTrigger/AltitudeTrigger.h | 2 +-
3 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp
index d1e8d33c1..3318bba8e 100644
--- a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp
+++ b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.cpp
@@ -57,13 +57,6 @@ void FlightStatsRecorder::dropDetected(uint64_t ts)
stats.dropTs = ts;
}
-void FlightStatsRecorder::deploymentDetected(uint64_t ts, Meter alt)
-{
- Lock<FastMutex> lock{statsMutex};
- stats.dplTs = ts;
- stats.dplAlt = alt;
-}
-
void FlightStatsRecorder::updateAcc(const AccelerometerData& data)
{
auto fmmState = getModule<FlightModeManager>()->getState();
@@ -75,23 +68,10 @@ void FlightStatsRecorder::updateAcc(const AccelerometerData& data)
auto acc = MeterPerSecondSquared{static_cast<Vector3f>(data).norm()};
Lock<FastMutex> lock{statsMutex};
- if (fmmState != FlightModeManagerState::FLYING_DROGUE_DESCENT)
- {
- // Record this event only after drop, before deployment
- if (acc > stats.dropMaxAcc)
- {
- stats.dropMaxAcc = acc;
- stats.dropMaxAccTs = data.accelerationTimestamp;
- }
- }
- else
+ if (acc > stats.dropMaxAcc)
{
- // Record this event only after deployment
- if (acc > stats.dplMaxAcc)
- {
- stats.dplMaxAcc = acc;
- stats.dplMaxAccTs = data.accelerationTimestamp;
- }
+ stats.dropMaxAcc = acc;
+ stats.dropMaxAccTs = data.accelerationTimestamp;
}
}
diff --git a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h
index b6276ba14..a0d0a3062 100644
--- a/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h
+++ b/src/MockupMain/FlightStatsRecorder/FlightStatsRecorder.h
@@ -45,7 +45,7 @@ public:
// Drop
uint64_t dropTs = 0;
- // Maximum acceleration after drop, before deployment
+ // Maximum acceleration after drop
uint64_t dropMaxAccTs = 0;
Boardcore::Units::Acceleration::MeterPerSecondSquared dropMaxAcc{0};
@@ -53,14 +53,6 @@ public:
uint64_t maxSpeedTs = 0;
Boardcore::Units::Speed::MeterPerSecond maxSpeed{0};
Boardcore::Units::Length::Meter maxSpeedAlt{0};
-
- // Deployment
- uint64_t dplTs = 0;
- Boardcore::Units::Length::Meter dplAlt{0};
-
- // Maximum acceleration after deployment
- uint64_t dplMaxAccTs = 0;
- Boardcore::Units::Acceleration::MeterPerSecondSquared dplMaxAcc{0};
};
void reset();
@@ -68,7 +60,6 @@ public:
Stats getStats();
void dropDetected(uint64_t ts);
- void deploymentDetected(uint64_t ts, Boardcore::Units::Length::Meter alt);
void updateAcc(const Boardcore::AccelerometerData& data);
void updateNas(const Boardcore::NASState& data, float refTemperature);
diff --git a/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h b/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h
index 702479554..9cc8608ba 100644
--- a/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h
+++ b/src/Parafoil/AltitudeTrigger/AltitudeTrigger.h
@@ -42,7 +42,7 @@ public:
/**
* @brief Constructor
*/
- AltitudeTrigger(AltitudeTriggerConfig config);
+ explicit AltitudeTrigger(AltitudeTriggerConfig config);
/**
* @brief Adds the update() task to the task scheduler.
--
GitLab