From 3e21d16f650839e77cf7fa0359a8680f418f21b9 Mon Sep 17 00:00:00 2001 From: shitcreek Date: Thu, 19 Dec 2019 23:13:33 -0600 Subject: [PATCH 1/4] add board MKS ROBIN 2 taken from https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin2/firmware/Marlin2.0-MKS-Robin2 --- Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 2 + Marlin/src/pins/stm32/pins_MKS_ROBIN2.h | 102 ++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 Marlin/src/pins/stm32/pins_MKS_ROBIN2.h diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 8734b9af4480..c1c5f6c733a1 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -310,6 +310,7 @@ #define BOARD_LERDGE_X 4210 // Lerdge X (STM32F407VE) #define BOARD_VAKE403D 4211 // VAkE 403D (STM32F446VET6) #define BOARD_FYSETC_S6 4212 // FYSETC S6 board +#define BOARD_MKS_ROBIN2 4110 // MKS_ROBIN2 (STM32F407ZE) // // ARM Cortex M7 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 460347487b47..bbb34ab76ec6 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -537,6 +537,8 @@ #include "stm32/pins_VAKE403D.h" // STM32F4 env:STM32F4 #elif MB(FYSETC_S6) #include "stm32/pins_FYSETC_S6.h" // STM32F4 env:FYSETC_S6 +#elif MB(MKS_ROBIN2) + #include "pins_MKS_ROBIN2.h" // STM32F4 env:MKS_ROBIN2 // // ARM Cortex M7 // diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h new file mode 100644 index 000000000000..e4efddb7e701 --- /dev/null +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h @@ -0,0 +1,102 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2019 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 . + * + */ +#pragma once + +#ifndef STM32F4 + #error "Oops! Select an STM32F4 board in 'Tools > Board.'" +#elif HOTENDS > 2 || E_STEPPERS > 2 + #error "MKS_ROBIN2 supports up to 2 hotends / E-steppers." +#endif + +#ifndef BOARD_INFO_NAME + #define BOARD_NAME "MKS_ROBIN2" +#endif + +#ifndef DEFAULT_MACHINE_NAME + #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME +#endif + +#define SRAM_EEPROM_EMULATION + +// +// Limit Switches +// +#define X_MIN_PIN PG8 +#define X_MAX_PIN PG7 +#define Y_MIN_PIN PG6 +#define Y_MAX_PIN PG5 +#define Z_MIN_PIN PG4 +#define Z_MAX_PIN PG3 + +// +// Servos +// +#define SERVO0_PIN PB0 //XS2-5 +#define SERVO1_PIN PF7 //XS1-5 +#define SERVO2_PIN PF8 //XS1-6 + +// +// Steppers +// +#define X_STEP_PIN PE6 +#define X_DIR_PIN PE5 +#define X_ENABLE_PIN PC13 + +#define Y_STEP_PIN PE3 +#define Y_DIR_PIN PE2 +#define Y_ENABLE_PIN PE4 + +#define Z_STEP_PIN PE0 +#define Z_DIR_PIN PB9 +#define Z_ENABLE_PIN PE1 + +#define E0_STEP_PIN PG10 +#define E0_DIR_PIN PG9 +#define E0_ENABLE_PIN PB8 + +#define E1_STEP_PIN PD3 +#define E1_DIR_PIN PA15 +#define E1_ENABLE_PIN PD6 + + +// +// Temperature Sensors +// +#define TEMP_0_PIN PC1 // T1 <-> E0 +#define TEMP_1_PIN PC2 // T2 <-> E1 +#define TEMP_BED_PIN PC0 // T0 <-> Bed + +// +// Heaters / Fans +// +#define HEATER_0_PIN PF3 // Heater0 +#define HEATER_1_PIN PF2 // Heater1 +#define HEATER_BED_PIN PF4 // Hotbed +#define FAN_PIN PA7 // Fan0 + +// +// Misc. Functions +// +#define SDSS -1//PB12 + +#define SD_DETECT_PIN PF9 +#define BEEPER_PIN PG2 \ No newline at end of file From 7cc2972cb67e586e741979e63df7b3b0283c300f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 20 Dec 2019 22:07:38 -0600 Subject: [PATCH 2/4] Update pins_MKS_ROBIN2.h --- Marlin/src/pins/stm32/pins_MKS_ROBIN2.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h index e4efddb7e701..d7193b6e157b 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h @@ -50,9 +50,9 @@ // // Servos // -#define SERVO0_PIN PB0 //XS2-5 -#define SERVO1_PIN PF7 //XS1-5 -#define SERVO2_PIN PF8 //XS1-6 +#define SERVO0_PIN PB0 // XS2-5 +#define SERVO1_PIN PF7 // XS1-5 +#define SERVO2_PIN PF8 // XS1-6 // // Steppers @@ -81,22 +81,22 @@ // // Temperature Sensors // -#define TEMP_0_PIN PC1 // T1 <-> E0 -#define TEMP_1_PIN PC2 // T2 <-> E1 -#define TEMP_BED_PIN PC0 // T0 <-> Bed +#define TEMP_0_PIN PC1 // T1 <-> E0 +#define TEMP_1_PIN PC2 // T2 <-> E1 +#define TEMP_BED_PIN PC0 // T0 <-> Bed // // Heaters / Fans // -#define HEATER_0_PIN PF3 // Heater0 -#define HEATER_1_PIN PF2 // Heater1 -#define HEATER_BED_PIN PF4 // Hotbed -#define FAN_PIN PA7 // Fan0 +#define HEATER_0_PIN PF3 // Heater0 +#define HEATER_1_PIN PF2 // Heater1 +#define HEATER_BED_PIN PF4 // Hotbed +#define FAN_PIN PA7 // Fan0 // // Misc. Functions // -#define SDSS -1//PB12 +#define SDSS -1 //PB12 #define SD_DETECT_PIN PF9 -#define BEEPER_PIN PG2 \ No newline at end of file +#define BEEPER_PIN PG2 From e90568c5c069cf48b02fe3ae3c6a3aa94ec996b6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 20 Dec 2019 22:11:40 -0600 Subject: [PATCH 3/4] Update pins_MKS_ROBIN2.h --- Marlin/src/pins/stm32/pins_MKS_ROBIN2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h index d7193b6e157b..98529e747be9 100644 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h @@ -96,7 +96,7 @@ // // Misc. Functions // -#define SDSS -1 //PB12 +#define SDSS -1 // PB12 #define SD_DETECT_PIN PF9 #define BEEPER_PIN PG2 From f353770c213c5dca5885e40dd326860d5021c5c5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 20 Dec 2019 22:12:18 -0600 Subject: [PATCH 4/4] Update boards.h --- Marlin/src/core/boards.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index c1c5f6c733a1..1594779d265c 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -310,7 +310,7 @@ #define BOARD_LERDGE_X 4210 // Lerdge X (STM32F407VE) #define BOARD_VAKE403D 4211 // VAkE 403D (STM32F446VET6) #define BOARD_FYSETC_S6 4212 // FYSETC S6 board -#define BOARD_MKS_ROBIN2 4110 // MKS_ROBIN2 (STM32F407ZE) +#define BOARD_MKS_ROBIN2 4213 // MKS_ROBIN2 (STM32F407ZE) // // ARM Cortex M7