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

Merge (PR#2295)

Richard Wackerbarth 10 years ago
parent
b93cddfcc9 318318b02f
commit
06906bc1c8
7 changed files with 18 additions and 15 deletions
Split View Show Diff Stats
  1. 3
    1
      Marlin/pins.h
  2. 1
    3
      Marlin/pins_AZTEEG_X3.h
  3. 1
    3
      Marlin/pins_BAM_DICE_DUE.h
  4. 1
    3
      Marlin/pins_FELIX2.h
  5. 1
    3
      Marlin/pins_MKS_BASE.h
  6. 2
    2
      Marlin/pins_RAMPS_13.h
  7. 9
    0
      Marlin/pins_RAMPS_13_EFB.h

+ 3
- 1
Marlin/pins.h View File 

@@ -34,7 +34,9 @@
34 34 
   #include "pins_SETHI.h"
35 35 
 #elif MB(RAMPS_OLD)
36 36 
   #include "pins_RAMPS_OLD.h"
37 
-#elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
37 
+#elif MB(RAMPS_13_EFB)
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)
38 40 
   #include "pins_RAMPS_13.h"
39 41 
 #elif MB(GEN6)
40 42 
   #include "pins_GEN6.h"

+ 1
- 3
Marlin/pins_AZTEEG_X3.h View File 

@@ -2,9 +2,7 @@
2 2 
  * AZTEEG_X3 Arduino Mega with RAMPS v1.3 pin assignments
3 3 
  */
4 4
5 
-#define IS_RAMPS_EFB
6 
-
7 
-#include "pins_RAMPS_13.h"
5 
+#include "pins_RAMPS_13_EFB.h"
8 6
9 7 
 //LCD Pins//
10 8

+ 1
- 3
Marlin/pins_BAM_DICE_DUE.h View File 

@@ -2,9 +2,7 @@
2 2 
  * BAM&DICE Due (Arduino Mega) pin assignments
3 3 
  */
4 4
5 
-#define IS_RAMPS_EFB
6 
-
7 
-#include "pins_RAMPS_13.h"
5 
+#include "pins_RAMPS_13_EFB.h"
8 6
9 7 
 #undef TEMP_0_PIN
10 8 
 #undef TEMP_1_PIN

+ 1
- 3
Marlin/pins_FELIX2.h View File 

@@ -2,9 +2,7 @@
2 2 
  * FELIXprinters v2.0/3.0 (RAMPS v1.3) pin assignments
3 3 
  */
4 4
5 
-#define IS_RAMPS_EFB
6 
-
7 
-#include "pins_RAMPS_13.h"
5 
+#include "pins_RAMPS_13_EFB.h"
8 6
9 7 
 #undef HEATER_1_PIN
10 8 
 #define HEATER_1_PIN        7 // EXTRUDER 2

+ 1
- 3
Marlin/pins_MKS_BASE.h View File 

@@ -2,9 +2,7 @@
2 2 
  * MKS BASE 1.0 – Arduino Mega2560 with RAMPS v1.4 pin assignments
3 3 
  */
4 4
5 
-#define IS_RAMPS_EFB
6 
-
7 
-#include "pins_RAMPS_13.h"
5 
+#include "pins_RAMPS_13_EFB.h"
8 6
9 7 
 #undef HEATER_1_PIN
10 8 
 #define HEATER_1_PIN        7

+ 2
- 2
Marlin/pins_RAMPS_13.h View File 

@@ -77,7 +77,7 @@
77 77 
   #define FILRUNOUT_PIN        4
78 78 
 #endif
79 79
80 
-#if MB(RAMPS_13_EFB) || MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB)
80 
+#if MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB)
81 81 
   #define FAN_PIN            9 // (Sprinter config)
82 82 
   #if MB(RAMPS_13_EFF)
83 83 
     #define CONTROLLERFAN_PIN  -1 // Pin used for the fan to cool controller
 
@@ -102,7 +102,7 @@
102 102 
   #define HEATER_0_PIN       10   // EXTRUDER 1
103 103 
 #endif
104 104
105 
-#if MB(RAMPS_13_EFB) || MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB)
105 
+#if MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB)
106 106 
   #define HEATER_1_PIN       -1
107 107 
 #else
108 108 
   #define HEATER_1_PIN       9    // EXTRUDER 2 (FAN On Sprinter)

+ 9
- 0
Marlin/pins_RAMPS_13_EFB.h View File 

@@ -0,0 +1,9 @@
1 
+/**
2 
+ * Arduino Mega with RAMPS v1.3 pin assignments
3 
+ *
4 
+ *  RAMPS_13_EFB (Extruder, Fan, Bed)
5 
+ */
6 
+
7 
+#define IS_RAMPS_EFB
8 
+
9 
+#include "pins_RAMPS_13.h"

Write Preview
Loading…
Cancel
Save