From 2cf580a444cee4c083b36b215debe2471663e689 Mon Sep 17 00:00:00 2001 From: Matteo Pignataro <matteo.pignataro@skywarder.eu> Date: Fri, 16 Sep 2022 23:25:30 +0200 Subject: [PATCH] [Payload] Set new target coordinates and ready to fly --- src/boards/Payload/Configs/WingConfig.h | 2 +- src/boards/Payload/StateMachines/Deployment/Deployment.cpp | 6 +++--- src/entrypoints/Payload/payload-entry.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/boards/Payload/Configs/WingConfig.h b/src/boards/Payload/Configs/WingConfig.h index eef6c39d0..8851252b6 100644 --- a/src/boards/Payload/Configs/WingConfig.h +++ b/src/boards/Payload/Configs/WingConfig.h @@ -51,7 +51,7 @@ constexpr float DEFAULT_TARGET_LAT = 39.389733; constexpr float DEFAULT_TARGET_LON = -8.288992; #elif defined(ROCCARASO) constexpr float DEFAULT_TARGET_LAT = 41.8039952; -constexpr float DEFAULT_TARGET_LON = 14.0535; +constexpr float DEFAULT_TARGET_LON = 14.0547223; #else // Milan constexpr float DEFAULT_TARGET_LAT = 42; constexpr float DEFAULT_TARGET_LON = 9; diff --git a/src/boards/Payload/StateMachines/Deployment/Deployment.cpp b/src/boards/Payload/StateMachines/Deployment/Deployment.cpp index 7cb8ead77..43ecd8cc2 100644 --- a/src/boards/Payload/StateMachines/Deployment/Deployment.cpp +++ b/src/boards/Payload/StateMachines/Deployment/Deployment.cpp @@ -76,7 +76,7 @@ void Deployment::state_idle(const Event& event) void Deployment::state_cutting(const Event& event) { - static uint16_t ncCuttinTimeoutEventId = -1; + static uint16_t ncCuttingTimeoutEventId = -1; switch (event) { @@ -86,7 +86,7 @@ void Deployment::state_cutting(const Event& event) startCutting(); - ncCuttinTimeoutEventId = + ncCuttingTimeoutEventId = EventBroker::getInstance().postDelayed<CUT_DURATION>( Boardcore::Event{DPL_CUT_TIMEOUT}, TOPIC_DPL); break; @@ -99,7 +99,7 @@ void Deployment::state_cutting(const Event& event) } case EV_EXIT: { - EventBroker::getInstance().removeDelayed(ncCuttinTimeoutEventId); + EventBroker::getInstance().removeDelayed(ncCuttingTimeoutEventId); break; } } diff --git a/src/entrypoints/Payload/payload-entry.cpp b/src/entrypoints/Payload/payload-entry.cpp index 8846f8413..d6073de12 100644 --- a/src/entrypoints/Payload/payload-entry.cpp +++ b/src/entrypoints/Payload/payload-entry.cpp @@ -137,8 +137,8 @@ int main() 0.1, 0.01, PARAFOIL_LEFT_SERVO, PARAFOIL_RIGHT_SERVO)); // WingController::getInstance().addAlgorithm(new AutomaticWingAlgorithm( // 1, 0, PARAFOIL_LEFT_SERVO, PARAFOIL_RIGHT_SERVO)); - WingController::getInstance().addAlgorithm(new FileWingAlgorithm( - PARAFOIL_LEFT_SERVO, PARAFOIL_RIGHT_SERVO, "/sd/servoCorta.csv")); + // WingController::getInstance().addAlgorithm(new FileWingAlgorithm( + // PARAFOIL_LEFT_SERVO, PARAFOIL_RIGHT_SERVO, "/sd/servoCorta.csv")); WingController::getInstance().selectAlgorithm(0); -- GitLab