From 86f03cf57a23ffbfef5ac4df31b7b78299a58bc6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 23 Jan 2025 22:55:36 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Shared=20USB=20build=20flags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ini/stm32f1.ini | 17 +++++++--------- ini/stm32f4.ini | 54 ++++++++++++++----------------------------------- 2 files changed, 22 insertions(+), 49 deletions(-) diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index 86aeacdecd..b4c6f22372 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -63,14 +63,13 @@ build_flags = ${common_STM32F103RC_variant.build_flags} board_build.offset = 0x7000 board_upload.offset_address = 0x08007000 +[USBD_CDC_MSC] +build_flags = -DUSE_USB_FS -DUSBD_USE_CDC_MSC -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 + [env:STM32F103RC_btt_USB] extends = env:STM32F103RC_btt platform_packages = ${stm_flash_drive.platform_packages} -build_flags = ${env:STM32F103RC_btt.build_flags} - -DUSE_USB_FS - -DUSBD_IRQ_PRIO=5 - -DUSBD_IRQ_SUBPRIO=6 - -DUSBD_USE_CDC_MSC +build_flags = ${env:STM32F103RC_btt.build_flags} ${USBD_CDC_MSC.build_flags} build_unflags = ${env:STM32F103RC_btt.build_unflags} -DUSBD_USE_CDC # @@ -227,9 +226,7 @@ upload_protocol = jlink [env:STM32F103RE_btt_USB] extends = env:STM32F103RE_btt platform_packages = ${stm_flash_drive.platform_packages} -build_flags = ${env:STM32F103RE_btt.build_flags} - -DUSE_USB_FS -DUSBD_IRQ_PRIO=5 - -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC +build_flags = ${env:STM32F103RE_btt.build_flags} ${USBD_CDC_MSC.build_flags} build_unflags = ${env:STM32F103RE_btt.build_unflags} -DUSBD_USE_CDC # @@ -468,8 +465,8 @@ board_upload.offset_address = 0x08005000 board_build.offset = 0x5000 board_upload.maximum_size = 237568 extra_scripts = ${stm32_variant.extra_scripts} -build_flags = ${stm32_variant.build_flags} - -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DUSE_USB_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC +build_flags = ${stm32_variant.build_flags} ${USBD_CDC_MSC.build_flags} + -DSS_TIMER=4 -DTIMER_SERVO=TIM5 build_unflags = ${stm32_variant.build_unflags} -DUSBD_USE_CDC [env:STM32F103RC_ZM3E2_USB] diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 3f7b5b6346..4cb3b91d09 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -254,6 +254,9 @@ build_flags = ${stm32_variant.build_flags} extends = env:BTT_BTT002 board = marlin_BTT_BTT002_VET6 +[USB_HS_IN_FS] +build_flags = -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 + # # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support # @@ -264,9 +267,7 @@ board = marlin_STM32F407VGT6_CCM board_build.variant = MARLIN_F4x7Vx board_build.offset = 0x8000 board_upload.offset_address = 0x08008000 -build_flags = ${stm_flash_drive.build_flags} - -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS - -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 +build_flags = ${stm_flash_drive.build_flags} ${USB_HS_IN_FS.build_flags} -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8 upload_protocol = stlink @@ -324,11 +325,8 @@ build_flags = ${stm32_variant.build_flags} extends = env:STM32F446ZE_btt platform_packages = ${stm_flash_drive.platform_packages} build_unflags = -DUSBD_USE_CDC -build_flags = ${stm_flash_drive.build_flags} - -DSTM32F446_5VX -DUSE_USB_HS_IN_FS - -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5 - -DUSBD_IRQ_SUBPRIO=6 - -DUSBD_USE_CDC_MSC +build_flags = ${stm_flash_drive.build_flags} -DSTM32F446_5VX + ${USB_HS_IN_FS.build_flags} -DUSBD_USE_CDC_MSC # # BigTreeTech Octopus V1.1 / Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) @@ -351,9 +349,7 @@ extends = env:STM32F429ZG_btt platform_packages = ${stm_flash_drive.platform_packages} build_unflags = -DUSBD_USE_CDC build_flags = ${stm_flash_drive.build_flags} - -DUSE_USB_HS_IN_FS -DUSE_USBHOST_HS - -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 - -DUSBD_USE_CDC_MSC + ${USB_HS_IN_FS.build_flags} -DUSBD_USE_CDC_MSC # # BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4) @@ -373,10 +369,7 @@ build_flags = ${stm32_variant.build_flags} extends = env:STM32F407ZE_btt platform_packages = ${stm_flash_drive.platform_packages} build_unflags = -DUSBD_USE_CDC -build_flags = ${stm_flash_drive.build_flags} - -DUSE_USB_HS_IN_FS -DUSE_USBHOST_HS - -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 - -DUSBD_USE_CDC_MSC +build_flags = ${stm_flash_drive.build_flags} ${USB_HS_IN_FS.build_flags} -DUSBD_USE_CDC_MSC # # Lerdge base @@ -514,11 +507,7 @@ upload_protocol = jlink [env:mks_robin_nano_v3_usb_flash_drive] extends = env:mks_robin_nano_v3 platform_packages = ${stm_flash_drive.platform_packages} -build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} - -DUSE_USBHOST_HS - -DUSBD_IRQ_PRIO=5 - -DUSBD_IRQ_SUBPRIO=6 - -DUSE_USB_HS_IN_FS +build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} ${USB_HS_IN_FS.build_flags} # # MKS Robin Nano V3 with USB Flash Drive Support and Shared Media @@ -574,11 +563,7 @@ upload_protocol = jlink [env:mks_eagle_usb_flash_drive] extends = env:mks_eagle platform_packages = ${stm_flash_drive.platform_packages} -build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} - -DUSE_USBHOST_HS - -DUSBD_IRQ_PRIO=5 - -DUSBD_IRQ_SUBPRIO=6 - -DUSE_USB_HS_IN_FS +build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags} ${USB_HS_IN_FS.build_flags} # # MKS Eagle with USB Flash Drive Support and Shared Media @@ -617,11 +602,7 @@ upload_protocol = jlink [env:mks_monster8_usb_flash_drive] extends = env:mks_monster8 platform_packages = ${stm_flash_drive.platform_packages} -build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flags} - -DUSE_USBHOST_HS - -DUSBD_IRQ_PRIO=5 - -DUSBD_IRQ_SUBPRIO=6 - -DUSE_USB_HS_IN_FS +build_flags = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flags} ${USB_HS_IN_FS.build_flags} # # MKS Monster8 V1 / V2 (STM32F407VET6 ARM Cortex-M4) with USB Flash Drive Support and Shared Media @@ -852,9 +833,8 @@ board = marlin_STM32F446ZET_tronxy board_build.ldscript = buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld board_build.offset = 0x10000 board_build.offset_address = 0x08010000 -build_flags = ${stm32_variant.build_flags} - -DSTM32F4xx -DUSE_USB_HS - -DUSE_USB_HS_IN_FS +build_flags = ${stm32_variant.build_flags} -DSTM32F4xx + -DUSE_USB_HS -DUSE_USB_HS_IN_FS build_unflags = ${stm32_variant.build_unflags} -fno-rtti -fno-threadsafe-statics -fno-exceptions -DUSBD_USE_CDC -DUSBCON @@ -914,13 +894,11 @@ board = marlin_STM32F407VGT6_CCM board_build.variant = MARLIN_F4x7Vx board_build.offset = 0x8000 board_upload.offset_address = 0x08008000 -build_flags = ${stm32_variant.build_flags} +build_flags = ${stm32_variant.build_flags} ${USB_HS_IN_FS.build_flags} -DHAVE_HWSERIAL1 -DHAVE_HWSERIAL3 -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8 -DHAL_SD_MODULE_ENABLED - -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS - -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DHSE_VALUE=8000000U upload_protocol = stlink @@ -934,8 +912,6 @@ board = marlin_STM32F407VGT6_CCM board_build.variant = MARLIN_F4x7Vx board_build.offset = 0x8000 board_upload.offset_address = 0x08008000 -build_flags = ${stm_flash_drive.build_flags} - -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS - -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 +build_flags = ${stm_flash_drive.build_flags} ${USB_HS_IN_FS.build_flags} -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8