CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge (PR#2295)

Browse Source
This commit is contained in:
Richard Wackerbarth 2015-06-15 20:18:21 -05:00
commit 06906bc1c8
7 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/pins.h
View File

@ -34,7 +34,9 @@
#include "pins_SETHI.h" #include "pins_SETHI.h"
#elif MB(RAMPS_OLD) #elif MB(RAMPS_OLD)
#include "pins_RAMPS_OLD.h" #include "pins_RAMPS_OLD.h"
#elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #elif MB(RAMPS_13_EFB)
#include "pins_RAMPS_13_EFB.h"
#elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#elif MB(GEN6) #elif MB(GEN6)
#include "pins_GEN6.h" #include "pins_GEN6.h"

4
Marlin/pins_AZTEEG_X3.h
View File

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

4
Marlin/pins_BAM_DICE_DUE.h
View File

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

4
Marlin/pins_FELIX2.h
View File

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

4
Marlin/pins_MKS_BASE.h
View File

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

4
Marlin/pins_RAMPS_13.h
View File

@ -77,7 +77,7 @@
#define FILRUNOUT_PIN 4 #define FILRUNOUT_PIN 4
#endif #endif
#if MB(RAMPS_13_EFB) || MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB) #if MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB)
#define FAN_PIN 9 // (Sprinter config) #define FAN_PIN 9 // (Sprinter config)
#if MB(RAMPS_13_EFF) #if MB(RAMPS_13_EFF)
#define CONTROLLERFAN_PIN -1 // Pin used for the fan to cool controller #define CONTROLLERFAN_PIN -1 // Pin used for the fan to cool controller
@ -102,7 +102,7 @@
#define HEATER_0_PIN 10 // EXTRUDER 1 #define HEATER_0_PIN 10 // EXTRUDER 1
#endif #endif
#if MB(RAMPS_13_EFB) || MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB) #if MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB)
#define HEATER_1_PIN -1 #define HEATER_1_PIN -1
#else #else
#define HEATER_1_PIN 9 // EXTRUDER 2 (FAN On Sprinter) #define HEATER_1_PIN 9 // EXTRUDER 2 (FAN On Sprinter)

9
Marlin/pins_RAMPS_13_EFB.h Normal file
View File

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