thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

🧑‍💻 Wrap MMU1 pins

Scott Lahteine 3 years ago
parent
5520aa3a10
commit
267a44c95c
12 changed files with 79 additions and 55 deletions
Unified View Show Diff Stats
  1. 10
    8
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  2. 6
    4
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  3. 5
    3
      Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
  4. 5
    3
      Marlin/src/pins/rambo/pins_EINSY_RETRO.h
  5. 6
    4
      Marlin/src/pins/rambo/pins_MINIRAMBO.h
  6. 5
    3
      Marlin/src/pins/rambo/pins_RAMBO.h
  7. 3
    1
      Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
  8. 10
    8
      Marlin/src/pins/ramps/pins_RAMPS.h
  9. 10
    8
      Marlin/src/pins/ramps/pins_RAMPS_S_12.h
  10. 11
    9
      Marlin/src/pins/ramps/pins_TT_OSCAR.h
  11. 4
    2
      Marlin/src/pins/stm32f4/pins_LERDGE_S.h
  12. 4
    2
      Marlin/src/pins/stm32f4/pins_VAKE403D.h

+ 10
- 8
Marlin/src/pins/linux/pins_RAMPS_LINUX.h View File

234 
 //
 234 
 //
235 
 // Průša i3 MK2 Multiplexer Support
 235 
 // Průša i3 MK2 Multiplexer Support
236 
 //
 236 
 //
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
245 
 #endif
 247 
 #endif
246
248
247 
 /**
 249 
 /**

+ 6
- 4
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h View File

258 
 //
 258 
 //
259 
 // Průša i3 MK2 Multiplexer Support
 259 
 // Průša i3 MK2 Multiplexer Support
260 
 //
 260 
 //
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
264 
 #endif
 267 
 #endif
265 
-#define E_MUX2_PIN                         P0_26  // (63) E1_CS_PIN
266
268
267 
 /**
 269 
 /**
268 
  * LCD / Controller
 270 
  * LCD / Controller

+ 5
- 3
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h View File

163 
 //
 163 
 //
164 
 // Průša i3 MK2 Multiplexer Support
 164 
 // Průša i3 MK2 Multiplexer Support
165 
 //
 165 
 //
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
169
171
170 
 //
 172 
 //
171 
 // LCD / Controller
 173 
 // LCD / Controller

+ 5
- 3
Marlin/src/pins/rambo/pins_EINSY_RETRO.h View File

157 
 //
 157 
 //
158 
 // Průša i3 MK2 Multiplexer Support
 158 
 // Průša i3 MK2 Multiplexer Support
159 
 //
 159 
 //
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
163
165
164 
 //
 166 
 //
165 
 // LCD / Controller
 167 
 // LCD / Controller

+ 6
- 4
Marlin/src/pins/rambo/pins_MINIRAMBO.h View File

130 
 //
 130 
 //
131 
 // Průša i3 MK2 Multiplexer Support
 131 
 // Průša i3 MK2 Multiplexer Support
132 
 //
 132 
 //
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
137 
 #endif
 139 
 #endif
138
140
139 
 //
 141 
 //

+ 5
- 3
Marlin/src/pins/rambo/pins_RAMBO.h View File

186 
 //
 186 
 //
187 
 // Průša i3 MK2 Multiplexer Support
 187 
 // Průša i3 MK2 Multiplexer Support
188 
 //
 188 
 //
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
192
194
193 
 //
 195 
 //
194 
 // LCD / Controller
 196 
 // LCD / Controller

+ 3
- 1
Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h View File

105 
 //
 105 
 //
106 
 // Průša i3 MK2 Multiplexer Support
 106 
 // Průša i3 MK2 Multiplexer Support
107 
 //
 107 
 //
108 
-#define E_MUX2_PIN                            -1
108 
+#if HAS_PRUSA_MMU1
109 
+  #define E_MUX2_PIN                          -1
110 
+#endif
109
111
110 
 //
 112 
 //
111 
 // Misc. Functions
 113 
 // Misc. Functions

+ 10
- 8
Marlin/src/pins/ramps/pins_RAMPS.h View File

412 
 //
 412 
 //
413 
 // Průša i3 MK2 Multiplexer Support
 413 
 // Průša i3 MK2 Multiplexer Support
414 
 //
 414 
 //
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
423 
 #endif
 425 
 #endif
424
426
425 
 //
 427 
 //

+ 10
- 8
Marlin/src/pins/ramps/pins_RAMPS_S_12.h View File

233 
 //
 233 
 //
234 
 // Průša i3 MK2 Multiplexer Support
 234 
 // Průša i3 MK2 Multiplexer Support
235 
 //
 235 
 //
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
244 
 #endif
 246 
 #endif
245
247
246 
 //////////////////////////
 248 
 //////////////////////////

+ 11
- 9
Marlin/src/pins/ramps/pins_TT_OSCAR.h View File

252 
 //
 252 
 //
253 
 // Průša i3 MK2 Multiplexer Support
 253 
 // Průša i3 MK2 Multiplexer Support
254 
 //
 254 
 //
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
264
266
265 
 //////////////////////////
 267 
 //////////////////////////
266 
 // LCDs and Controllers //
 268 
 // LCDs and Controllers //

+ 4
- 2
Marlin/src/pins/stm32f4/pins_LERDGE_S.h View File

133 
 //
 133 
 //
134 
 // Průša i3 MK2 Multi Material Multiplexer Support
 134 
 // Průša i3 MK2 Multi Material Multiplexer Support
135 
 //
 135 
 //
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
138
140
139 
 //
 141 
 //
140 
 // LED / Lighting
 142 
 // LED / Lighting

+ 4
- 2
Marlin/src/pins/stm32f4/pins_VAKE403D.h View File

150 
 //
 150 
 //
151 
 // Průša i3 MK2 Multi Material Multiplexer Support
 151 
 // Průša i3 MK2 Multi Material Multiplexer Support
152 
 //
 152 
 //
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
155
157
156 
 #define LED_PIN                             PB14  // Alive
 158 
 #define LED_PIN                             PB14  // Alive
157 
 #define PS_ON_PIN                           PE0
 159 
 #define PS_ON_PIN                           PE0

Write Preview
Loading…
Cancel
Save