Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: make hal::Port's contents depend on actual available ports #350

Merged
merged 3 commits into from
Jun 28, 2024
Merged

feat: make hal::Port's contents depend on actual available ports #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f93d7db
feat: make hal::Port's contents depend on actual available ports
daantimmer Jun 26, 2024
ca794f1
chore: make Nucleo64WBUi compile conditionally on whether there is a …
daantimmer Jun 28, 2024
3a29131
Merge branch 'main' into feature/make-hal--Port-s-contents-dependent-…
daantimmer Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions examples/helloworld/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "hal/interfaces/Gpio.hpp"
#include "hal_st/instantiations/NucleoUi.hpp"
#include "hal_st/instantiations/StmEventInfrastructure.hpp"
#include "hal_st/stm32fxxx/DmaStm.hpp"
#include "hal_st/stm32fxxx/UartStmDma.hpp"
#include "infra/timer/Timer.hpp"
#include "services/tracer/GlobalTracer.hpp"
#include "services/tracer/StreamWriterOnSerialCommunication.hpp"
Expand Down
4 changes: 2 additions & 2 deletions hal_st/instantiations/NucleoUi.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#ifndef HAL_ST_NUCLEO_UI_HPP
#define HAL_ST_NUCLEO_UI_HPP

#include "hal_st/stm32fxxx/DmaStm.hpp"
#include "hal_st/stm32fxxx/GpioStm.hpp"
#include "hal_st/stm32fxxx/UartStmDma.hpp"

namespace main_
{
Expand Down Expand Up @@ -36,6 +34,7 @@ namespace main_
#endif
};

#if defined(GPIOD)
// UM2435: MB1355 reference board with STM32WB55RG
struct Nucleo64WBUi
{
Expand All @@ -46,6 +45,7 @@ namespace main_
hal::GpioPinStm ledGreen{ hal::Port::B, 0 };
hal::GpioPinStm ledBlue{ hal::Port::B, 5 };
};
#endif

// UM3103: MB1863 reference board with STM32WBA52CG
struct Nucleo64WBAUi
Expand Down
16 changes: 11 additions & 5 deletions hal_st/stm32fxxx/GpioStm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@ namespace hal
{
namespace
{
GPIO_TypeDef* const portToGPIOPort[] = {
const std::array portToGPIOPort = {
#if defined(GPIOA)
GPIOA,
#endif
#if defined(GPIOB)
GPIOB,
#endif
#if defined(GPIOC)
GPIOC,
#endif
#if defined(GPIOD)
GPIOD,
#endif
Expand All @@ -37,7 +43,7 @@ namespace hal
#endif
};

const uint16_t pinToGPIOPin[16] = {
const std::array pinToGPIOPin = {
GPIO_PIN_0,
GPIO_PIN_1,
GPIO_PIN_2,
Expand All @@ -56,13 +62,13 @@ namespace hal
GPIO_PIN_15,
};

const uint32_t weakPullToPuPd[3] = {
const std::array weakPullToPuPd = {
GPIO_NOPULL,
GPIO_PULLUP,
GPIO_PULLDOWN
};

const uint32_t speedToSpeed[] = {
const std::array speedToSpeed = {
GPIO_SPEED_FREQ_LOW,
GPIO_SPEED_FREQ_MEDIUM,
GPIO_SPEED_FREQ_HIGH,
Expand All @@ -71,7 +77,7 @@ namespace hal
#endif
};

const uint32_t driveToAFMode[2] = {
const std::array driveToAFMode = {
GPIO_MODE_AF_PP,
GPIO_MODE_AF_OD
};
Expand Down
24 changes: 23 additions & 1 deletion hal_st/stm32fxxx/GpioStm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,39 @@ namespace hal

enum class Port : uint8_t
{
#if defined(GPIOA)
A,
#endif
#if defined(GPIOB)
B,
#endif
#if defined(GPIOC)
C,
#endif
#if defined(GPIOD)
D,
#endif
#if defined(GPIOE)
E,
#endif
#if defined(GPIOF)
F,
#endif
#if defined(GPIOG)
G,
#endif
#if defined(GPIOH)
H,
#endif
#if defined(GPIOI)
I,
#endif
#if defined(GPIOJ)
J,
K
#endif
#if defined(GPIOK)
K,
#endif
};

enum class WeakPull : uint8_t
Expand Down
Loading