added STM32 Timer{{ id }}::configureInputChannel(channel, filter)

Author: TomSaw

src/modm/platform/timer/stm32/advanced.cpp.in

@@ -66,6 +66,35 @@ modm::platform::Timer{{ id }}::setMode(Mode mode, SlaveMode slaveMode,
 }
 
 // ----------------------------------------------------------------------------
+void
+modm::platform::Timer{{ id }}::configureInputChannel(uint32_t channel, uint8_t filter) {
+		channel -= 1;	// 1..4 -> 0..3
+
+	// disable channel
+	TIM{{ id }}->CCER &= ~(TIM_CCER_CC1E << (channel * 4));
+
+	uint32_t flags = static_cast<uint32_t>(filter&0xf) << 4;
+
+	if (channel <= 1)
+	{
+		const uint32_t offset = 8 * channel;
+
+		flags <<= offset;
+		flags |= TIM{{ id }}->CCMR1 & ~(0xf0 << offset);
+
+		TIM{{ id }}->CCMR1 = flags;
+	}
+	else {
+		const uint32_t offset = 8 * (channel - 2);
+
+		flags <<= offset;
+		flags |= TIM{{ id }}->CCMR2 & ~(0xf0 << offset);
+
+		TIM{{ id }}->CCMR2 = flags;
+	}
+	TIM{{ id }}->CCER |= TIM_CCER_CC1E << (channel * 4);
+}
+
 void
 modm::platform::Timer{{ id }}::configureInputChannel(uint32_t channel,
 		InputCaptureMapping input, InputCapturePrescaler prescaler,

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

@@ -303,6 +303,9 @@ public:
 	}
 
 public:
+	static void
+	configureInputChannel(uint32_t channel, uint8_t filter);
+
 	static void
 	configureInputChannel(uint32_t channel, InputCaptureMapping input,
 			InputCapturePrescaler prescaler,

src/modm/platform/timer/stm32/general_purpose.cpp.in

@@ -81,6 +81,35 @@ modm::platform::Timer{{ id }}::setMode(Mode mode, SlaveMode slaveMode,
 }
 
 // ----------------------------------------------------------------------------
+void
+modm::platform::Timer{{ id }}::configureInputChannel(uint32_t channel, uint8_t filter) {
+		channel -= 1;	// 1..4 -> 0..3
+
+	// disable channel
+	TIM{{ id }}->CCER &= ~(TIM_CCER_CC1E << (channel * 4));
+
+	uint32_t flags = static_cast<uint32_t>(filter&0xf) << 4;
+
+	if (channel <= 1)
+	{
+		const uint32_t offset = 8 * channel;
+
+		flags <<= offset;
+		flags |= TIM{{ id }}->CCMR1 & ~(0xf0 << offset);
+
+		TIM{{ id }}->CCMR1 = flags;
+	}
+	else {
+		const uint32_t offset = 8 * (channel - 2);
+
+		flags <<= offset;
+		flags |= TIM{{ id }}->CCMR2 & ~(0xf0 << offset);
+
+		TIM{{ id }}->CCMR2 = flags;
+	}
+	TIM{{ id }}->CCER |= TIM_CCER_CC1E << (channel * 4);
+}
+
 void
 modm::platform::Timer{{ id }}::configureInputChannel(uint32_t channel,
 		InputCaptureMapping input, InputCapturePrescaler prescaler,

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

@@ -317,6 +317,9 @@ public:
 
 
 public:
+	static void
+	configureInputChannel(uint32_t channel, uint8_t filter);
+
 	static void
 	configureInputChannel(uint32_t channel, InputCaptureMapping input,
 			InputCapturePrescaler prescaler,

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

@@ -234,7 +234,7 @@ public:
 	/**
 	 * TODO Description
 	 */
-	void
+	static void
 	configureInputChannel(uint32_t channel, InputCaptureMapping input,
 			InputCapturePrescaler prescaler, InputCapturePolarity polarity, uint8_t filter);
 
@@ -256,7 +256,7 @@ public:
 	 * @param	channel	[1..4]
 	 * @param	value	Compare value
 	 */
-	static inline void
+	static void
 	setCompareValue(uint32_t channel, uint16_t value);
 
 	/**
@@ -265,7 +265,7 @@ public:
 	 * @param	channel	[1..4]
 	 * @return	Current compare value
 	 */
-	static inline uint16_t
+	static uint16_t
 	getCompareValue(uint32_t channel);
 };