From 469197184bda1c792e848c0ec68c1bceeec2c7fd Mon Sep 17 00:00:00 2001 From: Radu Raul <raul.radu@skywarder.eu> Date: Thu, 20 Jul 2023 22:57:18 +0200 Subject: [PATCH] Removed unused configuration points and set target point in the test unit --- src/boards/Parafoil/Configs/WingConfig.h | 53 ++----------------- .../Parafoil/parafoil-test-WingController.cpp | 5 ++ 2 files changed, 9 insertions(+), 49 deletions(-) diff --git a/src/boards/Parafoil/Configs/WingConfig.h b/src/boards/Parafoil/Configs/WingConfig.h index 8b5b905fa..72b5f04fc 100644 --- a/src/boards/Parafoil/Configs/WingConfig.h +++ b/src/boards/Parafoil/Configs/WingConfig.h @@ -39,76 +39,31 @@ constexpr int WING_ALTITUDE_TRIGGER_PERIOD = 1000; //[ms] #if defined(EUROC) constexpr float DEFAULT_TARGET_LAT = 39.389733; constexpr float DEFAULT_TARGET_LON = -8.288992; - -constexpr float M1_TARGET_LAT = 45.501200; -constexpr float M1_TARGET_LON = 9.156290; - -constexpr float M2_TARGET_LAT = 45.501100; -constexpr float M2_TARGET_LON = 9.156350; - -constexpr float EMC_TARGET_LAT = 45.501200; -constexpr float EMC_TARGET_LON = 9.156290; #elif defined(ROCCARASO) constexpr float DEFAULT_TARGET_LAT = 41.8039952; constexpr float DEFAULT_TARGET_LON = 14.0547223; - -constexpr float M1_TARGET_LAT = 45.501200; -constexpr float M1_TARGET_LON = 9.156290; - -constexpr float M2_TARGET_LAT = 45.501100; -constexpr float M2_TARGET_LON = 9.156350; - -constexpr float EMC_TARGET_LAT = 45.501200; -constexpr float EMC_TARGET_LON = 9.156290; #elif defined(TERNI) constexpr float DEFAULT_TARGET_LAT = 42.572165; constexpr float DEFAULT_TARGET_LON = 12.585847; - -constexpr float M1_TARGET_LAT = 45.501200; -constexpr float M1_TARGET_LON = 9.156290; - -constexpr float M2_TARGET_LAT = 45.501100; -constexpr float M2_TARGET_LON = 9.156350; - -constexpr float EMC_TARGET_LAT = 45.501200; -constexpr float EMC_TARGET_LON = 9.156290; #elif defined(MOLINELLA) constexpr float DEFAULT_TARGET_LAT = 44.588923; constexpr float DEFAULT_TARGET_LON = 11.653212; - -constexpr float M1_TARGET_LAT = 45.501200; -constexpr float M1_TARGET_LON = 9.156290; - -constexpr float M2_TARGET_LAT = 45.501100; -constexpr float M2_TARGET_LON = 9.156350; - -constexpr float EMC_TARGET_LAT = 45.501200; -constexpr float EMC_TARGET_LON = 9.156290; #else // Milan constexpr float DEFAULT_TARGET_LAT = 45.501148; constexpr float DEFAULT_TARGET_LON = 9.156301; - -constexpr float M1_TARGET_LAT = 45.501200; -constexpr float M1_TARGET_LON = 9.156290; - -constexpr float M2_TARGET_LAT = 45.501100; -constexpr float M2_TARGET_LON = 9.156350; - -constexpr float EMC_TARGET_LAT = 45.501200; -constexpr float EMC_TARGET_LON = 9.156290; #endif #if defined(GUIDED) constexpr int SELECTED_ALGORITHM = 0; #elif STOP_AND_GO -constexpr int SELECTED_ALGORITHM = 1; +constexpr int SELECTED_ALGORITHM = 1; #elif ROTATION -constexpr int SELECTED_ALGORITHM = 2; +constexpr int SELECTED_ALGORITHM = 2; #elif EARLY_MANEUVER -constexpr int SELECTED_ALGORITHM = 3; +constexpr int SELECTED_ALGORITHM = 3; #else -constexpr int SELECTED_ALGORITHM = 0; +constexpr int SELECTED_ALGORITHM = 0; #endif constexpr float MAX_SERVO_APERTURE = 1.0f; // Wing altitude checker configs diff --git a/src/tests/Parafoil/parafoil-test-WingController.cpp b/src/tests/Parafoil/parafoil-test-WingController.cpp index a333bfa91..391248d82 100644 --- a/src/tests/Parafoil/parafoil-test-WingController.cpp +++ b/src/tests/Parafoil/parafoil-test-WingController.cpp @@ -25,6 +25,7 @@ #include <Parafoil/BoardScheduler.h> #include <Parafoil/Buses.h> #include <Parafoil/Configs/SensorsConfig.h> +#include <Parafoil/Configs/WingConfig.h> #include <Parafoil/ParafoilModule/ParafoilModule.h> #include <Parafoil/PinHandler/PinHandler.h> #include <Parafoil/Sensors/Sensors.h> @@ -117,6 +118,10 @@ int main() if (initResult) { int i = 0; + + modules.get<WingController>()->setTargetPosition(Eigen::Vector2f( + WingConfig::DEFAULT_TARGET_LAT, WingConfig::DEFAULT_TARGET_LON)); + while (true) { if (i % 2 == 0) -- GitLab