From b131b07999a10c10287cfc83f12685f8a9d3a152 Mon Sep 17 00:00:00 2001 From: Davide Basso <davide.basso@skywarder.eu> Date: Mon, 30 Dec 2024 21:40:46 +0100 Subject: [PATCH] [Style] Fix formatting --- src/Parafoil/Sensors/SensorData.h | 2 +- src/Parafoil/Sensors/Sensors.cpp | 19 ++----------------- src/Parafoil/Sensors/Sensors.h | 2 +- .../FlightModeManager/FlightModeManager.h | 2 +- .../FlightModeManager/FlightModeManagerData.h | 2 +- .../EarlyManeuverGuidanceAlgorithm.cpp | 4 ++-- .../EarlyManeuverGuidanceAlgorithm.cpp | 4 ++-- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/Parafoil/Sensors/SensorData.h b/src/Parafoil/Sensors/SensorData.h index cf7a88d15..b132b4d82 100644 --- a/src/Parafoil/Sensors/SensorData.h +++ b/src/Parafoil/Sensors/SensorData.h @@ -50,4 +50,4 @@ struct SensorCalibrationData } }; -} // namespace Parafoil \ No newline at end of file +} // namespace Parafoil diff --git a/src/Parafoil/Sensors/Sensors.cpp b/src/Parafoil/Sensors/Sensors.cpp index e96aaf09c..2ccb85b15 100644 --- a/src/Parafoil/Sensors/Sensors.cpp +++ b/src/Parafoil/Sensors/Sensors.cpp @@ -43,34 +43,22 @@ bool Sensors::start() } if (config::LIS3MDL::ENABLED) - { lis3mdlInit(); - } if (config::H3LIS331DL::ENABLED) - { h3lisInit(); - } if (config::LPS22DF::ENABLED) - { lps22Init(); - } if (config::UBXGPS::ENABLED) - { ubxGpsInit(); - } if (config::ADS131M08::ENABLED) - { ads131Init(); - } if (config::InternalADC::ENABLED) - { internalADCInit(); - } if (!postSensorCreationHook()) { @@ -245,7 +233,7 @@ std::vector<SensorInfo> Sensors::getSensorInfo() infos.push_back(manager->getSensorInfo(instance.get())); \ else \ infos.push_back( \ - SensorInfo{#name, config::name::SAMPLING_RATE, nullptr, false}) + SensorInfo { #name, config::name::SAMPLING_RATE, nullptr, false }) PUSH_SENSOR_INFO(bmx160, BMX160); PUSH_SENSOR_INFO(bmx160WithCorrection, BMX160); @@ -296,7 +284,6 @@ void Sensors::bmx160Init() void Sensors::bmx160WithCorrectionInit() { - bmx160WithCorrection = std::make_unique<BMX160WithCorrection>( bmx160.get(), config::BMX160::AXIS_ORIENTATION); @@ -395,9 +382,7 @@ void Sensors::bmx160Callback() Logger::getInstance().log(bmx160->getTemperature()); for (auto i = 0; i < fifoSize; i++) - { Logger::getInstance().log(fifo.at(i)); - } Logger::getInstance().log(bmx160->getFifoStats()); } @@ -509,4 +494,4 @@ bool Sensors::sensorManagerInit() return manager->start(); } -} // namespace Parafoil \ No newline at end of file +} // namespace Parafoil diff --git a/src/Parafoil/Sensors/Sensors.h b/src/Parafoil/Sensors/Sensors.h index 46f40b8cb..11f590a49 100644 --- a/src/Parafoil/Sensors/Sensors.h +++ b/src/Parafoil/Sensors/Sensors.h @@ -177,4 +177,4 @@ private: Boardcore::PrintLogger logger = Boardcore::Logging::getLogger("Sensors"); }; -} // namespace Parafoil \ No newline at end of file +} // namespace Parafoil diff --git a/src/Parafoil/StateMachines/FlightModeManager/FlightModeManager.h b/src/Parafoil/StateMachines/FlightModeManager/FlightModeManager.h index 5eceae968..549636b2d 100644 --- a/src/Parafoil/StateMachines/FlightModeManager/FlightModeManager.h +++ b/src/Parafoil/StateMachines/FlightModeManager/FlightModeManager.h @@ -149,4 +149,4 @@ private: Boardcore::PrintLogger logger = Boardcore::Logging::getLogger("FMM"); }; -} // namespace Parafoil \ No newline at end of file +} // namespace Parafoil diff --git a/src/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h b/src/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h index 8b180f966..fa0f326cc 100644 --- a/src/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h +++ b/src/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h @@ -56,4 +56,4 @@ struct FlightModeManagerStatus } }; -} // namespace Parafoil \ No newline at end of file +} // namespace Parafoil diff --git a/src/Parafoil/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp b/src/Parafoil/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp index 85011723c..c7121cae3 100644 --- a/src/Parafoil/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp +++ b/src/Parafoil/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp @@ -38,9 +38,9 @@ namespace Parafoil EarlyManeuversGuidanceAlgorithm::EarlyManeuversGuidanceAlgorithm() : activeTarget(Target::EMC), targetAltitudeConfidence(0), m2AltitudeConfidence(0), m1AltitudeConfidence(0), - emcAltitudeConfidence(0){}; + emcAltitudeConfidence(0) {}; -EarlyManeuversGuidanceAlgorithm::~EarlyManeuversGuidanceAlgorithm(){}; +EarlyManeuversGuidanceAlgorithm::~EarlyManeuversGuidanceAlgorithm() {}; Radian EarlyManeuversGuidanceAlgorithm::calculateTargetAngle( const Eigen::Vector3f& currentPositionNED, Eigen::Vector2f& heading) diff --git a/src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp b/src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp index 1eb821bf5..98d035169 100644 --- a/src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp +++ b/src/Payload/Wing/Guidance/EarlyManeuverGuidanceAlgorithm.cpp @@ -37,9 +37,9 @@ namespace Payload EarlyManeuversGuidanceAlgorithm::EarlyManeuversGuidanceAlgorithm() : activeTarget(Target::EMC), targetAltitudeConfidence(0), m2AltitudeConfidence(0), m1AltitudeConfidence(0), - emcAltitudeConfidence(0){}; + emcAltitudeConfidence(0) {}; -EarlyManeuversGuidanceAlgorithm::~EarlyManeuversGuidanceAlgorithm(){}; +EarlyManeuversGuidanceAlgorithm::~EarlyManeuversGuidanceAlgorithm() {}; float EarlyManeuversGuidanceAlgorithm::calculateTargetAngle( const Eigen::Vector3f& currentPositionNED, Eigen::Vector2f& heading) -- GitLab