From 51aa9743a6362d18d18b9dd05d74d0a6fc60e5cd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 18 Apr 2018 22:04:52 -0500 Subject: [PATCH] Rename MKS_13 to MKS_GEN_13 --- Marlin/SanityCheck.h | 5 +++++ Marlin/boards.h | 2 +- .../delta/Hatchbox_Alpha/Configuration.h | 2 +- Marlin/pins.h | 6 +++--- Marlin/{pins_MKS_13.h => pins_MKS_GEN_13.h} | 12 ++++++------ Marlin/pins_ZRIB_V20.h | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) rename Marlin/{pins_MKS_13.h => pins_MKS_GEN_13.h} (91%) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 11b8ab560..260ac46f8 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -272,6 +272,11 @@ #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration." #endif +#define BOARD_MKS_13 -47 +#if MB(MKS_13) + #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration." +#endif + /** * Marlin release, version and default string */ diff --git a/Marlin/boards.h b/Marlin/boards.h index 0b6f47f5f..6c374672a 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -61,7 +61,7 @@ #define BOARD_MKS_BASE 40 // MKS BASE v1.0 #define BOARD_MKS_BASE_15 405 // MKS v1.5 with Allegro A4982 stepper drivers #define BOARD_MKS_BASE_HEROIC 41 // MKS BASE 1.0 with Heroic HR4982 stepper drivers -#define BOARD_MKS_13 47 // MKS v1.3 or 1.4 +#define BOARD_MKS_GEN_13 47 // MKS GEN v1.3 or 1.4 #define BOARD_MKS_GEN_L 53 // MKS GEN L #define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) diff --git a/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h b/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h index 2f3d75748..d81fd9d69 100644 --- a/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h @@ -129,7 +129,7 @@ // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_13 + #define MOTHERBOARD BOARD_MKS_GEN_13 #endif // Optional custom name for your RepStrap or other custom machine diff --git a/Marlin/pins.h b/Marlin/pins.h index 401c5f315..320a46ba4 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -104,12 +104,12 @@ #include "pins_MKS_BASE_15.h" // ATmega1280, ATmega2560 #elif MB(MKS_BASE_HEROIC) #include "pins_MKS_BASE_HEROIC.h" // ATmega1280, ATmega2560 -#elif MB(MKS_13) - #include "pins_MKS_13.h" // ATmega1280, ATmega2560 +#elif MB(MKS_GEN_13) + #include "pins_MKS_GEN_13.h" // ATmega1280, ATmega2560 #elif MB(MKS_GEN_L) #include "pins_MKS_GEN_L.h" // ATmega1280, ATmega2560 #elif MB(ZRIB_V20) - #include "pins_ZRIB_V20.h" // ATmega1280, ATmega2560 (MKS_13) + #include "pins_ZRIB_V20.h" // ATmega1280, ATmega2560 (MKS_GEN_13) #elif MB(FELIX2) #include "pins_FELIX2.h" // ATmega1280, ATmega2560 #elif MB(RIGIDBOARD) diff --git a/Marlin/pins_MKS_13.h b/Marlin/pins_MKS_GEN_13.h similarity index 91% rename from Marlin/pins_MKS_13.h rename to Marlin/pins_MKS_GEN_13.h index 07aa65811..70228e2f1 100644 --- a/Marlin/pins_MKS_13.h +++ b/Marlin/pins_MKS_GEN_13.h @@ -23,17 +23,17 @@ /** * Arduino Mega with RAMPS v1.4 adjusted pin assignments * - * MKS v1.3 (Extruder, Fan, Bed) - * MKS v1.3 (Extruder, Extruder, Fan, Bed) - * MKS v1.4 (Extruder, Fan, Bed) - * MKS v1.4 (Extruder, Extruder, Fan, Bed) + * MKS GEN v1.3 (Extruder, Fan, Bed) + * MKS GEN v1.3 (Extruder, Extruder, Fan, Bed) + * MKS GEN v1.4 (Extruder, Fan, Bed) + * MKS GEN v1.4 (Extruder, Extruder, Fan, Bed) */ #if HOTENDS > 2 || E_STEPPERS > 2 - #error "MKS 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue." + #error "MKS GEN 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue." #endif -#define BOARD_NAME "MKS > v1.3" +#define BOARD_NAME "MKS GEN > v1.3" // // Heaters / Fans diff --git a/Marlin/pins_ZRIB_V20.h b/Marlin/pins_ZRIB_V20.h index 1437c7184..94a083dd4 100644 --- a/Marlin/pins_ZRIB_V20.h +++ b/Marlin/pins_ZRIB_V20.h @@ -36,4 +36,4 @@ #define FILWIDTH_PIN 11 // Analog Input #endif -#include "pins_MKS_13.h" +#include "pins_MKS_GEN_13.h"