Browse Source

Split RAMPS 1.3 an 1.4 (PR#2741)

because of hardware differences on the SERVO0_PIN
AnHardt 9 years ago
parent
commit
8da2e98985
4 changed files with 59 additions and 8 deletions
  1. 24
    0
      Marlin/Makefile
  2. 10
    5
      Marlin/boards.h
  3. 6
    0
      Marlin/pins.h
  4. 19
    3
      Marlin/pins_RAMPS_13.h

+ 24
- 0
Marlin/Makefile View File

98
 else ifeq  ($(HARDWARE_MOTHERBOARD),34)
98
 else ifeq  ($(HARDWARE_MOTHERBOARD),34)
99
 HARDWARE_VARIANT ?= arduino
99
 HARDWARE_VARIANT ?= arduino
100
 MCU              ?= atmega2560
100
 MCU              ?= atmega2560
101
+else ifeq  ($(HARDWARE_MOTHERBOARD),35)
102
+HARDWARE_VARIANT ?= arduino
103
+MCU              ?= atmega2560
104
+else ifeq  ($(HARDWARE_MOTHERBOARD),36)
105
+HARDWARE_VARIANT ?= arduino
106
+MCU              ?= atmega2560
107
+else ifeq  ($(HARDWARE_MOTHERBOARD),38)
108
+HARDWARE_VARIANT ?= arduino
109
+MCU              ?= atmega2560
110
+else ifeq  ($(HARDWARE_MOTHERBOARD),43)
111
+HARDWARE_VARIANT ?= arduino
112
+MCU              ?= atmega2560
113
+else ifeq  ($(HARDWARE_MOTHERBOARD),44)
114
+HARDWARE_VARIANT ?= arduino
115
+MCU              ?= atmega2560
116
+else ifeq  ($(HARDWARE_MOTHERBOARD),45)
117
+HARDWARE_VARIANT ?= arduino
118
+MCU              ?= atmega2560
119
+else ifeq  ($(HARDWARE_MOTHERBOARD),46)
120
+HARDWARE_VARIANT ?= arduino
121
+MCU              ?= atmega2560
122
+else ifeq  ($(HARDWARE_MOTHERBOARD),48)
123
+HARDWARE_VARIANT ?= arduino
124
+MCU              ?= atmega2560
101
 
125
 
102
 #Gen6
126
 #Gen6
103
 else ifeq  ($(HARDWARE_MOTHERBOARD),5)
127
 else ifeq  ($(HARDWARE_MOTHERBOARD),5)

+ 10
- 5
Marlin/boards.h View File

10
 #define BOARD_CHEAPTRONIC       2    // Cheaptronic v1.0
10
 #define BOARD_CHEAPTRONIC       2    // Cheaptronic v1.0
11
 #define BOARD_SETHI             20   // Sethi 3D_1
11
 #define BOARD_SETHI             20   // Sethi 3D_1
12
 #define BOARD_RAMPS_OLD         3    // MEGA/RAMPS up to 1.2
12
 #define BOARD_RAMPS_OLD         3    // MEGA/RAMPS up to 1.2
13
-#define BOARD_RAMPS_13_EFB      33   // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Bed)
14
-#define BOARD_RAMPS_13_EEB      34   // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed)
15
-#define BOARD_RAMPS_13_EFF      35   // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan)
16
-#define BOARD_RAMPS_13_EEF      36   // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan)
17
-#define BOARD_RAMPS_13_SF       38   // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan)
13
+#define BOARD_RAMPS_13_EFB      33   // RAMPS 1.3 (Power outputs: Extruder, Fan, Bed)
14
+#define BOARD_RAMPS_13_EEB      34   // RAMPS 1.3 (Power outputs: Extruder0, Extruder1, Bed)
15
+#define BOARD_RAMPS_13_EFF      35   // RAMPS 1.3 (Power outputs: Extruder, Fan, Fan)
16
+#define BOARD_RAMPS_13_EEF      36   // RAMPS 1.3 (Power outputs: Extruder0, Extruder1, Fan)
17
+#define BOARD_RAMPS_13_SF       38   // RAMPS 1.3 (Power outputs: Spindle, Controller Fan)
18
 #define BOARD_FELIX2            37   // Felix 2.0+ Electronics Board (RAMPS like)
18
 #define BOARD_FELIX2            37   // Felix 2.0+ Electronics Board (RAMPS like)
19
 #define BOARD_RIGIDBOARD        42   // Invent-A-Part RigidBoard
19
 #define BOARD_RIGIDBOARD        42   // Invent-A-Part RigidBoard
20
+#define BOARD_RAMPS_14_EFB      43   // RAMPS 1.4 (Power outputs: Extruder, Fan, Bed)
21
+#define BOARD_RAMPS_14_EEB      44   // RAMPS 1.4 (Power outputs: Extruder0, Extruder1, Bed)
22
+#define BOARD_RAMPS_14_EFF      45   // RAMPS 1.4 (Power outputs: Extruder, Fan, Fan)
23
+#define BOARD_RAMPS_14_EEF      46   // RAMPS 1.4 (Power outputs: Extruder0, Extruder1, Fan)
24
+#define BOARD_RAMPS_14_SF       48   // RAMPS 1.4 (Power outputs: Spindle, Controller Fan)
20
 #define BOARD_GEN6              5    // Gen6
25
 #define BOARD_GEN6              5    // Gen6
21
 #define BOARD_GEN6_DELUXE       51   // Gen6 deluxe
26
 #define BOARD_GEN6_DELUXE       51   // Gen6 deluxe
22
 #define BOARD_SANGUINOLOLU_11   6    // Sanguinololu < 1.2
27
 #define BOARD_SANGUINOLOLU_11   6    // Sanguinololu < 1.2

+ 6
- 0
Marlin/pins.h View File

38
   #include "pins_RAMPS_13_EFB.h"
38
   #include "pins_RAMPS_13_EFB.h"
39
 #elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
39
 #elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
40
   #include "pins_RAMPS_13.h"
40
   #include "pins_RAMPS_13.h"
41
+#elif MB(RAMPS_14_EFB)
42
+  #define IS_RAMPS_14
43
+  #include "pins_RAMPS_13_EFB.h"
44
+#elif MB(RAMPS_14_EEB) || MB(RAMPS_14_EFF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_SF)
45
+  #define IS_RAMPS_14
46
+  #include "pins_RAMPS_13.h"
41
 #elif MB(GEN6)
47
 #elif MB(GEN6)
42
   #include "pins_GEN6.h"
48
   #include "pins_GEN6.h"
43
 #elif MB(GEN6_DELUXE)
49
 #elif MB(GEN6_DELUXE)

+ 19
- 3
Marlin/pins_RAMPS_13.h View File

1
 /**
1
 /**
2
- * Arduino Mega with RAMPS v1.3 pin assignments
2
+ * Arduino Mega with RAMPS v1.3 v1.4 pin assignments
3
  *
3
  *
4
  * Applies to the following boards:
4
  * Applies to the following boards:
5
  *
5
  *
8
  *  RAMPS_13_EFF (Extruder, Fan, Fan)
8
  *  RAMPS_13_EFF (Extruder, Fan, Fan)
9
  *  RAMPS_13_EEF (Extruder, Extruder, Fan)
9
  *  RAMPS_13_EEF (Extruder, Extruder, Fan)
10
  *  RAMPS_13_SF  (Spindle, Controller Fan)
10
  *  RAMPS_13_SF  (Spindle, Controller Fan)
11
+ * 
12
+ *  RAMPS_14_EFB (Extruder, Fan, Bed)
13
+ *  RAMPS_14_EEB (Extruder, Extruder, Bed)
14
+ *  RAMPS_14_EFF (Extruder, Fan, Fan)
15
+ *  RAMPS_14_EEF (Extruder, Extruder, Fan)
16
+ *  RAMPS_14_SF  (Spindle, Controller Fan)
11
  *
17
  *
12
  *  Other pins_MYBOARD.h files may override these defaults
18
  *  Other pins_MYBOARD.h files may override these defaults
19
+ *
20
+ *  Differences between
21
+ *  RAMPS_13 | RAMPS_14
22
+ *         7 | 11
13
  */
23
  */
14
 
24
 
15
 #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
25
 #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
18
 
28
 
19
 #define LARGE_FLASH true
29
 #define LARGE_FLASH true
20
 
30
 
21
-#define SERVO0_PIN         11
31
+#ifdef IS_RAMPS_14
32
+  #define SERVO0_PIN       11
33
+#else
34
+  #define SERVO0_PIN        7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
35
+#endif
22
 #define SERVO1_PIN          6
36
 #define SERVO1_PIN          6
23
 #define SERVO2_PIN          5
37
 #define SERVO2_PIN          5
24
 #define SERVO3_PIN          4
38
 #define SERVO3_PIN          4
154
       #define KILL_PIN 41
168
       #define KILL_PIN 41
155
     #elif ENABLED(LCD_I2C_VIKI)
169
     #elif ENABLED(LCD_I2C_VIKI)
156
       #define BTN_EN1 22  // reverse if the encoder turns the wrong way.
170
       #define BTN_EN1 22  // reverse if the encoder turns the wrong way.
157
-      #define BTN_EN2 7
171
+      #define BTN_EN2 7   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf
172
+                          // tells about 40/42.
173
+                          // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
158
       #define BTN_ENC -1
174
       #define BTN_ENC -1
159
       #define LCD_SDSS 53
175
       #define LCD_SDSS 53
160
       #define SD_DETECT_PIN 49
176
       #define SD_DETECT_PIN 49

Loading…
Cancel
Save