From 9d899089a7e4ed04b9e046c62e41fab74502dd5b Mon Sep 17 00:00:00 2001
From: Daniel Berlin <dberlin@dberlin.org>
Date: Fri, 22 Sep 2023 15:53:36 -0400
Subject: [PATCH 1/3] Add support for setting the channel input filter

---
 cores/arduino/HardwareTimer.h              | 23 +++++++-
 libraries/SrcWrapper/src/HardwareTimer.cpp | 61 ++++++++++++++++++++--
 2 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/cores/arduino/HardwareTimer.h b/cores/arduino/HardwareTimer.h
index d975ffb1b2..3b932d3c1b 100644
--- a/cores/arduino/HardwareTimer.h
+++ b/cores/arduino/HardwareTimer.h
@@ -90,6 +90,25 @@ typedef enum {
   PERCENT_COMPARE_FORMAT, // used for Dutycycle
 } TimerCompareFormat_t;
 
+typedef enum {
+  FILTER_NONE = 1,  // No filter
+  FILTER_CKINT_N2,  // Sampling rate is same as clock interrupt, n=2 events
+  FILTER_CKINT_N4,  // Sampling rate is same as clock interrupt, n=4 events
+  FILTER_CKINT_N8,  // Sampling rate is same as clock interrupt, n=8 events
+  FILTER_DTS2_N6,   // Sampling rate is DTS/2, n=6 events
+  FILTER_DTS2_N8,   // Sampling rate is DTS/2, n=8 events
+  FILTER_DTS4_N6,   // Sampling rate is DTS/4, n=6 events
+  FILTER_DTS4_N8,   // Sampling rate is DTS/4, n=8 events
+  FILTER_DTS8_N6,   // Sampling rate is DTS/8, n=6 events
+  FILTER_DTS8_N8,   // Sampling rate is DTS/8, n=8 events
+  FILTER_DTS16_N5,  // Sampling rate is DTS/16, n=5 events
+  FILTER_DTS16_N6,  // Sampling rate is DTS/16, n=6 events
+  FILTER_DTS16_N8,  // Sampling rate is DTS/16, n=8 events
+  FILTER_DTS32_N5,  // Sampling rate is DTS/32, n=5 events
+  FILTER_DTS32_N6,  // Sampling rate is DTS/32, n=6 events
+  FILTER_DTS32_N8,  // Sampling rate is DTS/32, n=8 events
+} ChannelInputFilter_t;
+
 #ifdef __cplusplus
 
 #include <functional>
@@ -121,8 +140,8 @@ class HardwareTimer {
     void setCount(uint32_t val, TimerFormat_t format = TICK_FORMAT); // set timer counter to value 'val' depending on format provided
     uint32_t getCount(TimerFormat_t format = TICK_FORMAT);  // return current counter value of timer depending on format provided
 
-    void setMode(uint32_t channel, TimerModes_t mode, PinName pin = NC); // Configure timer channel with specified mode on specified pin if available
-    void setMode(uint32_t channel, TimerModes_t mode, uint32_t pin);
+    void setMode(uint32_t channel, TimerModes_t mode, PinName pin = NC, ChannelInputFilter_t filter = FILTER_NONE); // Configure timer channel with specified mode on specified pin if available
+    void setMode(uint32_t channel, TimerModes_t mode, uint32_t pin, ChannelInputFilter_t filter = FILTER_NONE);
 
     TimerModes_t getMode(uint32_t channel);  // Retrieve configured mode
 
diff --git a/libraries/SrcWrapper/src/HardwareTimer.cpp b/libraries/SrcWrapper/src/HardwareTimer.cpp
index 231f53f41d..52c70a162c 100644
--- a/libraries/SrcWrapper/src/HardwareTimer.cpp
+++ b/libraries/SrcWrapper/src/HardwareTimer.cpp
@@ -619,9 +619,62 @@ void HardwareTimer::setCount(uint32_t counter, TimerFormat_t format)
   * @param  pin: Arduino pin number, ex: D1, 1 or PA1
   * @retval None
   */
-void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, uint32_t pin)
+void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, uint32_t pin, ChannelInputFilter_t filter)
 {
-  setMode(channel, mode, digitalPinToPinName(pin));
+  setMode(channel, mode, digitalPinToPinName(pin), filter);
+}
+
+inline uint8_t  getICFBitsFromFilterMode(ChannelInputFilter_t filter) {
+  switch (filter) {
+  case FILTER_NONE:
+      return 0;
+      break;
+  case FILTER_CKINT_N2:
+      return 1;
+      break;
+  case FILTER_CKINT_N4:
+      return 2;
+      break;
+  case FILTER_CKINT_N8:
+      return 3;
+      break;
+  case FILTER_DTS2_N6:
+      return 4;
+      break;
+  case FILTER_DTS2_N8:
+      return 5;
+      break;
+  case FILTER_DTS4_N6:
+      return 6;
+      break;
+  case FILTER_DTS4_N8:
+      return 7;
+      break;
+  case FILTER_DTS8_N6:
+      return 8;
+      break;
+  case FILTER_DTS8_N8:
+      return 9;
+      break;
+  case FILTER_DTS16_N5:
+      return 10;
+      break;
+  case FILTER_DTS16_N6:
+      return 11;
+      break;
+  case FILTER_DTS16_N8:
+      return 12;
+      break;
+  case FILTER_DTS32_N5:
+      return 13;
+      break;
+  case FILTER_DTS32_N6:
+      return 14;
+      break;
+  case FILTER_DTS32_N8:
+      return 15;
+      break;
+  }
 }
 
 /**
@@ -631,7 +684,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, uint32_t pin)
   * @param  pin: pin name, ex: PB_0
   * @retval None
   */
-void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin)
+void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin, ChannelInputFilter_t filter)
 {
   int timChannel = getChannel(channel);
   int timAssociatedInputChannel;
@@ -659,7 +712,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin)
   channelIC.ICPolarity = TIM_ICPOLARITY_RISING;
   channelIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
   channelIC.ICPrescaler = TIM_ICPSC_DIV1;
-  channelIC.ICFilter = 0;
+  channelIC.ICFilter = getICFBitsFromFilterMode(filter);
 
   switch (mode) {
     case TIMER_DISABLED:

From 28234858491534d8c2d0829b116e6794eb40f6be Mon Sep 17 00:00:00 2001
From: Daniel Berlin <dberlin@dberlin.org>
Date: Fri, 22 Sep 2023 21:34:31 -0400
Subject: [PATCH 2/3] Format with astyle

---
 libraries/SrcWrapper/src/HardwareTimer.cpp | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/libraries/SrcWrapper/src/HardwareTimer.cpp b/libraries/SrcWrapper/src/HardwareTimer.cpp
index 52c70a162c..ba4ba2aaaa 100644
--- a/libraries/SrcWrapper/src/HardwareTimer.cpp
+++ b/libraries/SrcWrapper/src/HardwareTimer.cpp
@@ -624,57 +624,59 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, uint32_t pin, C
   setMode(channel, mode, digitalPinToPinName(pin), filter);
 }
 
-inline uint8_t  getICFBitsFromFilterMode(ChannelInputFilter_t filter) {
+inline uint8_t getICFBitsFromFilterMode(ChannelInputFilter_t filter)
+{
   switch (filter) {
-  case FILTER_NONE:
+    case FILTER_NONE:
       return 0;
       break;
-  case FILTER_CKINT_N2:
+    case FILTER_CKINT_N2:
       return 1;
       break;
-  case FILTER_CKINT_N4:
+    case FILTER_CKINT_N4:
       return 2;
       break;
-  case FILTER_CKINT_N8:
+    case FILTER_CKINT_N8:
       return 3;
       break;
-  case FILTER_DTS2_N6:
+    case FILTER_DTS2_N6:
       return 4;
       break;
-  case FILTER_DTS2_N8:
+    case FILTER_DTS2_N8:
       return 5;
       break;
-  case FILTER_DTS4_N6:
+    case FILTER_DTS4_N6:
       return 6;
       break;
-  case FILTER_DTS4_N8:
+    case FILTER_DTS4_N8:
       return 7;
       break;
-  case FILTER_DTS8_N6:
+    case FILTER_DTS8_N6:
       return 8;
       break;
-  case FILTER_DTS8_N8:
+    case FILTER_DTS8_N8:
       return 9;
       break;
-  case FILTER_DTS16_N5:
+    case FILTER_DTS16_N5:
       return 10;
       break;
-  case FILTER_DTS16_N6:
+    case FILTER_DTS16_N6:
       return 11;
       break;
-  case FILTER_DTS16_N8:
+    case FILTER_DTS16_N8:
       return 12;
       break;
-  case FILTER_DTS32_N5:
+    case FILTER_DTS32_N5:
       return 13;
       break;
-  case FILTER_DTS32_N6:
+    case FILTER_DTS32_N6:
       return 14;
       break;
-  case FILTER_DTS32_N8:
+    case FILTER_DTS32_N8:
       return 15;
       break;
   }
+  return 0;
 }
 
 /**

From d243cf8964282c28e55c4b080d4c68a265333bdf Mon Sep 17 00:00:00 2001
From: Daniel Berlin <dberlin@dberlin.org>
Date: Mon, 25 Sep 2023 13:40:48 -0400
Subject: [PATCH 3/3] Start enum from 0 so we can directly convert enum to
 filter value

---
 cores/arduino/HardwareTimer.h              |  2 +-
 libraries/SrcWrapper/src/HardwareTimer.cpp | 57 +---------------------
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/cores/arduino/HardwareTimer.h b/cores/arduino/HardwareTimer.h
index 3b932d3c1b..2215743df1 100644
--- a/cores/arduino/HardwareTimer.h
+++ b/cores/arduino/HardwareTimer.h
@@ -91,7 +91,7 @@ typedef enum {
 } TimerCompareFormat_t;
 
 typedef enum {
-  FILTER_NONE = 1,  // No filter
+  FILTER_NONE = 0,  // No filter
   FILTER_CKINT_N2,  // Sampling rate is same as clock interrupt, n=2 events
   FILTER_CKINT_N4,  // Sampling rate is same as clock interrupt, n=4 events
   FILTER_CKINT_N8,  // Sampling rate is same as clock interrupt, n=8 events
diff --git a/libraries/SrcWrapper/src/HardwareTimer.cpp b/libraries/SrcWrapper/src/HardwareTimer.cpp
index ba4ba2aaaa..f65a4f4f13 100644
--- a/libraries/SrcWrapper/src/HardwareTimer.cpp
+++ b/libraries/SrcWrapper/src/HardwareTimer.cpp
@@ -624,61 +624,6 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, uint32_t pin, C
   setMode(channel, mode, digitalPinToPinName(pin), filter);
 }
 
-inline uint8_t getICFBitsFromFilterMode(ChannelInputFilter_t filter)
-{
-  switch (filter) {
-    case FILTER_NONE:
-      return 0;
-      break;
-    case FILTER_CKINT_N2:
-      return 1;
-      break;
-    case FILTER_CKINT_N4:
-      return 2;
-      break;
-    case FILTER_CKINT_N8:
-      return 3;
-      break;
-    case FILTER_DTS2_N6:
-      return 4;
-      break;
-    case FILTER_DTS2_N8:
-      return 5;
-      break;
-    case FILTER_DTS4_N6:
-      return 6;
-      break;
-    case FILTER_DTS4_N8:
-      return 7;
-      break;
-    case FILTER_DTS8_N6:
-      return 8;
-      break;
-    case FILTER_DTS8_N8:
-      return 9;
-      break;
-    case FILTER_DTS16_N5:
-      return 10;
-      break;
-    case FILTER_DTS16_N6:
-      return 11;
-      break;
-    case FILTER_DTS16_N8:
-      return 12;
-      break;
-    case FILTER_DTS32_N5:
-      return 13;
-      break;
-    case FILTER_DTS32_N6:
-      return 14;
-      break;
-    case FILTER_DTS32_N8:
-      return 15;
-      break;
-  }
-  return 0;
-}
-
 /**
   * @brief  Set channel mode
   * @param  channel: Arduino channel [1..4]
@@ -714,7 +659,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin, Ch
   channelIC.ICPolarity = TIM_ICPOLARITY_RISING;
   channelIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
   channelIC.ICPrescaler = TIM_ICPSC_DIV1;
-  channelIC.ICFilter = getICFBitsFromFilterMode(filter);
+  channelIC.ICFilter = filter;
 
   switch (mode) {
     case TIMER_DISABLED:

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2136.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2136.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2136.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2136.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>