0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Consolidate MKS Robin / SKR Mini E3 pins (#18354)

Browse source
This commit is contained in:
thisiskeithb 2020-06-19 16:32:05 -07:00 committed by GitHub
parent bc9e5e2abc
commit 8225d66b55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 200 additions and 322 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View file

@ -187,7 +187,7 @@
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD! #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue." #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
#define LCD_PINS_RS PB9 #define LCD_PINS_RS PB9
#define LCD_PINS_ENABLE PB6 #define LCD_PINS_ENABLE PB6

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
View file

@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "pins_BTT_SKR_MINI_E3.h" #include "pins_BTT_SKR_MINI_E3_common.h"
#define BOARD_INFO_NAME "BTT SKR Mini E3 V1.0" #define BOARD_INFO_NAME "BTT SKR Mini E3 V1.0"

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
View file

@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "pins_BTT_SKR_MINI_E3.h" #include "pins_BTT_SKR_MINI_E3_common.h"
#define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2" #define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2"

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
View file

@ -30,7 +30,7 @@
#undef NO_EEPROM_SELECTED #undef NO_EEPROM_SELECTED
#endif #endif
#include "pins_BTT_SKR_MINI_E3.h" #include "pins_BTT_SKR_MINI_E3_common.h"
#define BOARD_INFO_NAME "BTT SKR Mini E3 V2.0" #define BOARD_INFO_NAME "BTT SKR Mini E3 V2.0"

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h → Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View file

@ -145,7 +145,7 @@
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD! #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue." #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
#define LCD_PINS_RS PB9 #define LCD_PINS_RS PB9
#define LCD_PINS_ENABLE EXP1_9 #define LCD_PINS_ENABLE EXP1_9
@ -177,7 +177,7 @@
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue." #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
/** FYSETC TFT TFT81050 display pinout /** FYSETC TFT TFT81050 display pinout
* *

165
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
View file

@ -22,172 +22,15 @@
#pragma once #pragma once
/** /**
* MKS Robin E3D (STM32F103RCT6) board pin assignments * MKS Robin E3 (STM32F103RCT6) board pin assignments
*/ */
#ifndef __STM32F1__ #if HOTENDS > 1 || E_STEPPERS > 1
#error "Oops! Select an STM32F1 board in 'Tools > Board.'" #error "MKS Robin E3 supports up to 1 hotends / E-steppers. Comment out this line to continue."
#elif HOTENDS > 1 || E_STEPPERS > 1
#error "MKS Robin E3D supports up to 1 hotends / E-steppers. Comment out this line to continue."
#endif #endif
#ifndef BOARD_INFO_NAME #ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "MKS Robin E3" #define BOARD_INFO_NAME "MKS Robin E3"
#endif #endif
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
//#define DISABLE_DEBUG #include "pins_MKS_ROBIN_E3_common.h"
#define DISABLE_JTAG
#define ENABLE_SPI2
//
// EEPROM
//
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//
// Servos
//
#define SERVO0_PIN PA3
//
// Limit Switches
//
#define X_STOP_PIN PA12
#define Y_STOP_PIN PA11
#define Z_MIN_PIN PC6
#define Z_MAX_PIN PB1
//
// Steppers
//
#define X_STEP_PIN PC0
#define X_DIR_PIN PB2
#define X_ENABLE_PIN PC13
#define Y_STEP_PIN PC2
#define Y_DIR_PIN PB9
#define Y_ENABLE_PIN PB12
#define Z_STEP_PIN PB7
#define Z_DIR_PIN PB6
#define Z_ENABLE_PIN PB8
#define E0_STEP_PIN PB4
#define E0_DIR_PIN PB3
#define E0_ENABLE_PIN PB5
#if HAS_TMC220x
/**
* TMC2208/TMC2209 stepper drivers
*
* Hardware serial communication ports.
* If undefined software serial is used according to the pins below
*/
//#define X_HARDWARE_SERIAL Serial1
//#define Y_HARDWARE_SERIAL Serial1
//#define Z_HARDWARE_SERIAL Serial1
//#define E0_HARDWARE_SERIAL Serial1
//
// Software serial
//
#define X_SERIAL_TX_PIN PC7
#define X_SERIAL_RX_PIN PC7
#define Y_SERIAL_TX_PIN PD2
#define Y_SERIAL_RX_PIN PD2
#define Z_SERIAL_TX_PIN PC12
#define Z_SERIAL_RX_PIN PC12
#define E0_SERIAL_TX_PIN PC11
#define E0_SERIAL_RX_PIN PC11
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
//
// Heaters 0,1 / Fans / Bed
//
#define HEATER_0_PIN PC9
#define FAN_PIN PA8
#define HEATER_BED_PIN PC8
//
// Temperature Sensors
//
#define TEMP_BED_PIN PA1 // TB
#define TEMP_0_PIN PA0 // TH1
#define FIL_RUNOUT_PIN PB10 // MT_DET
/**
* _____ _____ _____
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) 5V | 1 2 | GND
* (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)
* (LCD_D4) PA6 | 5 6 PA7 (LCD_D5) (BTN_EN2) PB0 | 5 6 PB15 (SD_MOSI) (LCD_D4) PA6 | 5 6 PB0 (BTN_EN2)
* (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7) (SD_DETECT) PC10 | 7 8 | RESET RESET | 7 8 | PB11 (BTN_EN1)
* GND | 9 10| 5V GND | 9 10| NC (BTN_ENC) PC3 | 9 10| PC1 (BEEPER)
* ----- ----- -----
* EXP1 EXP2 EXP3
*/
#if HAS_SPI_LCD
#define BEEPER_PIN PC1
#define BTN_ENC PC3
#define LCD_PINS_ENABLE PA4
#define LCD_PINS_RS PA5
#define BTN_EN1 PB11
#define BTN_EN2 PB0
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 PC4
#define DOGLCD_CS PA7
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#undef SHOW_BOOTSCREEN
#else
#define LCD_PINS_D4 PA6
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5
#endif
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD
//
// SD Card
//
#define ENABLE_SPI2
#define SD_DETECT_PIN PC10
#define SCK_PIN PB13
#define MISO_PIN PB14
#define MOSI_PIN PB15
#define SS_PIN PA15
#ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef ST7920_DELAY_2
#define ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef ST7920_DELAY_3
#define ST7920_DELAY_3 DELAY_NS(125)
#endif

157
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
View file

@ -25,71 +25,26 @@
* MKS Robin E3D (STM32F103RCT6) board pin assignments * MKS Robin E3D (STM32F103RCT6) board pin assignments
*/ */
#ifndef __STM32F1__ #if HOTENDS > 1 || E_STEPPERS > 1
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#elif HOTENDS > 1 || E_STEPPERS > 1
#error "MKS Robin E3D supports up to 1 hotends / E-steppers. Comment out this line to continue." #error "MKS Robin E3D supports up to 1 hotends / E-steppers. Comment out this line to continue."
#endif #endif
#ifndef BOARD_INFO_NAME #ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "MKS Robin E3D" #define BOARD_INFO_NAME "MKS Robin E3D"
#endif #endif
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
//#define DISABLE_DEBUG
#define DISABLE_JTAG
#define ENABLE_SPI2
//
// EEPROM
//
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//
// Servos
//
#define SERVO0_PIN PA3
//
// Limit Switches
//
#define X_STOP_PIN PA12
#define Y_STOP_PIN PA11
#define Z_MIN_PIN PC6
#define Z_MAX_PIN PB1
// //
// Steppers // Steppers
// //
#define X_STEP_PIN PC0
#define X_DIR_PIN PB2
#define X_ENABLE_PIN PC13
#ifndef X_CS_PIN #ifndef X_CS_PIN
#define X_CS_PIN PC7 #define X_CS_PIN PC7
#endif #endif
#define Y_STEP_PIN PC2
#define Y_DIR_PIN PB9
#define Y_ENABLE_PIN PB12
#ifndef Y_CS_PIN #ifndef Y_CS_PIN
#define Y_CS_PIN PD2 #define Y_CS_PIN PD2
#endif #endif
#define Z_STEP_PIN PB7
#define Z_DIR_PIN PB6
#define Z_ENABLE_PIN PB8
#ifndef Z_CS_PIN #ifndef Z_CS_PIN
#define Z_CS_PIN PC12 #define Z_CS_PIN PC12
#endif #endif
#define E0_STEP_PIN PB4
#define E0_DIR_PIN PB3
#define E0_ENABLE_PIN PB5
#ifndef E0_CS_PIN #ifndef E0_CS_PIN
#define E0_CS_PIN PC11 #define E0_CS_PIN PC11
#endif #endif
@ -109,112 +64,4 @@
#endif #endif
#endif #endif
#if HAS_TMC220x #include "pins_MKS_ROBIN_E3_common.h"
/**
* TMC2208/TMC2209 stepper drivers
*
* Hardware serial communication ports.
* If undefined software serial is used according to the pins below
*/
//#define X_HARDWARE_SERIAL Serial1
//#define Y_HARDWARE_SERIAL Serial1
//#define Z_HARDWARE_SERIAL Serial1
//#define E0_HARDWARE_SERIAL Serial1
//
// Software serial
//
#define X_SERIAL_TX_PIN PC7
#define X_SERIAL_RX_PIN PC7
#define Y_SERIAL_TX_PIN PD2
#define Y_SERIAL_RX_PIN PD2
#define Z_SERIAL_TX_PIN PC12
#define Z_SERIAL_RX_PIN PC12
#define E0_SERIAL_TX_PIN PC11
#define E0_SERIAL_RX_PIN PC11
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
//
// Heaters 0,1 / Fans / Bed
//
#define HEATER_0_PIN PC9
#define FAN_PIN PA8
#define HEATER_BED_PIN PC8
//
// Temperature Sensors
//
#define TEMP_BED_PIN PA1 //TB
#define TEMP_0_PIN PA0 //TH1
#define FIL_RUNOUT_PIN PB10 // MT_DET
/**
* _____ _____ _____
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) 5V | 1 2 | GND
* (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)
* (LCD_D4) PA6 | 5 6 PA7 (LCD_D5) (BTN_EN2) PB0 | 5 6 PB15 (SD_MOSI) (LCD_D4) PA6 | 5 6 PB0 (BTN_EN2)
* (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7) (SD_DETECT) PC10 | 7 8 | RESET RESET | 7 8 | PB11 (BTN_EN1)
* GND | 9 10| 5V GND | 9 10| NC (BTN_ENC) PC3 | 9 10| PC1 (BEEPER)
* ----- ----- -----
* EXP1 EXP2 EXP3
*/
#if HAS_SPI_LCD
#define BEEPER_PIN PC1
#define BTN_ENC PC3
#define LCD_PINS_ENABLE PA4
#define LCD_PINS_RS PA5
#define BTN_EN1 PB11
#define BTN_EN2 PB0
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 PC4
#define DOGLCD_CS PA7
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#undef SHOW_BOOTSCREEN
#else
#define LCD_PINS_D4 PA6
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5
#endif
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD
//
// SD Card
//
#define ENABLE_SPI2
#define SD_DETECT_PIN PC10
#define SCK_PIN PB13
#define MISO_PIN PB14
#define MOSI_PIN PB15
#define SS_PIN PA15
#ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef ST7920_DELAY_2
#define ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef ST7920_DELAY_3
#define ST7920_DELAY_3 DELAY_NS(125)
#endif

188
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h Normal file
View file

@ -0,0 +1,188 @@
/**
* 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 Robin E3 & E3D (STM32F103RCT6) common board pin assignments
*/
#ifndef __STM32F1__
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
//#define DISABLE_DEBUG
#define DISABLE_JTAG
#define ENABLE_SPI2
//
// EEPROM
//
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//
// Servos
//
#define SERVO0_PIN PA3
//
// Limit Switches
//
#define X_STOP_PIN PA12
#define Y_STOP_PIN PA11
#define Z_MIN_PIN PC6
#define Z_MAX_PIN PB1
//
// Steppers
//
#define X_STEP_PIN PC0
#define X_DIR_PIN PB2
#define X_ENABLE_PIN PC13
#define Y_STEP_PIN PC2
#define Y_DIR_PIN PB9
#define Y_ENABLE_PIN PB12
#define Z_STEP_PIN PB7
#define Z_DIR_PIN PB6
#define Z_ENABLE_PIN PB8
#define E0_STEP_PIN PB4
#define E0_DIR_PIN PB3
#define E0_ENABLE_PIN PB5
#if HAS_TMC220x
/**
* TMC2208/TMC2209 stepper drivers
*
* Hardware serial communication ports.
* If undefined software serial is used according to the pins below
*/
//#define X_HARDWARE_SERIAL Serial1
//#define Y_HARDWARE_SERIAL Serial1
//#define Z_HARDWARE_SERIAL Serial1
//#define E0_HARDWARE_SERIAL Serial1
//
// Software serial
//
#define X_SERIAL_TX_PIN PC7
#define X_SERIAL_RX_PIN PC7
#define Y_SERIAL_TX_PIN PD2
#define Y_SERIAL_RX_PIN PD2
#define Z_SERIAL_TX_PIN PC12
#define Z_SERIAL_RX_PIN PC12
#define E0_SERIAL_TX_PIN PC11
#define E0_SERIAL_RX_PIN PC11
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
//
// Heaters 0,1 / Fans / Bed
//
#define HEATER_0_PIN PC9
#define FAN_PIN PA8
#define HEATER_BED_PIN PC8
//
// Temperature Sensors
//
#define TEMP_BED_PIN PA1 // TB
#define TEMP_0_PIN PA0 // TH1
#define FIL_RUNOUT_PIN PB10 // MT_DET
/**
* _____ _____ _____
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) 5V | 1 2 | GND
* (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)
* (LCD_D4) PA6 | 5 6 PA7 (LCD_D5) (BTN_EN2) PB0 | 5 6 PB15 (SD_MOSI) (LCD_D4) PA6 | 5 6 PB0 (BTN_EN2)
* (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7) (SD_DETECT) PC10 | 7 8 | RESET RESET | 7 8 | PB11 (BTN_EN1)
* GND | 9 10| 5V GND | 9 10| NC (BTN_ENC) PC3 | 9 10| PC1 (BEEPER)
* ----- ----- -----
* EXP1 EXP2 EXP3
*/
#if HAS_SPI_LCD
#define BEEPER_PIN PC1
#define BTN_ENC PC3
#define LCD_PINS_ENABLE PA4
#define LCD_PINS_RS PA5
#define BTN_EN1 PB11
#define BTN_EN2 PB0
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 PC4
#define DOGLCD_CS PA7
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#undef SHOW_BOOTSCREEN
#else
#define LCD_PINS_D4 PA6
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5
#endif
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD
//
// SD Card
//
#define ENABLE_SPI2
#define SD_DETECT_PIN PC10
#define SCK_PIN PB13
#define MISO_PIN PB14
#define MOSI_PIN PB15
#define SS_PIN PA15
#ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef ST7920_DELAY_2
#define ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef ST7920_DELAY_3
#define ST7920_DELAY_3 DELAY_NS(125)
#endif