Skip to content

Commit 39bb641

Browse files
thisiskeithbAndy-Big
thisiskeithb
authored and
Andy-Big
committed
✨ BTT Octopus Pro V1.1 (STM32H723ZE) (MarlinFirmware#26043)
1 parent fa2370e commit 39bb641

12 files changed

+640
-71
lines changed

‎Marlin/src/core/boards.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@
473473
#define BOARD_BTT_SKR_V3_0 6006 // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG)
474474
#define BOARD_BTT_SKR_V3_0_EZ 6007 // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG)
475475
#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6008 // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)
476+
#define BOARD_BTT_OCTOPUS_PRO_V1_1 6009 // BigTreeTech Octopus Pro v1.1 (STM32H723ZE)
476477

477478
//
478479
// Espressif ESP32 WiFi

‎Marlin/src/pins/pins.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,8 @@
823823
#include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
824824
#elif MB(BTT_OCTOPUS_MAX_EZ_V1_0)
825825
#include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723ZE_btt
826+
#elif MB(BTT_OCTOPUS_PRO_V1_1)
827+
#include "stm32h7/pins_BTT_OCTOPUS_PRO_V1_1.h" // STM32H7 env:STM32H723ZE_btt
826828
#elif MB(TEENSY41)
827829
#include "teensy4/pins_TEENSY41.h" // Teensy-4.x env:teensy41
828830
#elif MB(T41U5XBB)

‎Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
//
4545
#define SERVO0_PIN PB6
4646

47-
//
48-
// Misc. Functions
49-
//
50-
#define LED_PIN PA13
51-
5247
//
5348
// Trinamic Stallguard pins
5449
//
@@ -61,13 +56,6 @@
6156
#define E2_DIAG_PIN PG14 // E2DET
6257
#define E3_DIAG_PIN PG15 // E3DET
6358

64-
//
65-
// Z Probe (when not Z_MIN_PIN)
66-
//
67-
#ifndef Z_MIN_PROBE_PIN
68-
#define Z_MIN_PROBE_PIN PB7
69-
#endif
70-
7159
//
7260
// Limit Switches
7361
//
@@ -125,6 +113,13 @@
125113
#define Z_STOP_PIN Z_DIAG_PIN // Z-STOP
126114
#endif
127115

116+
//
117+
// Z Probe (when not Z_MIN_PIN)
118+
//
119+
#ifndef Z_MIN_PROBE_PIN
120+
#define Z_MIN_PROBE_PIN PB7
121+
#endif
122+
128123
//
129124
// Filament Runout Sensor
130125
//
@@ -147,6 +142,11 @@
147142
#define POWER_LOSS_PIN PC0 // PWRDET
148143
#endif
149144

145+
//
146+
// Misc. Functions
147+
//
148+
#define LED_PIN PA13
149+
150150
//
151151
// Steppers
152152
//

‎Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,8 @@
137137
//
138138
// Probe enable
139139
//
140-
#if ENABLED(PROBE_ENABLE_DISABLE)
141-
#ifndef PROBE_ENABLE_PIN
142-
#define PROBE_ENABLE_PIN SERVO0_PIN
143-
#endif
140+
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
141+
#define PROBE_ENABLE_PIN SERVO0_PIN
144142
#endif
145143

146144
//

‎Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@
5353
//
5454
// Probe enable
5555
//
56-
#if ENABLED(PROBE_ENABLE_DISABLE)
57-
#ifndef PROBE_ENABLE_PIN
58-
#define PROBE_ENABLE_PIN SERVO0_PIN
59-
#endif
56+
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
57+
#define PROBE_ENABLE_PIN SERVO0_PIN
6058
#endif
6159

6260
//

‎Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V1_0.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@
5555
//
5656
// Probe enable
5757
//
58-
#if ENABLED(PROBE_ENABLE_DISABLE)
59-
#ifndef PROBE_ENABLE_PIN
60-
#define PROBE_ENABLE_PIN SERVO0_PIN
61-
#endif
58+
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
59+
#define PROBE_ENABLE_PIN SERVO0_PIN
6260
#endif
6361

6462
//

‎Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@
5353
//
5454
// Probe enable
5555
//
56-
#if ENABLED(PROBE_ENABLE_DISABLE)
57-
#ifndef PROBE_ENABLE_PIN
58-
#define PROBE_ENABLE_PIN SERVO0_PIN
59-
#endif
56+
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
57+
#define PROBE_ENABLE_PIN SERVO0_PIN
6058
#endif
6159

6260
//

‎Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@
5151
//
5252
// Probe enable
5353
//
54-
#if ENABLED(PROBE_ENABLE_DISABLE)
55-
#ifndef PROBE_ENABLE_PIN
56-
#define PROBE_ENABLE_PIN SERVO0_PIN
57-
#endif
54+
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
55+
#define PROBE_ENABLE_PIN SERVO0_PIN
5856
#endif
5957

6058
//

‎Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,45 +45,33 @@
4545
//
4646
#define SERVO0_PIN PB14
4747

48-
//
49-
// Misc. Functions
50-
//
51-
#define LED_PIN PA14
52-
5348
//
5449
// Trinamic Stallguard pins
5550
//
5651
#define X_DIAG_PIN PF0 // M1-STOP
5752
#define Y_DIAG_PIN PF2 // M2-STOP
5853
#define Z_DIAG_PIN PF4 // M3-STOP
59-
#define Z2_DIAG_PIN PF3 // M4-STOP
60-
#define E0_DIAG_PIN PF1 // M5-STOP
61-
#define E1_DIAG_PIN PC15 // M6-STOP
54+
#define Z2_DIAG_PIN PF3 // M4-DET
55+
#define E0_DIAG_PIN PF1 // M5-DET
56+
#define E1_DIAG_PIN PC15 // M6-DET
6257
#define E2_DIAG_PIN PF12 // PWRDET
6358

64-
//
65-
// Z Probe (when not Z_MIN_PIN)
66-
//
67-
#ifndef Z_MIN_PROBE_PIN
68-
#define Z_MIN_PROBE_PIN PB15
69-
#endif
70-
7159
//
7260
// Limit Switches
7361
//
7462
#ifdef X_STALL_SENSITIVITY
7563
#define X_STOP_PIN X_DIAG_PIN
7664
#if X_HOME_TO_MIN
77-
#define X_MAX_PIN E0_DIAG_PIN // E0DET
65+
#define X_MAX_PIN E0_DIAG_PIN // M4-DET
7866
#else
79-
#define X_MIN_PIN E0_DIAG_PIN // E0DET
67+
#define X_MIN_PIN E0_DIAG_PIN // M4-DET
8068
#endif
8169
#elif NEEDS_X_MINMAX
8270
#ifndef X_MIN_PIN
8371
#define X_MIN_PIN X_DIAG_PIN // X-STOP
8472
#endif
8573
#ifndef X_MAX_PIN
86-
#define X_MAX_PIN E0_DIAG_PIN // E0DET
74+
#define X_MAX_PIN E0_DIAG_PIN // M4-DET
8775
#endif
8876
#else
8977
#define X_STOP_PIN X_DIAG_PIN // X-STOP
@@ -92,16 +80,16 @@
9280
#ifdef Y_STALL_SENSITIVITY
9381
#define Y_STOP_PIN Y_DIAG_PIN
9482
#if Y_HOME_TO_MIN
95-
#define Y_MAX_PIN E1_DIAG_PIN // E1DET
83+
#define Y_MAX_PIN E1_DIAG_PIN // M5-DET
9684
#else
97-
#define Y_MIN_PIN E1_DIAG_PIN // E1DET
85+
#define Y_MIN_PIN E1_DIAG_PIN // M5-DET
9886
#endif
9987
#elif NEEDS_Y_MINMAX
10088
#ifndef Y_MIN_PIN
10189
#define Y_MIN_PIN Y_DIAG_PIN // Y-STOP
10290
#endif
10391
#ifndef Y_MAX_PIN
104-
#define Y_MAX_PIN E1_DIAG_PIN // E1DET
92+
#define Y_MAX_PIN E1_DIAG_PIN // M5-DET
10593
#endif
10694
#else
10795
#define Y_STOP_PIN Y_DIAG_PIN // Y-STOP
@@ -126,24 +114,17 @@
126114
#endif
127115

128116
//
129-
// Filament Runout Sensor
130-
//
131-
#define FIL_RUNOUT_PIN PF1 // E0DET
132-
#define FIL_RUNOUT2_PIN PF15 // E1DET
133-
134-
//
135-
// Power Supply Control
117+
// Z Probe (when not Z_MIN_PIN)
136118
//
137-
#ifndef PS_ON_PIN
138-
#define PS_ON_PIN PF13 // PS-ON
119+
#ifndef Z_MIN_PROBE_PIN
120+
#define Z_MIN_PROBE_PIN PB15
139121
#endif
140122

141123
//
142-
// Power Loss Detection
124+
// Filament Runout Sensor
143125
//
144-
#ifndef POWER_LOSS_PIN
145-
#define POWER_LOSS_PIN PF12 // PWRDET
146-
#endif
126+
#define FIL_RUNOUT_PIN PF1 // M5-DET
127+
#define FIL_RUNOUT2_PIN PC15 // M6-DET
147128

148129
//
149130
// Steppers
@@ -244,6 +225,31 @@
244225
#define FAN5_PIN PF8 // 4 wire Fan5
245226
#define FAN6_PIN PA2 // 4 wire Fan6
246227

228+
//
229+
// Power Supply Control
230+
//
231+
#ifndef PS_ON_PIN
232+
#define PS_ON_PIN PF13 // PS-ON
233+
#endif
234+
235+
//
236+
// Power Loss Detection
237+
//
238+
#ifndef POWER_LOSS_PIN
239+
#define POWER_LOSS_PIN PF12 // PWRDET
240+
#endif
241+
242+
//
243+
// Misc. Functions
244+
//
245+
#define LED_PIN PA14
246+
#ifndef FILWIDTH_PIN
247+
#define FILWIDTH_PIN PC0
248+
#endif
249+
#ifndef FILWIDTH2_PIN
250+
#define FILWIDTH2_PIN PF10
251+
#endif
252+
247253
//
248254
// SD Support
249255
//

0 commit comments

Comments
 (0)