diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp index f1c2fc7c285e4af6bda3be0f5c37d310c28fb3bc..e68c14626eeb65147ff7d16cac034b90296ae2b1 100644 --- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp +++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/bsp.cpp @@ -395,69 +395,71 @@ void IRQbspInit() interfaces::uart4::tx::mode(Mode::ALTERNATE); interfaces::uart4::tx::alternateFunction(8); - interfaces::can1::rx::mode(Mode::ALTERNATE); - interfaces::can1::rx::alternateFunction(9); - interfaces::can1::tx::mode(Mode::ALTERNATE); - interfaces::can1::tx::alternateFunction(9); + // interfaces::can1::rx::mode(Mode::ALTERNATE); + // interfaces::can1::rx::alternateFunction(9); + // interfaces::can1::tx::mode(Mode::ALTERNATE); + // interfaces::can1::tx::alternateFunction(9); - sensors::ads131m04::cs1::mode(Mode::OUTPUT); - sensors::ads131m04::cs1::high(); + // sensors::ads131m04::cs1::mode(Mode::OUTPUT); + // sensors::ads131m04::cs1::high(); - sensors::bmx160::cs::mode(Mode::OUTPUT); - sensors::bmx160::cs::high(); - sensors::bmx160::intr::mode(Mode::INPUT_PULL_UP); + // sensors::bmx160::cs::mode(Mode::OUTPUT); + // sensors::bmx160::cs::high(); + // sensors::bmx160::intr::mode(Mode::INPUT_PULL_UP); - sensors::mpu9250::cs::mode(Mode::OUTPUT); - sensors::mpu9250::cs::high(); + // sensors::mpu9250::cs::mode(Mode::OUTPUT); + // sensors::mpu9250::cs::high(); - sensors::cc3135::cs::mode(Mode::OUTPUT); - sensors::cc3135::cs::high(); - sensors::cc3135::intr::mode(Mode::INPUT_PULL_UP); + // sensors::cc3135::cs::mode(Mode::OUTPUT); + // sensors::cc3135::cs::high(); + // sensors::cc3135::intr::mode(Mode::INPUT_PULL_UP); - sensors::sx127x::cs::mode(Mode::OUTPUT); - sensors::sx127x::cs::high(); - sensors::sx127x::dio0::mode(Mode::INPUT); + // sensors::sx127x::cs::mode(Mode::OUTPUT); + // sensors::sx127x::cs::high(); + // sensors::sx127x::dio0::mode(Mode::INPUT); - sensors::gps::cs::mode(Mode::OUTPUT); - sensors::gps::cs::high(); + // sensors::gps::cs::mode(Mode::OUTPUT); + // sensors::gps::cs::high(); - sensors::ms5803::cs::mode(Mode::OUTPUT); - sensors::ms5803::cs::high(); + // sensors::ms5803::cs::mode(Mode::OUTPUT); + // sensors::ms5803::cs::high(); - sensors::mlx91221_1::vout::mode(Mode::INPUT_ANALOG); - sensors::mlx91221_1::vout::high(); + // sensors::mlx91221_1::vout::mode(Mode::INPUT_ANALOG); + // sensors::mlx91221_1::vout::high(); - sensors::mlx91221_2::vout::mode(Mode::INPUT_ANALOG); - sensors::mlx91221_2::vout::high(); + // sensors::mlx91221_2::vout::mode(Mode::INPUT_ANALOG); + // sensors::mlx91221_2::vout::high(); sensors::launchpad_detach::mode(Mode::INPUT); expulsion::servo::mode(Mode::ALTERNATE); expulsion::servo::alternateFunction(2); - expulsion::sense::mode(Mode::INPUT_PULL_UP); + // expulsion::sense::mode(Mode::INPUT_PULL_UP); expulsion::nosecone_detach::mode(Mode::INPUT); - cutter::enable::mode(Mode::OUTPUT); - cutter::enable::low(); - cutter::enable_backup::mode(Mode::OUTPUT); - cutter::enable_backup::low(); - cutter::sense::mode(Mode::INPUT_ANALOG); + // cutter::enable::mode(Mode::OUTPUT); + // cutter::enable::low(); + // cutter::enable_backup::mode(Mode::OUTPUT); + // cutter::enable_backup::low(); + // cutter::sense::mode(Mode::INPUT_ANALOG); airbrakes::servo::mode(Mode::ALTERNATE); airbrakes::servo::alternateFunction(3); - airbrakes::sensor::mode(Mode::INPUT_ANALOG); + // airbrakes::sensor::mode(Mode::INPUT_ANALOG); leds::red::mode(Mode::OUTPUT); leds::green::mode(Mode::OUTPUT); leds::blue::mode(Mode::OUTPUT); + leds::led_blue1::mode(Mode::OUTPUT); + leds::led_ring::mode(Mode::OUTPUT); buzzer::drive::mode(Mode::ALTERNATE); buzzer::drive::alternateFunction(3); aux::servo::mode(Mode::ALTERNATE); aux::servo::alternateFunction(3); - aux::sense_1::mode(Mode::INPUT); - aux::sense_2::mode(Mode::INPUT); + // aux::sense_1::mode(Mode::INPUT); + // aux::sense_2::mode(Mode::INPUT); DefaultConsole::instance().IRQset(intrusive_ref_ptr<Device>( new STM32Serial(defaultSerial, defaultSerialSpeed, diff --git a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/hwmapping.h b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/hwmapping.h index 5b3957bda490e040ef1700a7484e394f2d2532c5..3a1e591d7d28ee5751067aff4a9dcf4f9f8123c4 100644 --- a/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/hwmapping.h +++ b/miosix/arch/cortexM4_stm32f4/stm32f429zi_skyward_death_stack_x_maker_faire/interfaces-impl/hwmapping.h @@ -169,8 +169,8 @@ using launchpad_detach = RANDOM_PIN; // launchpad detach namespace expulsion { -using servo = RANDOM_PIN; // Pwm expulsion servo, TIM4_CH2 -using sense = Gpio<GPIOE_BASE, 4>; // Expulsion sensor +using servo = Gpio<GPIOB_BASE, 7>; // Pwm expulsion servo, TIM4_CH2 +using sense = RANDOM_PIN; // Expulsion sensor using nosecone_detach = RANDOM_PIN; // Nosecone detach } // namespace expulsion @@ -183,8 +183,8 @@ using sense = Gpio<GPIOF_BASE, 6>; namespace airbrakes { -using servo = Gpio<GPIOD_BASE, 12>; // Airbrakes PWM, TIM4_CH1 -using sensor = RANDOM_PIN; // Airbrakes ADC +using servo = Gpio<GPIOC_BASE, 7>; // Airbrakes PWM, TIM8_CH2 +using sensor = RANDOM_PIN; // Airbrakes ADC } // namespace airbrakes namespace leds