Update to ChibiOS 20.3.4, support builds against trunk (#14208)

* Add support for building against ChibiOS svn/trunk. * Swap to 21.6.x * Update to latest branch revision as released version is broken. * Updated configs. * Conf updates. * Updated ChibiOS * Convert STM32L422 to actual L422 ChibiOS platform. * Downgrade to 20.3.4 as ChibiOS 21.6.x is being aborted. * Rollback L422-based boards.
author: Nick Brassel <nick@tzarc.org> 2021-11-03 08:26:40 +1100
committer: GitHub <noreply@github.com> 2021-11-03 08:26:40 +1100
commit: 5da04fb45b0d5cddc6f49f88ea9c6a4037ef82ce (patch)
tree: 6fb7eafbbbef1278200421290659a13d208d7c31 /keyboards/matrix
parent: 387edab52b1c1ab7585c4c1a11d997a6a90a505c (diff)
download: qmk_firmware-5da04fb45b0d5cddc6f49f88ea9c6a4037ef82ce.tar.gz
qmk_firmware-5da04fb45b0d5cddc6f49f88ea9c6a4037ef82ce.zip
2 files changed, 64 insertions, 66 deletions
diff --git a/keyboards/matrix/m20add/mcuconf.h b/keyboards/matrix/m20add/mcuconf.h
index 54a1f2661..00216f690 100644
--- a/keyboards/matrix/m20add/mcuconf.h
+++ b/keyboards/matrix/m20add/mcuconf.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -32,11 +32,15 @@
 */
 #define STM32F4xx_MCUCONF
+#define STM32F411_MCUCONF
 /*
 * HAL driver system settings.
 */
 #define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
 #define STM32_HSI_ENABLED                   TRUE
 #define STM32_LSI_ENABLED                   TRUE
 #define STM32_HSE_ENABLED                   TRUE
@@ -60,9 +64,6 @@
 #define STM32_I2SSRC                        STM32_I2SSRC_CKIN
 #define STM32_PLLI2SN_VALUE                 192
 #define STM32_PLLI2SR_VALUE                 5
-#define STM32_PVD_ENABLE                    FALSE
-#define STM32_PLS                           STM32_PLS_LEV0
-#define STM32_BKPRAM_ENABLE                 FALSE
 /*
 * IRQ system settings.
@@ -82,6 +83,19 @@
 #define STM32_IRQ_EXTI21_PRIORITY           15
 #define STM32_IRQ_EXTI22_PRIORITY           15
+#define STM32_IRQ_TIM1_BRK_TIM9_PRIORITY    7
+#define STM32_IRQ_TIM1_UP_TIM10_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM11_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+#define STM32_IRQ_TIM2_PRIORITY             7
+#define STM32_IRQ_TIM3_PRIORITY             7
+#define STM32_IRQ_TIM4_PRIORITY             7
+#define STM32_IRQ_TIM5_PRIORITY             7
+#define STM32_IRQ_USART1_PRIORITY           12
+#define STM32_IRQ_USART2_PRIORITY           12
+#define STM32_IRQ_USART6_PRIORITY           12
 /*
 * ADC driver system settings.
 */
@@ -101,14 +115,8 @@
 #define STM32_GPT_USE_TIM4                  TRUE
 #define STM32_GPT_USE_TIM5                  FALSE
 #define STM32_GPT_USE_TIM9                  FALSE
+#define STM32_GPT_USE_TIM10                 FALSE
 #define STM32_GPT_USE_TIM11                 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_TIM5_IRQ_PRIORITY         7
-#define STM32_GPT_TIM9_IRQ_PRIORITY         7
-#define STM32_GPT_TIM11_IRQ_PRIORITY        7
 /*
 * I2C driver system settings.
@@ -155,29 +163,28 @@
 #define STM32_ICU_USE_TIM4                  FALSE
 #define STM32_ICU_USE_TIM5                  FALSE
 #define STM32_ICU_USE_TIM9                  FALSE
-#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_USE_TIM10                 FALSE
-#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_USE_TIM11                 FALSE
-#define STM32_ICU_TIM3_IRQ_PRIORITY         7
-#define STM32_ICU_TIM4_IRQ_PRIORITY         7
-#define STM32_ICU_TIM5_IRQ_PRIORITY         7
-#define STM32_ICU_TIM9_IRQ_PRIORITY         7
 /*
 * PWM driver system settings.
 */
-#define STM32_PWM_USE_ADVANCED              FALSE
 #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_TIM5                  FALSE
 #define STM32_PWM_USE_TIM9                  FALSE
-#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_USE_TIM10                 FALSE
-#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_USE_TIM11                 FALSE
-#define STM32_PWM_TIM3_IRQ_PRIORITY         7
-#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+/*
-#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+ * RTC driver system settings.
-#define STM32_PWM_TIM9_IRQ_PRIORITY         7
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
 /*
 * SERIAL driver system settings.
@@ -185,9 +192,6 @@
 #define STM32_SERIAL_USE_USART1             FALSE
 #define STM32_SERIAL_USE_USART2             FALSE
 #define STM32_SERIAL_USE_USART6             FALSE
-#define STM32_SERIAL_USART1_PRIORITY        12
-#define STM32_SERIAL_USART2_PRIORITY        12
-#define STM32_SERIAL_USART6_PRIORITY        12
 /*
 * SPI driver system settings.
@@ -227,9 +231,6 @@
 #define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
 #define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 2)
 #define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
-#define STM32_UART_USART1_IRQ_PRIORITY      12
-#define STM32_UART_USART2_IRQ_PRIORITY      12
-#define STM32_UART_USART6_IRQ_PRIORITY      12
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_USART6_DMA_PRIORITY      0
@@ -241,9 +242,7 @@
 #define STM32_USB_USE_OTG1                  TRUE
 #define STM32_USB_OTG1_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
+#define STM32_USB_HOST_WAKEUP_DURATION      2
-#define STM32_USB_OTG_THREAD_STACK_SIZE     128
-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0
 /*
 * WDG driver system settings.
diff --git a/keyboards/matrix/noah/mcuconf.h b/keyboards/matrix/noah/mcuconf.h
index 54a1f2661..00216f690 100644
--- a/keyboards/matrix/noah/mcuconf.h
+++ b/keyboards/matrix/noah/mcuconf.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -32,11 +32,15 @@
 */
 #define STM32F4xx_MCUCONF
+#define STM32F411_MCUCONF
 /*
 * HAL driver system settings.
 */
 #define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
 #define STM32_HSI_ENABLED                   TRUE
 #define STM32_LSI_ENABLED                   TRUE
 #define STM32_HSE_ENABLED                   TRUE
@@ -60,9 +64,6 @@
 #define STM32_I2SSRC                        STM32_I2SSRC_CKIN
 #define STM32_PLLI2SN_VALUE                 192
 #define STM32_PLLI2SR_VALUE                 5
-#define STM32_PVD_ENABLE                    FALSE
-#define STM32_PLS                           STM32_PLS_LEV0
-#define STM32_BKPRAM_ENABLE                 FALSE
 /*
 * IRQ system settings.
@@ -82,6 +83,19 @@
 #define STM32_IRQ_EXTI21_PRIORITY           15
 #define STM32_IRQ_EXTI22_PRIORITY           15
+#define STM32_IRQ_TIM1_BRK_TIM9_PRIORITY    7
+#define STM32_IRQ_TIM1_UP_TIM10_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM11_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+#define STM32_IRQ_TIM2_PRIORITY             7
+#define STM32_IRQ_TIM3_PRIORITY             7
+#define STM32_IRQ_TIM4_PRIORITY             7
+#define STM32_IRQ_TIM5_PRIORITY             7
+#define STM32_IRQ_USART1_PRIORITY           12
+#define STM32_IRQ_USART2_PRIORITY           12
+#define STM32_IRQ_USART6_PRIORITY           12
 /*
 * ADC driver system settings.
 */
@@ -101,14 +115,8 @@
 #define STM32_GPT_USE_TIM4                  TRUE
 #define STM32_GPT_USE_TIM5                  FALSE
 #define STM32_GPT_USE_TIM9                  FALSE
+#define STM32_GPT_USE_TIM10                 FALSE
 #define STM32_GPT_USE_TIM11                 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_TIM5_IRQ_PRIORITY         7
-#define STM32_GPT_TIM9_IRQ_PRIORITY         7
-#define STM32_GPT_TIM11_IRQ_PRIORITY        7
 /*
 * I2C driver system settings.
@@ -155,29 +163,28 @@
 #define STM32_ICU_USE_TIM4                  FALSE
 #define STM32_ICU_USE_TIM5                  FALSE
 #define STM32_ICU_USE_TIM9                  FALSE
-#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_USE_TIM10                 FALSE
-#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_USE_TIM11                 FALSE
-#define STM32_ICU_TIM3_IRQ_PRIORITY         7
-#define STM32_ICU_TIM4_IRQ_PRIORITY         7
-#define STM32_ICU_TIM5_IRQ_PRIORITY         7
-#define STM32_ICU_TIM9_IRQ_PRIORITY         7
 /*
 * PWM driver system settings.
 */
-#define STM32_PWM_USE_ADVANCED              FALSE
 #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_TIM5                  FALSE
 #define STM32_PWM_USE_TIM9                  FALSE
-#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_USE_TIM10                 FALSE
-#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_USE_TIM11                 FALSE
-#define STM32_PWM_TIM3_IRQ_PRIORITY         7
-#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+/*
-#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+ * RTC driver system settings.
-#define STM32_PWM_TIM9_IRQ_PRIORITY         7
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
 /*
 * SERIAL driver system settings.
@@ -185,9 +192,6 @@
 #define STM32_SERIAL_USE_USART1             FALSE
 #define STM32_SERIAL_USE_USART2             FALSE
 #define STM32_SERIAL_USE_USART6             FALSE
-#define STM32_SERIAL_USART1_PRIORITY        12
-#define STM32_SERIAL_USART2_PRIORITY        12
-#define STM32_SERIAL_USART6_PRIORITY        12
 /*
 * SPI driver system settings.
@@ -227,9 +231,6 @@
 #define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
 #define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 2)
 #define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
-#define STM32_UART_USART1_IRQ_PRIORITY      12
-#define STM32_UART_USART2_IRQ_PRIORITY      12
-#define STM32_UART_USART6_IRQ_PRIORITY      12
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_USART6_DMA_PRIORITY      0
@@ -241,9 +242,7 @@
 #define STM32_USB_USE_OTG1                  TRUE
 #define STM32_USB_OTG1_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
+#define STM32_USB_HOST_WAKEUP_DURATION      2
-#define STM32_USB_OTG_THREAD_STACK_SIZE     128
-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0
 /*
 * WDG driver system settings.
author	Nick Brassel <nick@tzarc.org>	2021-11-03 08:26:40 +1100
committer	GitHub <noreply@github.com>	2021-11-03 08:26:40 +1100
commit	5da04fb45b0d5cddc6f49f88ea9c6a4037ef82ce (patch)
tree	6fb7eafbbbef1278200421290659a13d208d7c31 /keyboards/matrix
parent	387edab52b1c1ab7585c4c1a11d997a6a90a505c (diff)
download	qmk_firmware-5da04fb45b0d5cddc6f49f88ea9c6a4037ef82ce.tar.gz qmk_firmware-5da04fb45b0d5cddc6f49f88ea9c6a4037ef82ce.zip

diff --git a/keyboards/matrix/m20add/mcuconf.h b/keyboards/matrix/m20add/mcuconf.h index 54a1f2661..00216f690 100644 --- a/keyboards/matrix/m20add/mcuconf.h +++ b/keyboards/matrix/m20add/mcuconf.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio	2	ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
3		3
4	Licensed under the Apache License, Version 2.0 (the "License");	4	Licensed under the Apache License, Version 2.0 (the "License");
5	you may not use this file except in compliance with the License.	5	you may not use this file except in compliance with the License.
@@ -32,11 +32,15 @@
32	*/	32	*/
33		33
34	#define STM32F4xx_MCUCONF	34	#define STM32F4xx_MCUCONF
		35	#define STM32F411_MCUCONF
35		36
36	/*	37	/*
37	* HAL driver system settings.	38	* HAL driver system settings.
38	*/	39	*/
39	#define STM32_NO_INIT FALSE	40	#define STM32_NO_INIT FALSE
		41	#define STM32_PVD_ENABLE FALSE
		42	#define STM32_PLS STM32_PLS_LEV0
		43	#define STM32_BKPRAM_ENABLE FALSE
40	#define STM32_HSI_ENABLED TRUE	44	#define STM32_HSI_ENABLED TRUE
41	#define STM32_LSI_ENABLED TRUE	45	#define STM32_LSI_ENABLED TRUE
42	#define STM32_HSE_ENABLED TRUE	46	#define STM32_HSE_ENABLED TRUE
@@ -60,9 +64,6 @@
60	#define STM32_I2SSRC STM32_I2SSRC_CKIN	64	#define STM32_I2SSRC STM32_I2SSRC_CKIN
61	#define STM32_PLLI2SN_VALUE 192	65	#define STM32_PLLI2SN_VALUE 192
62	#define STM32_PLLI2SR_VALUE 5	66	#define STM32_PLLI2SR_VALUE 5
63	#define STM32_PVD_ENABLE FALSE
64	#define STM32_PLS STM32_PLS_LEV0
65	#define STM32_BKPRAM_ENABLE FALSE
66		67
67	/*	68	/*
68	* IRQ system settings.	69	* IRQ system settings.
@@ -82,6 +83,19 @@
82	#define STM32_IRQ_EXTI21_PRIORITY 15	83	#define STM32_IRQ_EXTI21_PRIORITY 15
83	#define STM32_IRQ_EXTI22_PRIORITY 15	84	#define STM32_IRQ_EXTI22_PRIORITY 15
84		85
		86	#define STM32_IRQ_TIM1_BRK_TIM9_PRIORITY 7
		87	#define STM32_IRQ_TIM1_UP_TIM10_PRIORITY 7
		88	#define STM32_IRQ_TIM1_TRGCO_TIM11_PRIORITY 7
		89	#define STM32_IRQ_TIM1_CC_PRIORITY 7
		90	#define STM32_IRQ_TIM2_PRIORITY 7
		91	#define STM32_IRQ_TIM3_PRIORITY 7
		92	#define STM32_IRQ_TIM4_PRIORITY 7
		93	#define STM32_IRQ_TIM5_PRIORITY 7
		94
		95	#define STM32_IRQ_USART1_PRIORITY 12
		96	#define STM32_IRQ_USART2_PRIORITY 12
		97	#define STM32_IRQ_USART6_PRIORITY 12
		98
85	/*	99	/*
86	* ADC driver system settings.	100	* ADC driver system settings.
87	*/	101	*/
@@ -101,14 +115,8 @@
101	#define STM32_GPT_USE_TIM4 TRUE	115	#define STM32_GPT_USE_TIM4 TRUE
102	#define STM32_GPT_USE_TIM5 FALSE	116	#define STM32_GPT_USE_TIM5 FALSE
103	#define STM32_GPT_USE_TIM9 FALSE	117	#define STM32_GPT_USE_TIM9 FALSE
		118	#define STM32_GPT_USE_TIM10 FALSE
104	#define STM32_GPT_USE_TIM11 FALSE	119	#define STM32_GPT_USE_TIM11 FALSE
105	#define STM32_GPT_TIM1_IRQ_PRIORITY 7
106	#define STM32_GPT_TIM2_IRQ_PRIORITY 7
107	#define STM32_GPT_TIM3_IRQ_PRIORITY 7
108	#define STM32_GPT_TIM4_IRQ_PRIORITY 7
109	#define STM32_GPT_TIM5_IRQ_PRIORITY 7
110	#define STM32_GPT_TIM9_IRQ_PRIORITY 7
111	#define STM32_GPT_TIM11_IRQ_PRIORITY 7
112		120
113	/*	121	/*
114	* I2C driver system settings.	122	* I2C driver system settings.
@@ -155,29 +163,28 @@
155	#define STM32_ICU_USE_TIM4 FALSE	163	#define STM32_ICU_USE_TIM4 FALSE
156	#define STM32_ICU_USE_TIM5 FALSE	164	#define STM32_ICU_USE_TIM5 FALSE
157	#define STM32_ICU_USE_TIM9 FALSE	165	#define STM32_ICU_USE_TIM9 FALSE
158	#define STM32_ICU_TIM1_IRQ_PRIORITY 7	166	#define STM32_ICU_USE_TIM10 FALSE
159	#define STM32_ICU_TIM2_IRQ_PRIORITY 7	167	#define STM32_ICU_USE_TIM11 FALSE
160	#define STM32_ICU_TIM3_IRQ_PRIORITY 7
161	#define STM32_ICU_TIM4_IRQ_PRIORITY 7
162	#define STM32_ICU_TIM5_IRQ_PRIORITY 7
163	#define STM32_ICU_TIM9_IRQ_PRIORITY 7
164		168
165	/*	169	/*
166	* PWM driver system settings.	170	* PWM driver system settings.
167	*/	171	*/
168	#define STM32_PWM_USE_ADVANCED FALSE
169	#define STM32_PWM_USE_TIM1 FALSE	172	#define STM32_PWM_USE_TIM1 FALSE
170	#define STM32_PWM_USE_TIM2 FALSE	173	#define STM32_PWM_USE_TIM2 FALSE
171	#define STM32_PWM_USE_TIM3 FALSE	174	#define STM32_PWM_USE_TIM3 FALSE
172	#define STM32_PWM_USE_TIM4 FALSE	175	#define STM32_PWM_USE_TIM4 FALSE
173	#define STM32_PWM_USE_TIM5 FALSE	176	#define STM32_PWM_USE_TIM5 FALSE
174	#define STM32_PWM_USE_TIM9 FALSE	177	#define STM32_PWM_USE_TIM9 FALSE
175	#define STM32_PWM_TIM1_IRQ_PRIORITY 7	178	#define STM32_PWM_USE_TIM10 FALSE
176	#define STM32_PWM_TIM2_IRQ_PRIORITY 7	179	#define STM32_PWM_USE_TIM11 FALSE
177	#define STM32_PWM_TIM3_IRQ_PRIORITY 7	180
178	#define STM32_PWM_TIM4_IRQ_PRIORITY 7	181	/*
179	#define STM32_PWM_TIM5_IRQ_PRIORITY 7	182	* RTC driver system settings.
180	#define STM32_PWM_TIM9_IRQ_PRIORITY 7	183	*/
		184	#define STM32_RTC_PRESA_VALUE 32
		185	#define STM32_RTC_PRESS_VALUE 1024
		186	#define STM32_RTC_CR_INIT 0
		187	#define STM32_RTC_TAMPCR_INIT 0
181		188
182	/*	189	/*
183	* SERIAL driver system settings.	190	* SERIAL driver system settings.
@@ -185,9 +192,6 @@
185	#define STM32_SERIAL_USE_USART1 FALSE	192	#define STM32_SERIAL_USE_USART1 FALSE
186	#define STM32_SERIAL_USE_USART2 FALSE	193	#define STM32_SERIAL_USE_USART2 FALSE
187	#define STM32_SERIAL_USE_USART6 FALSE	194	#define STM32_SERIAL_USE_USART6 FALSE
188	#define STM32_SERIAL_USART1_PRIORITY 12
189	#define STM32_SERIAL_USART2_PRIORITY 12
190	#define STM32_SERIAL_USART6_PRIORITY 12
191		195
192	/*	196	/*
193	* SPI driver system settings.	197	* SPI driver system settings.
@@ -227,9 +231,6 @@
227	#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)	231	#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
228	#define STM32_UART_USART6_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2)	232	#define STM32_UART_USART6_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2)
229	#define STM32_UART_USART6_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)	233	#define STM32_UART_USART6_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)
230	#define STM32_UART_USART1_IRQ_PRIORITY 12
231	#define STM32_UART_USART2_IRQ_PRIORITY 12
232	#define STM32_UART_USART6_IRQ_PRIORITY 12
233	#define STM32_UART_USART1_DMA_PRIORITY 0	234	#define STM32_UART_USART1_DMA_PRIORITY 0
234	#define STM32_UART_USART2_DMA_PRIORITY 0	235	#define STM32_UART_USART2_DMA_PRIORITY 0
235	#define STM32_UART_USART6_DMA_PRIORITY 0	236	#define STM32_UART_USART6_DMA_PRIORITY 0
@@ -241,9 +242,7 @@
241	#define STM32_USB_USE_OTG1 TRUE	242	#define STM32_USB_USE_OTG1 TRUE
242	#define STM32_USB_OTG1_IRQ_PRIORITY 14	243	#define STM32_USB_OTG1_IRQ_PRIORITY 14
243	#define STM32_USB_OTG1_RX_FIFO_SIZE 512	244	#define STM32_USB_OTG1_RX_FIFO_SIZE 512
244	#define STM32_USB_OTG_THREAD_PRIO LOWPRIO	245	#define STM32_USB_HOST_WAKEUP_DURATION 2
245	#define STM32_USB_OTG_THREAD_STACK_SIZE 128
246	#define STM32_USB_OTGFIFO_FILL_BASEPRI 0
247		246
248	/*	247	/*
249	* WDG driver system settings.	248	* WDG driver system settings.


diff --git a/keyboards/matrix/noah/mcuconf.h b/keyboards/matrix/noah/mcuconf.h index 54a1f2661..00216f690 100644 --- a/keyboards/matrix/noah/mcuconf.h +++ b/keyboards/matrix/noah/mcuconf.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio	2	ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
3		3
4	Licensed under the Apache License, Version 2.0 (the "License");	4	Licensed under the Apache License, Version 2.0 (the "License");
5	you may not use this file except in compliance with the License.	5	you may not use this file except in compliance with the License.
@@ -32,11 +32,15 @@
32	*/	32	*/
33		33
34	#define STM32F4xx_MCUCONF	34	#define STM32F4xx_MCUCONF
		35	#define STM32F411_MCUCONF
35		36
36	/*	37	/*
37	* HAL driver system settings.	38	* HAL driver system settings.
38	*/	39	*/
39	#define STM32_NO_INIT FALSE	40	#define STM32_NO_INIT FALSE
		41	#define STM32_PVD_ENABLE FALSE
		42	#define STM32_PLS STM32_PLS_LEV0
		43	#define STM32_BKPRAM_ENABLE FALSE
40	#define STM32_HSI_ENABLED TRUE	44	#define STM32_HSI_ENABLED TRUE
41	#define STM32_LSI_ENABLED TRUE	45	#define STM32_LSI_ENABLED TRUE
42	#define STM32_HSE_ENABLED TRUE	46	#define STM32_HSE_ENABLED TRUE
@@ -60,9 +64,6 @@
60	#define STM32_I2SSRC STM32_I2SSRC_CKIN	64	#define STM32_I2SSRC STM32_I2SSRC_CKIN
61	#define STM32_PLLI2SN_VALUE 192	65	#define STM32_PLLI2SN_VALUE 192
62	#define STM32_PLLI2SR_VALUE 5	66	#define STM32_PLLI2SR_VALUE 5
63	#define STM32_PVD_ENABLE FALSE
64	#define STM32_PLS STM32_PLS_LEV0
65	#define STM32_BKPRAM_ENABLE FALSE
66		67
67	/*	68	/*
68	* IRQ system settings.	69	* IRQ system settings.
@@ -82,6 +83,19 @@
82	#define STM32_IRQ_EXTI21_PRIORITY 15	83	#define STM32_IRQ_EXTI21_PRIORITY 15
83	#define STM32_IRQ_EXTI22_PRIORITY 15	84	#define STM32_IRQ_EXTI22_PRIORITY 15
84		85
		86	#define STM32_IRQ_TIM1_BRK_TIM9_PRIORITY 7
		87	#define STM32_IRQ_TIM1_UP_TIM10_PRIORITY 7
		88	#define STM32_IRQ_TIM1_TRGCO_TIM11_PRIORITY 7
		89	#define STM32_IRQ_TIM1_CC_PRIORITY 7
		90	#define STM32_IRQ_TIM2_PRIORITY 7
		91	#define STM32_IRQ_TIM3_PRIORITY 7
		92	#define STM32_IRQ_TIM4_PRIORITY 7
		93	#define STM32_IRQ_TIM5_PRIORITY 7
		94
		95	#define STM32_IRQ_USART1_PRIORITY 12
		96	#define STM32_IRQ_USART2_PRIORITY 12
		97	#define STM32_IRQ_USART6_PRIORITY 12
		98
85	/*	99	/*
86	* ADC driver system settings.	100	* ADC driver system settings.
87	*/	101	*/
@@ -101,14 +115,8 @@
101	#define STM32_GPT_USE_TIM4 TRUE	115	#define STM32_GPT_USE_TIM4 TRUE
102	#define STM32_GPT_USE_TIM5 FALSE	116	#define STM32_GPT_USE_TIM5 FALSE
103	#define STM32_GPT_USE_TIM9 FALSE	117	#define STM32_GPT_USE_TIM9 FALSE
		118	#define STM32_GPT_USE_TIM10 FALSE
104	#define STM32_GPT_USE_TIM11 FALSE	119	#define STM32_GPT_USE_TIM11 FALSE
105	#define STM32_GPT_TIM1_IRQ_PRIORITY 7
106	#define STM32_GPT_TIM2_IRQ_PRIORITY 7
107	#define STM32_GPT_TIM3_IRQ_PRIORITY 7
108	#define STM32_GPT_TIM4_IRQ_PRIORITY 7
109	#define STM32_GPT_TIM5_IRQ_PRIORITY 7
110	#define STM32_GPT_TIM9_IRQ_PRIORITY 7
111	#define STM32_GPT_TIM11_IRQ_PRIORITY 7
112		120
113	/*	121	/*
114	* I2C driver system settings.	122	* I2C driver system settings.
@@ -155,29 +163,28 @@
155	#define STM32_ICU_USE_TIM4 FALSE	163	#define STM32_ICU_USE_TIM4 FALSE
156	#define STM32_ICU_USE_TIM5 FALSE	164	#define STM32_ICU_USE_TIM5 FALSE
157	#define STM32_ICU_USE_TIM9 FALSE	165	#define STM32_ICU_USE_TIM9 FALSE
158	#define STM32_ICU_TIM1_IRQ_PRIORITY 7	166	#define STM32_ICU_USE_TIM10 FALSE
159	#define STM32_ICU_TIM2_IRQ_PRIORITY 7	167	#define STM32_ICU_USE_TIM11 FALSE
160	#define STM32_ICU_TIM3_IRQ_PRIORITY 7
161	#define STM32_ICU_TIM4_IRQ_PRIORITY 7
162	#define STM32_ICU_TIM5_IRQ_PRIORITY 7
163	#define STM32_ICU_TIM9_IRQ_PRIORITY 7
164		168
165	/*	169	/*
166	* PWM driver system settings.	170	* PWM driver system settings.
167	*/	171	*/
168	#define STM32_PWM_USE_ADVANCED FALSE
169	#define STM32_PWM_USE_TIM1 FALSE	172	#define STM32_PWM_USE_TIM1 FALSE
170	#define STM32_PWM_USE_TIM2 FALSE	173	#define STM32_PWM_USE_TIM2 FALSE
171	#define STM32_PWM_USE_TIM3 FALSE	174	#define STM32_PWM_USE_TIM3 FALSE
172	#define STM32_PWM_USE_TIM4 FALSE	175	#define STM32_PWM_USE_TIM4 FALSE
173	#define STM32_PWM_USE_TIM5 FALSE	176	#define STM32_PWM_USE_TIM5 FALSE
174	#define STM32_PWM_USE_TIM9 FALSE	177	#define STM32_PWM_USE_TIM9 FALSE
175	#define STM32_PWM_TIM1_IRQ_PRIORITY 7	178	#define STM32_PWM_USE_TIM10 FALSE
176	#define STM32_PWM_TIM2_IRQ_PRIORITY 7	179	#define STM32_PWM_USE_TIM11 FALSE
177	#define STM32_PWM_TIM3_IRQ_PRIORITY 7	180
178	#define STM32_PWM_TIM4_IRQ_PRIORITY 7	181	/*
179	#define STM32_PWM_TIM5_IRQ_PRIORITY 7	182	* RTC driver system settings.
180	#define STM32_PWM_TIM9_IRQ_PRIORITY 7	183	*/
		184	#define STM32_RTC_PRESA_VALUE 32
		185	#define STM32_RTC_PRESS_VALUE 1024
		186	#define STM32_RTC_CR_INIT 0
		187	#define STM32_RTC_TAMPCR_INIT 0
181		188
182	/*	189	/*
183	* SERIAL driver system settings.	190	* SERIAL driver system settings.
@@ -185,9 +192,6 @@
185	#define STM32_SERIAL_USE_USART1 FALSE	192	#define STM32_SERIAL_USE_USART1 FALSE
186	#define STM32_SERIAL_USE_USART2 FALSE	193	#define STM32_SERIAL_USE_USART2 FALSE
187	#define STM32_SERIAL_USE_USART6 FALSE	194	#define STM32_SERIAL_USE_USART6 FALSE
188	#define STM32_SERIAL_USART1_PRIORITY 12
189	#define STM32_SERIAL_USART2_PRIORITY 12
190	#define STM32_SERIAL_USART6_PRIORITY 12
191		195
192	/*	196	/*
193	* SPI driver system settings.	197	* SPI driver system settings.
@@ -227,9 +231,6 @@
227	#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)	231	#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
228	#define STM32_UART_USART6_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2)	232	#define STM32_UART_USART6_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2)
229	#define STM32_UART_USART6_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)	233	#define STM32_UART_USART6_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)
230	#define STM32_UART_USART1_IRQ_PRIORITY 12
231	#define STM32_UART_USART2_IRQ_PRIORITY 12
232	#define STM32_UART_USART6_IRQ_PRIORITY 12
233	#define STM32_UART_USART1_DMA_PRIORITY 0	234	#define STM32_UART_USART1_DMA_PRIORITY 0
234	#define STM32_UART_USART2_DMA_PRIORITY 0	235	#define STM32_UART_USART2_DMA_PRIORITY 0
235	#define STM32_UART_USART6_DMA_PRIORITY 0	236	#define STM32_UART_USART6_DMA_PRIORITY 0
@@ -241,9 +242,7 @@
241	#define STM32_USB_USE_OTG1 TRUE	242	#define STM32_USB_USE_OTG1 TRUE
242	#define STM32_USB_OTG1_IRQ_PRIORITY 14	243	#define STM32_USB_OTG1_IRQ_PRIORITY 14
243	#define STM32_USB_OTG1_RX_FIFO_SIZE 512	244	#define STM32_USB_OTG1_RX_FIFO_SIZE 512
244	#define STM32_USB_OTG_THREAD_PRIO LOWPRIO	245	#define STM32_USB_HOST_WAKEUP_DURATION 2
245	#define STM32_USB_OTG_THREAD_STACK_SIZE 128
246	#define STM32_USB_OTGFIFO_FILL_BASEPRI 0
247		246
248	/*	247	/*
249	* WDG driver system settings.	248	* WDG driver system settings.