MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luke Harrison 2021-07-21 07:43:33 +02:00 committed by Scott Lahteine
parent 15cf97f0d5
commit 8d34a99d8f
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View File

@ -500,6 +500,24 @@
#endif #endif
#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 // WIFI
// //

2
ini/stm32f1.ini
View File

@ -336,7 +336,7 @@ board_build.variant = MARLIN_F103Vx
board_build.offset = 0x10000 board_build.offset = 0x10000
board_upload.offset_address = 0x08010000 board_upload.offset_address = 0x08010000
build_flags = ${stm32_variant.build_flags} 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 -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
-DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
build_unflags = ${stm32_variant.build_unflags} build_unflags = ${stm32_variant.build_unflags}

3
ini/stm32f4.ini
View File

@ -129,7 +129,7 @@ platform = ${common_stm32.platform}
extends = stm32_variant extends = stm32_variant
board = marlin_BigTree_SKR_Pro board = marlin_BigTree_SKR_Pro
board_build.offset = 0x8000 board_build.offset = 0x8000
build_flags = ${stm32_variant.build_flags} -DSTM32F407_5ZX build_flags = ${stm32_variant.build_flags} -DSTM32F407_5ZX
debug_tool = stlink debug_tool = stlink
upload_protocol = stlink upload_protocol = stlink
@ -235,6 +235,7 @@ build_flags = ${stm32_variant.build_flags}
platform = ${common_stm32.platform} platform = ${common_stm32.platform}
extends = env:BIGTREE_OCTOPUS_V1 extends = env:BIGTREE_OCTOPUS_V1
platform_packages = ${stm_flash_drive.platform_packages} platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC
build_flags = ${stm_flash_drive.build_flags} build_flags = ${stm_flash_drive.build_flags}
-DSTM32F446_5VX -DUSE_USB_HS_IN_FS -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
-DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5 -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5