From a3229b30ecedc7ef6b406186f794b913a6dbbcf5 Mon Sep 17 00:00:00 2001
From: Daniel Negut <33815341+danandrei96@users.noreply.github.com>
Date: Wed, 20 Nov 2019 06:06:26 +0000
Subject: [PATCH] Add Zonestar/Anet LCD for SKR mini E3 (#15931)
---
Marlin/src/HAL/HAL_STM32F1/HAL.cpp | 9 ++
Marlin/src/HAL/HAL_STM32F1/timers.h | 2 +-
Marlin/src/core/boards.h | 6 +-
Marlin/src/inc/SanityCheck.h | 4 +
Marlin/src/pins/lpc1768/pins_BTT_SKR.h | 104 ++++++++++++++
...BIGTREE_SKR_V1.1.h => pins_BTT_SKR_V1_1.h} | 56 +-------
...BIGTREE_SKR_V1.3.h => pins_BTT_SKR_V1_3.h} | 68 +--------
Marlin/src/pins/pins.h | 16 +--
...E_BTT002_V1.0.h => pins_BTT_BTT002_V1_0.h} | 0
...REE_SKR_E3_DIP.h => pins_BTT_SKR_E3_DIP.h} | 0
...E_SKR_MINI_E3.h => pins_BTT_SKR_MINI_E3.h} | 50 +++----
.../pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h | 37 +++++
.../pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h | 129 +-----------------
...R_MINI_V1_1.h => pins_BTT_SKR_MINI_V1_1.h} | 0
...SKR_PRO_V1.1.h => pins_BTT_SKR_PRO_V1_1.h} | 0
.../tests/STM32F103RC_bigtree_NOUSB-tests | 2 +-
16 files changed, 203 insertions(+), 280 deletions(-)
create mode 100644 Marlin/src/pins/lpc1768/pins_BTT_SKR.h
rename Marlin/src/pins/lpc1768/{pins_BIGTREE_SKR_V1.1.h => pins_BTT_SKR_V1_1.h} (85%)
rename Marlin/src/pins/lpc1768/{pins_BIGTREE_SKR_V1.3.h => pins_BTT_SKR_V1_3.h} (78%)
rename Marlin/src/pins/stm32/{pins_BIGTREE_BTT002_V1.0.h => pins_BTT_BTT002_V1_0.h} (100%)
rename Marlin/src/pins/stm32/{pins_BIGTREE_SKR_E3_DIP.h => pins_BTT_SKR_E3_DIP.h} (100%)
rename Marlin/src/pins/stm32/{pins_BIGTREE_SKR_MINI_E3.h => pins_BTT_SKR_MINI_E3.h} (80%)
create mode 100644 Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
rename Marlin/src/pins/stm32/{pins_BIGTREE_SKR_MINI_V1_1.h => pins_BTT_SKR_MINI_V1_1.h} (100%)
rename Marlin/src/pins/stm32/{pins_BIGTREE_SKR_PRO_V1.1.h => pins_BTT_SKR_PRO_V1_1.h} (100%)
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
index afd6eff027..9dcb77ae4f 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
@@ -121,6 +121,9 @@ const uint8_t adc_pins[] = {
#if ENABLED(FILAMENT_WIDTH_SENSOR)
FILWIDTH_PIN,
#endif
+ #if ENABLED(ADC_KEYPAD)
+ ADC_KEYPAD_PIN,
+ #endif
#if HAS_JOY_ADC_X
JOY_X_PIN,
#endif
@@ -160,6 +163,9 @@ enum TEMP_PINS : char {
#if ENABLED(FILAMENT_WIDTH_SENSOR)
FILWIDTH,
#endif
+ #if ENABLED(ADC_KEYPAD)
+ ADC_KEY,
+ #endif
#if HAS_JOY_ADC_X
JOY_X,
#endif
@@ -352,6 +358,9 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
#if ENABLED(FILAMENT_WIDTH_SENSOR)
case FILWIDTH_PIN: pin_index = FILWIDTH; break;
#endif
+ #if ENABLED(ADC_KEYPAD)
+ case ADC_KEYPAD_PIN: pin_index = ADC_KEY; break;
+ #endif
}
HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only.
}
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.h b/Marlin/src/HAL/HAL_STM32F1/timers.h
index 4fe0bcbe89..d5d02a3dc6 100644
--- a/Marlin/src/HAL/HAL_STM32F1/timers.h
+++ b/Marlin/src/HAL/HAL_STM32F1/timers.h
@@ -70,7 +70,7 @@ typedef uint16_t hal_timer_t;
//#define TEMP_TIMER_NUM 4 // 2->4, Timer 2 for Stepper Current PWM
#define PULSE_TIMER_NUM STEP_TIMER_NUM
-#if MB(BIGTREE_SKR_MINI_E3, BIGTREE_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
+#if MB(BTT_SKR_MINI_E3_V1_0, BIGTREE_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
// SKR Mini E3 boards use PA8 as FAN_PIN, so TIMER 1 is used for Fan PWM.
#ifdef STM32_HIGH_DENSITY
#define SERVO0_TIMER_NUM 8 // tone.cpp uses Timer 4
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 0911d6e2dd..0ab5a28940 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -270,9 +270,9 @@
#define BOARD_MKS_ROBIN_NANO 4008 // MKS Robin Nano (STM32F103VET6)
#define BOARD_MKS_ROBIN_LITE 4009 // MKS Robin Lite/Lite2 (STM32F103RCT6)
#define BOARD_BIGTREE_SKR_MINI_V1_1 4010 // BigTreeTech SKR Mini v1.1 (STM32F103RC)
-#define BOARD_BIGTREE_SKR_MINI_E3 4011 // BigTreeTech SKR Mini E3 (STM32F103RC)
-#define BOARD_BIGTREE_SKR_E3_DIP 4012 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC)
-#define BOARD_BTT_SKR_MINI_E3_V1_2 4013 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V1_0 4011 // BigTreeTech SKR Mini E3 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V1_2 4012 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
+#define BOARD_BIGTREE_SKR_E3_DIP 4013 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC)
#define BOARD_JGAURORA_A5S_A1 4014 // JGAurora A5S A1 (STM32F103ZET6)
#define BOARD_FYSETC_AIO_II 4015 // FYSETC AIO_II
#define BOARD_FYSETC_CHEETAH 4016 // FYSETC Cheetah
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8eaf10a75f..e356c6f9b7 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -420,6 +420,7 @@
#define BOARD_STM32F1R -1005
#define BOARD_STM32F103R -1006
#define BOARD_ESP32 -1007
+#define BOARD_BIGTREE_SKR_MINI_E3 -1008
#if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
#elif MB(TRIGORILLA)
@@ -436,6 +437,8 @@
#error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
#elif MOTHERBOARD == BOARD_ESP32
#error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
+#elif MOTHERBOARD == BOARD_BIGTREE_SKR_MINI_E3
+ #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
#endif
#undef BOARD_MKS_13
#undef BOARD_TRIGORILLA
@@ -445,6 +448,7 @@
#undef BOARD_STM32F1R
#undef BOARD_STM32F103R
#undef BOARD_ESP32
+#undef BOARD_BIGTREE_SKR_MINI_E3
/**
* Marlin release, version and default string
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR.h
new file mode 100644
index 0000000000..4e73c389af
--- /dev/null
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR.h
@@ -0,0 +1,104 @@
+/**
+ * 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 MCU_LPC1768
+ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
+#endif
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN P1_29
+#define X_MAX_PIN P1_28
+#define Y_MIN_PIN P1_27
+#define Y_MAX_PIN P1_26
+#define Z_MIN_PIN P1_25
+#define Z_MAX_PIN P1_24
+
+//
+// Steppers
+//
+
+#define E1_STEP_PIN P0_01
+#define E1_DIR_PIN P0_00
+#define E1_ENABLE_PIN P0_10
+
+//
+// Temperature Sensors
+// 3.3V max when defined as an analog input
+//
+#define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN
+#define TEMP_0_PIN P0_24_A1 // A1 (T1) - (68) - TEMP_0_PIN
+#define TEMP_1_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_1_PIN
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+ #define HEATER_0_PIN P2_07
+#endif
+#if HOTENDS == 1
+ #ifndef FAN1_PIN
+ #define FAN1_PIN P2_04
+ #endif
+#else
+ #ifndef HEATER_1_PIN
+ #define HEATER_1_PIN P2_04
+ #endif
+#endif
+#ifndef FAN_PIN
+ #define FAN_PIN P2_03
+#endif
+#ifndef HEATER_BED_PIN
+ #define HEATER_BED_PIN P2_05
+#endif
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+ #define BEEPER_PIN P1_30 // (37) not 5V tolerant
+#endif
+
+//
+// SD Support
+//
+#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
+
+#if SD_CONNECTION_IS(LCD)
+ #define SCK_PIN P0_15
+ #define MISO_PIN P0_17
+ #define MOSI_PIN P0_18
+#elif SD_CONNECTION_IS(ONBOARD)
+ #undef SD_DETECT_PIN
+ #define SD_DETECT_PIN P0_27
+ #define SCK_PIN P0_07
+ #define MISO_PIN P0_08
+ #define MOSI_PIN P0_09
+ #define SS_PIN ONBOARD_SD_CS_PIN
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+ #error "No custom SD drive cable defined for this board."
+#endif
diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
similarity index 85%
rename from Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h
rename to Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index ea7d22d6a4..68a8bd1808 100644
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -21,22 +21,8 @@
*/
#pragma once
-#ifndef MCU_LPC1768
- #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
-#endif
-
#define BOARD_INFO_NAME "BIGTREE SKR 1.1"
-//
-// Limit Switches
-//
-#define X_MIN_PIN P1_29
-#define X_MAX_PIN P1_28
-#define Y_MIN_PIN P1_27
-#define Y_MAX_PIN P1_26
-#define Z_MIN_PIN P1_25
-#define Z_MAX_PIN P1_24
-
//
// Steppers
//
@@ -56,30 +42,6 @@
#define E0_DIR_PIN P2_13
#define E0_ENABLE_PIN P2_12
-#define E1_STEP_PIN P0_01
-#define E1_DIR_PIN P0_00
-#define E1_ENABLE_PIN P0_10
-
-//
-// Temperature Sensors
-// 3.3V max when defined as an analog input
-//
-#define TEMP_BED_PIN P0_23_A0 // Analog Input
-#define TEMP_0_PIN P0_24_A1 // Analog Input
-#define TEMP_1_PIN P0_25_A2 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN P2_07
-#if HOTENDS == 1
- #define FAN1_PIN P2_04
-#else
- #define HEATER_1_PIN P2_04
-#endif
-#define FAN_PIN P2_03
-#define HEATER_BED_PIN P2_05
-
/**
* LCD / Controller
*
@@ -94,7 +56,6 @@
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_30
#define BTN_EN1 P3_26
#define BTN_EN2 P3_25
#define BTN_ENC P2_11
@@ -125,22 +86,8 @@
#endif
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
-
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15
- #define MISO_PIN P0_17
- #define MOSI_PIN P0_18
#define SS_PIN P1_23
-#elif SD_CONNECTION_IS(ONBOARD)
- #undef SD_DETECT_PIN
- #define SD_DETECT_PIN P0_27
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
- #error "No custom SD drive cable defined for this board."
#endif
// Trinamic driver support
@@ -270,3 +217,6 @@
#endif // SOFTWARE_DRIVER_ENABLE
#endif
+
+// Include common SKR pins
+#include "pins_BTT_SKR.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
similarity index 78%
rename from Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
rename to Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index c7396887f4..830da00828 100644
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -21,15 +21,8 @@
*/
#pragma once
-#ifndef MCU_LPC1768
- #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
-#endif
-
#define BOARD_INFO_NAME "BIGTREE SKR 1.3"
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
//
// Servos
//
@@ -37,16 +30,6 @@
#define SERVO0_PIN P2_00
#endif
-//
-// Limit Switches
-//
-#define X_MIN_PIN P1_29
-#define X_MAX_PIN P1_28
-#define Y_MIN_PIN P1_27
-#define Y_MAX_PIN P1_26
-#define Z_MIN_PIN P1_25
-#define Z_MAX_PIN P1_24
-
//
// Z Probe (when not Z_MIN_PIN)
//
@@ -92,9 +75,6 @@
#define E0_CS_PIN P1_08
#endif
-#define E1_STEP_PIN P0_01
-#define E1_DIR_PIN P0_00
-#define E1_ENABLE_PIN P0_10
#ifndef E1_CS_PIN
#define E1_CS_PIN P1_01
#endif
@@ -158,36 +138,6 @@
#define TMC_BAUD_RATE 19200
#endif
-//
-// Temperature Sensors
-// 3.3V max when defined as an analog input
-//
-#define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN
-#define TEMP_0_PIN P0_24_A1 // A1 (T1) - (68) - TEMP_0_PIN
-#define TEMP_1_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_1_PIN
-
-//
-// Heaters / Fans
-//
-#ifndef HEATER_0_PIN
- #define HEATER_0_PIN P2_07
-#endif
-#if HOTENDS == 1
- #ifndef FAN1_PIN
- #define FAN1_PIN P2_04
- #endif
-#else
- #ifndef HEATER_1_PIN
- #define HEATER_1_PIN P2_04
- #endif
-#endif
-#ifndef FAN_PIN
- #define FAN_PIN P2_03
-#endif
-#ifndef HEATER_BED_PIN
- #define HEATER_BED_PIN P2_05
-#endif
-
/**
* _____ _____
* NC | · · | GND 5V | · · | GND
@@ -199,7 +149,6 @@
* EXP2 EXP1
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN P1_30 // (37) not 5V tolerant
#define BTN_ENC P0_28 // (58) open-drain
#if ENABLED(CR10_STOCKDISPLAY)
@@ -280,22 +229,8 @@
#define SDCARD_CONNECTION LCD
#endif
-#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
-
#if SD_CONNECTION_IS(LCD)
- #define SCK_PIN P0_15
- #define MISO_PIN P0_17
- #define MOSI_PIN P0_18
#define SS_PIN P0_16
-#elif SD_CONNECTION_IS(ONBOARD)
- #undef SD_DETECT_PIN
- #define SD_DETECT_PIN P0_27
- #define SCK_PIN P0_07
- #define MISO_PIN P0_08
- #define MOSI_PIN P0_09
- #define SS_PIN ONBOARD_SD_CS_PIN
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
- #error "No custom SD drive cable defined for this board."
#endif
/**
@@ -305,3 +240,6 @@
* P0_27 (57) (Open collector)
* P0_28 (58) (Open collector)
*/
+
+// Include common SKR pins
+#include "pins_BTT_SKR.h"
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index bec999aa28..d4322adae4 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -355,11 +355,11 @@
#elif MB(SELENA_COMPACT)
#include "lpc1768/pins_SELENA_COMPACT.h" // LPC1768 env:LPC1768
#elif MB(BIGTREE_SKR_V1_1)
- #include "lpc1768/pins_BIGTREE_SKR_V1.1.h" // LPC1768 env:LPC1768
+ #include "lpc1768/pins_BTT_SKR_V1_1.h" // LPC1768 env:LPC1768
#elif MB(BIQU_B300_V1_0)
#include "lpc1768/pins_BIQU_B300_V1.0.h" // LPC1768 env:LPC1768
#elif MB(BIGTREE_SKR_V1_3)
- #include "lpc1768/pins_BIGTREE_SKR_V1.3.h" // LPC1768 env:LPC1768
+ #include "lpc1768/pins_BTT_SKR_V1_3.h" // LPC1768 env:LPC1768
#elif MB(GMARSH_X6_REV1)
#include "lpc1768/pins_GMARSH_X6_REV1.h" // LPC1768 env:LPC1768
@@ -470,13 +470,13 @@
#elif MB(MKS_ROBIN_LITE)
#include "stm32/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
#elif MB(BIGTREE_SKR_MINI_V1_1)
- #include "stm32/pins_BIGTREE_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
+ #include "stm32/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
+#elif MB(BTT_SKR_MINI_E3_V1_0)
+ #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
#elif MB(BTT_SKR_MINI_E3_V1_2)
#include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
-#elif MB(BIGTREE_SKR_MINI_E3)
- #include "stm32/pins_BIGTREE_SKR_MINI_E3.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
#elif MB(BIGTREE_SKR_E3_DIP)
- #include "stm32/pins_BIGTREE_SKR_E3_DIP.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
+ #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
#elif MB(JGAURORA_A5S_A1)
#include "stm32/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
#elif MB(FYSETC_AIO_II)
@@ -514,9 +514,9 @@
#elif MB(STEVAL)
#include "stm32/pins_STEVAL.h" // STM32F4 env:STM32F4
#elif MB(BIGTREE_SKR_PRO_V1_1)
- #include "stm32/pins_BIGTREE_SKR_PRO_V1.1.h" // STM32F4 env:BIGTREE_SKR_PRO
+ #include "stm32/pins_BTT_SKR_PRO_V1_1.h" // STM32F4 env:BIGTREE_SKR_PRO
#elif MB(BIGTREE_BTT002_V1_0)
- #include "stm32/pins_BIGTREE_BTT002_V1.0.h" // STM32F4 env:BIGTREE_BTT002
+ #include "stm32/pins_BTT_BTT002_V1_0.h" // STM32F4 env:BIGTREE_BTT002
#elif MB(LERDGE_K)
#include "stm32/pins_LERDGE_K.h" // STM32F4 env:STM32F4
#elif MB(LERDGE_X)
diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_BTT002_V1.0.h b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BIGTREE_BTT002_V1.0.h
rename to Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_E3_DIP.h b/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BIGTREE_SKR_E3_DIP.h
rename to Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
similarity index 80%
rename from Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_E3.h
rename to Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
index 33e79bffea..41060dc6b0 100644
--- a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_E3.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
@@ -25,8 +25,6 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
-#define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
-
// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
#define DISABLE_JTAG
@@ -60,7 +58,7 @@
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PC15
+ #define FIL_RUNOUT_PIN PC15 // "E0-STOP"
#endif
//
@@ -82,17 +80,6 @@
#define E0_STEP_PIN PB3
#define E0_DIR_PIN PB4
-#if HAS_DRIVER(TMC2209)
- /**
- * TMC2209 stepper drivers
- * Hardware serial communication ports.
- */
- #define X_HARDWARE_SERIAL Serial4
- #define Y_HARDWARE_SERIAL Serial4
- #define Z_HARDWARE_SERIAL Serial4
- #define E0_HARDWARE_SERIAL Serial4
-#endif
-
//
// Temperature Sensors
//
@@ -125,10 +112,12 @@
* EXP1
*/
#if HAS_SPI_LCD
- #define BEEPER_PIN PB5
- #define BTN_ENC PB6
#if ENABLED(CR10_STOCKDISPLAY)
+
+ #define BEEPER_PIN PB5
+ #define BTN_ENC PB6
+
#define LCD_PINS_RS PB8
#define BTN_EN1 PA9
@@ -137,6 +126,16 @@
#define LCD_PINS_ENABLE PB7
#define LCD_PINS_D4 PB9
+ #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+ #define LCD_PINS_RS PB9
+ #define LCD_PINS_ENABLE PB6
+ #define LCD_PINS_D4 PB8
+ #define LCD_PINS_D5 PA10
+ #define LCD_PINS_D6 PA9
+ #define LCD_PINS_D7 PB5
+ #define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
#elif ENABLED(MKS_MINI_12864)
/** Creality Ender-2 display pinout
@@ -149,18 +148,19 @@
* -----
* EXP1
*/
-
- #define BTN_EN1 PA9
- #define BTN_EN2 PA10
- #define DOGLCD_CS PB8
- #define DOGLCD_A0 PB9
- #define DOGLCD_SCK PA15
- #define DOGLCD_MOSI PB7
+ #define BTN_EN1 PA9
+ #define BTN_EN2 PA10
+ #define DOGLCD_CS PB8
+ #define DOGLCD_A0 PB9
+ #define DOGLCD_SCK PA15
+ #define DOGLCD_MOSI PB7
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#else
- #error "Only CR10_STOCKDISPLAY and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
+
+ #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
+
#endif
#endif // HAS_SPI_LCD
@@ -174,5 +174,5 @@
#define SDCARD_CONNECTION ONBOARD
#endif
-#define ON_BOARD_SPI_DEVICE 1 //SPI1
+#define ON_BOARD_SPI_DEVICE 1 // SPI1
#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
new file mode 100644
index 0000000000..bd2078e5d9
--- /dev/null
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
@@ -0,0 +1,37 @@
+/**
+ * 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
+
+#include "pins_BTT_SKR_MINI_E3.h"
+
+#define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
+
+/**
+ * TMC2209 stepper drivers
+ * Hardware serial communication ports.
+ */
+#if HAS_DRIVER(TMC2209)
+ #define X_HARDWARE_SERIAL Serial4
+ #define Y_HARDWARE_SERIAL Serial4
+ #define Z_HARDWARE_SERIAL Serial4
+ #define E0_HARDWARE_SERIAL Serial4
+#endif
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
index 94b4152a69..67da8571fb 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -21,71 +21,16 @@
*/
#pragma once
-#ifndef TARGET_STM32F1
- #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
+#include "pins_BTT_SKR_MINI_E3.h"
#define BOARD_INFO_NAME "BIGTREE SKR Mini E3 V1.2"
-// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
-#define DISABLE_JTAG
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-#define FLASH_EEPROM_EMULATION
-#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
-#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-#undef E2END
-#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
-
-//
-// Servos
-//
-#define SERVO0_PIN PA1
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN PC0
-#define Y_STOP_PIN PC1
-#define Z_STOP_PIN PC2
-
-//
-// Z Probe must be this pins
-//
-#define Z_MIN_PROBE_PIN PC14
-
-//
-// Filament Runout Sensor
-//
-#ifndef FIL_RUNOUT_PIN
- #define FIL_RUNOUT_PIN PC15 // "E0-STOP"
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN PB14
-#define X_STEP_PIN PB13
-#define X_DIR_PIN PB12
-
-#define Y_ENABLE_PIN PB11
-#define Y_STEP_PIN PB10
-#define Y_DIR_PIN PB2
-
-#define Z_ENABLE_PIN PB1
-#define Z_STEP_PIN PB0
-#define Z_DIR_PIN PC5
-
-#define E0_ENABLE_PIN PD2
-#define E0_STEP_PIN PB3
-#define E0_DIR_PIN PB4
+#define NEOPIXEL_PIN PC7 // LED driving pin
+/**
+ * TMC2208/TMC2209 stepper drivers
+ */
#if HAS_TMC220x
- /**
- * TMC2208/TMC2209 stepper drivers
- */
//
// Software serial
//
@@ -104,67 +49,3 @@
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN PA0 // Analog Input
-#define TEMP_BED_PIN PC3 // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN PC8 // EXTRUDER
-#define HEATER_BED_PIN PC9 // BED
-#define FAN_PIN PA8
-
-//
-// USB connect control
-//
-#define USB_CONNECT_PIN PC13
-#define USB_CONNECT_INVERTING false
-
-#define NEOPIXEL_PIN PC7 // LED driving pin
-
-#define SD_DETECT_PIN PC4
-
-/**
- * _____
- * 5V | · · | GND
- * (LCD_EN) PB7 | · · | PB8 (LCD_RS)
- * (LCD_D4) PB9 | · · | PA10 (BTN_EN2)
- * RESET | · · | PA9 (BTN_EN1)
- * (BTN_ENC) PB6 | · · | PB5 (BEEPER)
- * -----
- * EXP1
- */
-#if HAS_SPI_LCD
- #define BEEPER_PIN PB5
- #define BTN_ENC PB6
-
- #if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS PB8
-
- #define BTN_EN1 PA9
- #define BTN_EN2 PA10
-
- #define LCD_PINS_ENABLE PB7
- #define LCD_PINS_D4 PB9
-
- #else
- #error "Only CR10_STOCKDISPLAY is currently supported on the BIGTREE_SKR_MINI_E3 V1.2."
- #endif
-
-#endif // HAS_SPI_LCD
-
-//
-// SD Support
-//
-#define HAS_ONBOARD_SD
-
-#ifndef SDCARD_CONNECTION
- #define SDCARD_CONNECTION ONBOARD
-#endif
-
-#define ON_BOARD_SPI_DEVICE 1 //SPI1
-#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h
rename to Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h
rename to Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
diff --git a/buildroot/share/tests/STM32F103RC_bigtree_NOUSB-tests b/buildroot/share/tests/STM32F103RC_bigtree_NOUSB-tests
index 8c83c029e6..653614f375 100644
--- a/buildroot/share/tests/STM32F103RC_bigtree_NOUSB-tests
+++ b/buildroot/share/tests/STM32F103RC_bigtree_NOUSB-tests
@@ -10,7 +10,7 @@ set -e
# Build with the default configurations
#
restore_configs
-opt_set MOTHERBOARD BOARD_BIGTREE_SKR_MINI_E3
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0
opt_set SERIAL_PORT 1
opt_set SERIAL_PORT_2 -1
exec_test $1 $2 "Bigtreetech SKR Mini E3 - Basic Configuration"