sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename MKS_13 to MKS_GEN_13

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-18 22:04:52 -05:00
parent e561ecb5a7
commit 51aa9743a6
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/SanityCheck.h
View File

@@ -272,6 +272,11 @@
#error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration." #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration."
#endif #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 * Marlin release, version and default string
*/ */

2
Marlin/boards.h
View File

@@ -61,7 +61,7 @@
#define BOARD_MKS_BASE 40 // MKS BASE v1.0 #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_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_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_MKS_GEN_L 53 // MKS GEN L
#define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica) #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) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like)

2
Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h
View File

@@ -129,7 +129,7 @@
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD #ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_MKS_13 #define MOTHERBOARD BOARD_MKS_GEN_13
#endif #endif
// Optional custom name for your RepStrap or other custom machine // Optional custom name for your RepStrap or other custom machine

6
Marlin/pins.h
View File

@@ -104,12 +104,12 @@
#include "pins_MKS_BASE_15.h" // ATmega1280, ATmega2560 #include "pins_MKS_BASE_15.h" // ATmega1280, ATmega2560
#elif MB(MKS_BASE_HEROIC) #elif MB(MKS_BASE_HEROIC)
#include "pins_MKS_BASE_HEROIC.h" // ATmega1280, ATmega2560 #include "pins_MKS_BASE_HEROIC.h" // ATmega1280, ATmega2560
#elif MB(MKS_13) #elif MB(MKS_GEN_13)
#include "pins_MKS_13.h" // ATmega1280, ATmega2560 #include "pins_MKS_GEN_13.h" // ATmega1280, ATmega2560
#elif MB(MKS_GEN_L) #elif MB(MKS_GEN_L)
#include "pins_MKS_GEN_L.h" // ATmega1280, ATmega2560 #include "pins_MKS_GEN_L.h" // ATmega1280, ATmega2560
#elif MB(ZRIB_V20) #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) #elif MB(FELIX2)
#include "pins_FELIX2.h" // ATmega1280, ATmega2560 #include "pins_FELIX2.h" // ATmega1280, ATmega2560
#elif MB(RIGIDBOARD) #elif MB(RIGIDBOARD)

12
Marlin/pins_MKS_13.h → Marlin/pins_MKS_GEN_13.h
View File

@@ -23,17 +23,17 @@
/** /**
* Arduino Mega with RAMPS v1.4 adjusted pin assignments * Arduino Mega with RAMPS v1.4 adjusted pin assignments
* *
* MKS v1.3 (Extruder, Fan, Bed) * MKS GEN v1.3 (Extruder, Fan, Bed)
* MKS v1.3 (Extruder, Extruder, Fan, Bed) * MKS GEN v1.3 (Extruder, Extruder, Fan, Bed)
* MKS v1.4 (Extruder, Fan, Bed) * MKS GEN v1.4 (Extruder, Fan, Bed)
* MKS v1.4 (Extruder, Extruder, Fan, Bed) * MKS GEN v1.4 (Extruder, Extruder, Fan, Bed)
*/ */
#if HOTENDS > 2 || E_STEPPERS > 2 #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 #endif
#define BOARD_NAME "MKS > v1.3" #define BOARD_NAME "MKS GEN > v1.3"
// //
// Heaters / Fans // Heaters / Fans

2
Marlin/pins_ZRIB_V20.h
View File

@@ -36,4 +36,4 @@
#define FILWIDTH_PIN 11 // Analog Input #define FILWIDTH_PIN 11 // Analog Input
#endif #endif
#include "pins_MKS_13.h" #include "pins_MKS_GEN_13.h"