diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-09-03 14:29:18 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-09-03 14:29:18 +0000 |
| commit | 4b148d3cbcd338dd5d72fac683e712f448d08341 (patch) | |
| tree | 4407c437e72a9bef93e903ab6a19891a3874397b | |
| parent | 16e2a55bf42f532404cddd8ddbc7cbee38c39572 (diff) | |
| download | ChibiOS-4b148d3cbcd338dd5d72fac683e712f448d08341.tar.gz ChibiOS-4b148d3cbcd338dd5d72fac683e712f448d08341.tar.bz2 ChibiOS-4b148d3cbcd338dd5d72fac683e712f448d08341.zip | |
Aligned some mcuconf.h files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10544 35acf78f-673a-0410-8e92-d51de3d6d3f4
4 files changed, 37 insertions, 19 deletions
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/mcuconf.h index 8f35f3572..c1adf2bd0 100644 --- a/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/mcuconf.h +++ b/testhal/STM32/multi/PAL/cfg-stm32f303_discovery/mcuconf.h @@ -259,7 +259,7 @@ /*
* USB driver system settings.
*/
-#define STM32_USB_USE_USB1 TRUE
+#define STM32_USB_USE_USB1 FALSE
#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE
#define STM32_USB_USB1_HP_IRQ_PRIORITY 13
#define STM32_USB_USB1_LP_IRQ_PRIORITY 14
diff --git a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/mcuconf.h index d509d6260..fc3f3c402 100755 --- a/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/mcuconf.h +++ b/testhal/STM32/multi/PAL/cfg-stm32l151_discovery/mcuconf.h @@ -193,7 +193,7 @@ /*
* USB driver system settings.
*/
-#define STM32_USB_USE_USB1 TRUE
+#define STM32_USB_USE_USB1 FALSE
#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE
#define STM32_USB_USB1_HP_IRQ_PRIORITY 13
#define STM32_USB_USB1_LP_IRQ_PRIORITY 14
diff --git a/testhal/STM32/multi/USB_CDC/cfg-stm32f303_discovery/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg-stm32f303_discovery/mcuconf.h index 0bcab46c8..8f35f3572 100644 --- a/testhal/STM32/multi/USB_CDC/cfg-stm32f303_discovery/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg-stm32f303_discovery/mcuconf.h @@ -67,6 +67,25 @@ #define STM32_USBPRE STM32_USBPRE_DIV1P5
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY 6
+#define STM32_IRQ_EXTI1_PRIORITY 6
+#define STM32_IRQ_EXTI2_PRIORITY 6
+#define STM32_IRQ_EXTI3_PRIORITY 6
+#define STM32_IRQ_EXTI4_PRIORITY 6
+#define STM32_IRQ_EXTI5_9_PRIORITY 6
+#define STM32_IRQ_EXTI10_15_PRIORITY 6
+#define STM32_IRQ_EXTI16_PRIORITY 6
+#define STM32_IRQ_EXTI17_PRIORITY 6
+#define STM32_IRQ_EXTI18_PRIORITY 6
+#define STM32_IRQ_EXTI19_PRIORITY 6
+#define STM32_IRQ_EXTI20_PRIORITY 6
+#define STM32_IRQ_EXTI21_22_29_PRIORITY 6
+#define STM32_IRQ_EXTI30_32_PRIORITY 6
+#define STM32_IRQ_EXTI33_PRIORITY 6
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_DUAL_MODE FALSE
diff --git a/testhal/STM32/multi/USB_CDC/cfg-stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg-stm32l476_discovery/mcuconf.h index 713bc0e85..1c4e0a88d 100644 --- a/testhal/STM32/multi/USB_CDC/cfg-stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg-stm32l476_discovery/mcuconf.h @@ -92,6 +92,22 @@ #define STM32_RTCSEL STM32_RTCSEL_LSI
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY 6
+#define STM32_IRQ_EXTI1_PRIORITY 6
+#define STM32_IRQ_EXTI2_PRIORITY 6
+#define STM32_IRQ_EXTI3_PRIORITY 6
+#define STM32_IRQ_EXTI4_PRIORITY 6
+#define STM32_IRQ_EXTI5_9_PRIORITY 6
+#define STM32_IRQ_EXTI10_15_PRIORITY 6
+#define STM32_IRQ_EXTI1635_38_PRIORITY 6
+#define STM32_IRQ_EXTI18_PRIORITY 6
+#define STM32_IRQ_EXTI19_PRIORITY 6
+#define STM32_IRQ_EXTI20_PRIORITY 6
+#define STM32_IRQ_EXTI2122_PRIORITY 15
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_DUAL_MODE FALSE
@@ -132,23 +148,6 @@ #define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI1_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI2_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI3_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI4_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI18_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI19_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI20_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI2122_IRQ_PRIORITY 15
-
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
|