From ee93b32979761a68647099d434872f724cebf7ea Mon Sep 17 00:00:00 2001
From: Matteo Pignataro <matteo.pignataro@skywarder.eu>
Date: Sat, 9 Sep 2023 08:22:21 +0200
Subject: [PATCH] [Actuators] Modified expulsion timer
---
.../interfaces-impl/bsp.cpp | 4 ++--
.../interfaces-impl/hwmapping.h | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/bsp.cpp b/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/bsp.cpp
index d43a74c1..d3eabf94 100644
--- a/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/bsp.cpp
+++ b/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/bsp.cpp
@@ -301,8 +301,8 @@ void IRQbspInit()
tim3ch2::alternateFunction(2);
tim1ch1::mode(Mode::ALTERNATE);
tim1ch1::alternateFunction(1);
- tim1ch3::mode(Mode::ALTERNATE);
- tim1ch3::alternateFunction(1);
+ tim12ch2::mode(Mode::ALTERNATE);
+ tim12ch2::alternateFunction(9);
using namespace sensors;
LSM6DSRX::cs::mode(Mode::OUTPUT);
diff --git a/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/hwmapping.h b/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/hwmapping.h
index f1059505..43f47225 100644
--- a/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/hwmapping.h
+++ b/miosix/arch/cortexM7_stm32f7/stm32f767zi_skyward_death_stack_v4/interfaces-impl/hwmapping.h
@@ -99,10 +99,10 @@ using rx = Gpio<GPIOA_BASE, 1>;
namespace timers
{
-using tim3ch1 = Gpio<GPIOC_BASE, 6>; // Airbrakes servo - Servo1 Payload
-using tim3ch2 = Gpio<GPIOC_BASE, 7>; // Auxiliary - Servo2 Payload
-using tim1ch1 = Gpio<GPIOA_BASE, 8>; // Buzzer
-using tim1ch3 = Gpio<GPIOB_BASE, 15>; // Expulsion
+using tim3ch1 = Gpio<GPIOC_BASE, 6>; // Airbrakes servo - Servo1 Payload
+using tim3ch2 = Gpio<GPIOC_BASE, 7>; // Auxiliary - Servo2 Payload
+using tim1ch1 = Gpio<GPIOA_BASE, 8>; // Buzzer
+using tim12ch2 = Gpio<GPIOB_BASE, 15>; // Expulsion
} // namespace timers
} // namespace interfaces
@@ -204,7 +204,7 @@ using tx_enable = Gpio<GPIOC_BASE, 1>;
namespace actuators
{
using airbrakes = interfaces::timers::tim3ch1;
-using expulsion = interfaces::timers::tim1ch3;
+using expulsion = interfaces::timers::tim12ch2;
using buzzer = interfaces::timers::tim1ch1;
using parafoil_servo1 = interfaces::timers::tim3ch1;
using parafoil_servo2 = interfaces::timers::tim3ch2;
--
GitLab