melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

📦️ STM32F103RE_btt(_USB) with HAL/STM32 (#22040)

Browse Source
This commit is contained in:
Victor Oliveira 2021-06-05 01:49:00 -03:00 committed by Scott Lahteine
parent c90fa530db
commit f3f3d202ac
7 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/pins.h
View File

@ -518,9 +518,9 @@
#elif MB(BTT_SKR_MINI_MZ_V1_0)
#include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
#elif MB(BTT_SKR_E3_DIP)
#include "stm32f1/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K
#include "stm32f1/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple env:STM32F103RC_btt env:STM32F103RC_btt_512K
#elif MB(BTT_SKR_CR6)
#include "stm32f1/pins_BTT_SKR_CR6.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB
#include "stm32f1/pins_BTT_SKR_CR6.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
#elif MB(JGAURORA_A5S_A1)
#include "stm32f1/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
#elif MB(FYSETC_AIO_II)

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@ -21,9 +21,7 @@
*/
#pragma once
#if NOT_TARGET(TARGET_STM32F1)
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#include "env_validate.h"
#define BOARD_INFO_NAME "BTT SKR E3 DIP V1.x"

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@ -21,9 +21,7 @@
*/
#pragma once
#if NOT_TARGET(__STM32F1__, STM32F1)
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#include "env_validate.h"
// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
#define DISABLE_JTAG

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@ -21,9 +21,7 @@
*/
#pragma once
#if NOT_TARGET(TARGET_STM32F1)
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#include "env_validate.h"
#define BOARD_INFO_NAME "BTT SKR Mini V1.1"

6
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
View File

@ -21,9 +21,9 @@
*/
#pragma once
#if NOT_TARGET(TARGET_STM32F1)
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#elif HOTENDS > 1 || E_STEPPERS > 1
#include "env_validate.h"
#if HOTENDS > 1 || E_STEPPERS > 1
#error "CCROBOT-ONLINE MEEB_3DP only supports one hotend / E-stepper. Comment out this line to continue."
#endif

12
ini/stm32f1-maple.ini
View File

@ -157,10 +157,10 @@ upload_protocol = jlink
#
# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
#
# STM32F103RE_btt ............. RET6
# STM32F103RE_btt_USB ......... RET6 (USB mass storage)
# STM32F103RE_btt_maple ............. RET6
# STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
#
[env:STM32F103RE_btt]
[env:STM32F103RE_btt_maple]
platform = ${common_stm32f1.platform}
extends = env:STM32F103RE_maple
board_build.address = 0x08007000
@ -171,10 +171,10 @@ build_flags = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
debug_tool = stlink
upload_protocol = stlink
[env:STM32F103RE_btt_USB]
[env:STM32F103RE_btt_USB_maple]
platform = ${common_stm32f1.platform}
extends = env:STM32F103RE_btt
build_flags = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE
extends = env:STM32F103RE_btt_maple
build_flags = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
lib_deps = ${common_stm32f1.lib_deps}
USBComposite for STM32F1@0.91

37
ini/stm32f1.ini
View File

@ -184,6 +184,43 @@ extra_scripts = ${common.extra_scripts}
debug_tool = jlink
upload_protocol = jlink
#
# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
#
# STM32F103RE_btt ............. RET6
# STM32F103RE_btt_USB ......... RET6 (USB mass storage)
#
[env:STM32F103RE_btt]
platform = ${common_stm32.platform}
extends = common_stm32
build_flags = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
board = genericSTM32F103RE
monitor_speed = 115200
board_build.core = stm32
board_build.variant = MARLIN_F103Rx
board_build.offset = 0x7000
board_build.ldscript = ldscript.ld
board_upload.offset_address = 0x08007000
build_unflags = ${common_stm32.build_unflags}
extra_scripts = ${common.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
buildroot/share/PlatformIO/scripts/stm32_bootloader.py
debug_tool = jlink
upload_protocol = jlink
[env:STM32F103RE_btt_USB]
extends = env:STM32F103RE_btt
platform = ${common_stm32.platform}
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
build_unflags = ${common_stm32.build_unflags} -DUSBD_USE_CDC
build_flags = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.build_flags}
-DUSBCON
-DUSE_USBHOST_HS
-DUSBD_IRQ_PRIO=5
-DUSBD_IRQ_SUBPRIO=6
-DUSE_USB_HS_IN_FS
-DUSBD_USE_CDC_MSC
#
# FLSUN QQS Pro (STM32F103VET6)
# board Hispeedv1