Skip to content

Commit 7013f04

Browse files
lehjrfpistm
lehjr
authored and
fpistm
committed
add support for WeAct "F411 8M HSE" variant and rename existing menu entry to avoid confusion
1 parent bb4b804 commit 7013f04

5 files changed

Lines changed: 152 additions & 12 deletions

File tree

‎boards.txt‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5139,8 +5139,8 @@ GenF4.menu.pnum.BLACKPILL_F401CE.build.variant_h=variant_BLACKPILL_F401Cx.h
51395139
GenF4.menu.pnum.BLACKPILL_F401CE.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
51405140
GenF4.menu.pnum.BLACKPILL_F401CE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
51415141

5142-
# BlackPill F411CE
5143-
GenF4.menu.pnum.BLACKPILL_F411CE=BlackPill F411CE
5142+
# BlackPill F411CE 25M
5143+
GenF4.menu.pnum.BLACKPILL_F411CE=BlackPill F411CE (HSE 25Mhz)
51445144
GenF4.menu.pnum.BLACKPILL_F411CE.upload.maximum_size=524288
51455145
GenF4.menu.pnum.BLACKPILL_F411CE.upload.maximum_data_size=131072
51465146
GenF4.menu.pnum.BLACKPILL_F411CE.build.board=BLACKPILL_F411CE
@@ -5150,6 +5150,17 @@ GenF4.menu.pnum.BLACKPILL_F411CE.build.variant_h=variant_{build.board}.h
51505150
GenF4.menu.pnum.BLACKPILL_F411CE.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
51515151
GenF4.menu.pnum.BLACKPILL_F411CE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F411.svd
51525152

5153+
# BlackPill F411CE 8M
5154+
GenF4.menu.pnum.BLACKPILL_F411CE_8M=BlackPill F411CE (HSE 8Mhz)
5155+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.upload.maximum_size=524288
5156+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.upload.maximum_data_size=131072
5157+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.build.board=BLACKPILL_F411CE_8M
5158+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.build.product_line=STM32F411xE
5159+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.build.variant=STM32F4xx/F411C(C-E)(U-Y)
5160+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.build.variant_h=variant_BLACKPILL_F411CE.h
5161+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
5162+
GenF4.menu.pnum.BLACKPILL_F411CE_8M.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F411.svd
5163+
51535164
# Blue F407VE mini
51545165
GenF4.menu.pnum.BLUE_F407VE_MINI=Blue F407VE mini
51555166
GenF4.menu.pnum.BLUE_F407VE_MINI.upload.maximum_size=524288

‎cmake/boards_db.cmake‎

Lines changed: 123 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,8 +2260,7 @@ target_link_options(BLACKPILL_F401CE_hid INTERFACE
22602260
-mcpu=${BLACKPILL_F401CE_hid_MCU}
22612261
)
22622262

2263-
2264-
# BLACKPILL_F411CE
2263+
# BLACKPILL_F411CE_25M
22652264
# -----------------------------------------------------------------------------
22662265

22672266
set(BLACKPILL_F411CE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32F4xx/F411C(C-E)(U-Y)")
@@ -2341,7 +2340,7 @@ target_compile_options(BLACKPILL_F411CE_xusb_HSFS INTERFACE
23412340
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
23422341
)
23432342

2344-
# BLACKPILL_F411CE_hid
2343+
# BLACKPILL_F411CE_25M_hid
23452344
# -----------------------------------------------------------------------------
23462345

23472346
set(BLACKPILL_F411CE_hid_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32F4xx/F411C(C-E)(U-Y)")
@@ -2383,6 +2382,127 @@ target_link_options(BLACKPILL_F411CE_hid INTERFACE
23832382
-mcpu=${BLACKPILL_F411CE_hid_MCU}
23842383
)
23852384

2385+
# BLACKPILL_F411CE_8M
2386+
# -----------------------------------------------------------------------------
2387+
2388+
set(BLACKPILL_F411CE_8M_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32F4xx/F411C(C-E)(U-Y)")
2389+
set(BLACKPILL_F411CE_8M_MAXSIZE 524288)
2390+
set(BLACKPILL_F411CE_8M_MAXDATASIZE 131072)
2391+
set(BLACKPILL_F411CE_8M_MCU cortex-m4)
2392+
set(BLACKPILL_F411CE_8M_FPCONF "-")
2393+
add_library(BLACKPILL_F411CE_8M INTERFACE)
2394+
target_compile_options(BLACKPILL_F411CE_8M INTERFACE
2395+
"SHELL:-DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER"
2396+
"SHELL:-DSTM32F411xE"
2397+
"SHELL:-DCUSTOM_PERIPHERAL_PINS"
2398+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
2399+
-mcpu=${BLACKPILL_F411CE_8M_MCU}
2400+
)
2401+
target_compile_definitions(BLACKPILL_F411CE_8M INTERFACE
2402+
"STM32F4xx"
2403+
"ARDUINO_BLACKPILL_F411CE_8M"
2404+
"BOARD_NAME=\"BLACKPILL_F411CE_8M\""
2405+
"BOARD_ID=BLACKPILL_F411CE_8M"
2406+
"VARIANT_H=\"variant_BLACKPILL_F411CE.h\""
2407+
)
2408+
target_include_directories(BLACKPILL_F411CE_8M INTERFACE
2409+
${CMAKE_CURRENT_LIST_DIR}/../system/STM32F4xx
2410+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32F4xx_HAL_Driver/Inc
2411+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32F4xx_HAL_Driver/Src
2412+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/
2413+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32F4xx/Source/
2414+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/
2415+
${BLACKPILL_F411CE_8M_VARIANT_PATH}
2416+
)
2417+
2418+
target_link_options(BLACKPILL_F411CE_8M INTERFACE
2419+
"LINKER:--default-script=${BLACKPILL_F411CE_8M_VARIANT_PATH}/ldscript.ld"
2420+
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
2421+
"LINKER:--defsym=LD_MAX_SIZE=524288"
2422+
"LINKER:--defsym=LD_MAX_DATA_SIZE=131072"
2423+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
2424+
-mcpu=${BLACKPILL_F411CE_8M_MCU}
2425+
)
2426+
2427+
add_library(BLACKPILL_F411CE_8M_serial_disabled INTERFACE)
2428+
target_compile_options(BLACKPILL_F411CE_8M_serial_disabled INTERFACE
2429+
)
2430+
add_library(BLACKPILL_F411CE_8M_serial_generic INTERFACE)
2431+
target_compile_options(BLACKPILL_F411CE_8M_serial_generic INTERFACE
2432+
"SHELL:-DHAL_UART_MODULE_ENABLED"
2433+
)
2434+
add_library(BLACKPILL_F411CE_8M_serial_none INTERFACE)
2435+
target_compile_options(BLACKPILL_F411CE_8M_serial_none INTERFACE
2436+
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
2437+
)
2438+
add_library(BLACKPILL_F411CE_8M_usb_CDC INTERFACE)
2439+
target_compile_options(BLACKPILL_F411CE_8M_usb_CDC INTERFACE
2440+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
2441+
)
2442+
add_library(BLACKPILL_F411CE_8M_usb_CDCgen INTERFACE)
2443+
target_compile_options(BLACKPILL_F411CE_8M_usb_CDCgen INTERFACE
2444+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
2445+
)
2446+
add_library(BLACKPILL_F411CE_8M_usb_HID INTERFACE)
2447+
target_compile_options(BLACKPILL_F411CE_8M_usb_HID INTERFACE
2448+
"SHELL:-DUSBCON -DUSBD_VID=0x0483 -DUSBD_PID=0x5740 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
2449+
)
2450+
add_library(BLACKPILL_F411CE_8M_usb_none INTERFACE)
2451+
target_compile_options(BLACKPILL_F411CE_8M_usb_none INTERFACE
2452+
)
2453+
add_library(BLACKPILL_F411CE_8M_xusb_FS INTERFACE)
2454+
target_compile_options(BLACKPILL_F411CE_8M_xusb_FS INTERFACE
2455+
)
2456+
add_library(BLACKPILL_F411CE_8M_xusb_HS INTERFACE)
2457+
target_compile_options(BLACKPILL_F411CE_8M_xusb_HS INTERFACE
2458+
"SHELL:-DUSE_USB_HS"
2459+
)
2460+
add_library(BLACKPILL_F411CE_8M_xusb_HSFS INTERFACE)
2461+
target_compile_options(BLACKPILL_F411CE_8M_xusb_HSFS INTERFACE
2462+
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
2463+
)
2464+
2465+
# BLACKPILL_F411CE_8M_hid
2466+
# -----------------------------------------------------------------------------
2467+
2468+
set(BLACKPILL_F411CE_8M_hid_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32F4xx/F411C(C-E)(U-Y)")
2469+
set(BLACKPILL_F411CE_8M_hid_MAXSIZE 524288)
2470+
set(BLACKPILL_F411CE_8M_hid_MAXDATASIZE 131072)
2471+
set(BLACKPILL_F411CE_8M_hid_MCU cortex-m4)
2472+
set(BLACKPILL_F411CE_8M_hid_FPCONF "-")
2473+
add_library(BLACKPILL_F411CE_8M_hid INTERFACE)
2474+
target_compile_options(BLACKPILL_F411CE_8M_hid INTERFACE
2475+
"SHELL:-DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER"
2476+
"SHELL:-DSTM32F411xE -DHAL_UART_MODULE_ENABLED -DBL_HID"
2477+
"SHELL:-DCUSTOM_PERIPHERAL_PINS"
2478+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
2479+
-mcpu=${BLACKPILL_F411CE_8M_hid_MCU}
2480+
)
2481+
target_compile_definitions(BLACKPILL_F411CE_8M_hid INTERFACE
2482+
"STM32F4xx"
2483+
"ARDUINO_BLACKPILL_F411CE_8M"
2484+
"BOARD_NAME=\"BLACKPILL_F411CE_8M\""
2485+
"BOARD_ID=BLACKPILL_F411CE_8M"
2486+
"VARIANT_H=\"variant_BLACKPILL_F411CE.h\""
2487+
)
2488+
target_include_directories(BLACKPILL_F411CE_8M_hid INTERFACE
2489+
${CMAKE_CURRENT_LIST_DIR}/../system/STM32F4xx
2490+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32F4xx_HAL_Driver/Inc
2491+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32F4xx_HAL_Driver/Src
2492+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/
2493+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32F4xx/Source/
2494+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/
2495+
${BLACKPILL_F411CE_8M_hid_VARIANT_PATH}
2496+
)
2497+
2498+
target_link_options(BLACKPILL_F411CE_8M_hid INTERFACE
2499+
"LINKER:--default-script=${BLACKPILL_F411CE_8M_hid_VARIANT_PATH}/ldscript.ld"
2500+
"LINKER:--defsym=LD_FLASH_OFFSET=0x4000"
2501+
"LINKER:--defsym=LD_MAX_SIZE=524288"
2502+
"LINKER:--defsym=LD_MAX_DATA_SIZE=131072"
2503+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
2504+
-mcpu=${BLACKPILL_F411CE_8M_hid_MCU}
2505+
)
23862506

23872507
# BLUE_F407VE_MINI
23882508
# -----------------------------------------------------------------------------
@@ -4525,7 +4645,6 @@ target_link_options(DATABOARD_hid INTERFACE
45254645
-mcpu=${DATABOARD_hid_MCU}
45264646
)
45274647

4528-
45294648
# DEMO_F030F4
45304649
# -----------------------------------------------------------------------------
45314650

‎variants/STM32F4xx/F411C(C-E)(U-Y)/PeripheralPins_BLACKPILL_F411CE.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Automatically generated from STM32F411C(C-E)Ux.xml, STM32F411C(C-E)Yx.xml
1515
* CubeMX DB release 6.0.20
1616
*/
17-
#if defined(ARDUINO_BLACKPILL_F411CE)
17+
#if defined(ARDUINO_BLACKPILL_F411CE) || defined(ARDUINO_BLACKPILL_F411CE_8M)
1818
#include "Arduino.h"
1919
#include "PeripheralPins.h"
2020

‎variants/STM32F4xx/F411C(C-E)(U-Y)/variant_BLACKPILL_F411CE.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*******************************************************************************
1212
*/
13-
#if defined(ARDUINO_BLACKPILL_F411CE)
13+
#if defined(ARDUINO_BLACKPILL_F411CE_8M) || defined(ARDUINO_BLACKPILL_F411CE)
1414
#include "pins_arduino.h"
1515

1616
// Digital PinName array
@@ -92,8 +92,13 @@ WEAK void SystemClock_Config(void)
9292
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
9393
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
9494
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
95+
#if defined(ARDUINO_BLACKPILL_F411CE_8M)
96+
RCC_OscInitStruct.PLL.PLLM = 4;
97+
RCC_OscInitStruct.PLL.PLLN = 100;
98+
#else
9599
RCC_OscInitStruct.PLL.PLLM = 25;
96100
RCC_OscInitStruct.PLL.PLLN = 192;
101+
#endif
97102
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
98103
RCC_OscInitStruct.PLL.PLLQ = 4;
99104
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
@@ -117,4 +122,4 @@ WEAK void SystemClock_Config(void)
117122
}
118123
#endif
119124

120-
#endif /* ARDUINO_BLACKPILL_F411CE */
125+
#endif /* ARDUINO_BLACKPILL_F411CE_8M || ARDUINO_BLACKPILL_F411CE) */

‎variants/STM32F4xx/F411C(C-E)(U-Y)/variant_BLACKPILL_F411CE.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,15 @@
142142
#define PIN_SERIAL_TX PA9
143143
#endif
144144

145-
#ifndef HSE_VALUE
146-
#define HSE_VALUE 25000000U
145+
#if defined(ARDUINO_BLACKPILL_F411CE_8M)
146+
#ifndef HSE_VALUE
147+
#define HSE_VALUE 8000000U
148+
#endif
149+
#else
150+
#ifndef HSE_VALUE
151+
#define HSE_VALUE 25000000U
152+
#endif
147153
#endif
148-
149154
/*----------------------------------------------------------------------------
150155
* Arduino objects - C++ only
151156
*----------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)