Browse Source

Implemented BQ ZUM Mega 3D board layout as an override to RAMPS 1.3

Scott Lahteine 8 years ago
parent
commit
6a21180bd4
4 changed files with 37 additions and 58 deletions
  1. 1
    2
      Marlin/pins.h
  2. 35
    54
      Marlin/pins_BQ_ZUM_MEGA_3D.h
  3. 0
    1
      Marlin/pins_RAMBO.h
  4. 1
    1
      Marlin/pins_RAMPS_13.h

+ 1
- 2
Marlin/pins.h View File

@@ -16,7 +16,6 @@
16 16
 #define E0_MS2_PIN -1
17 17
 #define E1_MS1_PIN -1
18 18
 #define E1_MS2_PIN -1
19
-#define DIGIPOTSS_PIN -1
20 19
 #define HEATER_3_PIN -1
21 20
 #define TEMP_3_PIN -1
22 21
 
@@ -269,7 +268,7 @@
269 268
     analogInputToDigitalPin(TEMP_BED_PIN) \
270 269
   }
271 270
 
272
-#define HAS_DIGIPOTSS (DIGIPOTSS_PIN >= 0)
271
+#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
273 272
 
274 273
 #endif //__PINS_H
275 274
 

+ 35
- 54
Marlin/pins_BQ_ZUM_MEGA_3D.h View File

@@ -6,76 +6,57 @@
6 6
   #error Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu.
7 7
 #endif
8 8
 
9
-#define LARGE_FLASH         true
9
+#include "pins_RAMPS_13.h"
10 10
 
11
-#define LED_PIN             13
11
+#undef X_MAX_PIN
12
+#define X_MAX_PIN         79 //  2
12 13
 
13
-#define X_STEP_PIN          54
14
-#define X_DIR_PIN           55
15
-#define X_ENABLE_PIN        38
16
-#define X_MIN_PIN           3
17
-#define X_MAX_PIN           79
14
+#undef Z_ENABLE_PIN
15
+#define Z_ENABLE_PIN      77 // 62
18 16
 
19
-#define Y_STEP_PIN          60
20
-#define Y_DIR_PIN           61
21
-#define Y_ENABLE_PIN        56
22
-#define Y_MIN_PIN           14
23
-#define Y_MAX_PIN           15
17
+#undef FAN_PIN
18
+#define FAN_PIN           12 //  4
24 19
 
25
-#define Z_STEP_PIN          46
26
-#define Z_DIR_PIN           48
27
-#define Z_ENABLE_PIN        77
28
-#define Z_MIN_PIN           18 // Z-MIN Label
29
-#define Z_MAX_PIN           19 // IND_S_5V
20
+#undef HEATER_0_PIN
21
+#define HEATER_0_PIN       9 // 10
30 22
 
31
-#define E0_STEP_PIN         26
32
-#define E0_DIR_PIN          28
33
-#define E0_ENABLE_PIN       24
23
+#undef HEATER_1_PIN
24
+#define HEATER_1_PIN      10 //  9
34 25
 
35
-#define E1_STEP_PIN         36
36
-#define E1_DIR_PIN          34
37
-#define E1_ENABLE_PIN       30
26
+#undef TEMP_1_PIN
27
+#define TEMP_1_PIN        14 // 15
38 28
 
39
-#define FAN_PIN             12
40
-#define HEATER_0_PIN        9
41
-#define TEMP_0_PIN          13
29
+#undef TEMP_BED_PIN
30
+#define TEMP_BED_PIN      15 // 14
42 31
 
43
-#define FAN1_PIN            7
44
-#define HEATER_1_PIN        10
45
-#define TEMP_1_PIN          14
32
+#define DIGIPOTSS_PIN     22
33
+#define DIGIPOT_CHANNELS  { 4, 5, 3, 0, 1 }
46 34
 
47
-#define HEATER_BED_PIN      8
48
-#define TEMP_BED_PIN        15
35
+#define FAN1_PIN          7
49 36
 
50
-#undef DIGIPOTSS_PIN
51
-#define DIGIPOTSS_PIN       22
52
-#define DIGIPOT_CHANNELS    { 4, 5, 3 , 0, 1 }
37
+#undef PS_ON_PIN             // 12
38
+#define PS_ON_PIN         81 // External Power Supply
53 39
 
54
-#define PS_ON_PIN           81 // External Power Supply
40
+#if ENABLED(BQ_LCD_SMART_CONTROLLER) // Most similar to REPRAP_DISCOUNT_SMART_CONTROLLER
41
+  #define KILL_PIN        41
55 42
 
56
-#if ENABLED(BQ_LCD_SMART_CONTROLLER)
57
-	#define KILL_PIN        41
43
+  #define BEEPER_PIN      37
58 44
 
59
-	#define LCD_PIN_BL      39
60
-	#define LCD_PINS_RS     16
61
-	#define LCD_PINS_ENABLE 17
62
-	#define LCD_PINS_D4     23
45
+  #define BTN_EN1         31
46
+  #define BTN_EN2         33
47
+  #define BTN_ENC         35
63 48
 
64
-	#define BTN_EN1         31
65
-	#define BTN_EN2         33
66
-	#define BTN_ENC         35
49
+  #define LCD_PIN_BL      39
50
+  #define LCD_PINS_RS     16
51
+  #define LCD_PINS_ENABLE 17
52
+  #define LCD_PINS_D4     23
67 53
 
68
-	#define BEEPER_PIN      37
69
-
70
-    #define SDPOWER         -1
71
-	#define SDSS            53
72
-	#define SD_DETECT_PIN   49
54
+  #define SD_DETECT_PIN   49
73 55
 #endif
74 56
 
75 57
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
76
- 	#undef Z_MIN_PIN
77
- 	#undef Z_MAX_PIN
78
-
79
-	#define Z_MIN_PIN       19 // IND_S_5V
80
-	#define Z_MAX_PIN       18 // Z-MIN Label
58
+  #undef Z_MIN_PIN
59
+  #undef Z_MAX_PIN
60
+  #define Z_MIN_PIN       19 // IND_S_5V
61
+  #define Z_MAX_PIN       18 // Z-MIN Label
81 62
 #endif

+ 0
- 1
Marlin/pins_RAMBO.h View File

@@ -82,7 +82,6 @@
82 82
 #define E1_MS1_PIN 63
83 83
 #define E1_MS2_PIN 64
84 84
 
85
-#undef DIGIPOTSS_PIN
86 85
 #define DIGIPOTSS_PIN 38
87 86
 #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
88 87
 

+ 1
- 1
Marlin/pins_RAMPS_13.h View File

@@ -8,7 +8,7 @@
8 8
  *  RAMPS_13_EFF (Extruder, Fan, Fan)
9 9
  *  RAMPS_13_EEF (Extruder, Extruder, Fan)
10 10
  *  RAMPS_13_SF  (Spindle, Controller Fan)
11
- * 
11
+ *
12 12
  *  RAMPS_14_EFB (Extruder, Fan, Bed)
13 13
  *  RAMPS_14_EEB (Extruder, Extruder, Bed)
14 14
  *  RAMPS_14_EFF (Extruder, Fan, Fan)

Loading…
Cancel
Save