Skip to content

Commit 9e75da6

Browse files
Sergey Pluzhnikovchris-durand
authored andcommitted
STM32G4 Timer::signalToChannel works with complementary channels
1 parent 49afc81 commit 9e75da6

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/modm/platform/timer/stm32/general_purpose_base.hpp.in

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public:
5050
CaptureCompare1 = TIM_DIER_CC1IE,
5151
CaptureCompare2 = TIM_DIER_CC2IE,
5252
CaptureCompare3 = TIM_DIER_CC3IE,
53-
CaptureCompare4= TIM_DIER_CC4IE,
53+
CaptureCompare4 = TIM_DIER_CC4IE,
5454
Trigger = TIM_DIER_TIE,
5555
%% if target.family not in ["l0", "l1"]
5656
COM = TIM_DIER_COMIE,
@@ -275,6 +275,16 @@ protected:
275275
signalToChannel()
276276
{
277277
modm::platform::detail::SignalConnection<Signal, p>{};
278+
%% if target.family == "g4"
279+
if constexpr (Signal::Signal == Gpio::Signal::Ch1 || Signal::Signal == Gpio::Signal::Ch1n) {
280+
return 1;
281+
} else if constexpr (Signal::Signal == Gpio::Signal::Ch2 || Signal::Signal == Gpio::Signal::Ch2n) {
282+
return 2;
283+
} else if constexpr (Signal::Signal == Gpio::Signal::Ch3 || Signal::Signal == Gpio::Signal::Ch3n) {
284+
return 3;
285+
} else if constexpr (Signal::Signal == Gpio::Signal::Ch4 || Signal::Signal == Gpio::Signal::Ch4n) {
286+
return 4;
287+
%% else
278288
if constexpr (Signal::Signal == Gpio::Signal::Ch1) {
279289
return 1;
280290
} else if constexpr (Signal::Signal == Gpio::Signal::Ch2) {
@@ -284,6 +294,7 @@ protected:
284294
%% if target.family != "l0" or target.pin != "d"
285295
} else if constexpr (Signal::Signal == Gpio::Signal::Ch4) {
286296
return 4;
297+
%% endif
287298
%% endif
288299
} else {
289300
// assert is always false, static_assert(false) would not compile

0 commit comments

Comments
 (0)