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

[2.0.x] Add BOARD_MKS_BASE_15 with digital micro-stepping (#10454)

Browse source 
* Add BOARD_MKS_BASE_15 with digital micro-stepping
* Rename MKS_13 to MKS_GEN_13
This commit is contained in:
Scott Lahteine 2018-04-18 22:58:43 -05:00 committed by GitHub
parent ad6baa5c9d
commit 4f184ba5da
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
View file

@ -138,7 +138,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

5
Marlin/src/core/boards.h
View file

@ -58,9 +58,10 @@
#define BOARD_K8400 79 // Velleman K8400 Controller (derived from 3Drag Controller)
#define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers
#define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers
#define BOARD_MKS_BASE 40 // MKS BASE 1.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_HEROIC 41 // MKS BASE 1.0 with Heroic HR4982 stepper drivers
#define BOARD_MKS_13 47 // MKS v1.3 or 1.4 (maybe higher)
#define BOARD_MKS_GEN_13 47 // MKS 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)

5
Marlin/src/inc/SanityCheck.h
View file

@ -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
*/

8
Marlin/src/pins/pins.h
View file

@ -102,14 +102,16 @@
#include "pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560
#elif MB(MKS_BASE)
#include "pins_MKS_BASE.h" // ATmega1280, ATmega2560
#elif MB(MKS_BASE_15)
#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)

41
Marlin/src/pins/pins_MKS_BASE_15.h Normal file
View file

@ -0,0 +1,41 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/**
* MKS BASE v1.5 with A4982 stepper drivers and digital micro-stepping
*/
#include "pins_MKS_BASE.h"
/**
* Microstepping pins
*/
#define X_MS1_PIN 5 // Digital 3 / Pin 5 / PE3 / SERVO2_PIN
#define X_MS2_PIN 6 // Digital 6 / Pin 14 / PH3 / SERVO1_PIN
#define Y_MS1_PIN 59 // Analog 5 / Pin 92 / PF5
#define Y_MS2_PIN 58 // Analog 4 / Pin 93 / PF4
#define Z_MS1_PIN 22 // Digital 22 / Pin 78 / PA0
#define Z_MS2_PIN 39 // Digital 39 / Pin 70 / PG2
#define E0_MS1_PIN 63 // Analog 9 / Pin 86 / PK1
#define E0_MS2_PIN 64 // Analog 10 / Pin 87 / PK2
#define E1_MS1_PIN 57 // Analog 3 / Pin 93 / PF3
#define E1_MS2_PIN 4 // Digital 4 / Pin 1 / PG5 / SERVO3_PIN

19
Marlin/src/pins/pins_MKS_BASE_HEROIC.h
View file

@ -24,23 +24,12 @@
* MKS BASE with Heroic HR4982 stepper drivers
*/
#include "pins_MKS_BASE.h"
#include "pins_MKS_BASE_15.h"
/**
* Microstepping pins (reverse engineered at V1.4 - due to closed source schematics).
* Some new boards use HR4982 (Heroic) instead of the A4982 (Allegro) stepper drivers.
* While most of the functionality is similar, the HR variant obviously doesn't work
* with diode smoothers (no fast decay). And the Heroic has a 128 µStepping mode where
* the A4982 is doing quarter steps (MS1=L / MS2=H).
* Most the functionality is similar, the HR variant obviously doesn't work with diode
* smoothers (no fast decay). And the Heroic has a 128 µStepping mode where the A4982
* is doing quarter steps (MS1=0, MS2=1).
*/
#define HEROIC_STEPPER_DRIVERS
#define X_MS1_PIN 5 // Digital 3 / Pin 5 / PE3 / SERVO2_PIN
#define X_MS2_PIN 6 // Digital 6 / Pin 14 / PH3 / SERVO1_PIN
#define Y_MS1_PIN 59 // Analog 5 / Pin 92 / PF5
#define Y_MS2_PIN 58 // Analog 4 / Pin 93 / PF4
#define Z_MS1_PIN 22 // Digital 22 / Pin 78 / PA0
#define Z_MS2_PIN 39 // Digital 39 / Pin 70 / PG2
#define E0_MS1_PIN 63 // Analog 9 / Pin 86 / PK1
#define E0_MS2_PIN 64 // Analog 10 / Pin 87 / PK2
#define E1_MS1_PIN 57 // Analog 3 / Pin 93 / PF3
#define E1_MS2_PIN 4 // Digital 4 / Pin 1 / PG5 / SERVO3_PIN

12
Marlin/src/pins/pins_MKS_13.h → Marlin/src/pins/pins_MKS_GEN_13.h
View file

@ -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

2
Marlin/src/pins/pins_ZRIB_V20.h
View file

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