From 089066942ee1a2967c1ca41d01d31d527ed9256a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Betto?= <niccolo.betto@skywarder.eu> Date: Wed, 27 Nov 2024 18:21:43 +0100 Subject: [PATCH] [RIGv2] Fix servo port mapping SER_1: N2O_FILLING_VALVE SER_2: N2O_RELEASE_VALVE SER_3: N2O_VENTING_VALVE SER_4: N2_FILLING_VALVE SER_5: N2_RELEASE_VALVE SER_6: N2_DETACH_SERVO SER_7: MAIN_VALVE SER_8: NITROGEN_VALVE --- src/RIGv2/Actuators/Actuators.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/RIGv2/Actuators/Actuators.cpp b/src/RIGv2/Actuators/Actuators.cpp index f22a2aabb..c05c94d56 100644 --- a/src/RIGv2/Actuators/Actuators.cpp +++ b/src/RIGv2/Actuators/Actuators.cpp @@ -138,11 +138,11 @@ Actuators::Actuators() // Config::Servos::MIN_PULSE, Config::Servos::MAX_PULSE, // Config::Servos::FREQUENCY); infos[5].servo = std::make_unique<Servo>( - MIOSIX_SERVOS_6_TIM, TimerUtils::Channel::MIOSIX_SERVOS_6_CHANNEL, + MIOSIX_SERVOS_7_TIM, TimerUtils::Channel::MIOSIX_SERVOS_7_CHANNEL, Config::Servos::MIN_PULSE, Config::Servos::MAX_PULSE, Config::Servos::FREQUENCY); infos[6].servo = std::make_unique<Servo>( - MIOSIX_SERVOS_7_TIM, TimerUtils::Channel::MIOSIX_SERVOS_7_CHANNEL, + MIOSIX_SERVOS_9_TIM, TimerUtils::Channel::MIOSIX_SERVOS_9_CHANNEL, Config::Servos::SERVO2_MIN_PULSE, Config::Servos::SERVO2_MAX_PULSE, Config::Servos::FREQUENCY); // This servo is currently unusable, due to it sharing the same timer as @@ -152,11 +152,11 @@ Actuators::Actuators() // Config::Servos::MIN_PULSE, Config::Servos::MAX_PULSE, // Config::Servos::FREQUENCY); infos[8].servo = std::make_unique<Servo>( - MIOSIX_SERVOS_9_TIM, TimerUtils::Channel::MIOSIX_SERVOS_9_CHANNEL, + MIOSIX_SERVOS_6_TIM, TimerUtils::Channel::MIOSIX_SERVOS_6_CHANNEL, Config::Servos::MIN_PULSE, Config::Servos::MAX_PULSE, Config::Servos::FREQUENCY); infos[9].servo = std::make_unique<Servo>( - MIOSIX_SERVOS_10_TIM, TimerUtils::Channel::MIOSIX_SERVOS_10_CHANNEL, + MIOSIX_SERVOS_8_TIM, TimerUtils::Channel::MIOSIX_SERVOS_8_CHANNEL, Config::Servos::MIN_PULSE, Config::Servos::MAX_PULSE, Config::Servos::FREQUENCY); -- GitLab