1 files changed, 22 insertions, 166 deletions
diff --git a/keyboards/geekboards/macropad_v2/mcuconf.h b/keyboards/geekboards/macropad_v2/mcuconf.h
index 271bd570b..7f21a800c 100644
--- a/keyboards/geekboards/macropad_v2/mcuconf.h
+++ b/keyboards/geekboards/macropad_v2/mcuconf.h
@@ -1,178 +1,34 @@
-/*
+/* Copyright 2020 QMK
-    ChibiOS - Copyright (C) 2006..2015 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.
-    You may obtain a copy of the License at
-        http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-#ifndef _MCUCONF_H_
-#define _MCUCONF_H_
-/*
- * STM32F0xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the whole
- * driver is enabled in halconf.h.
 *
- * IRQ priorities:
+ * This program is free software: you can redistribute it and/or modify
- * 3...0       Lowest...Highest.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
 *
- * DMA priorities:
+ * This program is distributed in the hope that it will be useful,
- * 0...3        Lowest...Highest.
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- */
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
-#define STM32F0xx_MCUCONF
+ *
-// #define STM32F070xB
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-/*
- * HAL driver system settings.
- */
-#define STM32_NO_INIT                       FALSE
-#define STM32_PVD_ENABLE                    FALSE
-#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
-#define STM32_SW                            STM32_SW_PLL
-#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
-#define STM32_PREDIV_VALUE                  1
-#define STM32_PLLMUL_VALUE                  12
-#define STM32_HPRE                          STM32_HPRE_DIV1
-#define STM32_PPRE                          STM32_PPRE_DIV1
-#define STM32_ADCSW                         STM32_ADCSW_HSI14
-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
-#define STM32_ADCSW                         STM32_ADCSW_HSI14
-#define STM32_USBSW                         STM32_USBSW_HSI48
-#define STM32_CECSW                         STM32_CECSW_HSI
-#define STM32_I2C1SW                        STM32_I2C1SW_HSI
-#define STM32_USART1SW                      STM32_USART1SW_PCLK
-#define STM32_RTCSEL                        STM32_RTCSEL_LSI
-/*
- * ADC driver system settings.
- */
-#define STM32_ADC_USE_ADC1                  FALSE
-#define STM32_ADC_ADC1_DMA_PRIORITY         2
-#define STM32_ADC_IRQ_PRIORITY              2
-#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
-/*
- * 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_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_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_TIM14_IRQ_PRIORITY        2
-/*
- * I2C driver system settings.
- */
-#define STM32_I2C_USE_I2C1                  TRUE
-#define STM32_I2C_USE_I2C2                  FALSE
-#define STM32_I2C_BUSY_TIMEOUT              50
-#define STM32_I2C_I2C1_IRQ_PRIORITY         3
-#define STM32_I2C_I2C2_IRQ_PRIORITY         3
-#define STM32_I2C_USE_DMA                   TRUE
-#define STM32_I2C_I2C1_DMA_PRIORITY         1
-#define STM32_I2C_I2C2_DMA_PRIORITY         1
-#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
-#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
-/*
- * ICU driver system settings.
 */
-#define STM32_ICU_USE_TIM1                  FALSE
-#define STM32_ICU_USE_TIM2                  FALSE
-#define STM32_ICU_USE_TIM3                  FALSE
-#define STM32_ICU_TIM1_IRQ_PRIORITY         3
-#define STM32_ICU_TIM2_IRQ_PRIORITY         3
-#define STM32_ICU_TIM3_IRQ_PRIORITY         3
 /*
- * PWM driver system settings.
+ * This file was auto-generated by:
+ *    `qmk chibios-confupdate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
 */
-#define STM32_PWM_USE_ADVANCED              FALSE
-#define STM32_PWM_USE_TIM1                  FALSE
-#define STM32_PWM_USE_TIM2                  FALSE
-#define STM32_PWM_USE_TIM3                  TRUE
-#define STM32_PWM_TIM1_IRQ_PRIORITY         3
-#define STM32_PWM_TIM2_IRQ_PRIORITY         3
-#define STM32_PWM_TIM3_IRQ_PRIORITY         3
-/*
+#pragma once
- * SERIAL driver system settings.
- */
-#define STM32_SERIAL_USE_USART1             FALSE
-#define STM32_SERIAL_USE_USART2             FALSE
-#define STM32_SERIAL_USART1_PRIORITY        3
-#define STM32_SERIAL_USART2_PRIORITY        3
-/*
+#include_next <mcuconf.h>
- * SPI driver system settings.
- */
-#define STM32_SPI_USE_SPI1                  TRUE
-#define STM32_SPI_USE_SPI2                  FALSE
-#define STM32_SPI_SPI1_DMA_PRIORITY         1
-#define STM32_SPI_SPI2_DMA_PRIORITY         1
-#define STM32_SPI_SPI1_IRQ_PRIORITY         2
-#define STM32_SPI_SPI2_IRQ_PRIORITY         2
-#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
-#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
-// #define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
-// #define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
-#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
-/*
+#undef STM32_I2C_USE_I2C1
- * ST driver system settings.
+#define STM32_I2C_USE_I2C1 TRUE
- */
-#define STM32_ST_IRQ_PRIORITY               2
-#define STM32_ST_USE_TIMER                  2
-/*
+#undef STM32_PWM_USE_TIM3
- * UART driver system settings.
+#define STM32_PWM_USE_TIM3 TRUE
- */
-#define STM32_UART_USE_USART1               FALSE
-#define STM32_UART_USE_USART2               FALSE
-#define STM32_UART_USART1_IRQ_PRIORITY      3
-#define STM32_UART_USART2_IRQ_PRIORITY      3
-#define STM32_UART_USART1_DMA_PRIORITY      0
-#define STM32_UART_USART2_DMA_PRIORITY      0
-#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
-/*
+#undef STM32_SPI_USE_SPI1
- * USB driver system settings.
+#define STM32_SPI_USE_SPI1 TRUE
- */
-#define STM32_USB_USE_USB1                  TRUE
-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
-#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
-#endif /* _MCUCONF_H_ */

diff --git a/keyboards/geekboards/macropad_v2/mcuconf.h b/keyboards/geekboards/macropad_v2/mcuconf.h index 271bd570b..7f21a800c 100644 --- a/keyboards/geekboards/macropad_v2/mcuconf.h +++ b/keyboards/geekboards/macropad_v2/mcuconf.h
@@ -1,178 +1,34 @@
1	/*	1	/* Copyright 2020 QMK
2	ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
3
4	Licensed under the Apache License, Version 2.0 (the "License");
5	you may not use this file except in compliance with the License.
6	You may obtain a copy of the License at
7
8	http://www.apache.org/licenses/LICENSE-2.0
9
10	Unless required by applicable law or agreed to in writing, software
11	distributed under the License is distributed on an "AS IS" BASIS,
12	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	See the License for the specific language governing permissions and
14	limitations under the License.
15	*/
16
17	#ifndef _MCUCONF_H_
18	#define _MCUCONF_H_
19
20	/*
21	* STM32F0xx drivers configuration.
22	* The following settings override the default settings present in
23	* the various device driver implementation headers.
24	* Note that the settings for each driver only have effect if the whole
25	* driver is enabled in halconf.h.
26	*	2	*
27	* IRQ priorities:	3	* This program is free software: you can redistribute it and/or modify
28	* 3...0 Lowest...Highest.	4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
29	*	7	*
30	* DMA priorities:	8	* This program is distributed in the hope that it will be useful,
31	* 0...3 Lowest...Highest.	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
32	*/	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
33		11	* GNU General Public License for more details.
34	#define STM32F0xx_MCUCONF	12	*
35	// #define STM32F070xB	13	* You should have received a copy of the GNU General Public License
36		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
37	/*
38	* HAL driver system settings.
39	*/
40	#define STM32_NO_INIT FALSE
41	#define STM32_PVD_ENABLE FALSE
42	#define STM32_PLS STM32_PLS_LEV0
43	#define STM32_HSI_ENABLED TRUE
44	#define STM32_HSI14_ENABLED TRUE
45	#define STM32_HSI48_ENABLED FALSE
46	#define STM32_LSI_ENABLED TRUE
47	#define STM32_HSE_ENABLED FALSE
48	#define STM32_LSE_ENABLED FALSE
49	#define STM32_SW STM32_SW_PLL
50	#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2
51	#define STM32_PREDIV_VALUE 1
52	#define STM32_PLLMUL_VALUE 12
53	#define STM32_HPRE STM32_HPRE_DIV1
54	#define STM32_PPRE STM32_PPRE_DIV1
55	#define STM32_ADCSW STM32_ADCSW_HSI14
56	#define STM32_ADCPRE STM32_ADCPRE_DIV4
57	#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
58	#define STM32_ADCPRE STM32_ADCPRE_DIV4
59	#define STM32_ADCSW STM32_ADCSW_HSI14
60	#define STM32_USBSW STM32_USBSW_HSI48
61	#define STM32_CECSW STM32_CECSW_HSI
62	#define STM32_I2C1SW STM32_I2C1SW_HSI
63	#define STM32_USART1SW STM32_USART1SW_PCLK
64	#define STM32_RTCSEL STM32_RTCSEL_LSI
65
66	/*
67	* ADC driver system settings.
68	*/
69	#define STM32_ADC_USE_ADC1 FALSE
70	#define STM32_ADC_ADC1_DMA_PRIORITY 2
71	#define STM32_ADC_IRQ_PRIORITY 2
72	#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2
73
74	/*
75	* EXT driver system settings.
76	*/
77	#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3
78	#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
79	#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
80	#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
81	#define STM32_EXT_EXTI17_IRQ_PRIORITY 3
82
83	/*
84	* GPT driver system settings.
85	*/
86	#define STM32_GPT_USE_TIM1 FALSE
87	#define STM32_GPT_USE_TIM2 FALSE
88	#define STM32_GPT_USE_TIM3 FALSE
89	#define STM32_GPT_USE_TIM14 FALSE
90	#define STM32_GPT_TIM1_IRQ_PRIORITY 2
91	#define STM32_GPT_TIM2_IRQ_PRIORITY 2
92	#define STM32_GPT_TIM3_IRQ_PRIORITY 2
93	#define STM32_GPT_TIM14_IRQ_PRIORITY 2
94
95	/*
96	* I2C driver system settings.
97	*/
98	#define STM32_I2C_USE_I2C1 TRUE
99	#define STM32_I2C_USE_I2C2 FALSE
100	#define STM32_I2C_BUSY_TIMEOUT 50
101	#define STM32_I2C_I2C1_IRQ_PRIORITY 3
102	#define STM32_I2C_I2C2_IRQ_PRIORITY 3
103	#define STM32_I2C_USE_DMA TRUE
104	#define STM32_I2C_I2C1_DMA_PRIORITY 1
105	#define STM32_I2C_I2C2_DMA_PRIORITY 1
106	#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
107	#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
108	#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
109
110	/*
111	* ICU driver system settings.
112	*/	15	*/
113	#define STM32_ICU_USE_TIM1 FALSE
114	#define STM32_ICU_USE_TIM2 FALSE
115	#define STM32_ICU_USE_TIM3 FALSE
116	#define STM32_ICU_TIM1_IRQ_PRIORITY 3
117	#define STM32_ICU_TIM2_IRQ_PRIORITY 3
118	#define STM32_ICU_TIM3_IRQ_PRIORITY 3
119		16
120	/*	17	/*
121	* PWM driver system settings.	18	* This file was auto-generated by:
		19	* `qmk chibios-confupdate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
122	*/	20	*/
123	#define STM32_PWM_USE_ADVANCED FALSE
124	#define STM32_PWM_USE_TIM1 FALSE
125	#define STM32_PWM_USE_TIM2 FALSE
126	#define STM32_PWM_USE_TIM3 TRUE
127	#define STM32_PWM_TIM1_IRQ_PRIORITY 3
128	#define STM32_PWM_TIM2_IRQ_PRIORITY 3
129	#define STM32_PWM_TIM3_IRQ_PRIORITY 3
130		21
131	/*	22	#pragma once
132	* SERIAL driver system settings.
133	*/
134	#define STM32_SERIAL_USE_USART1 FALSE
135	#define STM32_SERIAL_USE_USART2 FALSE
136	#define STM32_SERIAL_USART1_PRIORITY 3
137	#define STM32_SERIAL_USART2_PRIORITY 3
138		23
139	/*	24	#include_next <mcuconf.h>
140	* SPI driver system settings.
141	*/
142	#define STM32_SPI_USE_SPI1 TRUE
143	#define STM32_SPI_USE_SPI2 FALSE
144	#define STM32_SPI_SPI1_DMA_PRIORITY 1
145	#define STM32_SPI_SPI2_DMA_PRIORITY 1
146	#define STM32_SPI_SPI1_IRQ_PRIORITY 2
147	#define STM32_SPI_SPI2_IRQ_PRIORITY 2
148	#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
149	#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
150	// #define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
151	// #define STM32_SPI_SPI2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
152	#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure")
153		25
154	/*	26	#undef STM32_I2C_USE_I2C1
155	* ST driver system settings.	27	#define STM32_I2C_USE_I2C1 TRUE
156	*/
157	#define STM32_ST_IRQ_PRIORITY 2
158	#define STM32_ST_USE_TIMER 2
159		28
160	/*	29	#undef STM32_PWM_USE_TIM3
161	* UART driver system settings.	30	#define STM32_PWM_USE_TIM3 TRUE
162	*/
163	#define STM32_UART_USE_USART1 FALSE
164	#define STM32_UART_USE_USART2 FALSE
165	#define STM32_UART_USART1_IRQ_PRIORITY 3
166	#define STM32_UART_USART2_IRQ_PRIORITY 3
167	#define STM32_UART_USART1_DMA_PRIORITY 0
168	#define STM32_UART_USART2_DMA_PRIORITY 0
169	#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure")
170		31
171	/*	32	#undef STM32_SPI_USE_SPI1
172	* USB driver system settings.	33	#define STM32_SPI_USE_SPI1 TRUE
173	*/
174	#define STM32_USB_USE_USB1 TRUE
175	#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE
176	#define STM32_USB_USB1_LP_IRQ_PRIORITY 3
177		34
178	#endif /* _MCUCONF_H_ */