Procházet zdrojové kódy

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

Luke Harrison před 3 roky
rodič
revize
eb2f086522
No account linked to committer's email address

+ 18
- 0
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h Zobrazit soubor

@@ -500,6 +500,24 @@
500 500
   #endif
501 501
 #endif
502 502
 
503
+#if HAS_SPI_TFT
504
+  #define TFT_CS_PIN                 EXP2_07_PIN
505
+  #define TFT_A0_PIN                 EXP2_04_PIN
506
+  #define TFT_SCK_PIN                EXP2_09_PIN
507
+  #define TFT_MISO_PIN               EXP2_10_PIN
508
+  #define TFT_MOSI_PIN               EXP2_05_PIN
509
+
510
+  #define TOUCH_INT_PIN              EXP1_04_PIN
511
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
512
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
513
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
514
+  #define TOUCH_CS_PIN               EXP1_07_PIN
515
+
516
+  #define BTN_EN1                    EXP2_08_PIN
517
+  #define BTN_EN2                    EXP2_06_PIN
518
+  #define BTN_ENC                    EXP1_09_PIN
519
+#endif
520
+
503 521
 //
504 522
 // WIFI
505 523
 //

+ 1
- 1
ini/stm32f1.ini Zobrazit soubor

@@ -336,7 +336,7 @@ board_build.variant         = MARLIN_F103Vx
336 336
 board_build.offset          = 0x10000
337 337
 board_upload.offset_address = 0x08010000
338 338
 build_flags                 = ${stm32_variant.build_flags}
339
-                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA 
339
+                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA
340 340
                               -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
341 341
                               -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
342 342
 build_unflags               = ${stm32_variant.build_unflags}

+ 2
- 1
ini/stm32f4.ini Zobrazit soubor

@@ -129,7 +129,7 @@ platform           = ${common_stm32.platform}
129 129
 extends            = stm32_variant
130 130
 board              = marlin_BigTree_SKR_Pro
131 131
 board_build.offset = 0x8000
132
-build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX 
132
+build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX
133 133
 debug_tool         = stlink
134 134
 upload_protocol    = stlink
135 135
 
@@ -235,6 +235,7 @@ build_flags        = ${stm32_variant.build_flags}
235 235
 platform          = ${common_stm32.platform}
236 236
 extends           = env:BIGTREE_OCTOPUS_V1
237 237
 platform_packages = ${stm_flash_drive.platform_packages}
238
+build_unflags     = -DUSBD_USE_CDC
238 239
 build_flags       = ${stm_flash_drive.build_flags}
239 240
                     -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
240 241
                     -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5

Loading…
Zrušit
Uložit