Browse Source

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

Luke Harrison 3 years ago
parent
commit
eb2f086522
No account linked to committer's email address
3 changed files with 21 additions and 2 deletions
  1. 18
    0
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
  2. 1
    1
      ini/stm32f1.ini
  3. 2
    1
      ini/stm32f4.ini

+ 18
- 0
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h View File

500
   #endif
500
   #endif
501
 #endif
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
 // WIFI
522
 // WIFI
505
 //
523
 //

+ 1
- 1
ini/stm32f1.ini View File

336
 board_build.offset          = 0x10000
336
 board_build.offset          = 0x10000
337
 board_upload.offset_address = 0x08010000
337
 board_upload.offset_address = 0x08010000
338
 build_flags                 = ${stm32_variant.build_flags}
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
                               -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
340
                               -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
341
                               -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
341
                               -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
342
 build_unflags               = ${stm32_variant.build_unflags}
342
 build_unflags               = ${stm32_variant.build_unflags}

+ 2
- 1
ini/stm32f4.ini View File

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

Loading…
Cancel
Save