Compare revisions

ef4e55b6 · ef4e55b6 · ef4e55b6 · ef4e55b6 · ef4e55b6 · ef4e55b6
--- a/src/bsps/stm32f429zi_pyxis_auxiliary/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f429zi_pyxis_auxiliary/core/stage_1_boot.cpp
--- a/src/bsps/stm32f429zi_pyxis_auxiliary/interfaces-impl/arch_registers_impl.h
+++ b/src/bsps/stm32f429zi_pyxis_auxiliary/interfaces-impl/arch_registers_impl.h
--- a/src/bsps/stm32f429zi_pyxis_auxiliary/interfaces-impl/bsp.cpp
+++ b/src/bsps/stm32f429zi_pyxis_auxiliary/interfaces-impl/bsp.cpp
@@ -62,29 +62,29 @@ void IRQbspInit()

    using namespace interfaces;

-    debug::rx::mode(Mode::ALTERNATE);
    debug::rx::alternateFunction(8);
-    debug::tx::mode(Mode::ALTERNATE);
+    debug::rx::mode(Mode::ALTERNATE);
    debug::tx::alternateFunction(8);
+    debug::tx::mode(Mode::ALTERNATE);

-    cam1::rx::mode(Mode::ALTERNATE);
    cam1::rx::alternateFunction(7);
-    cam1::tx::mode(Mode::ALTERNATE);
+    cam1::rx::mode(Mode::ALTERNATE);
    cam1::tx::alternateFunction(7);
+    cam1::tx::mode(Mode::ALTERNATE);

-    cam2::tx::mode(Mode::ALTERNATE);
    cam2::tx::alternateFunction(8);
+    cam2::tx::mode(Mode::ALTERNATE);

-    cam3::tx::mode(Mode::ALTERNATE);
    cam3::tx::alternateFunction(8);
+    cam3::tx::mode(Mode::ALTERNATE);

    camMosfet::mode(Mode::OUTPUT);
    camMosfet::low();

-    can1::rx::mode(Mode::ALTERNATE);
    can1::rx::alternateFunction(9);
-    can1::tx::mode(Mode::ALTERNATE);
+    can1::rx::mode(Mode::ALTERNATE);
    can1::tx::alternateFunction(9);
+    can1::tx::mode(Mode::ALTERNATE);

    using namespace leds;


--- a/src/bsps/stm32f429zi_rig/config/miosix_settings.h
+++ b/src/bsps/stm32f429zi_rig/config/miosix_settings.h
--- a/src/bsps/stm32f429zi_rig/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f429zi_rig/core/stage_1_boot.cpp
--- a/src/bsps/stm32f429zi_rig/interfaces-impl/bsp.cpp
+++ b/src/bsps/stm32f429zi_rig/interfaces-impl/bsp.cpp
@@ -214,56 +214,50 @@ void IRQbspInit()

    using namespace interfaces;

-    spi1::sck::mode(Mode::ALTERNATE);
    spi1::sck::alternateFunction(5);
-    spi1::miso::mode(Mode::ALTERNATE);
+    spi1::sck::mode(Mode::ALTERNATE);
    spi1::miso::alternateFunction(5);
-    spi1::mosi::mode(Mode::ALTERNATE);
+    spi1::miso::mode(Mode::ALTERNATE);
    spi1::mosi::alternateFunction(5);
+    spi1::mosi::mode(Mode::ALTERNATE);

-    spi2::sck::mode(Mode::ALTERNATE);
    spi2::sck::alternateFunction(5);
-    spi2::miso::mode(Mode::ALTERNATE);
+    spi2::sck::mode(Mode::ALTERNATE);
    spi2::miso::alternateFunction(5);
-    spi2::mosi::mode(Mode::ALTERNATE);
+    spi2::miso::mode(Mode::ALTERNATE);
    spi2::mosi::alternateFunction(5);
+    spi2::mosi::mode(Mode::ALTERNATE);

-    spi4::sck::mode(Mode::ALTERNATE);
    spi4::sck::alternateFunction(5);
-    spi4::miso::mode(Mode::ALTERNATE);
+    spi4::sck::mode(Mode::ALTERNATE);
    spi4::miso::alternateFunction(5);
-    spi4::mosi::mode(Mode::ALTERNATE);
+    spi4::miso::mode(Mode::ALTERNATE);
    spi4::mosi::alternateFunction(5);
+    spi4::mosi::mode(Mode::ALTERNATE);

-    spi5::sck::mode(Mode::ALTERNATE);
    spi5::sck::alternateFunction(5);
-    spi5::miso::mode(Mode::ALTERNATE);
+    spi5::sck::mode(Mode::ALTERNATE);
    spi5::miso::alternateFunction(5);
-    spi5::mosi::mode(Mode::ALTERNATE);
+    spi5::miso::mode(Mode::ALTERNATE);
    spi5::mosi::alternateFunction(5);
+    spi5::mosi::mode(Mode::ALTERNATE);

-    spi6::sck::mode(Mode::ALTERNATE);
    spi6::sck::alternateFunction(5);
-    spi6::miso::mode(Mode::ALTERNATE);
+    spi6::sck::mode(Mode::ALTERNATE);
    spi6::miso::alternateFunction(5);
-    spi6::mosi::mode(Mode::ALTERNATE);
+    spi6::miso::mode(Mode::ALTERNATE);
    spi6::mosi::alternateFunction(5);
+    spi6::mosi::mode(Mode::ALTERNATE);

-    uart1::rx::mode(Mode::ALTERNATE);
    uart1::rx::alternateFunction(7);
-    uart1::tx::mode(Mode::ALTERNATE);
+    uart1::rx::mode(Mode::ALTERNATE);
    uart1::tx::alternateFunction(7);
+    uart1::tx::mode(Mode::ALTERNATE);

-    can1::rx::mode(Mode::ALTERNATE);
    can1::rx::alternateFunction(9);
-    can1::tx::mode(Mode::ALTERNATE);
+    can1::rx::mode(Mode::ALTERNATE);
    can1::tx::alternateFunction(9);
-
-    timers::tim4ch2::mode(Mode::ALTERNATE);
-    timers::tim11ch1::mode(Mode::ALTERNATE);
-    timers::tim3ch1::mode(Mode::ALTERNATE);
-    timers::tim10ch1::mode(Mode::ALTERNATE);
-    timers::tim8ch1::mode(Mode::ALTERNATE);
+    can1::tx::mode(Mode::ALTERNATE);

    timers::tim4ch2::alternateFunction(2);
    timers::tim11ch1::alternateFunction(3);
@@ -271,6 +265,12 @@ void IRQbspInit()
    timers::tim10ch1::alternateFunction(3);
    timers::tim8ch1::alternateFunction(3);

+    timers::tim4ch2::mode(Mode::ALTERNATE);
+    timers::tim11ch1::mode(Mode::ALTERNATE);
+    timers::tim3ch1::mode(Mode::ALTERNATE);
+    timers::tim10ch1::mode(Mode::ALTERNATE);
+    timers::tim8ch1::mode(Mode::ALTERNATE);
+
    using namespace sensors;
    ADS131_1::cs::mode(Mode::OUTPUT);
    ADS131_1::cs::high();

--- a/src/bsps/stm32f756zg_nucleo/config/miosix_settings.h
+++ b/src/bsps/stm32f756zg_nucleo/config/miosix_settings.h
--- a/src/bsps/stm32f756zg_nucleo/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f756zg_nucleo/core/stage_1_boot.cpp
--- a/src/bsps/stm32f756zg_nucleo/interfaces-impl/bsp.cpp
+++ b/src/bsps/stm32f756zg_nucleo/interfaces-impl/bsp.cpp
@@ -77,10 +77,15 @@ void IRQbspInit()
    ledOn();
    delayMs(100);
    ledOff();
+
    auto tx = Gpio<GPIOD_BASE, 8>::getPin();
    tx.alternateFunction(7);
    auto rx = Gpio<GPIOD_BASE, 9>::getPin();
    rx.alternateFunction(7);
+
+    // rx and tx alternate function is set here, mode will be set by the
+    // STM32Serial class later on
+
    DefaultConsole::instance().IRQset(intrusive_ref_ptr<Device>(
        new STM32Serial(3, defaultSerialSpeed, tx, rx)));
 }

--- a/src/bsps/stm32f767zi_automated_antennas/config/miosix_settings.h
+++ b/src/bsps/stm32f767zi_automated_antennas/config/miosix_settings.h
--- a/src/bsps/stm32f767zi_automated_antennas/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f767zi_automated_antennas/core/stage_1_boot.cpp
@@ -49,8 +49,7 @@ void program_startup()
    // enabled
    __disable_irq();

-    miosix::IRQconfigureCache((const unsigned int *)0xd0000000,
-                              8 * 1024 * 1024);
+    miosix::IRQconfigureCache((const unsigned int*)0xd0000000, 8 * 1024 * 1024);

    // These are defined in the linker script
    extern unsigned char _etext asm("_etext");

--- a/src/bsps/stm32f767zi_automated_antennas/interfaces-impl/bsp.cpp
+++ b/src/bsps/stm32f767zi_automated_antennas/interfaces-impl/bsp.cpp
@@ -232,41 +232,41 @@ void IRQbspInit()
    userSwitch::mode(Mode::INPUT);

    using namespace interfaces;
-    spi1::sck::mode(Mode::ALTERNATE);
    spi1::sck::alternateFunction(5);
-    spi1::miso::mode(Mode::ALTERNATE);
+    spi1::sck::mode(Mode::ALTERNATE);
    spi1::miso::alternateFunction(5);
-    spi1::mosi::mode(Mode::ALTERNATE);
+    spi1::miso::mode(Mode::ALTERNATE);
    spi1::mosi::alternateFunction(5);
+    spi1::mosi::mode(Mode::ALTERNATE);

-    spi3::sck::mode(Mode::ALTERNATE);
    spi3::sck::alternateFunction(6);
-    spi3::miso::mode(Mode::ALTERNATE);
+    spi3::sck::mode(Mode::ALTERNATE);
    spi3::miso::alternateFunction(6);
-    spi3::mosi::mode(Mode::ALTERNATE);
+    spi3::miso::mode(Mode::ALTERNATE);
    spi3::mosi::alternateFunction(5);
+    spi3::mosi::mode(Mode::ALTERNATE);

-    spi4::sck::mode(Mode::ALTERNATE);
    spi4::sck::alternateFunction(5);
-    spi4::miso::mode(Mode::ALTERNATE);
+    spi4::sck::mode(Mode::ALTERNATE);
    spi4::miso::alternateFunction(5);
-    spi4::mosi::mode(Mode::ALTERNATE);
+    spi4::miso::mode(Mode::ALTERNATE);
    spi4::mosi::alternateFunction(5);
+    spi4::mosi::mode(Mode::ALTERNATE);

-    can2::rx::mode(Mode::ALTERNATE);
    can2::rx::alternateFunction(9);
-    can2::tx::mode(Mode::ALTERNATE);
+    can2::rx::mode(Mode::ALTERNATE);
    can2::tx::alternateFunction(9);
+    can2::tx::mode(Mode::ALTERNATE);

-    usart1::tx::mode(Mode::ALTERNATE);
    usart1::tx::alternateFunction(7);
-    usart1::rx::mode(Mode::ALTERNATE);
+    usart1::tx::mode(Mode::ALTERNATE);
    usart1::rx::alternateFunction(7);
+    usart1::rx::mode(Mode::ALTERNATE);

-    usart2::tx::mode(Mode::ALTERNATE);
    usart2::tx::alternateFunction(7);
-    usart2::rx::mode(Mode::ALTERNATE);
+    usart2::tx::mode(Mode::ALTERNATE);
    usart2::rx::alternateFunction(7);
+    usart2::rx::mode(Mode::ALTERNATE);

    using namespace radio;
    cs::mode(Mode::OUTPUT);
@@ -278,10 +278,10 @@ void IRQbspInit()
    rx_enable::mode(Mode::OUTPUT);

    using namespace timers;
-    tim3ch2::mode(Mode::ALTERNATE);
    tim3ch2::alternateFunction(2);
-    tim4ch1::mode(Mode::ALTERNATE);
+    tim3ch2::mode(Mode::ALTERNATE);
    tim4ch1::alternateFunction(2);
+    tim4ch1::mode(Mode::ALTERNATE);

    stepper1::enable::mode(Mode::OUTPUT);
    stepper1::direction::mode(Mode::OUTPUT);

--- a/src/bsps/stm32f767zi_automated_antennas/interfaces-impl/hwmapping.h
+++ b/src/bsps/stm32f767zi_automated_antennas/interfaces-impl/hwmapping.h
--- a/src/bsps/stm32f767zi_compute_unit/config/miosix_settings.h
+++ b/src/bsps/stm32f767zi_compute_unit/config/miosix_settings.h
--- a/src/bsps/stm32f767zi_compute_unit/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f767zi_compute_unit/core/stage_1_boot.cpp
@@ -49,8 +49,7 @@ void program_startup()
    // enabled
    __disable_irq();

-    miosix::IRQconfigureCache((const unsigned int *)0xd0000000,
-                              8 * 1024 * 1024);
+    miosix::IRQconfigureCache((const unsigned int*)0xd0000000, 8 * 1024 * 1024);

    // These are defined in the linker script
    extern unsigned char _etext asm("_etext");

--- a/src/bsps/stm32f767zi_compute_unit_v2/config/miosix_settings.h
+++ b/src/bsps/stm32f767zi_compute_unit_v2/config/miosix_settings.h
--- a/src/bsps/stm32f767zi_compute_unit_v2/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f767zi_compute_unit_v2/core/stage_1_boot.cpp
@@ -49,8 +49,7 @@ void program_startup()
    // enabled
    __disable_irq();

-    miosix::IRQconfigureCache((const unsigned int *)0xd0000000,
-                              8 * 1024 * 1024);
+    miosix::IRQconfigureCache((const unsigned int*)0xd0000000, 8 * 1024 * 1024);

    // These are defined in the linker script
    extern unsigned char _etext asm("_etext");

--- a/src/bsps/stm32f767zi_compute_unit_v2/interfaces-impl/bsp.cpp
+++ b/src/bsps/stm32f767zi_compute_unit_v2/interfaces-impl/bsp.cpp
--- a/src/bsps/stm32f767zi_death_stack_v4/config/miosix_settings.h
+++ b/src/bsps/stm32f767zi_death_stack_v4/config/miosix_settings.h
--- a/src/bsps/stm32f767zi_death_stack_v4/core/stage_1_boot.cpp
+++ b/src/bsps/stm32f767zi_death_stack_v4/core/stage_1_boot.cpp
@@ -49,8 +49,7 @@ void program_startup()
    // enabled
    __disable_irq();

-    miosix::IRQconfigureCache((const unsigned int *)0xd0000000,
-                              8 * 1024 * 1024);
+    miosix::IRQconfigureCache((const unsigned int*)0xd0000000, 8 * 1024 * 1024);

    // These are defined in the linker script
    extern unsigned char _etext asm("_etext");
No results found