Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated pin description for MKS BASE V1.6 #16806

Merged
merged 5 commits into from
Feb 10, 2020
Merged

Updated pin description for MKS BASE V1.6 #16806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9ce0f1
updated pin description for MKS BASE V1.6
Feb 8, 2020
ac6e1b2
Update pins_MKS_BASE_16.h
thinkyhead Feb 8, 2020
9b9b000
Include default pins for features
thinkyhead Feb 9, 2020
afce615
Consolidate MKS BASE more
thinkyhead Feb 9, 2020
155c462
Update pins_MKS_BASE_common.h
thinkyhead Feb 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
#elif MB(BAM_DICE_DUE)
#include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE)
#include "ramps/pins_MKS_BASE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#include "ramps/pins_MKS_BASE_10.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE_14)
#include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
#elif MB(MKS_BASE_15)
Expand Down
22 changes: 3 additions & 19 deletions Marlin/src/pins/ramps/pins_MKS_BASE.h → Marlin/src/pins/ramps/pins_MKS_BASE_10.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,7 @@
#error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif

#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "MKS BASE 1.0"
#endif

//
// Heaters / Fans
//
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7

#define CASE_LIGHT_PIN 2

//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 2 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 15 // Pullup!
#define SPINDLE_DIR_PIN 19
#define BOARD_INFO_NAME "MKS BASE 1.0"
#define MKS_BASE_VERSION 10

#include "pins_RAMPS.h"
#include "pins_MKS_BASE_common.h"
43 changes: 11 additions & 32 deletions Marlin/src/pins/ramps/pins_MKS_BASE_14.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,52 +30,31 @@
#endif

#define BOARD_INFO_NAME "MKS BASE 1.4"
#define MKS_BASE_VERSION 14

//
// Heaters / Fans
//
#define MOSFET_D_PIN 7 // PH4 ** Pin16 ** PWM7 //E1
#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9

// Other Mods
#define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11
#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12
#define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
#define FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX

//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define SPINDLE_DIR_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX

//
// Microstepping pins
//
#define X_MS1_PIN 5 // PE3 ** Pin5 ** PWM5
#define X_MS2_PIN 6 // PH3 ** Pin15 ** PWM6
#define Y_MS1_PIN 59 // PF5 ** Pin92 ** A5
#define Y_MS2_PIN 58 // PF4 ** Pin93 ** A4
#define Z_MS1_PIN 22 // PA0 ** Pin78 ** D22
#define Z_MS2_PIN 39 // PG2 ** Pin70 ** D39
#define E0_MS1_PIN 64 // PK2 ** Pin87 ** A10
#define E0_MS2_PIN 63 // PK1 ** Pin88 ** A9
#define E1_MS1_PIN 57 // PF3 ** Pin94 ** A3
#define E1_MS2_PIN 4 // PG5 ** Pin1 ** PWM4
#define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11
#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12
#define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
#define FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX

#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 50
#define RGB_LED_R_PIN 50
#endif
#ifndef RGB_LED_R_PIN
#define RGB_LED_G_PIN 51
#define RGB_LED_G_PIN 51
#endif
#ifndef RGB_LED_R_PIN
#define RGB_LED_B_PIN 52
#define RGB_LED_B_PIN 52
#endif

#include "pins_RAMPS.h"
#include "pins_MKS_BASE_common.h"

/*
Available connectors on MKS BASE v1.4
Expand Down
17 changes: 2 additions & 15 deletions Marlin/src/pins/ramps/pins_MKS_BASE_15.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,6 @@
#endif

#define BOARD_INFO_NAME "MKS BASE 1.5"
#define MKS_BASE_VERSION 15

#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
#include "pins_MKS_BASE_common.h"
39 changes: 25 additions & 14 deletions Marlin/src/pins/ramps/pins_MKS_BASE_16.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,30 @@
#endif

#define BOARD_INFO_NAME "MKS BASE 1.6"
#define MKS_BASE_VERSION 16

#include "pins_MKS_BASE.h"
//
// Servos
//
#define SERVO1_PIN 12 // Digital 12 / Pin 25

/**
* 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
//
// Omitted RAMPS pins
//
#ifndef SERVO2_PIN
#define SERVO2_PIN -1
#endif
#ifndef SERVO3_PIN
#define SERVO3_PIN -1
#endif
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN -1
#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN -1
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN -1
#endif

#include "pins_MKS_BASE_common.h"
75 changes: 75 additions & 0 deletions Marlin/src/pins/ramps/pins_MKS_BASE_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 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/>.
*
*/
#pragma once

/**
* MKS BASE – Arduino Mega2560 with RAMPS pin assignments
*/

#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "MKS BASE"
#endif

#if MKS_BASE_VERSION == 14 || MKS_BASE_VERSION == 15
//
// Heaters / Fans
//
// Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7

//
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
#define SPINDLE_LASER_PWM_PIN 2 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 15 // Pullup!
#define SPINDLE_DIR_PIN 19
#endif

#ifndef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 2
#endif

#endif

//
// Microstepping pins
//
#if MKS_BASE_VERSION >= 14 // |===== 1.4 =====|===== 1.5+ =====|
#define X_MS1_PIN 5 // PE3 | Pin 5 | PWM5 | | D3 | SERVO2_PIN
#define X_MS2_PIN 6 // PH3 | Pin 15 | PWM6 | Pin 14 | D6 | SERVO1_PIN
#define Y_MS1_PIN 59 // PF5 | Pin 92 | A5 | | |
#define Y_MS2_PIN 58 // PF4 | Pin 93 | A4 | | |
#define Z_MS1_PIN 22 // PA0 | Pin 78 | D22 | | |
#define Z_MS2_PIN 39 // PG2 | Pin 70 | D39 | | |
#if MKS_BASE_VERSION == 14
#define E0_MS1_PIN 64 // PK2 | Pin 87 | A10 | | |
#define E0_MS2_PIN 63 // PK1 | Pin 88 | A9 | | |
#else
#define E0_MS1_PIN 63 // PK1 | | | Pin 86 | A9 |
#define E0_MS2_PIN 64 // PK2 | | | Pin 87 | A10 |
#endif
#define E1_MS1_PIN 57 // PF3 | Pin 94 | A3 | Pin 93 | A3 |
#define E1_MS2_PIN 4 // PG5 | Pin 1 | PWM4 | | D4 | SERVO3_PIN
#endif

#include "pins_RAMPS.h"