From d34e6b7e178b3b88555fbbb52649cbbf0a7c5ba6 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 19 Aug 2021 12:38:00 +0000 Subject: [PATCH] Fixed bug #1178. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14675 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- demos/STM32/NIL-STM32G071RB-NUCLEO64/cfg/mcuconf.h | 9 +++++++++ demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/mcuconf.h | 9 +++++++++ readme.txt | 2 ++ .../STM32/multi/ADC/cfg/stm32g071rb_nucleo64/mcuconf.h | 9 +++++++++ testhal/STM32/multi/RTC/cfg/stm32g071_nucleo64/mcuconf.h | 9 +++++++++ .../processors/conf/mcuconf_stm32g071xx/mcuconf.h.ftl | 9 +++++++++ 6 files changed, 47 insertions(+) diff --git a/demos/STM32/NIL-STM32G071RB-NUCLEO64/cfg/mcuconf.h b/demos/STM32/NIL-STM32G071RB-NUCLEO64/cfg/mcuconf.h index 5ce188251..0480b9ff3 100644 --- a/demos/STM32/NIL-STM32G071RB-NUCLEO64/cfg/mcuconf.h +++ b/demos/STM32/NIL-STM32G071RB-NUCLEO64/cfg/mcuconf.h @@ -144,6 +144,10 @@ #define STM32_GPT_USE_TIM3 FALSE #define STM32_GPT_USE_TIM6 FALSE #define STM32_GPT_USE_TIM7 FALSE +#define STM32_GPT_USE_TIM14 FALSE +#define STM32_GPT_USE_TIM15 FALSE +#define STM32_GPT_USE_TIM16 FALSE +#define STM32_GPT_USE_TIM17 FALSE /* * I2C driver system settings. @@ -167,6 +171,7 @@ #define STM32_ICU_USE_TIM1 FALSE #define STM32_ICU_USE_TIM2 FALSE #define STM32_ICU_USE_TIM3 FALSE +#define STM32_ICU_USE_TIM15 FALSE /* * PWM driver system settings. @@ -174,6 +179,10 @@ #define STM32_PWM_USE_TIM1 FALSE #define STM32_PWM_USE_TIM2 FALSE #define STM32_PWM_USE_TIM3 FALSE +#define STM32_PWM_USE_TIM14 FALSE +#define STM32_PWM_USE_TIM15 FALSE +#define STM32_PWM_USE_TIM16 FALSE +#define STM32_PWM_USE_TIM17 FALSE /* * RTC driver system settings. diff --git a/demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/mcuconf.h b/demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/mcuconf.h index 60e609576..546cc3a92 100644 --- a/demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/mcuconf.h @@ -144,6 +144,10 @@ #define STM32_GPT_USE_TIM3 FALSE #define STM32_GPT_USE_TIM6 FALSE #define STM32_GPT_USE_TIM7 FALSE +#define STM32_GPT_USE_TIM14 FALSE +#define STM32_GPT_USE_TIM15 FALSE +#define STM32_GPT_USE_TIM16 FALSE +#define STM32_GPT_USE_TIM17 FALSE /* * I2C driver system settings. @@ -167,6 +171,7 @@ #define STM32_ICU_USE_TIM1 FALSE #define STM32_ICU_USE_TIM2 FALSE #define STM32_ICU_USE_TIM3 FALSE +#define STM32_ICU_USE_TIM15 FALSE /* * PWM driver system settings. @@ -174,6 +179,10 @@ #define STM32_PWM_USE_TIM1 FALSE #define STM32_PWM_USE_TIM2 FALSE #define STM32_PWM_USE_TIM3 FALSE +#define STM32_PWM_USE_TIM14 FALSE +#define STM32_PWM_USE_TIM15 FALSE +#define STM32_PWM_USE_TIM16 FALSE +#define STM32_PWM_USE_TIM17 FALSE /* * RTC driver system settings. diff --git a/readme.txt b/readme.txt index 69de2856d..62c4b4f19 100644 --- a/readme.txt +++ b/readme.txt @@ -77,6 +77,8 @@ - NEW: EFL driver and demo for STM32F3xx. - NEW: New unitary test subsystem under /os/test. Now it is officially ChibiOS/TEST. +- FIX: Fixed STM32G071 mcuconf.h template not showing TIM14/15/16/17 + (bug #1178)(TBP). - FIX: Fixed path ambiguity between STM32 USARTv2 and USARTv3 drivers (bug #1177)(TBP). - FIX: Fixed invalid DMAMUX settings in DMAv1 for some devices (bug #1176)(TBP). diff --git a/testhal/STM32/multi/ADC/cfg/stm32g071rb_nucleo64/mcuconf.h b/testhal/STM32/multi/ADC/cfg/stm32g071rb_nucleo64/mcuconf.h index f6e48d7ca..99aac4378 100644 --- a/testhal/STM32/multi/ADC/cfg/stm32g071rb_nucleo64/mcuconf.h +++ b/testhal/STM32/multi/ADC/cfg/stm32g071rb_nucleo64/mcuconf.h @@ -144,6 +144,10 @@ #define STM32_GPT_USE_TIM3 FALSE #define STM32_GPT_USE_TIM6 TRUE #define STM32_GPT_USE_TIM7 FALSE +#define STM32_GPT_USE_TIM14 FALSE +#define STM32_GPT_USE_TIM15 FALSE +#define STM32_GPT_USE_TIM16 FALSE +#define STM32_GPT_USE_TIM17 FALSE /* * I2C driver system settings. @@ -167,6 +171,7 @@ #define STM32_ICU_USE_TIM1 FALSE #define STM32_ICU_USE_TIM2 FALSE #define STM32_ICU_USE_TIM3 FALSE +#define STM32_ICU_USE_TIM15 FALSE /* * PWM driver system settings. @@ -174,6 +179,10 @@ #define STM32_PWM_USE_TIM1 FALSE #define STM32_PWM_USE_TIM2 FALSE #define STM32_PWM_USE_TIM3 FALSE +#define STM32_PWM_USE_TIM14 FALSE +#define STM32_PWM_USE_TIM15 FALSE +#define STM32_PWM_USE_TIM16 FALSE +#define STM32_PWM_USE_TIM17 FALSE /* * RTC driver system settings. diff --git a/testhal/STM32/multi/RTC/cfg/stm32g071_nucleo64/mcuconf.h b/testhal/STM32/multi/RTC/cfg/stm32g071_nucleo64/mcuconf.h index fe27e627c..c3f1b6ae0 100644 --- a/testhal/STM32/multi/RTC/cfg/stm32g071_nucleo64/mcuconf.h +++ b/testhal/STM32/multi/RTC/cfg/stm32g071_nucleo64/mcuconf.h @@ -144,6 +144,10 @@ #define STM32_GPT_USE_TIM3 FALSE #define STM32_GPT_USE_TIM6 FALSE #define STM32_GPT_USE_TIM7 FALSE +#define STM32_GPT_USE_TIM14 FALSE +#define STM32_GPT_USE_TIM15 FALSE +#define STM32_GPT_USE_TIM16 FALSE +#define STM32_GPT_USE_TIM17 FALSE /* * I2C driver system settings. @@ -167,6 +171,7 @@ #define STM32_ICU_USE_TIM1 FALSE #define STM32_ICU_USE_TIM2 FALSE #define STM32_ICU_USE_TIM3 FALSE +#define STM32_ICU_USE_TIM15 FALSE /* * PWM driver system settings. @@ -174,6 +179,10 @@ #define STM32_PWM_USE_TIM1 FALSE #define STM32_PWM_USE_TIM2 FALSE #define STM32_PWM_USE_TIM3 FALSE +#define STM32_PWM_USE_TIM14 FALSE +#define STM32_PWM_USE_TIM15 FALSE +#define STM32_PWM_USE_TIM16 FALSE +#define STM32_PWM_USE_TIM17 FALSE /* * RTC driver system settings. diff --git a/tools/ftl/processors/conf/mcuconf_stm32g071xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32g071xx/mcuconf.h.ftl index 79b18cdcc..496398585 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32g071xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32g071xx/mcuconf.h.ftl @@ -155,6 +155,10 @@ #define STM32_GPT_USE_TIM3 ${doc.STM32_GPT_USE_TIM3!"FALSE"} #define STM32_GPT_USE_TIM6 ${doc.STM32_GPT_USE_TIM6!"FALSE"} #define STM32_GPT_USE_TIM7 ${doc.STM32_GPT_USE_TIM7!"FALSE"} +#define STM32_GPT_USE_TIM14 ${doc.STM32_GPT_USE_TIM14!"FALSE"} +#define STM32_GPT_USE_TIM15 ${doc.STM32_GPT_USE_TIM15!"FALSE"} +#define STM32_GPT_USE_TIM16 ${doc.STM32_GPT_USE_TIM16!"FALSE"} +#define STM32_GPT_USE_TIM17 ${doc.STM32_GPT_USE_TIM17!"FALSE"} /* * I2C driver system settings. @@ -178,6 +182,7 @@ #define STM32_ICU_USE_TIM1 ${doc.STM32_ICU_USE_TIM1!"FALSE"} #define STM32_ICU_USE_TIM2 ${doc.STM32_ICU_USE_TIM2!"FALSE"} #define STM32_ICU_USE_TIM3 ${doc.STM32_ICU_USE_TIM3!"FALSE"} +#define STM32_ICU_USE_TIM15 ${doc.STM32_ICU_USE_TIM15!"FALSE"} /* * PWM driver system settings. @@ -185,6 +190,10 @@ #define STM32_PWM_USE_TIM1 ${doc.STM32_PWM_USE_TIM1!"FALSE"} #define STM32_PWM_USE_TIM2 ${doc.STM32_PWM_USE_TIM2!"FALSE"} #define STM32_PWM_USE_TIM3 ${doc.STM32_PWM_USE_TIM3!"FALSE"} +#define STM32_PWM_USE_TIM14 ${doc.STM32_PWM_USE_TIM14!"FALSE"} +#define STM32_PWM_USE_TIM15 ${doc.STM32_PWM_USE_TIM15!"FALSE"} +#define STM32_PWM_USE_TIM16 ${doc.STM32_PWM_USE_TIM16!"FALSE"} +#define STM32_PWM_USE_TIM17 ${doc.STM32_PWM_USE_TIM17!"FALSE"} /* * RTC driver system settings.