Skip to content

Commit 267a44c

Browse files
thinkyheadthinkyhead
committed
🧑‍💻 Wrap MMU1 pins
1 parent 5520aa3 commit 267a44c

12 files changed

+79
-55
lines changed

‎Marlin/src/pins/linux/pins_RAMPS_LINUX.h

+10-8
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,16 @@
234234
//
235235
// Průša i3 MK2 Multiplexer Support
236236
//
237-
#ifndef E_MUX0_PIN
238-
#define E_MUX0_PIN 40 // Z_CS_PIN
239-
#endif
240-
#ifndef E_MUX1_PIN
241-
#define E_MUX1_PIN 42 // E0_CS_PIN
242-
#endif
243-
#ifndef E_MUX2_PIN
244-
#define E_MUX2_PIN 44 // E1_CS_PIN
237+
#if HAS_PRUSA_MMU1
238+
#ifndef E_MUX0_PIN
239+
#define E_MUX0_PIN 40 // Z_CS_PIN
240+
#endif
241+
#ifndef E_MUX1_PIN
242+
#define E_MUX1_PIN 42 // E0_CS_PIN
243+
#endif
244+
#ifndef E_MUX2_PIN
245+
#define E_MUX2_PIN 44 // E1_CS_PIN
246+
#endif
245247
#endif
246248

247249
/**

‎Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,13 @@
258258
//
259259
// Průša i3 MK2 Multiplexer Support
260260
//
261-
#if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
262-
#define E_MUX0_PIN P0_03 // ( 0) Z_CS_PIN
263-
#define E_MUX1_PIN P0_02 // ( 1) E0_CS_PIN
261+
#if HAS_PRUSA_MMU1
262+
#if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
263+
#define E_MUX0_PIN P0_03 // ( 0) Z_CS_PIN
264+
#define E_MUX1_PIN P0_02 // ( 1) E0_CS_PIN
265+
#endif
266+
#define E_MUX2_PIN P0_26 // (63) E1_CS_PIN
264267
#endif
265-
#define E_MUX2_PIN P0_26 // (63) E1_CS_PIN
266268

267269
/**
268270
* LCD / Controller

‎Marlin/src/pins/rambo/pins_EINSY_RAMBO.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,11 @@
163163
//
164164
// Průša i3 MK2 Multiplexer Support
165165
//
166-
#define E_MUX0_PIN 17
167-
#define E_MUX1_PIN 16
168-
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
166+
#if HAS_PRUSA_MMU1
167+
#define E_MUX0_PIN 17
168+
#define E_MUX1_PIN 16
169+
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
170+
#endif
169171

170172
//
171173
// LCD / Controller

‎Marlin/src/pins/rambo/pins_EINSY_RETRO.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,11 @@
157157
//
158158
// Průša i3 MK2 Multiplexer Support
159159
//
160-
#define E_MUX0_PIN 17
161-
#define E_MUX1_PIN 16
162-
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
160+
#if HAS_PRUSA_MMU1
161+
#define E_MUX0_PIN 17
162+
#define E_MUX1_PIN 16
163+
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
164+
#endif
163165

164166
//
165167
// LCD / Controller

‎Marlin/src/pins/rambo/pins_MINIRAMBO.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,12 @@
130130
//
131131
// Průša i3 MK2 Multiplexer Support
132132
//
133-
#define E_MUX0_PIN 17
134-
#define E_MUX1_PIN 16
135-
#if !MB(MINIRAMBO_10A)
136-
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
133+
#if HAS_PRUSA_MMU1
134+
#define E_MUX0_PIN 17
135+
#define E_MUX1_PIN 16
136+
#if !MB(MINIRAMBO_10A)
137+
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
138+
#endif
137139
#endif
138140

139141
//

‎Marlin/src/pins/rambo/pins_RAMBO.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@
186186
//
187187
// Průša i3 MK2 Multiplexer Support
188188
//
189-
#define E_MUX0_PIN 17
190-
#define E_MUX1_PIN 16
191-
#define E_MUX2_PIN 84 // 84 in MK2 Firmware
189+
#if HAS_PRUSA_MMU1
190+
#define E_MUX0_PIN 17
191+
#define E_MUX1_PIN 16
192+
#define E_MUX2_PIN 84 // 84 in MK2 Firmware
193+
#endif
192194

193195
//
194196
// LCD / Controller

‎Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
//
106106
// Průša i3 MK2 Multiplexer Support
107107
//
108-
#define E_MUX2_PIN -1
108+
#if HAS_PRUSA_MMU1
109+
#define E_MUX2_PIN -1
110+
#endif
109111

110112
//
111113
// Misc. Functions

‎Marlin/src/pins/ramps/pins_RAMPS.h

+10-8
Original file line numberDiff line numberDiff line change
@@ -412,14 +412,16 @@
412412
//
413413
// Průša i3 MK2 Multiplexer Support
414414
//
415-
#ifndef E_MUX0_PIN
416-
#define E_MUX0_PIN 40 // Z_CS_PIN
417-
#endif
418-
#ifndef E_MUX1_PIN
419-
#define E_MUX1_PIN 42 // E0_CS_PIN
420-
#endif
421-
#ifndef E_MUX2_PIN
422-
#define E_MUX2_PIN 44 // E1_CS_PIN
415+
#if HAS_PRUSA_MMU1
416+
#ifndef E_MUX0_PIN
417+
#define E_MUX0_PIN 40 // Z_CS_PIN
418+
#endif
419+
#ifndef E_MUX1_PIN
420+
#define E_MUX1_PIN 42 // E0_CS_PIN
421+
#endif
422+
#ifndef E_MUX2_PIN
423+
#define E_MUX2_PIN 44 // E1_CS_PIN
424+
#endif
423425
#endif
424426

425427
//

‎Marlin/src/pins/ramps/pins_RAMPS_S_12.h

+10-8
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,16 @@
233233
//
234234
// Průša i3 MK2 Multiplexer Support
235235
//
236-
#ifndef E_MUX0_PIN
237-
#define E_MUX0_PIN 29 // E2_STEP_PIN
238-
#endif
239-
#ifndef E_MUX1_PIN
240-
#define E_MUX1_PIN 28 // E2_DIR_PIN
241-
#endif
242-
#ifndef E_MUX2_PIN
243-
#define E_MUX2_PIN 39 // E2_ENABLE_PIN
236+
#if HAS_PRUSA_MMU1
237+
#ifndef E_MUX0_PIN
238+
#define E_MUX0_PIN 29 // E2_STEP_PIN
239+
#endif
240+
#ifndef E_MUX1_PIN
241+
#define E_MUX1_PIN 28 // E2_DIR_PIN
242+
#endif
243+
#ifndef E_MUX2_PIN
244+
#define E_MUX2_PIN 39 // E2_ENABLE_PIN
245+
#endif
244246
#endif
245247

246248
//////////////////////////

‎Marlin/src/pins/ramps/pins_TT_OSCAR.h

+11-9
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,17 @@
252252
//
253253
// Průša i3 MK2 Multiplexer Support
254254
//
255-
//#ifndef E_MUX0_PIN
256-
// #define E_MUX0_PIN 58 // Y_CS_PIN
257-
//#endif
258-
//#ifndef E_MUX1_PIN
259-
// #define E_MUX1_PIN 53 // Z_CS_PIN
260-
//#endif
261-
//#ifndef E_MUX2_PIN
262-
// #define E_MUX2_PIN 49 // En_CS_PIN
263-
//#endif
255+
#if 0 && HAS_PRUSA_MMU1
256+
#ifndef E_MUX0_PIN
257+
#define E_MUX0_PIN 58 // Y_CS_PIN
258+
#endif
259+
#ifndef E_MUX1_PIN
260+
#define E_MUX1_PIN 53 // Z_CS_PIN
261+
#endif
262+
#ifndef E_MUX2_PIN
263+
#define E_MUX2_PIN 49 // En_CS_PIN
264+
#endif
265+
#endif
264266

265267
//////////////////////////
266268
// LCDs and Controllers //

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@
133133
//
134134
// Průša i3 MK2 Multi Material Multiplexer Support
135135
//
136-
//#define E_MUX0_PIN -1
137-
//#define E_MUX1_PIN -1
136+
#if HAS_PRUSA_MMU1
137+
//#define E_MUX0_PIN -1
138+
//#define E_MUX1_PIN -1
139+
#endif
138140

139141
//
140142
// LED / Lighting

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,10 @@
150150
//
151151
// Průša i3 MK2 Multi Material Multiplexer Support
152152
//
153-
//#define E_MUX0_PIN PG3
154-
//#define E_MUX1_PIN PG4
153+
#if HAS_PRUSA_MMU1
154+
//#define E_MUX0_PIN PG3
155+
//#define E_MUX1_PIN PG4
156+
#endif
155157

156158
#define LED_PIN PB14 // Alive
157159
#define PS_ON_PIN PE0

0 commit comments

Comments
 (0)