diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-19 08:07:44 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-19 08:07:44 +0000 |
| commit | f8555ffa3f85b0588b20914fb2e15207336b7fa4 (patch) | |
| tree | ab212b331b6c99e2ae210546a07c9d7d172641c9 /testhal | |
| parent | e877388d6da00a2f52ab1661a642f9e779022b15 (diff) | |
| download | ChibiOS-f8555ffa3f85b0588b20914fb2e15207336b7fa4.tar.gz ChibiOS-f8555ffa3f85b0588b20914fb2e15207336b7fa4.tar.bz2 ChibiOS-f8555ffa3f85b0588b20914fb2e15207336b7fa4.zip | |
Re-aligned mcuconf.h files for F0 devices.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11035 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
| -rw-r--r-- | testhal/STM32/STM32F0xx/ADC/mcuconf.h | 21 | ||||
| -rw-r--r-- | testhal/STM32/STM32F0xx/CAN/mcuconf.h | 29 | ||||
| -rw-r--r-- | testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h | 21 | ||||
| -rw-r--r-- | testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h | 21 | ||||
| -rw-r--r-- | testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h | 30 | ||||
| -rw-r--r-- | testhal/STM32/STM32F0xx/WDG/mcuconf.h | 21 | ||||
| -rw-r--r-- | testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h | 18 |
7 files changed, 78 insertions, 83 deletions
diff --git a/testhal/STM32/STM32F0xx/ADC/mcuconf.h b/testhal/STM32/STM32F0xx/ADC/mcuconf.h index 262aa9d1b..e98772f82 100644 --- a/testhal/STM32/STM32F0xx/ADC/mcuconf.h +++ b/testhal/STM32/STM32F0xx/ADC/mcuconf.h @@ -41,7 +41,6 @@ #define STM32_PLS STM32_PLS_LEV0
#define STM32_HSI_ENABLED TRUE
#define STM32_HSI14_ENABLED TRUE
-#define STM32_HSI48_ENABLED FALSE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED FALSE
@@ -61,6 +60,16 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_USE_ADC1 TRUE
@@ -70,16 +79,6 @@ #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
diff --git a/testhal/STM32/STM32F0xx/CAN/mcuconf.h b/testhal/STM32/STM32F0xx/CAN/mcuconf.h index 4b96dfe28..f38cd53ad 100644 --- a/testhal/STM32/STM32F0xx/CAN/mcuconf.h +++ b/testhal/STM32/STM32F0xx/CAN/mcuconf.h @@ -61,6 +61,16 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_USE_ADC1 FALSE
@@ -76,14 +86,17 @@ #define STM32_CAN_CAN1_IRQ_PRIORITY 3
/*
- * EXT driver system settings.
+ * DAC driver system settings.
*/
-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
+#define STM32_DAC_DUAL_MODE FALSE
+#define STM32_DAC_USE_DAC1_CH1 FALSE
+#define STM32_DAC_USE_DAC1_CH2 FALSE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 2
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 2
+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2
+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY 2
+#define STM32_DAC_DAC1_CH1_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
+#define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
/*
* GPT driver system settings.
@@ -91,10 +104,12 @@ #define STM32_GPT_USE_TIM1 FALSE
#define STM32_GPT_USE_TIM2 FALSE
#define STM32_GPT_USE_TIM3 FALSE
+#define STM32_GPT_USE_TIM6 FALSE
#define STM32_GPT_USE_TIM14 FALSE
#define STM32_GPT_TIM1_IRQ_PRIORITY 2
#define STM32_GPT_TIM2_IRQ_PRIORITY 2
#define STM32_GPT_TIM3_IRQ_PRIORITY 2
+#define STM32_GPT_TIM6_IRQ_PRIORITY 2
#define STM32_GPT_TIM14_IRQ_PRIORITY 2
/*
diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h index ac13f86b7..514fc2638 100644 --- a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h +++ b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h @@ -41,7 +41,6 @@ #define STM32_PLS STM32_PLS_LEV0
#define STM32_HSI_ENABLED TRUE
#define STM32_HSI14_ENABLED TRUE
-#define STM32_HSI48_ENABLED FALSE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED FALSE
@@ -61,6 +60,16 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_USE_ADC1 FALSE
@@ -70,16 +79,6 @@ #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 TRUE
diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h index 21b50a738..6379c3bd5 100644 --- a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h +++ b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h @@ -41,7 +41,6 @@ #define STM32_PLS STM32_PLS_LEV0
#define STM32_HSI_ENABLED TRUE
#define STM32_HSI14_ENABLED TRUE
-#define STM32_HSI48_ENABLED FALSE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED FALSE
@@ -61,6 +60,16 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_USE_ADC1 FALSE
@@ -70,16 +79,6 @@ #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
diff --git a/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h index 6ef61bb64..145e4e98a 100644 --- a/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h +++ b/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h @@ -61,6 +61,16 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_USE_ADC1 FALSE
@@ -79,35 +89,27 @@ * DAC driver system settings.
*/
#define STM32_DAC_DUAL_MODE FALSE
-#define STM32_DAC_USE_DAC1_CH1 TRUE
-#define STM32_DAC_USE_DAC1_CH2 TRUE
-#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 10
-#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 10
+#define STM32_DAC_USE_DAC1_CH1 FALSE
+#define STM32_DAC_USE_DAC1_CH2 FALSE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 2
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 2
#define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2
#define STM32_DAC_DAC1_CH2_DMA_PRIORITY 2
#define STM32_DAC_DAC1_CH1_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
#define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
#define STM32_GPT_USE_TIM2 FALSE
#define STM32_GPT_USE_TIM3 FALSE
+#define STM32_GPT_USE_TIM6 FALSE
#define STM32_GPT_USE_TIM14 FALSE
#define STM32_GPT_TIM1_IRQ_PRIORITY 2
#define STM32_GPT_TIM2_IRQ_PRIORITY 2
#define STM32_GPT_TIM3_IRQ_PRIORITY 2
+#define STM32_GPT_TIM6_IRQ_PRIORITY 2
#define STM32_GPT_TIM14_IRQ_PRIORITY 2
/*
diff --git a/testhal/STM32/STM32F0xx/WDG/mcuconf.h b/testhal/STM32/STM32F0xx/WDG/mcuconf.h index 8a2324cac..0d28e1d75 100644 --- a/testhal/STM32/STM32F0xx/WDG/mcuconf.h +++ b/testhal/STM32/STM32F0xx/WDG/mcuconf.h @@ -41,7 +41,6 @@ #define STM32_PLS STM32_PLS_LEV0
#define STM32_HSI_ENABLED TRUE
#define STM32_HSI14_ENABLED TRUE
-#define STM32_HSI48_ENABLED FALSE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED FALSE
@@ -61,6 +60,16 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_USE_ADC1 FALSE
@@ -70,16 +79,6 @@ #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h index 3edc757af..49aaf37d1 100644 --- a/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h +++ b/testhal/STM32/multi/PAL/cfg-stm32f051_discovery/mcuconf.h @@ -79,24 +79,6 @@ #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
/*
- * DAC driver system settings.
- */
-#define STM32_DAC_USE_DAC1_CH1 FALSE
-#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 10
-#define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2
-#define STM32_DAC_DAC1_CH1_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
-
-/*
- * EXT driver system settings.
- */
-#define STM32_IRQ_EXTI0_1_PRIORITY 3
-#define STM32_IRQ_EXTI2_3_PRIORITY 3
-#define STM32_IRQ_EXTI4_15_PRIORITY 3
-#define STM32_IRQ_EXTI16_PRIORITY 3
-#define STM32_IRQ_EXTI17_20_PRIORITY 3
-#define STM32_IRQ_EXTI21_22_PRIORITY 3
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
|