CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MKS BASE and v1.6 pins (#16806)

Browse Source
This commit is contained in:
Daniel Mazurkiewicz 2020-02-10 22:12:11 +02:00 committed by GitHub
parent 0b45493557
commit e561f744fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 117 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/pins.h
View File

@ -105,7 +105,7 @@
#elif MB(BAM_DICE_DUE) #elif MB(BAM_DICE_DUE)
#include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 #include "ramps/pins_BAM_DICE_DUE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE) #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) #elif MB(MKS_BASE_14)
#include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560 #include "ramps/pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
#elif MB(MKS_BASE_15) #elif MB(MKS_BASE_15)

22
Marlin/src/pins/ramps/pins_MKS_BASE.h → Marlin/src/pins/ramps/pins_MKS_BASE_10.h
View File

@ -31,23 +31,7 @@
#error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue." #error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif #endif
#ifndef BOARD_INFO_NAME #define BOARD_INFO_NAME "MKS BASE 1.0"
#define BOARD_INFO_NAME "MKS BASE 1.0" #define MKS_BASE_VERSION 10
#endif
// #include "pins_MKS_BASE_common.h"
// 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
#include "pins_RAMPS.h"

43
Marlin/src/pins/ramps/pins_MKS_BASE_14.h
View File

@ -30,52 +30,31 @@
#endif #endif
#define BOARD_INFO_NAME "MKS BASE 1.4" #define BOARD_INFO_NAME "MKS BASE 1.4"
#define MKS_BASE_VERSION 14
// //
// Heaters / Fans // 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 // Other Mods
#define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11 #define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11
#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12 #define SERVO3_PIN 12 // PB6 ** Pin25 ** D12
#define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM #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 FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX #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
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 50 #define RGB_LED_R_PIN 50
#endif #endif
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_G_PIN 51 #define RGB_LED_G_PIN 51
#endif #endif
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_B_PIN 52 #define RGB_LED_B_PIN 52
#endif #endif
#include "pins_RAMPS.h" #include "pins_MKS_BASE_common.h"
/* /*
Available connectors on MKS BASE v1.4 Available connectors on MKS BASE v1.4

17
Marlin/src/pins/ramps/pins_MKS_BASE_15.h
View File

@ -30,19 +30,6 @@
#endif #endif
#define BOARD_INFO_NAME "MKS BASE 1.5" #define BOARD_INFO_NAME "MKS BASE 1.5"
#define MKS_BASE_VERSION 15
#include "pins_MKS_BASE.h" #include "pins_MKS_BASE_common.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

39
Marlin/src/pins/ramps/pins_MKS_BASE_16.h
View File

@ -30,19 +30,30 @@
#endif #endif
#define BOARD_INFO_NAME "MKS BASE 1.6" #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 // Omitted RAMPS pins
*/ //
#define X_MS1_PIN 5 // Digital 3 / Pin 5 / PE3 / SERVO2_PIN #ifndef SERVO2_PIN
#define X_MS2_PIN 6 // Digital 6 / Pin 14 / PH3 / SERVO1_PIN #define SERVO2_PIN -1
#define Y_MS1_PIN 59 // Analog 5 / Pin 92 / PF5 #endif
#define Y_MS2_PIN 58 // Analog 4 / Pin 93 / PF4 #ifndef SERVO3_PIN
#define Z_MS1_PIN 22 // Digital 22 / Pin 78 / PA0 #define SERVO3_PIN -1
#define Z_MS2_PIN 39 // Digital 39 / Pin 70 / PG2 #endif
#define E0_MS1_PIN 63 // Analog 9 / Pin 86 / PK1 #ifndef FILWIDTH_PIN
#define E0_MS2_PIN 64 // Analog 10 / Pin 87 / PK2 #define FILWIDTH_PIN -1
#define E1_MS1_PIN 57 // Analog 3 / Pin 93 / PF3 #endif
#define E1_MS2_PIN 4 // Digital 4 / Pin 1 / PG5 / SERVO3_PIN #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
Marlin/src/pins/ramps/pins_MKS_BASE_common.h Normal file
View File

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