Просмотр исходного кода

Support for RAMPS Plus (3DYMY)

Scott Lahteine 6 лет назад
Родитель
Сommit
b6ba32ce75
3 измененных файлов: 110 добавлений и 5 удалений
  1. 8
    0
      Marlin/src/core/boards.h
  2. 15
    5
      Marlin/src/pins/pins.h
  3. 87
    0
      Marlin/src/pins/pins_RAMPS_PLUS.h

+ 8
- 0
Marlin/src/core/boards.h Просмотреть файл

@@ -30,17 +30,25 @@
30 30
 //
31 31
 
32 32
 #define BOARD_RAMPS_OLD         3     // MEGA/RAMPS up to 1.2
33
+
33 34
 #define BOARD_RAMPS_13_EFB      33    // RAMPS 1.3 (Power outputs: Hotend, Fan, Bed)
34 35
 #define BOARD_RAMPS_13_EEB      34    // RAMPS 1.3 (Power outputs: Hotend0, Hotend1, Bed)
35 36
 #define BOARD_RAMPS_13_EFF      35    // RAMPS 1.3 (Power outputs: Hotend, Fan0, Fan1)
36 37
 #define BOARD_RAMPS_13_EEF      36    // RAMPS 1.3 (Power outputs: Hotend0, Hotend1, Fan)
37 38
 #define BOARD_RAMPS_13_SF       38    // RAMPS 1.3 (Power outputs: Spindle, Controller Fan)
39
+
38 40
 #define BOARD_RAMPS_14_EFB      43    // RAMPS 1.4 (Power outputs: Hotend, Fan, Bed)
39 41
 #define BOARD_RAMPS_14_EEB      44    // RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Bed)
40 42
 #define BOARD_RAMPS_14_EFF      45    // RAMPS 1.4 (Power outputs: Hotend, Fan0, Fan1)
41 43
 #define BOARD_RAMPS_14_EEF      46    // RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Fan)
42 44
 #define BOARD_RAMPS_14_SF       48    // RAMPS 1.4 (Power outputs: Spindle, Controller Fan)
43 45
 
46
+#define BOARD_RAMPS_PLUS_EFB   143    // RAMPS Plus 3DYMY (Power outputs: Hotend, Fan, Bed)
47
+#define BOARD_RAMPS_PLUS_EEB   144    // RAMPS Plus 3DYMY (Power outputs: Hotend0, Hotend1, Bed)
48
+#define BOARD_RAMPS_PLUS_EFF   145    // RAMPS Plus 3DYMY (Power outputs: Hotend, Fan0, Fan1)
49
+#define BOARD_RAMPS_PLUS_EEF   146    // RAMPS Plus 3DYMY (Power outputs: Hotend0, Hotend1, Fan)
50
+#define BOARD_RAMPS_PLUS_SF    148    // RAMPS Plus 3DYMY (Power outputs: Spindle, Controller Fan)
51
+
44 52
 //
45 53
 // RAMPS Derivatives - ATmega1280, ATmega2560
46 54
 //

+ 15
- 5
Marlin/src/pins/pins.h Просмотреть файл

@@ -37,15 +37,15 @@
37 37
 
38 38
 #include "../inc/MarlinConfig.h"
39 39
 
40
-#if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB)
40
+#if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_PLUS_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB)
41 41
   #define IS_RAMPS_EFB
42
-#elif MB(RAMPS_13_EEB) || MB(RAMPS_14_EEB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_SMART_EEB) || MB(RAMPS_DUO_EEB) || MB(RAMPS4DUE_EEB)
42
+#elif MB(RAMPS_13_EEB) || MB(RAMPS_14_EEB) || MB(RAMPS_PLUS_EEB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_SMART_EEB) || MB(RAMPS_DUO_EEB) || MB(RAMPS4DUE_EEB)
43 43
   #define IS_RAMPS_EEB
44
-#elif MB(RAMPS_13_EFF) || MB(RAMPS_14_EFF) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_SMART_EFF) || MB(RAMPS_DUO_EFF) || MB(RAMPS4DUE_EFF)
44
+#elif MB(RAMPS_13_EFF) || MB(RAMPS_14_EFF) || MB(RAMPS_PLUS_EFF) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_SMART_EFF) || MB(RAMPS_DUO_EFF) || MB(RAMPS4DUE_EFF)
45 45
   #define IS_RAMPS_EFF
46
-#elif MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_DUO_EEF) || MB(RAMPS4DUE_EEF)
46
+#elif MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_PLUS_EEF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_DUO_EEF) || MB(RAMPS4DUE_EEF)
47 47
   #define IS_RAMPS_EEF
48
-#elif MB(RAMPS_13_SF)  || MB(RAMPS_14_SF)  || MB(RAMPS_14_RE_ARM_SF)  || MB(RAMPS_SMART_SF)  || MB(RAMPS_DUO_SF)  || MB(RAMPS4DUE_SF)
48
+#elif MB(RAMPS_13_SF)  || MB(RAMPS_14_SF)  || MB(RAMPS_PLUS_SF)  || MB(RAMPS_14_RE_ARM_SF)  || MB(RAMPS_SMART_SF)  || MB(RAMPS_DUO_SF)  || MB(RAMPS4DUE_SF)
49 49
   #define IS_RAMPS_SF
50 50
 #endif
51 51
 
@@ -75,6 +75,16 @@
75 75
   #include "pins_RAMPS.h"
76 76
 #elif MB(RAMPS_14_SF)
77 77
   #include "pins_RAMPS.h"
78
+#elif MB(RAMPS_PLUS_EFB)
79
+  #include "pins_RAMPS_PLUS.h"
80
+#elif MB(RAMPS_PLUS_EEB)
81
+  #include "pins_RAMPS_PLUS.h"
82
+#elif MB(RAMPS_PLUS_EFF)
83
+  #include "pins_RAMPS_PLUS.h"
84
+#elif MB(RAMPS_PLUS_EEF)
85
+  #include "pins_RAMPS_PLUS.h"
86
+#elif MB(RAMPS_PLUS_SF)
87
+  #include "pins_RAMPS_PLUS.h"
78 88
 
79 89
 //
80 90
 // RAMPS Derivatives - ATmega1280, ATmega2560

+ 87
- 0
Marlin/src/pins/pins_RAMPS_PLUS.h Просмотреть файл

@@ -0,0 +1,87 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+/**
24
+ * Arduino Mega with RAMPS v1.4Plus, also known as 3DYMY version, pin assignments
25
+ * The differences to the RAMPS v1.4 are:
26
+ *  - Swap heater E0 with E1
27
+ *  - Swap pins 8 and 10. Bed/Fan/Hotend as labeled on the board are on pins 8/9/10.
28
+ *  - Change pins 16->42, 17->44 and 29->53 used for display.
29
+ *
30
+ * Applies to the following boards:
31
+ *
32
+ *  RAMPS_PLUS_EFB (Extruder, Fan, Bed)
33
+ *  RAMPS_PLUS_EEB (Extruder, Extruder, Bed)
34
+ *  RAMPS_PLUS_EFF (Extruder, Fan, Fan)
35
+ *  RAMPS_PLUS_EEF (Extruder, Extruder, Fan)
36
+ *  RAMPS_PLUS_SF  (Spindle, Controller Fan)
37
+ *
38
+ */
39
+
40
+#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
41
+ #error "Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
42
+#endif
43
+
44
+#ifndef BOARD_NAME
45
+ #define BOARD_NAME "RAMPS 1.4 Plus"
46
+#endif
47
+
48
+#define RAMPS_D8_PIN  10
49
+#define RAMPS_D10_PIN  8
50
+
51
+#include "pins_RAMPS.h"
52
+
53
+//
54
+// Steppers - Swap E0 / E1 on 3DYMY
55
+//
56
+#undef E0_STEP_PIN
57
+#undef E0_DIR_PIN
58
+#undef E0_ENABLE_PIN
59
+
60
+#undef E1_STEP_PIN
61
+#undef E1_DIR_PIN
62
+#undef E1_ENABLE_PIN
63
+
64
+#define E0_STEP_PIN        36
65
+#define E0_DIR_PIN         34
66
+#define E0_ENABLE_PIN      30
67
+
68
+#define E1_STEP_PIN        26
69
+#define E1_DIR_PIN         28
70
+#define E1_ENABLE_PIN      24
71
+
72
+#undef X_CS_PIN
73
+#undef Y_CS_PIN
74
+#undef Z_CS_PIN
75
+#undef E0_CS_PIN
76
+#undef E1_CS_PIN
77
+
78
+#if ENABLED(ULTRA_LCD) && DISABLED(REPRAPWORLD_GRAPHICAL_LCD) && (DISABLED(NEWPANEL) || DISABLED(PANEL_ONE)) && DISABLED(CR10_STOCKDISPLAY)
79
+  #if DISABLED(MKS_12864OLED)
80
+    #undef LCD_PINS_RS
81
+    #define LCD_PINS_RS     42   // 3DYMY boards pin 16 -> 42
82
+    #undef LCD_PINS_ENABLE
83
+    #define LCD_PINS_ENABLE 44   // 3DYMY boards pin 17 -> 44
84
+  #endif
85
+  #undef LCD_PINS_D7
86
+  #define LCD_PINS_D7       53   // 3DYMY boards pin 29 -> 53
87
+#endif

Загрузка…
Отмена
Сохранить