aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2019-01-05 10:45:52 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2019-01-05 10:45:52 +0000
commit874f246e6f54ee7db66911006e9005ad76b5147b (patch)
tree2a236a4a7dd706672098898ee933e68892760c20 /demos
parent523aea591e7f922419d4513229ae877584748176 (diff)
downloadChibiOS-874f246e6f54ee7db66911006e9005ad76b5147b.tar.gz
ChibiOS-874f246e6f54ee7db66911006e9005ad76b5147b.tar.bz2
ChibiOS-874f246e6f54ee7db66911006e9005ad76b5147b.zip
New timers added to STM32 GPT, ICU and PWM drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12525 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'demos')
-rw-r--r--demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h4
-rw-r--r--demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h19
2 files changed, 17 insertions, 6 deletions
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
index 34923a64c..3a12af333 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
@@ -100,7 +100,7 @@
* @brief Enables the ICU subsystem.
*/
#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU FALSE
+#define HAL_USE_ICU TRUE
#endif
/**
@@ -121,7 +121,7 @@
* @brief Enables the PWM subsystem.
*/
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM FALSE
+#define HAL_USE_PWM TRUE
#endif
/**
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h
index 4e2cbd381..e6326d991 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/mcuconf.h
@@ -137,15 +137,15 @@
/*
* GPT driver system settings.
*/
-#define STM32_GPT_USE_TIM1 TRUE
+#define STM32_GPT_USE_TIM1 FALSE
#define STM32_GPT_USE_TIM2 FALSE
#define STM32_GPT_USE_TIM3 FALSE
#define STM32_GPT_USE_TIM4 FALSE
#define STM32_GPT_USE_TIM6 FALSE
#define STM32_GPT_USE_TIM7 FALSE
#define STM32_GPT_USE_TIM8 FALSE
-#define STM32_GPT_USE_TIM15 TRUE
-#define STM32_GPT_USE_TIM16 TRUE
+#define STM32_GPT_USE_TIM15 FALSE
+#define STM32_GPT_USE_TIM16 FALSE
#define STM32_GPT_USE_TIM17 TRUE
#define STM32_GPT_TIM2_IRQ_PRIORITY 7
#define STM32_GPT_TIM3_IRQ_PRIORITY 7
@@ -153,6 +153,9 @@
#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.
@@ -175,24 +178,32 @@
#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_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 FALSE
+#define STM32_PWM_USE_TIM1 TRUE
#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_TIM17 FALSE
#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.