removed unused template par from signalToChannel()

TomSaw · TomSaw · commit 6206aebbd254 · 2024-03-10T15:31:52.000+01:00
diff --git a/src/modm/platform/timer/stm32/advanced.hpp.in b/src/modm/platform/timer/stm32/advanced.hpp.in
@@ -338,7 +338,7 @@ public:
 	static void
 	setOutputIdleState(OutputIdleState idle, OutputIdleState idle_n = OutputIdleState::Reset)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		setOutputIdleState(channel, idle, idle_n);
 	}
 
@@ -408,7 +408,7 @@ public:
 	static void
 	configureInputChannel(uint8_t filter)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureInputChannel(channel, filter);
 	}
 
@@ -425,7 +425,7 @@ public:
 			InputCapturePolarity polarity, uint8_t filter,
 			bool xor_ch1_3=false)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureInputChannel(channel, input, prescaler, polarity, filter, xor_ch1_3);
 	}
 
@@ -441,7 +441,7 @@ public:
 	configureOutputChannel(OutputCompareMode mode,
 			Value compareValue, PinState out = PinState::Enable)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureOutputChannel(channel, mode, compareValue, out);
 	}
 
@@ -460,7 +460,7 @@ public:
 			OutputComparePolarity polarity_n = OutputComparePolarity::ActiveHigh,
 			OutputComparePreload preload = OutputComparePreload::Disable)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureOutputChannel(channel, mode, compareValue, out, polarity, out_n, polarity_n, preload);
 	}
 
@@ -491,7 +491,7 @@ public:
 			OutputComparePolarity polarity_n = OutputComparePolarity::ActiveHigh,
 			OutputComparePreload preload = OutputComparePreload::Disable)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureOutputChannel(channel, mode, out, polarity, out_n, polarity_n, preload);
 	}
 
@@ -522,7 +522,7 @@ public:
 	static void
 	configureOutputChannel(uint32_t modeOutputPorts)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureOutputChannel(channel, modeOutputPorts);
 	}
 
@@ -546,7 +546,7 @@ public:
 	static void
 	setCompareValue(Value value)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		setCompareValue(channel, value);
 	}
 
@@ -560,7 +560,7 @@ public:
 	static inline Value
 	getCompareValue()
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		return getCompareValue(channel);
 	}
 
diff --git a/src/modm/platform/timer/stm32/general_purpose.hpp.in b/src/modm/platform/timer/stm32/general_purpose.hpp.in
@@ -405,7 +405,7 @@ public:
 	static void
 	configureInputChannel(uint8_t filter)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureInputChannel(channel, filter);
 	}
 
@@ -422,7 +422,7 @@ public:
 			InputCapturePolarity polarity, uint8_t filter,
 			bool xor_ch1_3=false)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureInputChannel(channel, input, prescaler, polarity, filter, xor_ch1_3);
 	}
 
@@ -437,7 +437,7 @@ public:
 			Value compareValue, PinState out = PinState::Enable,
 			bool enableComparePreload = true)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureOutputChannel(channel, mode, compareValue, out, enableComparePreload);
 	}
 
@@ -454,7 +454,7 @@ public:
 			OutputComparePolarity polarity,
 			OutputComparePreload preload = OutputComparePreload::Disable)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		configureOutputChannel(channel, mode, compareValue, out, polarity, PinState::Disable, OutputComparePolarity::ActiveHigh, preload);
 	}
 
@@ -485,7 +485,7 @@ public:
 			OutputComparePolarity polarity_n = OutputComparePolarity::ActiveHigh,
 			OutputComparePreload preload = OutputComparePreload::Disable)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 %% if id in [15, 16, 17]
         static_assert(channel == 1, "Timer{{ id }} has complementary output only on channel 1");
 %% endif
@@ -528,7 +528,7 @@ public:
 	static void
 	setInvertedPwm()
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		setInvertedPwm(channel);
 	}
 
@@ -568,7 +568,7 @@ public:
 	static void
 	setNormalPwm()
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		setNormalPwm(channel);
 	}
 
@@ -607,7 +607,7 @@ public:
 	static void
 	forceInactive()
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		forceInactive(channel);
 	}
 
@@ -646,7 +646,7 @@ public:
 	static void
 	forceActive()
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		forceActive(channel);
 	}
 
@@ -687,7 +687,7 @@ public:
 	static void
 	setCompareValue(Value value)
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{id}}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		setCompareValue(channel, value);
 	}
 
@@ -701,7 +701,7 @@ public:
 	static inline Value
 	getCompareValue()
 	{
-		constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();
+		constexpr auto channel = signalToChannel<Signal>();
 		return getCompareValue(channel);
 	}
 public:
diff --git a/src/modm/platform/timer/stm32/general_purpose_base.hpp.in b/src/modm/platform/timer/stm32/general_purpose_base.hpp.in
@@ -327,11 +327,10 @@ public:
 	}
 
 protected:
-	template<Peripheral p, typename Signal>
+	template<typename Signal>
 	static consteval int
 	signalToChannel()
 	{
-		modm::platform::detail::SignalConnection<Signal, p>{};
 %% for signal, number in signals
 %% if loop.first
 		if constexpr (Signal::Signal == Gpio::Signal::{{ signal }}) {

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public:`
`338`	`338`	`static void`
`339`	`339`	`setOutputIdleState(OutputIdleState idle, OutputIdleState idle_n = OutputIdleState::Reset)`
`340`	`340`	`{`
`341`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`341`	`+ constexpr auto channel = signalToChannel<Signal>();`
`342`	`342`	`setOutputIdleState(channel, idle, idle_n);`
`343`	`343`	`}`
`344`	`344`
`@@ -408,7 +408,7 @@ public:`
`408`	`408`	`static void`
`409`	`409`	`configureInputChannel(uint8_t filter)`
`410`	`410`	`{`
`411`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`411`	`+ constexpr auto channel = signalToChannel<Signal>();`
`412`	`412`	`configureInputChannel(channel, filter);`
`413`	`413`	`}`
`414`	`414`
`@@ -425,7 +425,7 @@ public:`
`425`	`425`	`InputCapturePolarity polarity, uint8_t filter,`
`426`	`426`	`bool xor_ch1_3=false)`
`427`	`427`	`{`
`428`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`428`	`+ constexpr auto channel = signalToChannel<Signal>();`
`429`	`429`	`configureInputChannel(channel, input, prescaler, polarity, filter, xor_ch1_3);`
`430`	`430`	`}`
`431`	`431`
`@@ -441,7 +441,7 @@ public:`
`441`	`441`	`configureOutputChannel(OutputCompareMode mode,`
`442`	`442`	`Value compareValue, PinState out = PinState::Enable)`
`443`	`443`	`{`
`444`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`444`	`+ constexpr auto channel = signalToChannel<Signal>();`
`445`	`445`	`configureOutputChannel(channel, mode, compareValue, out);`
`446`	`446`	`}`
`447`	`447`
`@@ -460,7 +460,7 @@ public:`
`460`	`460`	`OutputComparePolarity polarity_n = OutputComparePolarity::ActiveHigh,`
`461`	`461`	`OutputComparePreload preload = OutputComparePreload::Disable)`
`462`	`462`	`{`
`463`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`463`	`+ constexpr auto channel = signalToChannel<Signal>();`
`464`	`464`	`configureOutputChannel(channel, mode, compareValue, out, polarity, out_n, polarity_n, preload);`
`465`	`465`	`}`
`466`	`466`
`@@ -491,7 +491,7 @@ public:`
`491`	`491`	`OutputComparePolarity polarity_n = OutputComparePolarity::ActiveHigh,`
`492`	`492`	`OutputComparePreload preload = OutputComparePreload::Disable)`
`493`	`493`	`{`
`494`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`494`	`+ constexpr auto channel = signalToChannel<Signal>();`
`495`	`495`	`configureOutputChannel(channel, mode, out, polarity, out_n, polarity_n, preload);`
`496`	`496`	`}`
`497`	`497`
`@@ -522,7 +522,7 @@ public:`
`522`	`522`	`static void`
`523`	`523`	`configureOutputChannel(uint32_t modeOutputPorts)`
`524`	`524`	`{`
`525`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`525`	`+ constexpr auto channel = signalToChannel<Signal>();`
`526`	`526`	`configureOutputChannel(channel, modeOutputPorts);`
`527`	`527`	`}`
`528`	`528`
`@@ -546,7 +546,7 @@ public:`
`546`	`546`	`static void`
`547`	`547`	`setCompareValue(Value value)`
`548`	`548`	`{`
`549`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`549`	`+ constexpr auto channel = signalToChannel<Signal>();`
`550`	`550`	`setCompareValue(channel, value);`
`551`	`551`	`}`
`552`	`552`
`@@ -560,7 +560,7 @@ public:`
`560`	`560`	`static inline Value`
`561`	`561`	`getCompareValue()`
`562`	`562`	`{`
`563`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`563`	`+ constexpr auto channel = signalToChannel<Signal>();`
`564`	`564`	`return getCompareValue(channel);`
`565`	`565`	`}`
`566`	`566`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public:`
`405`	`405`	`static void`
`406`	`406`	`configureInputChannel(uint8_t filter)`
`407`	`407`	`{`
`408`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`408`	`+ constexpr auto channel = signalToChannel<Signal>();`
`409`	`409`	`configureInputChannel(channel, filter);`
`410`	`410`	`}`
`411`	`411`
`@@ -422,7 +422,7 @@ public:`
`422`	`422`	`InputCapturePolarity polarity, uint8_t filter,`
`423`	`423`	`bool xor_ch1_3=false)`
`424`	`424`	`{`
`425`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`425`	`+ constexpr auto channel = signalToChannel<Signal>();`
`426`	`426`	`configureInputChannel(channel, input, prescaler, polarity, filter, xor_ch1_3);`
`427`	`427`	`}`
`428`	`428`
`@@ -437,7 +437,7 @@ public:`
`437`	`437`	`Value compareValue, PinState out = PinState::Enable,`
`438`	`438`	`bool enableComparePreload = true)`
`439`	`439`	`{`
`440`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`440`	`+ constexpr auto channel = signalToChannel<Signal>();`
`441`	`441`	`configureOutputChannel(channel, mode, compareValue, out, enableComparePreload);`
`442`	`442`	`}`
`443`	`443`
`@@ -454,7 +454,7 @@ public:`
`454`	`454`	`OutputComparePolarity polarity,`
`455`	`455`	`OutputComparePreload preload = OutputComparePreload::Disable)`
`456`	`456`	`{`
`457`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`457`	`+ constexpr auto channel = signalToChannel<Signal>();`
`458`	`458`	`configureOutputChannel(channel, mode, compareValue, out, polarity, PinState::Disable, OutputComparePolarity::ActiveHigh, preload);`
`459`	`459`	`}`
`460`	`460`
`@@ -485,7 +485,7 @@ public:`
`485`	`485`	`OutputComparePolarity polarity_n = OutputComparePolarity::ActiveHigh,`
`486`	`486`	`OutputComparePreload preload = OutputComparePreload::Disable)`
`487`	`487`	`{`
`488`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`488`	`+ constexpr auto channel = signalToChannel<Signal>();`
`489`	`489`	`%% if id in [15, 16, 17]`
`490`	`490`	`static_assert(channel == 1, "Timer{{ id }} has complementary output only on channel 1");`
`491`	`491`	`%% endif`
`@@ -528,7 +528,7 @@ public:`
`528`	`528`	`static void`
`529`	`529`	`setInvertedPwm()`
`530`	`530`	`{`
`531`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`531`	`+ constexpr auto channel = signalToChannel<Signal>();`
`532`	`532`	`setInvertedPwm(channel);`
`533`	`533`	`}`
`534`	`534`
`@@ -568,7 +568,7 @@ public:`
`568`	`568`	`static void`
`569`	`569`	`setNormalPwm()`
`570`	`570`	`{`
`571`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`571`	`+ constexpr auto channel = signalToChannel<Signal>();`
`572`	`572`	`setNormalPwm(channel);`
`573`	`573`	`}`
`574`	`574`
`@@ -607,7 +607,7 @@ public:`
`607`	`607`	`static void`
`608`	`608`	`forceInactive()`
`609`	`609`	`{`
`610`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`610`	`+ constexpr auto channel = signalToChannel<Signal>();`
`611`	`611`	`forceInactive(channel);`
`612`	`612`	`}`
`613`	`613`
`@@ -646,7 +646,7 @@ public:`
`646`	`646`	`static void`
`647`	`647`	`forceActive()`
`648`	`648`	`{`
`649`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`649`	`+ constexpr auto channel = signalToChannel<Signal>();`
`650`	`650`	`forceActive(channel);`
`651`	`651`	`}`
`652`	`652`
`@@ -687,7 +687,7 @@ public:`
`687`	`687`	`static void`
`688`	`688`	`setCompareValue(Value value)`
`689`	`689`	`{`
`690`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{id}}, Signal>();`
	`690`	`+ constexpr auto channel = signalToChannel<Signal>();`
`691`	`691`	`setCompareValue(channel, value);`
`692`	`692`	`}`
`693`	`693`
`@@ -701,7 +701,7 @@ public:`
`701`	`701`	`static inline Value`
`702`	`702`	`getCompareValue()`
`703`	`703`	`{`
`704`		`- constexpr auto channel = signalToChannel<Peripheral::Tim{{ id }}, Signal>();`
	`704`	`+ constexpr auto channel = signalToChannel<Signal>();`
`705`	`705`	`return getCompareValue(channel);`
`706`	`706`	`}`
`707`	`707`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -327,11 +327,10 @@ public:`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`protected:`
`330`		`- template<Peripheral p, typename Signal>`
	`330`	`+ template<typename Signal>`
`331`	`331`	`static consteval int`
`332`	`332`	`signalToChannel()`
`333`	`333`	`{`
`334`		`- modm::platform::detail::SignalConnection<Signal, p>{};`
`335`	`334`	`%% for signal, number in signals`
`336`	`335`	`%% if loop.first`
`337`	`336`	`if constexpr (Signal::Signal == Gpio::Signal::{{ signal }}) {`