diff --git a/src/boards/Parafoil/Configs/FlightModeManagerConfig.h b/src/boards/Parafoil/Configs/FlightModeManagerConfig.h index bb1843eb73cdcd2de5a19debeb0e4d66a2a17a9e..a9489f1ff6aaf5ea140903fd3c62c6d5db9c93a3 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 f5554dcaca0e0dd8bc42121645019f5d64073efe..06d0d393267cc7acae789bf4dd88ea9bff6bc5e6 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 60155a96c67f37d81da593d0a69556fbf914dd09..a6a3b393bcb263ffb89925c40d220b9d56ac748b 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 371f081abcfc41b4e4d693774a7b50ff388139cd..fc3672a91368bbb044e7a4d8573dd5643d47548f 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();