From 55a81020ffd7ef18a317d128cddd7fdb63153713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Caruso?= <niccolo.caruso@skywarder.eu> Date: Wed, 2 Oct 2024 15:17:14 +0200 Subject: [PATCH] [ARP] Removed remnances of emergency button from Actuators --- src/boards/Groundstation/Automated/Actuators/Actuators.h | 1 - .../Groundstation/Automated/Actuators/ActuatorsConfig.h | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/boards/Groundstation/Automated/Actuators/Actuators.h b/src/boards/Groundstation/Automated/Actuators/Actuators.h index b388f3155..6f6b6c739 100644 --- a/src/boards/Groundstation/Automated/Actuators/Actuators.h +++ b/src/boards/Groundstation/Automated/Actuators/Actuators.h @@ -51,7 +51,6 @@ enum class ActuationStatus : uint8_t NOT_TEST, ///< `3` Such movement is allowed only in test NO_STEPPER, ///< `4` The specified stepper does not exist DISABLED, ///< `5` - EMERGENCY_STOP, ///< `6` }; class Actuators : public Boardcore::Injectable diff --git a/src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h b/src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h index ff9442024..bce7a7ad0 100644 --- a/src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h +++ b/src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h @@ -49,13 +49,14 @@ static const Antennas::StepperConfig stepperYConfig{ namespace StepperSettings { -// TIM1_CH4 PA11 AF1 +// TIM1_CH1 PA8 AF1 Stepper H step // | -// TIM3_CH2 PC7 AF2 +// TIM3_CH2 PC7 AF2 Stepper H count -// TIM4_CH1 PD12 AF2 +// TIM4_CH1 PD12 AF2 Stepper V step // | -// TIM8_CH4 PC9 AF3 +// TIM8_CH1 PC6 AF3 Stepper V count + static TIM_TypeDef* const SERVO1_PULSE_TIM = TIM1; static TIM_TypeDef* const SERVO1_COUNT_TIM = TIM3; static TIM_TypeDef* const SERVO2_PULSE_TIM = TIM4; -- GitLab