From d800b917b9fffdf57d2fb9dcbacc67feafd8fb10 Mon Sep 17 00:00:00 2001 From: JayceeB1 <45721154+JayceeB1@users.noreply.github.com> Date: Thu, 21 Jan 2021 18:50:34 +0100 Subject: [PATCH] Revert "Revert "Lerdge K/S/X support for Flash Drive (#20593)"" This reverts commit 4499c70208c9a7ccd2e6f37f8ad240279599e9ef. --- Marlin/src/pins/pins.h | 6 +++--- Marlin/src/pins/stm32f4/pins_LERDGE_K.h | 3 +++ Marlin/src/pins/stm32f4/pins_LERDGE_S.h | 3 +++ Marlin/src/pins/stm32f4/pins_LERDGE_X.h | 3 +++ platformio.ini | 24 ++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 9e14049b5d2e..f57e8e7dac32 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -581,11 +581,11 @@ #elif MB(BTT_BTT002_V1_0) #include "stm32f4/pins_BTT_BTT002_V1_0.h" // STM32F4 env:BIGTREE_BTT002 #elif MB(LERDGE_K) - #include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:LERDGEK + #include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:LERDGEK env:LERDGEK_usb_flash_drive #elif MB(LERDGE_S) - #include "stm32f4/pins_LERDGE_S.h" // STM32F4 env:LERDGES + #include "stm32f4/pins_LERDGE_S.h" // STM32F4 env:LERDGES env:LERDGES_usb_flash_drive #elif MB(LERDGE_X) - #include "stm32f4/pins_LERDGE_X.h" // STM32F4 env:LERDGEX + #include "stm32f4/pins_LERDGE_X.h" // STM32F4 env:LERDGEX env:LERDGEX_usb_flash_drive #elif MB(VAKE403D) #include "stm32f4/pins_VAKE403D.h" // STM32F4 #elif MB(FYSETC_S6) diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h index 18cbdeaaf58f..bf6df0356237 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h @@ -29,6 +29,9 @@ #define I2C_EEPROM +// USB Flash Drive support +#define HAS_OTG_USB_HOST_SUPPORT + // // Servos // diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h index 486aabfd8ecd..c6cfa98831e2 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h @@ -32,6 +32,9 @@ //#define I2C_EEPROM +// USB Flash Drive support +#define HAS_OTG_USB_HOST_SUPPORT + // // Servos // diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h index c73b9927ac30..606d932c5739 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h @@ -32,6 +32,9 @@ #define I2C_EEPROM +// USB Flash Drive support +#define HAS_OTG_USB_HOST_SUPPORT + // // Servos // diff --git a/platformio.ini b/platformio.ini index 64fcb4643e44..2a70d53579dd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1371,6 +1371,14 @@ build_unflags = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUS extends = lerdge_common board_build.firmware = Lerdge_X_firmware_force.bin +# +# Lerdge X with USB Flash Drive Support +# +[env:LERDGEX_usb_flash_drive] +extends = LERDGEX +platform_packages = ${stm32_flash_drive.platform_packages} +build_flags = ${stm32_flash_drive.build_flags} + # # Lerdge S # @@ -1378,6 +1386,14 @@ board_build.firmware = Lerdge_X_firmware_force.bin extends = lerdge_common board_build.firmware = Lerdge_firmware_force.bin +# +# Lerdge S with USB Flash Drive Support +# +[env:LERDGES_usb_flash_drive] +extends = LERDGES +platform_packages = ${stm32_flash_drive.platform_packages} +build_flags = ${stm32_flash_drive.build_flags} + # # Lerdge K # @@ -1387,6 +1403,14 @@ board_build.firmware = Lerdge_K_firmware_force.bin build_flags = ${lerdge_common.build_flags} -DLERDGEK +# +# Lerdge K with USB Flash Drive Support +# +[env:LERDGEK_usb_flash_drive] +extends = LERDGEK +platform_packages = ${stm32_flash_drive.platform_packages} +build_flags = ${stm32_flash_drive.build_flags} + # # RUMBA32 #