SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle RAMPS 1.3 as the special case

Browse source
This commit is contained in:
Scott Lahteine 2016-02-28 23:10:15 -08:00
parent 679be3294f
commit 50e3482e0a
4 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/pins.h
View file

@ -38,11 +38,9 @@
#elif MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #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(RAMPS_14_EFB) #elif MB(RAMPS_14_EFB)
#define IS_RAMPS_14 #include "pins_RAMPS_14_EFB.h"
#include "pins_RAMPS_13_EFB.h"
#elif MB(RAMPS_14_EEB) || MB(RAMPS_14_EFF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_SF) #elif MB(RAMPS_14_EEB) || MB(RAMPS_14_EFF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_SF)
#define IS_RAMPS_14 #include "pins_RAMPS_14.h"
#include "pins_RAMPS_13.h"
#elif MB(GEN6) #elif MB(GEN6)
#include "pins_GEN6.h" #include "pins_GEN6.h"
#elif MB(GEN6_DELUXE) #elif MB(GEN6_DELUXE)
@ -114,7 +112,7 @@
#elif MB(LEAPFROG) #elif MB(LEAPFROG)
#include "pins_LEAPFROG.h" #include "pins_LEAPFROG.h"
#elif MB(BAM_DICE) #elif MB(BAM_DICE)
#include "pins_RAMPS_13.h" #include "pins_RAMPS_14.h"
#elif MB(BAM_DICE_DUE) #elif MB(BAM_DICE_DUE)
#include "pins_BAM_DICE_DUE.h" #include "pins_BAM_DICE_DUE.h"
#elif MB(FELIX2) #elif MB(FELIX2)

16
Marlin/pins_RAMPS_13.h Normal file
View file

@ -0,0 +1,16 @@
/**
* Arduino Mega with RAMPS v1.3 pin assignments
*
* Applies to the following boards:
*
* RAMPS_13_EFB (Extruder, Fan, Bed)
* RAMPS_13_EEB (Extruder, Extruder, Bed)
* RAMPS_13_EFF (Extruder, Fan, Fan)
* RAMPS_13_EEF (Extruder, Extruder, Fan)
* RAMPS_13_SF (Spindle, Controller Fan)
*
*/
#define IS_RAMPS_13
#include "pins_RAMPS_14.h"

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_13
#include "pins_RAMPS_14_EFB.h"

12
Marlin/pins_RAMPS_14.h
View file

@ -85,12 +85,12 @@
#define FILRUNOUT_PIN 4 #define FILRUNOUT_PIN 4
#endif #endif
#if MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB) #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
#define FAN_PIN 9 // (Sprinter config) #define FAN_PIN 9 // (Sprinter config)
#if MB(RAMPS_13_EFF) #if MB(RAMPS_14_EFF) || 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
#endif #endif
#elif MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #elif MB(RAMPS_14_EEF) || MB(RAMPS_14_SF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
#define FAN_PIN 8 #define FAN_PIN 8
#else #else
#define FAN_PIN 4 // IO pin. Buffer needed #define FAN_PIN 4 // IO pin. Buffer needed
@ -102,13 +102,13 @@
#define KILL_PIN 41 #define KILL_PIN 41
#endif #endif
#if MB(RAMPS_13_EFF) #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF)
#define HEATER_0_PIN 8 #define HEATER_0_PIN 8
#else #else
#define HEATER_0_PIN 10 // EXTRUDER 1 #define HEATER_0_PIN 10 // EXTRUDER 1
#endif #endif
#if MB(RAMPS_13_SF) || ENABLED(IS_RAMPS_EFB) #if MB(RAMPS_14_SF) || MB(RAMPS_13_SF) || ENABLED(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)
@ -120,7 +120,7 @@
#define TEMP_1_PIN 15 // ANALOG NUMBERING #define TEMP_1_PIN 15 // ANALOG NUMBERING
#define TEMP_2_PIN -1 // ANALOG NUMBERING #define TEMP_2_PIN -1 // ANALOG NUMBERING
#if MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #if MB(RAMPS_14_EFF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_SF) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
#define HEATER_BED_PIN -1 // NO BED #define HEATER_BED_PIN -1 // NO BED
#else #else
#define HEATER_BED_PIN 8 // BED #define HEATER_BED_PIN 8 // BED