Skip to content

Commit 5c4c35e

Browse files
jgillickjgillick
authored
Add new Thunderpack v1.1: STM32F411 (stm32duino#1013)
1 parent e1d409f commit 5c4c35e

File tree

10 files changed

+365
-233
lines changed

10 files changed

+365
-233
lines changed

‎CI/build/conf/cores_config.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"RAK811_TRACKERA",
211211
"REMRAM_V1",
212212
"STEVAL_MKSBOX1V1",
213-
"THUNDER_PACK",
213+
"THUNDERPACK_F411",
214+
"THUNDERPACK_L072",
214215
"Wraith32_V1"
215216
]
216217
},
@@ -225,7 +226,8 @@
225226
"RAK811_TRACKERA",
226227
"REMRAM_V1",
227228
"STEVAL_MKSBOX1V1",
228-
"THUNDER_PACK"
229+
"THUNDERPACK_F411",
230+
"THUNDERPACK_L072"
229231
]
230232
},
231233
{
@@ -277,7 +279,7 @@
277279
"applicable": false,
278280
"boards": [
279281
"GENERIC_F401RB", "GENERIC_F401RC", "GENERIC_F401RD", "GENERIC_F401RE",
280-
"HY_TinySTM103TB", "THUNDER_PACK"
282+
"HY_TinySTM103TB", "THUNDERPACK_F411", "THUNDERPACK_L072"
281283
]
282284
},
283285
{

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,12 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
154154
| :yellow_heart: | Generic F423CH | **1.9.0** | |
155155
| :yellow_heart: | Generic F423RH | **1.9.0** | |
156156
| :yellow_heart: | Generic F446R(C-E) | **1.9.0** | |
157+
| :yellow_heart: | [ThunderPack v1.1+](https://github.com/jgillick/ThunderPack) | **1.9.0** | Based on STM32F411CEUx |
157158

158159
| Status | Generic STM32L0xx | Release | Comment |
159160
| :---: | --- | :---: | :--- |
160161
| :green_heart: | [PX-HER0](https://piconomix.com/fwlib/_p_i_c_o_n_o_m_i_x__s_t_m32__h_e_r_o__b_o_a_r_d.html) | *1.8.0* | |
161-
| :green_heart: | [ThunderPack](https://github.com/jgillick/ThunderPack) | *1.8.0* | |
162+
| :green_heart: | [ThunderPack v1.0](https://github.com/jgillick/ThunderPack) | *1.8.0* | Based on STM32L072KZTx |
162163

163164
| Status | 3D printer boards | Release | Comment |
164165
| :---: | --- | :---: | :--- |

‎boards.txt‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,14 @@ GenF4.menu.pnum.FEATHER_F405.build.board=FEATHER_F405
11541154
GenF4.menu.pnum.FEATHER_F405.build.product_line=STM32F405xx
11551155
GenF4.menu.pnum.FEATHER_F405.build.variant=FEATHER_F405
11561156

1157+
# ThunderPack F411xxE
1158+
GenF4.menu.pnum.THUNDERPACK_F411=ThunderPack v1.1+
1159+
GenF4.menu.pnum.THUNDERPACK_F411.upload.maximum_size=524288
1160+
GenF4.menu.pnum.THUNDERPACK_F411.upload.maximum_data_size=131072
1161+
GenF4.menu.pnum.THUNDERPACK_F411.build.board=THUNDERPACK_F411
1162+
GenF4.menu.pnum.THUNDERPACK_F411.build.product_line=STM32F411xE
1163+
GenF4.menu.pnum.THUNDERPACK_F411.build.variant=THUNDERPACK
1164+
11571165
# Generic F446RE
11581166
GenF4.menu.pnum.Generic_F446RE=Generic F446RE
11591167
GenF4.menu.pnum.Generic_F446RE.upload.maximum_size=524288
@@ -1464,12 +1472,12 @@ GenL0.build.series=STM32L0xx
14641472
GenL0.build.cmsis_lib_gcc=arm_cortexM0l_math
14651473

14661474
# ThunderPack
1467-
GenL0.menu.pnum.THUNDER_PACK=ThunderPack
1468-
GenL0.menu.pnum.THUNDER_PACK.upload.maximum_size=196608
1469-
GenL0.menu.pnum.THUNDER_PACK.upload.maximum_data_size=20480
1470-
GenL0.menu.pnum.THUNDER_PACK.build.board=THUNDER_PACK
1471-
GenL0.menu.pnum.THUNDER_PACK.build.product_line=STM32L072xx
1472-
GenL0.menu.pnum.THUNDER_PACK.build.variant=THUNDER_PACK
1475+
GenL0.menu.pnum.THUNDERPACK_L072=ThunderPack v1.0
1476+
GenL0.menu.pnum.THUNDERPACK_L072.upload.maximum_size=196608
1477+
GenL0.menu.pnum.THUNDERPACK_L072.upload.maximum_data_size=20480
1478+
GenL0.menu.pnum.THUNDERPACK_L072.build.board=THUNDERPACK_L072
1479+
GenL0.menu.pnum.THUNDERPACK_L072.build.product_line=STM32L072xx
1480+
GenL0.menu.pnum.THUNDERPACK_L072.build.variant=THUNDERPACK
14731481

14741482
# Piconomix PX-HER0 board
14751483
GenL0.menu.pnum.PX_HER0=PX-HER0

‎variants/THUNDER_PACK/PeripheralPins.c‎ renamed to ‎variants/THUNDERPACK/PeripheralPins.c‎

Lines changed: 95 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
*******************************************************************************
3-
* Copyright (c) 2019, STMicroelectronics
3+
* Copyright (c) 2020, STMicroelectronics
44
* All rights reserved.
55
*
66
* This software component is licensed by ST under BSD 3-Clause license,
@@ -9,7 +9,9 @@
99
* opensource.org/licenses/BSD-3-Clause
1010
*
1111
*******************************************************************************
12-
* Automatically generated from STM32L072K(B-Z)Tx.xml
12+
* Automatically generated from STM32F411C(C-E)Ux.xml
13+
* and merged manually with the STM32L072K(B-Z)Tx.xml
14+
* to fit ThunderPack requirements
1315
*/
1416
#include "Arduino.h"
1517
#include "PeripheralPins.h"
@@ -24,17 +26,17 @@
2426

2527
#ifdef HAL_ADC_MODULE_ENABLED
2628
WEAK const PinMap PinMap_ADC[] = {
27-
{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC_IN4
28-
{PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC_IN5
29-
{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC_IN6
30-
{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC_IN7
29+
{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
30+
{PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
31+
{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
32+
{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
3133
{NC, NP, 0}
3234
};
3335
#endif
3436

3537
//*** DAC ***
3638

37-
#ifdef HAL_DAC_MODULE_ENABLED
39+
#if defined(HAL_DAC_MODULE_ENABLED) && defined(ARDUINO_THUNDERPACK_L072)
3840
WEAK const PinMap PinMap_DAC[] = {
3941
{PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
4042
{PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
@@ -46,17 +48,26 @@ WEAK const PinMap PinMap_DAC[] = {
4648

4749
#ifdef HAL_I2C_MODULE_ENABLED
4850
WEAK const PinMap PinMap_I2C_SDA[] = {
51+
#ifdef ARDUINO_THUNDERPACK_L072
4952
{PA_10, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
5053
{PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
54+
#else /* ARDUINO_THUNDERPACK_F411 */
55+
{PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
56+
#endif
5157
{NC, NP, 0}
5258
};
5359
#endif
5460

5561
#ifdef HAL_I2C_MODULE_ENABLED
5662
WEAK const PinMap PinMap_I2C_SCL[] = {
63+
#ifdef ARDUINO_THUNDERPACK_L072
5764
{PA_8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF7_I2C3)},
5865
{PA_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
5966
{PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)},
67+
#else /* ARDUINO_THUNDERPACK_F411 */
68+
{PA_8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
69+
{PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
70+
#endif
6071
{NC, NP, 0}
6172
};
6273
#endif
@@ -65,6 +76,7 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
6576

6677
#ifdef HAL_TIM_MODULE_ENABLED
6778
WEAK const PinMap PinMap_PWM[] = {
79+
#ifdef ARDUINO_THUNDERPACK_L072
6880
{PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
6981
{PA_1, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
7082
{PA_2, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
@@ -78,6 +90,26 @@ WEAK const PinMap PinMap_PWM[] = {
7890
// {PA_7, TIM22, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM22, 2, 0)}, // TIM22_CH2
7991
{PB_5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM3, 2, 0)}, // TIM3_CH2
8092
// {PB_5, TIM22, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM22, 2, 0)}, // TIM22_CH2
93+
#else /* ARDUINO_THUNDERPACK_F411 */
94+
{PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
95+
{PA_1, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
96+
{PA_2, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
97+
// {PA_2, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
98+
// {PA_2, TIM9, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
99+
{PA_3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
100+
// {PA_3, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
101+
// {PA_3, TIM9, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
102+
// {PA_5, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
103+
{PA_6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
104+
// {PA_7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
105+
{PA_7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
106+
{PA_8, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
107+
{PA_9, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
108+
{PA_10, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
109+
{PB_5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
110+
{PB_6, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
111+
{PB_7, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
112+
#endif
81113
{NC, NP, 0}
82114
};
83115
#endif
@@ -86,19 +118,29 @@ WEAK const PinMap PinMap_PWM[] = {
86118

87119
#ifdef HAL_UART_MODULE_ENABLED
88120
WEAK const PinMap PinMap_UART_TX[] = {
121+
#ifdef ARDUINO_THUNDERPACK_L072
89122
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
90123
// {PA_14, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
91124
{PA_14, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)},
92125
{PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
126+
#else /* ARDUINO_THUNDERPACK_F411 */
127+
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
128+
{PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
129+
#endif
93130
{NC, NP, 0}
94131
};
95132
#endif
96133

97134
#ifdef HAL_UART_MODULE_ENABLED
98135
WEAK const PinMap PinMap_UART_RX[] = {
136+
#ifdef ARDUINO_THUNDERPACK_L072
99137
{PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
100138
{PA_13, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
101139
{PB_7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
140+
#else /* ARDUINO_THUNDERPACK_F411 */
141+
{PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
142+
{PB_7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
143+
#endif
102144
{NC, NP, 0}
103145
};
104146
#endif
@@ -111,8 +153,6 @@ WEAK const PinMap PinMap_UART_RTS[] = {
111153

112154
#ifdef HAL_UART_MODULE_ENABLED
113155
WEAK const PinMap PinMap_UART_CTS[] = {
114-
{PA_6, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)},
115-
{PB_7, USART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_USART4)},
116156
{NC, NP, 0}
117157
};
118158
#endif
@@ -121,29 +161,49 @@ WEAK const PinMap PinMap_UART_CTS[] = {
121161

122162
#ifdef HAL_SPI_MODULE_ENABLED
123163
WEAK const PinMap PinMap_SPI_MOSI[] = {
164+
#ifdef ARDUINO_THUNDERPACK_L072
124165
{PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
125166
{PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
167+
#else /* ARDUINO_THUNDERPACK_F411 */
168+
{PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
169+
{PA_10, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI5)},
170+
// {PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
171+
{PB_5, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
172+
#endif
126173
{NC, NP, 0}
127174
};
128175
#endif
129176

130177
#ifdef HAL_SPI_MODULE_ENABLED
131178
WEAK const PinMap PinMap_SPI_MISO[] = {
179+
#ifdef ARDUINO_THUNDERPACK_L072
132180
{PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
181+
#else /* ARDUINO_THUNDERPACK_F411 */
182+
{PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
183+
#endif
133184
{NC, NP, 0}
134185
};
135186
#endif
136187

137188
#ifdef HAL_SPI_MODULE_ENABLED
138189
WEAK const PinMap PinMap_SPI_SCLK[] = {
190+
#ifdef ARDUINO_THUNDERPACK_L072
139191
{PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
192+
#else /* ARDUINO_THUNDERPACK_F411 */
193+
{PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
194+
#endif
140195
{NC, NP, 0}
141196
};
142197
#endif
143198

144199
#ifdef HAL_SPI_MODULE_ENABLED
145200
WEAK const PinMap PinMap_SPI_SSEL[] = {
201+
#ifdef ARDUINO_THUNDERPACK_L072
146202
{PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
203+
#else /* ARDUINO_THUNDERPACK_F411 */
204+
{PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
205+
// {PA_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
206+
#endif
147207
{NC, NP, 0}
148208
};
149209
#endif
@@ -156,7 +216,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
156216

157217
//*** USB ***
158218

159-
#ifdef HAL_PCD_MODULE_ENABLED
219+
#if defined(HAL_PCD_MODULE_ENABLED) && defined(ARDUINO_THUNDERPACK_L072)
160220
WEAK const PinMap PinMap_USB[] = {
161221
{PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DM
162222
{PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DP
@@ -165,8 +225,31 @@ WEAK const PinMap PinMap_USB[] = {
165225
};
166226
#endif
167227

168-
//*** No USB_OTG_FS ***
228+
#if defined(HAL_PCD_MODULE_ENABLED) && defined(ARDUINO_THUNDERPACK_F411)
229+
WEAK const PinMap PinMap_USB_OTG_FS[] = {
230+
{PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
231+
{PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
232+
{NC, NP, 0}
233+
};
234+
#endif
169235

170236
//*** No USB_OTG_HS ***
171237

172-
//*** No SD ***
238+
//*** SD ***
239+
240+
#if defined(HAL_SD_MODULE_ENABLED) && defined(ARDUINO_THUNDERPACK_F411)
241+
WEAK const PinMap PinMap_SD[] = {
242+
{PA_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
243+
{PA_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
244+
{PA_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
245+
{PB_4, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
246+
{PB_5, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
247+
{PB_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
248+
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
249+
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
250+
{PB_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
251+
{PB_14, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
252+
{PB_15, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
253+
{NC, NP, 0}
254+
};
255+
#endif

‎variants/THUNDER_PACK/PinNamesVar.h‎ renamed to ‎variants/THUNDERPACK/PinNamesVar.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
SYS_WKUP1 = PA_0,
44
#endif
55
#ifdef PWR_WAKEUP_PIN2
6+
#ifdef ARDUINO_THUNDERPACK_L072
67
SYS_WKUP2 = PC_13,
8+
#else /* ARDUINO_THUNDERPACK_F411 */
9+
SYS_WKUP2 = NC,
10+
#endif
711
#endif
812
#ifdef PWR_WAKEUP_PIN3
913
SYS_WKUP3 = NC,
@@ -25,7 +29,15 @@ SYS_WKUP8 = NC,
2529
#endif
2630
/* USB */
2731
#ifdef USBCON
32+
#ifdef ARDUINO_THUNDERPACK_L072
2833
USB_DM = PA_11,
2934
USB_DP = PA_12,
3035
USB_NOE = PA_13,
36+
#else /* ARDUINO_THUNDERPACK_F411 */
37+
USB_OTG_FS_SOF = PA_8,
38+
USB_OTG_FS_VBUS = PA_9,
39+
USB_OTG_FS_ID = PA_10,
40+
USB_OTG_FS_DM = PA_11,
41+
USB_OTG_FS_DP = PA_12,
42+
#endif
3143
#endif

‎variants/THUNDER_PACK/readme.txt‎ renamed to ‎variants/THUNDERPACK/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# ThunderPack
22
A self-contained microcontroller, battery and power management system that fits in your pocket.
33

4+
* ThunderPack v1.0 based on STM32L072KZTx
5+
* ThunderPack v1.1+ based on STM32F411CEUx
6+
47
More info: https://github.com/jgillick/ThunderPack

0 commit comments

Comments
 (0)