🔧 Octopus SPI display pins, fix USB build env (MarlinFirmware#22412)

ptoal · Dec 16, 2021 · d05eb66 · d05eb66
1 parent ca6dc55
commit d05eb66
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -500,6 +500,24 @@
   #endif
 #endif
 
+#if HAS_SPI_TFT
+  #define TFT_CS_PIN                 EXP2_07_PIN
+  #define TFT_A0_PIN                 EXP2_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+
+  #define TOUCH_INT_PIN              EXP1_04_PIN
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
+  #define TOUCH_CS_PIN               EXP1_07_PIN
+
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
+
 //
 // WIFI
 //

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
@@ -336,7 +336,7 @@ board_build.variant         = MARLIN_F103Vx
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA 
+                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA
                               -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
                               -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
 build_unflags               = ${stm32_variant.build_unflags}

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -129,7 +129,7 @@ platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_SKR_Pro
 board_build.offset = 0x8000
-build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX 
+build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX
 debug_tool         = stlink
 upload_protocol    = stlink
 
@@ -235,6 +235,7 @@ build_flags        = ${stm32_variant.build_flags}
 platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_OCTOPUS_V1
 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