From 46ea168f083d9edbece66d506b8ff9fa71ffa116 Mon Sep 17 00:00:00 2001 From: Angelo Prete <angelo.prete@skywarder.eu> Date: Mon, 15 Apr 2024 23:29:11 +0200 Subject: [PATCH] [Parafoil] Fixed linting --- src/boards/Parafoil/Configs/FlightModeManagerConfig.h | 2 +- src/boards/Parafoil/Configs/WingConfig.h | 2 +- src/boards/Parafoil/Sensors/Sensors.cpp | 3 ++- .../Parafoil/WindEstimationScheme/WindEstimation.cpp | 10 +++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/boards/Parafoil/Configs/FlightModeManagerConfig.h b/src/boards/Parafoil/Configs/FlightModeManagerConfig.h index bb1843eb7..a9489f1ff 100644 --- a/src/boards/Parafoil/Configs/FlightModeManagerConfig.h +++ b/src/boards/Parafoil/Configs/FlightModeManagerConfig.h @@ -25,6 +25,6 @@ namespace Parafoil { constexpr unsigned int LOGGING_DELAY = 5 * 1000; // [ms] -constexpr unsigned int CONTROL_DELAY = 5 * 1000; // [ms] +constexpr unsigned int CONTROL_DELAY = 5 * 1000; // [ms] } // namespace Parafoil diff --git a/src/boards/Parafoil/Configs/WingConfig.h b/src/boards/Parafoil/Configs/WingConfig.h index f5554dcac..06d0d3932 100644 --- a/src/boards/Parafoil/Configs/WingConfig.h +++ b/src/boards/Parafoil/Configs/WingConfig.h @@ -36,7 +36,7 @@ namespace WingConfig #if defined(CLOSED_LOOP) constexpr int SELECTED_ALGORITHM = 0; #elif EARLY_MANEUVER -constexpr int SELECTED_ALGORITHM = 1; +constexpr int SELECTED_ALGORITHM = 1; #elif SEQUENCE constexpr int SELECTED_ALGORITHM = 2; #else diff --git a/src/boards/Parafoil/Sensors/Sensors.cpp b/src/boards/Parafoil/Sensors/Sensors.cpp index 60155a96c..a6a3b393b 100644 --- a/src/boards/Parafoil/Sensors/Sensors.cpp +++ b/src/boards/Parafoil/Sensors/Sensors.cpp @@ -347,7 +347,8 @@ void Sensors::ubxGpsInit() // Create sensor instance with configured parameters ubxGps = new UBXGPSSpi(modules.get<Buses>()->spi1, - miosix::sensors::ubxgps::cs::getPin(), config, UBXGPS_SAMPLE_RATE); + miosix::sensors::ubxgps::cs::getPin(), config, + UBXGPS_SAMPLE_RATE); // Emplace the sensor inside the map SensorInfo info("UBXGPS", UBXGPS_PERIOD, diff --git a/src/boards/Parafoil/WindEstimationScheme/WindEstimation.cpp b/src/boards/Parafoil/WindEstimationScheme/WindEstimation.cpp index 371f081ab..fc3672a91 100644 --- a/src/boards/Parafoil/WindEstimationScheme/WindEstimation.cpp +++ b/src/boards/Parafoil/WindEstimationScheme/WindEstimation.cpp @@ -89,8 +89,8 @@ void WindEstimation::stopWindEstimationSchemeCalibration() wind = windCalibration; } windLogger.cal = true; - windLogger.vn = windCalibration[0]; - windLogger.ve = windCalibration[1]; + windLogger.vn = windCalibration[0]; + windLogger.ve = windCalibration[1]; startWindEstimationScheme(); logStatus(); } @@ -192,9 +192,9 @@ void WindEstimation::windEstimationScheme() (y - phiT * getWindEstimationScheme()); { miosix::Lock<FastMutex> l(mutex); - wind = wind + temp; - windLogger.vn = wind[0]; - windLogger.ve = wind[1]; + wind = wind + temp; + windLogger.vn = wind[0]; + windLogger.ve = wind[1]; windLogger.cal = false; } logStatus(); -- GitLab