diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/bsp.cpp b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/bsp.cpp index de4b926c2fc783da1777853080c81ab38b6484a0..2b498dd758938dd78c2983ff1c7a71c4ce4949d8 100644 --- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/bsp.cpp +++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/bsp.cpp @@ -263,13 +263,13 @@ namespace miosix timers::tim11ch1::mode(Mode::ALTERNATE); timers::tim3ch1::mode(Mode::ALTERNATE); timers::tim10ch1::mode(Mode::ALTERNATE); - timers::tim2ch2::mode(Mode::ALTERNATE); + timers::tim8ch1::mode(Mode::ALTERNATE); timers::tim4ch2::alternateFunction(2); timers::tim11ch1::alternateFunction(3); timers::tim3ch1::alternateFunction(2); timers::tim10ch1::alternateFunction(3); - timers::tim2ch2::alternateFunction(1); + timers::tim8ch1::alternateFunction(3); using namespace sensors; ADS131_1::cs::mode(Mode::OUTPUT); @@ -282,15 +282,15 @@ namespace miosix MAX31855::cs::high(); using namespace relays; - relay1::mode(Mode::OUTPUT); - relay2::mode(Mode::OUTPUT); - relay3::mode(Mode::OUTPUT); - relay4::mode(Mode::OUTPUT); - - relay1::high(); - relay2::high(); - relay3::high(); - relay4::high(); + ignition::mode(Mode::OUTPUT); + ledLamp::mode(Mode::OUTPUT); + nitrogen::mode(Mode::OUTPUT); + generalPurpose::mode(Mode::OUTPUT); + + ignition::high(); + ledLamp::high(); + nitrogen::high(); + generalPurpose::high(); using namespace radio; cs::mode(Mode::OUTPUT); diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/hwmapping.h b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/hwmapping.h index 1fa4fca0651fe2f17c6a6597cce0730618870e8b..5286b802321e045bb8d19033388fa728882b0fbc 100644 --- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/hwmapping.h +++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_rig/interfaces-impl/hwmapping.h @@ -83,7 +83,7 @@ using tim4ch2 = Gpio<GPIOB_BASE, 7>; // Servo 1 using tim11ch1 = Gpio<GPIOB_BASE, 9>; // Servo 2 using tim3ch1 = Gpio<GPIOB_BASE, 4>; // Servo 3 using tim10ch1 = Gpio<GPIOB_BASE, 8>; // Servo 4 -using tim2ch2 = Gpio<GPIOB_BASE, 3>; // Servo 5 +using tim8ch1 = Gpio<GPIOC_BASE, 6>; // Servo 5 } // namespace timers } // namespace interfaces @@ -137,15 +137,15 @@ using servo1 = interfaces::timers::tim4ch2; using servo2 = interfaces::timers::tim11ch1; using servo3 = interfaces::timers::tim3ch1; using servo4 = interfaces::timers::tim10ch1; -using servo5 = interfaces::timers::tim2ch2; +using servo5 = interfaces::timers::tim8ch1; } // namespace servos namespace relays { -using relay1 = Gpio<GPIOC_BASE, 14>; // Ignition -using relay2 = Gpio<GPIOE_BASE, 3>; // Faro LED -using relay3 = Gpio<GPIOC_BASE, 13>; // Nitrogen -using relay4 = Gpio<GPIOA_BASE, 15>; +using ignition = Gpio<GPIOC_BASE, 14>; +using ledLamp = Gpio<GPIOE_BASE, 3>; +using nitrogen = Gpio<GPIOC_BASE, 13>; +using generalPurpose = Gpio<GPIOA_BASE, 15>; } // namespace relays namespace radio