Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ BTT Octopus Pro V1.1 (STM32H723ZE) #26043

Merged
merged 3 commits into from
Jul 14, 2023
Merged

✨ BTT Octopus Pro V1.1 (STM32H723ZE) #26043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55431f7
✨ BTT Octopus Pro V1.1 (STM32H723ZE)
thisiskeithb Jul 3, 2023
f5147c8
pinsformat
thinkyhead Jul 14, 2023
f10dd1d
misc. pins adjust
thinkyhead Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Marlin/src/core/boards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@
#define BOARD_BTT_SKR_V3_0 6006 // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG)
#define BOARD_BTT_SKR_V3_0_EZ 6007 // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG)
#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6008 // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)
#define BOARD_BTT_OCTOPUS_PRO_V1_1 6009 // BigTreeTech Octopus Pro v1.1 (STM32H723ZE)

//
// Espressif ESP32 WiFi
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,8 @@
#include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
#elif MB(BTT_OCTOPUS_MAX_EZ_V1_0)
#include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(BTT_OCTOPUS_PRO_V1_1)
#include "stm32h7/pins_BTT_OCTOPUS_PRO_V1_1.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(TEENSY41)
#include "teensy4/pins_TEENSY41.h" // Teensy-4.x env:teensy41
#elif MB(T41U5XBB)
Expand Down
24 changes: 12 additions & 12 deletions Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@
//
#define SERVO0_PIN PB6

//
// Misc. Functions
//
#define LED_PIN PA13

//
// Trinamic Stallguard pins
//
Expand All @@ -61,13 +56,6 @@
#define E2_DIAG_PIN PG14 // E2DET
#define E3_DIAG_PIN PG15 // E3DET

//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PB7
#endif

//
// Limit Switches
//
Expand Down Expand Up @@ -125,6 +113,13 @@
#define Z_STOP_PIN Z_DIAG_PIN // Z-STOP
#endif

//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PB7
#endif

//
// Filament Runout Sensor
//
Expand All @@ -147,6 +142,11 @@
#define POWER_LOSS_PIN PC0 // PWRDET
#endif

//
// Misc. Functions
//
#define LED_PIN PA13

//
// Steppers
//
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,8 @@
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE)
#ifndef PROBE_ENABLE_PIN
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif

//
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE)
#ifndef PROBE_ENABLE_PIN
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif

//
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V1_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE)
#ifndef PROBE_ENABLE_PIN
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif

//
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE)
#ifndef PROBE_ENABLE_PIN
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif

//
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE)
#ifndef PROBE_ENABLE_PIN
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif

//
Expand Down
74 changes: 40 additions & 34 deletions Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,45 +45,33 @@
//
#define SERVO0_PIN PB14

//
// Misc. Functions
//
#define LED_PIN PA14

//
// Trinamic Stallguard pins
//
#define X_DIAG_PIN PF0 // M1-STOP
#define Y_DIAG_PIN PF2 // M2-STOP
#define Z_DIAG_PIN PF4 // M3-STOP
#define Z2_DIAG_PIN PF3 // M4-STOP
#define E0_DIAG_PIN PF1 // M5-STOP
#define E1_DIAG_PIN PC15 // M6-STOP
#define Z2_DIAG_PIN PF3 // M4-DET
#define E0_DIAG_PIN PF1 // M5-DET
#define E1_DIAG_PIN PC15 // M6-DET
#define E2_DIAG_PIN PF12 // PWRDET

//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PB15
#endif

//
// Limit Switches
//
#ifdef X_STALL_SENSITIVITY
#define X_STOP_PIN X_DIAG_PIN
#if X_HOME_TO_MIN
#define X_MAX_PIN E0_DIAG_PIN // E0DET
#define X_MAX_PIN E0_DIAG_PIN // M4-DET
#else
#define X_MIN_PIN E0_DIAG_PIN // E0DET
#define X_MIN_PIN E0_DIAG_PIN // M4-DET
#endif
#elif NEEDS_X_MINMAX
#ifndef X_MIN_PIN
#define X_MIN_PIN X_DIAG_PIN // X-STOP
#endif
#ifndef X_MAX_PIN
#define X_MAX_PIN E0_DIAG_PIN // E0DET
#define X_MAX_PIN E0_DIAG_PIN // M4-DET
#endif
#else
#define X_STOP_PIN X_DIAG_PIN // X-STOP
Expand All @@ -92,16 +80,16 @@
#ifdef Y_STALL_SENSITIVITY
#define Y_STOP_PIN Y_DIAG_PIN
#if Y_HOME_TO_MIN
#define Y_MAX_PIN E1_DIAG_PIN // E1DET
#define Y_MAX_PIN E1_DIAG_PIN // M5-DET
#else
#define Y_MIN_PIN E1_DIAG_PIN // E1DET
#define Y_MIN_PIN E1_DIAG_PIN // M5-DET
#endif
#elif NEEDS_Y_MINMAX
#ifndef Y_MIN_PIN
#define Y_MIN_PIN Y_DIAG_PIN // Y-STOP
#endif
#ifndef Y_MAX_PIN
#define Y_MAX_PIN E1_DIAG_PIN // E1DET
#define Y_MAX_PIN E1_DIAG_PIN // M5-DET
#endif
#else
#define Y_STOP_PIN Y_DIAG_PIN // Y-STOP
Expand All @@ -126,24 +114,17 @@
#endif

//
// Filament Runout Sensor
//
#define FIL_RUNOUT_PIN PF1 // E0DET
#define FIL_RUNOUT2_PIN PF15 // E1DET

//
// Power Supply Control
// Z Probe (when not Z_MIN_PIN)
//
#ifndef PS_ON_PIN
#define PS_ON_PIN PF13 // PS-ON
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PB15
#endif

//
// Power Loss Detection
// Filament Runout Sensor
//
#ifndef POWER_LOSS_PIN
#define POWER_LOSS_PIN PF12 // PWRDET
#endif
#define FIL_RUNOUT_PIN PF1 // M5-DET
#define FIL_RUNOUT2_PIN PC15 // M6-DET

//
// Steppers
Expand Down Expand Up @@ -244,6 +225,31 @@
#define FAN5_PIN PF8 // 4 wire Fan5
#define FAN6_PIN PA2 // 4 wire Fan6

//
// Power Supply Control
//
#ifndef PS_ON_PIN
#define PS_ON_PIN PF13 // PS-ON
#endif

//
// Power Loss Detection
//
#ifndef POWER_LOSS_PIN
#define POWER_LOSS_PIN PF12 // PWRDET
#endif

//
// Misc. Functions
//
#define LED_PIN PA14
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN PC0
#endif
#ifndef FILWIDTH2_PIN
#define FILWIDTH2_PIN PF10
#endif

//
// SD Support
//
Expand Down
Loading