Mass update for TIM-related changes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12526 110e8d01-0319-4d1e-a829-52ad28d1bb01

11 files changed, 107 insertions, 14 deletions

diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/mcuconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/mcuconf.h
index b8acb0843..d2a404c84 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/mcuconf.h
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/mcuconf.h
@@ -85,6 +85,10 @@
 #define STM32_IRQ_EXTI21_22_29_PRIORITY     6

 #define STM32_IRQ_EXTI30_32_PRIORITY        6

 #define STM32_IRQ_EXTI33_PRIORITY           6

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -140,6 +144,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -169,6 +176,7 @@
 #define STM32_ICU_USE_TIM3                  FALSE

 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -184,6 +192,9 @@
 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
index 3a12af333..89be0946a 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
@@ -79,7 +79,7 @@
  * @brief   Enables the GPT subsystem.

  */

 #if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                         TRUE

+#define HAL_USE_GPT                         FALSE

 #endif

 

 /**

@@ -100,7 +100,7 @@
  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                         TRUE

+#define HAL_USE_ICU                         FALSE

 #endif

 

 /**

@@ -121,7 +121,7 @@
  * @brief   Enables the PWM subsystem.

  */

 #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                         TRUE

+#define HAL_USE_PWM                         FALSE

 #endif

 

 /**

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h
index e6326d991..d2a404c84 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h
@@ -146,16 +146,14 @@
 #define STM32_GPT_USE_TIM8                  FALSE

 #define STM32_GPT_USE_TIM15                 FALSE

 #define STM32_GPT_USE_TIM16                 FALSE

-#define STM32_GPT_USE_TIM17                 TRUE

+#define STM32_GPT_USE_TIM17                 FALSE

+#define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

 #define STM32_GPT_TIM4_IRQ_PRIORITY         7

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

 #define STM32_GPT_TIM7_IRQ_PRIORITY         7

 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

-#define STM32_GPT_TIM15_IRQ_PRIORITY        7

-#define STM32_GPT_TIM16_IRQ_PRIORITY        7

-#define STM32_GPT_TIM17_IRQ_PRIORITY        7

 

 /*

  * I2C driver system settings.

@@ -178,32 +176,30 @@
 #define STM32_ICU_USE_TIM3                  FALSE

 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_USE_TIM15                 TRUE

+#define STM32_ICU_USE_TIM15                 FALSE

+#define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

 #define STM32_ICU_TIM4_IRQ_PRIORITY         7

 #define STM32_ICU_TIM8_IRQ_PRIORITY         7

-#define STM32_ICU_TIM15_IRQ_PRIORITY        7

 

 /*

  * PWM driver system settings.

  */

 #define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  TRUE

+#define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

 #define STM32_PWM_USE_TIM15                 FALSE

-#define STM32_PWM_USE_TIM16                 TRUE

+#define STM32_PWM_USE_TIM16                 FALSE

 #define STM32_PWM_USE_TIM17                 FALSE

+#define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

 #define STM32_PWM_TIM4_IRQ_PRIORITY         7

 #define STM32_PWM_TIM8_IRQ_PRIORITY         7

-#define STM32_PWM_TIM15_IRQ_PRIORITY        7

-#define STM32_PWM_TIM16_IRQ_PRIORITY        7

-#define STM32_PWM_TIM17_IRQ_PRIORITY        7

 

 /*

  * RTC driver system settings.

diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/mcuconf.h b/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/mcuconf.h
index 8d0ddd9c8..e88a07cf5 100644
--- a/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/mcuconf.h
@@ -85,6 +85,10 @@
 #define STM32_IRQ_EXTI21_22_29_PRIORITY     6

 #define STM32_IRQ_EXTI30_32_PRIORITY        6

 #define STM32_IRQ_EXTI33_PRIORITY           6

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -140,6 +144,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -169,6 +176,7 @@
 #define STM32_ICU_USE_TIM3                  FALSE

 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -184,6 +192,9 @@
 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/mcuconf.h
index 4bb3530df..4e6e5ff02 100644
--- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/mcuconf.h
@@ -85,6 +85,10 @@
 #define STM32_IRQ_EXTI21_22_29_PRIORITY     6

 #define STM32_IRQ_EXTI30_32_PRIORITY        6

 #define STM32_IRQ_EXTI33_PRIORITY           6

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -140,6 +144,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -169,6 +176,7 @@
 #define STM32_ICU_USE_TIM3                  FALSE

 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -184,6 +192,9 @@
 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/mcuconf.h b/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/mcuconf.h
index ac5171035..7ea0dd503 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/mcuconf.h
@@ -101,6 +101,10 @@
 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

 #define STM32_IRQ_EXTI21_22_PRIORITY        15

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -139,6 +143,8 @@
 #define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

@@ -165,6 +171,7 @@
  */

 #define STM32_ICU_USE_TIM1                  FALSE

 #define STM32_ICU_USE_TIM2                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 

@@ -174,6 +181,8 @@
 #define STM32_PWM_USE_ADVANCED              FALSE

 #define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 

diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h
index 4909ef632..05498c26a 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h
@@ -108,6 +108,10 @@
 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

 #define STM32_IRQ_EXTI21_22_PRIORITY        15

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -160,6 +164,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -199,6 +206,7 @@
 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -216,6 +224,9 @@
 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/mcuconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/mcuconf.h
index 15a90dc10..428d68189 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/mcuconf.h
@@ -108,6 +108,10 @@
 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

 #define STM32_IRQ_EXTI21_22_PRIORITY        15

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -160,6 +164,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -199,6 +206,7 @@
 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -216,6 +224,9 @@
 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h
index 8cd60c45c..3965d40ac 100644
--- a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h
@@ -112,6 +112,10 @@
 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

 #define STM32_IRQ_EXTI21_22_PRIORITY        6

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -165,6 +169,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -204,6 +211,7 @@
 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -221,6 +229,9 @@
 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h
index f391ffccb..55323b8d7 100644
--- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h
@@ -122,6 +122,10 @@
 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

 #define STM32_IRQ_EXTI21_22_PRIORITY        6

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -164,6 +168,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -203,6 +210,7 @@
 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -220,6 +228,9 @@
 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7

diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h
index 8c5fc1f0b..495e26174 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h
@@ -122,6 +122,10 @@
 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

 #define STM32_IRQ_EXTI21_22_PRIORITY        6

+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7

+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7

+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7

+#define STM32_IRQ_TIM1_CC_PRIORITY          7

 

 /*

  * ADC driver system settings.

@@ -164,6 +168,9 @@
 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

+#define STM32_GPT_USE_TIM15                 FALSE

+#define STM32_GPT_USE_TIM16                 FALSE

+#define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

@@ -203,6 +210,7 @@
 #define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

+#define STM32_ICU_USE_TIM15                 FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

 #define STM32_ICU_TIM3_IRQ_PRIORITY         7

@@ -220,6 +228,9 @@
 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

+#define STM32_PWM_USE_TIM15                 FALSE

+#define STM32_PWM_USE_TIM16                 FALSE

+#define STM32_PWM_USE_TIM17                 FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

 #define STM32_PWM_TIM3_IRQ_PRIORITY         7