From 679be3294f98ac138e3c538e7cfde2066c641610 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 28 Feb 2016 23:09:40 -0800 Subject: [PATCH] Rename RAMPS 1.3 pins for RAMPS 1.4 --- Marlin/pins_RAMPS_13_EFB.h | 9 --------- Marlin/{pins_RAMPS_13.h => pins_RAMPS_14.h} | 20 ++++++++++---------- Marlin/pins_RAMPS_14_EFB.h | 9 +++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 Marlin/pins_RAMPS_13_EFB.h rename Marlin/{pins_RAMPS_13.h => pins_RAMPS_14.h} (98%) create mode 100644 Marlin/pins_RAMPS_14_EFB.h diff --git a/Marlin/pins_RAMPS_13_EFB.h b/Marlin/pins_RAMPS_13_EFB.h deleted file mode 100644 index c75acd8d99..0000000000 --- a/Marlin/pins_RAMPS_13_EFB.h +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Arduino Mega with RAMPS v1.3 pin assignments - * - * RAMPS_13_EFB (Extruder, Fan, Bed) - */ - -#define IS_RAMPS_EFB - -#include "pins_RAMPS_13.h" \ No newline at end of file diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_14.h similarity index 98% rename from Marlin/pins_RAMPS_13.h rename to Marlin/pins_RAMPS_14.h index 3a8062f08b..be6fcd2130 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_14.h @@ -1,20 +1,20 @@ /** - * Arduino Mega with RAMPS v1.3 v1.4 pin assignments + * Arduino Mega with RAMPS v1.4 (or 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) - * * RAMPS_14_EFB (Extruder, Fan, Bed) * RAMPS_14_EEB (Extruder, Extruder, Bed) * RAMPS_14_EFF (Extruder, Fan, Fan) * RAMPS_14_EEF (Extruder, Extruder, Fan) * RAMPS_14_SF (Spindle, Controller Fan) * + * 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) + * * Other pins_MYBOARD.h files may override these defaults * * Differences between @@ -28,10 +28,10 @@ #define LARGE_FLASH true -#ifdef IS_RAMPS_14 - #define SERVO0_PIN 11 -#else +#ifdef IS_RAMPS_13 #define SERVO0_PIN 7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI +#else + #define SERVO0_PIN 11 #endif #define SERVO1_PIN 6 #define SERVO2_PIN 5 diff --git a/Marlin/pins_RAMPS_14_EFB.h b/Marlin/pins_RAMPS_14_EFB.h new file mode 100644 index 0000000000..66666d033e --- /dev/null +++ b/Marlin/pins_RAMPS_14_EFB.h @@ -0,0 +1,9 @@ +/** + * Arduino Mega with RAMPS v1.4 pin assignments + * + * RAMPS_14_EFB (Extruder, Fan, Bed) + */ + +#define IS_RAMPS_EFB + +#include "pins_RAMPS_14.h" \ No newline at end of file