From fdfa378023d5f289a47a9063d7d5ca592cc4a30d Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Tue, 20 Aug 2024 04:52:32 -0700 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20SKRat=20V1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 2 + Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h | 569 ++++++++++++++++++ ini/renamed.ini | 3 - ini/stm32g0.ini | 12 + 5 files changed, 584 insertions(+), 3 deletions(-) create mode 100644 Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 710cb8d3528e..f9d0458513b3 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -328,6 +328,7 @@ #define BOARD_BTT_MANTA_M5P_V1_0 4004 // BigTreeTech Manta M5P V1.0 (STM32G0B1RE) #define BOARD_BTT_MANTA_M8P_V1_0 4005 // BigTreeTech Manta M8P V1.0 (STM32G0B1VE) #define BOARD_BTT_MANTA_M8P_V1_1 4006 // BigTreeTech Manta M8P V1.1 (STM32G0B1VE) +#define BOARD_BTT_SKRAT_V1_0 4007 // BigTreeTech SKRat V1.0 (STM32G0B1VE) // // STM32 ARM Cortex-M3 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 3f6b26e39a66..321d6d18f216 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -579,6 +579,8 @@ #include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h" // STM32G0 env:STM32G0B1VE_btt #elif MB(BTT_MANTA_M8P_V1_1) #include "stm32g0/pins_BTT_MANTA_M8P_V1_1.h" // STM32G0 env:STM32G0B1VE_btt +#elif MB(BTT_SKRAT_V1_0) + #include "stm32g0/pins_BTT_SKRAT_V1_0.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer // // STM32 ARM Cortex-M3 diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h new file mode 100644 index 000000000000..c010e0232552 --- /dev/null +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h @@ -0,0 +1,569 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2024 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 + +/** + * BigTreeTech SKRat 1.0 pin assignments + * Schematic: https://github.com/bigtreetech/SKRat/blob/master/Hardware/BTT_SKRat_V1.0_SCH.pdf + * Pins: https://github.com/bigtreetech/SKRat/blob/master/Hardware/BIGTREETECH%20SKRat%20V1.0-Pin.pdf + */ + +#include "env_validate.h" + +//#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4 + +#ifndef BOARD_INFO_NAME + #define BOARD_INFO_NAME "BTT SKRat V1.0" +#endif + +#define USES_DIAG_JUMPERS + +// Ignore temp readings during development. +//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 + +#define LED_PIN PE2 + +// +// EEPROM +// +#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION) + #undef NO_EEPROM_SELECTED + #ifndef FLASH_EEPROM_EMULATION + #define FLASH_EEPROM_EMULATION + #endif + #define EEPROM_PAGE_SIZE (0x800UL) // 2K + #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL) + #define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE +#endif + +// +// Servos +// +#define SERVO0_PIN PE6 // SERVOS + +// +// Probe enable +// +#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN) + #define PROBE_ENABLE_PIN SERVO0_PIN +#endif + +// +// Trinamic Stallguard pins +// +#define X_DIAG_PIN PB5 // X-STOP +#define Y_DIAG_PIN PC1 // Y-STOP +#define Z_DIAG_PIN PC0 // Z-STOP +#define E0_DIAG_PIN PF4 // E0_DET +#define E1_DIAG_PIN PF5 // E1_DET + +// +// Limit Switches +// +#ifdef X_STALL_SENSITIVITY + #define X_STOP_PIN X_DIAG_PIN + #if X_HOME_TO_MIN + #define X_MAX_PIN PF4 // E0_DET + #else + #define X_MIN_PIN PF4 // E0_DET + #endif +#elif ENABLED(X_DUAL_ENDSTOPS) + #ifndef X_MIN_PIN + #define X_MIN_PIN PB5 // X-STOP + #endif + #ifndef X_MAX_PIN + #define X_MAX_PIN PF4 // E0_DET + #endif +#else + #define X_STOP_PIN PB5 // X-STOP +#endif + +#ifdef Y_STALL_SENSITIVITY + #define Y_STOP_PIN Y_DIAG_PIN + #if Y_HOME_TO_MIN + #define Y_MAX_PIN PF5 // E1_DET + #else + #define Y_MIN_PIN PF5 // E1_DET + #endif +#elif ENABLED(Y_DUAL_ENDSTOPS) + #ifndef Y_MIN_PIN + #define Y_MIN_PIN PC1 // Y-STOP + #endif + #ifndef Y_MAX_PIN + #define Y_MAX_PIN PF5 // E1_DET + #endif +#else + #define Y_STOP_PIN PC1 // Y-STOP +#endif + +#ifdef Z_STALL_SENSITIVITY + #define Z_STOP_PIN Z_DIAG_PIN + #if Z_HOME_TO_MIN + #define Z_MAX_PIN PE12 // PWR_DET + #else + #define Z_MIN_PIN PE12 // PWR_DET + #endif +#elif ENABLED(Z_MULTI_ENDSTOPS) + #ifndef Z_MIN_PIN + #define Z_MIN_PIN PC0 // Z-STOP + #endif + #ifndef Z_MAX_PIN + #define Z_MAX_PIN PE12 // PWR_DET + #endif +#else + #ifndef Z_STOP_PIN + #define Z_STOP_PIN PC0 // Z-STOP + #endif +#endif + +// +// Z Probe (when not Z_MIN_PIN) +// +#ifndef Z_MIN_PROBE_PIN + #define Z_MIN_PROBE_PIN PE5 // Probe +#endif + +// +// Filament Runout Sensor +// +#ifndef FIL_RUNOUT_PIN + #define FIL_RUNOUT_PIN PF4 // E0_DET +#endif +#ifndef FIL_RUNOUT2_PIN + #define FIL_RUNOUT2_PIN PF5 // E1_DET +#endif + +// +// Power Supply Control +// +#ifndef PS_ON_PIN + #define PS_ON_PIN PF6 // PS_ON +#endif + +// +// Power-loss Detection +// +#ifndef POWER_LOSS_PIN + #define POWER_LOSS_PIN PE12 // PWR_DET +#endif + +// +// Steppers +// +#define X_STEP_PIN PF9 // XM +#define X_DIR_PIN PD7 +#define X_ENABLE_PIN PD6 +#ifndef X_CS_PIN + #define X_CS_PIN PF10 +#endif + +#define Y_STEP_PIN PD3 // YM +#define Y_DIR_PIN PD2 +#define Y_ENABLE_PIN PD5 +#ifndef Y_CS_PIN + #define Y_CS_PIN PD4 +#endif + +#define Z_STEP_PIN PA15 // ZMA / ZMB +#define Z_DIR_PIN PF8 +#define Z_ENABLE_PIN PC9 +#ifndef Z_CS_PIN + #define Z_CS_PIN PC8 +#endif + +#define E0_STEP_PIN PC7 // E0M +#define E0_DIR_PIN PC6 +#define E0_ENABLE_PIN PD9 +#ifndef E0_CS_PIN + #define E0_CS_PIN PD8 +#endif + +#define E1_STEP_PIN PB10 // E1M +#define E1_DIR_PIN PE15 +#define E1_ENABLE_PIN PA8 +#ifndef E1_CS_PIN + #define E1_CS_PIN PB11 +#endif + +// +// Temperature Sensors +// +#if TEMP_SENSOR_0_IS_MAX31865 + #define TEMP_0_CS_PIN PA4 // Max31865 CS + #define TEMP_0_SCK_PIN PA5 + #define TEMP_0_MISO_PIN PA6 + #define TEMP_0_MOSI_PIN PA7 + #define SOFTWARE_SPI // Max31865 and LCD SD share a set of SPIs, Set SD to softwareSPI for Max31865 + #define FORCE_SOFT_SPI +#else + #ifndef TEMP_0_PIN + #define TEMP_0_PIN PA3 // TH0 + #endif +#endif +#ifndef TEMP_1_PIN + #define TEMP_1_PIN PA2 // TH1 +#endif +#ifndef TEMP_BED_PIN + #define TEMP_BED_PIN PB2 // TB +#endif +#ifndef TEMP_SENSOR_PROBE + #define TEMP_PROBE_PIN PA1 // TH2 +#endif +#ifndef TEMP_SENSOR_CHAMBER + #define TEMP_CHAMBER_PIN PA0 // TH3 +#endif + +// +// Heaters / Fans +// +#ifndef HEATER_0_PIN + #define HEATER_0_PIN PE11 // HE0 +#endif +#ifndef HEATER_1_PIN + #define HEATER_1_PIN PE13 // HE1 +#endif +#ifndef HEATER_BED_PIN + #define HEATER_BED_PIN PB3 // HB +#endif +#ifndef FAN0_PIN + #define FAN0_PIN PD15 // FAN0 + //#define FAN0_PIN PE9 // "Four-Wire FAN0" +#endif + +#if HAS_CUTTER + #ifndef SPINDLE_LASER_PWM_PIN + #define SPINDLE_LASER_PWM_PIN PD13 // FAN2 + #endif + #ifndef SPINDLE_LASER_ENA_PIN + #define SPINDLE_LASER_ENA_PIN PD14 // FAN1 + #endif +#else + #ifndef FAN1_PIN + #define FAN1_PIN PD14 // FAN1 + //#define FAN1_PIN PE14 // "Four-Wire FAN1" + #endif + #ifndef FAN2_PIN + #define FAN2_PIN PD13 // FAN2 + #endif + #ifndef FAN3_PIN + #define FAN3_PIN PD12 // FAN3 + #endif + + #ifndef E0_FAN_TACHO_PIN + //#define E0_FAN_TACHO_PIN PD10 // "Four-Wire FAN0" + #endif + #ifndef E1_FAN_TACHO_PIN + //#define E1_FAN_TACHO_PIN PA11 // "Four-Wire FAN1" + #endif + +#endif // SPINDLE_FEATURE || LASER_FEATURE + +// +// Default pins for TMC software SPI +// +#if HAS_TMC_SPI + #define TMC_USE_SW_SPI + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PC12 + #endif + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PC11 + #endif + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PC10 + #endif +#endif + +#if HAS_TMC_UART + /** + * 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 + //#define E1_HARDWARE_SERIAL Serial1 + + // + // Software serial + // + #define X_SERIAL_TX_PIN PF10 + #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN + + #define Y_SERIAL_TX_PIN PD4 + #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN + + #define Z_SERIAL_TX_PIN PC8 + #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN + + #define E0_SERIAL_TX_PIN PD8 + #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN + + #define E1_SERIAL_TX_PIN PB11 + #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN + + // Reduce baud rate to improve software serial reliability + #ifndef TMC_BAUD_RATE + #define TMC_BAUD_RATE 19200 + #endif + +#endif + +// +// SD Support +// +#ifndef SDCARD_CONNECTION + #if HAS_WIRED_LCD && DISABLED(NO_LCD_SDCARD) + #define SDCARD_CONNECTION LCD + #else + #define SDCARD_CONNECTION ONBOARD + #endif +#endif + +/** + * ------ ------ + * (BEEPER) PC13 | 1 2 | PF3 (BTN_ENC) (MISO) PA6 | 1 2 | PA5 (SCK) + * (LCD_EN) PC3 | 3 4 | PC2 (LCD_RS) (BTN_EN1) PE7 | 3 4 | PF7 (SD_SS) + * (LCD_D4) PB1 | 5 6 PB0 (LCD_D5) (BTN_EN2) PE8 | 5 6 PA7 (MOSI) + * (LCD_D6) PC5 | 7 8 | PC4 (LCD_D7) (SD_DETECT) PE10 | 7 8 | RESET + * GND | 9 10 | 5V GND | 9 10 | -- + * ------ ------ + * EXP1 EXP2 + */ +#define EXP1_01_PIN PC13 +#define EXP1_02_PIN PF3 +#define EXP1_03_PIN PC3 +#define EXP1_04_PIN PC2 +#define EXP1_05_PIN PB1 +#define EXP1_06_PIN PB0 +#define EXP1_07_PIN PC5 +#define EXP1_08_PIN PC4 + +#define EXP2_01_PIN PA6 +#define EXP2_02_PIN PA5 +#define EXP2_03_PIN PE7 +#define EXP2_04_PIN PF7 +#define EXP2_05_PIN PE8 +#define EXP2_06_PIN PA7 +#define EXP2_07_PIN PE10 +#define EXP2_08_PIN -1 + +// +// Onboard SD card +// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 +// +#if SD_CONNECTION_IS(ONBOARD) + #define SD_DETECT_PIN PE3 +#elif SD_CONNECTION_IS(LCD) && (ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL) + #define SD_DETECT_PIN EXP1_01_PIN + #define SD_SS_PIN EXP1_05_PIN +#elif SD_CONNECTION_IS(CUSTOM_CABLE) + #error "No custom SD drive cable defined for this board." +#endif + +#define ONBOARD_SPI_DEVICE 1 // SPI1 -> used only by HAL/STM32F1... +#define ONBOARD_SD_CS_PIN PB8 // Chip select for "System" SD card + +#define ENABLE_SPI1 +#define SDSS ONBOARD_SD_CS_PIN +#define SD_SS_PIN ONBOARD_SD_CS_PIN +#define SD_SCK_PIN PA5 +#define SD_MISO_PIN PA6 +#define SD_MOSI_PIN PA7 + +#if ENABLED(BTT_MOTOR_EXPANSION) + /** ------ ------ + * M3DIAG | 1 2 | M3RX M3STP | 1 2 | M3DIR + * M2DIAG | 3 4 | M2RX M2STP | 3 4 | M2DIR + * M1DIAG 5 6 | M1RX M1DIR 5 6 | M1STP + * M3EN | 7 8 | M2EN M1EN | 7 8 | -- + * GND | 9 10 | -- GND | 9 10 | -- + * ------ ------ + * EXP1 EXP2 + * + * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN + */ + + // M1 on Driver Expansion Module + #define E2_STEP_PIN EXP2_06_PIN + #define E2_DIR_PIN EXP2_05_PIN + #define E2_ENABLE_PIN EXP2_07_PIN + #if !EXP_MOT_USE_EXP2_ONLY + #define E2_DIAG_PIN EXP1_05_PIN + #define E2_CS_PIN EXP1_06_PIN + #if HAS_TMC_UART + #define E2_SERIAL_TX_PIN EXP1_06_PIN + #define E2_SERIAL_RX_PIN EXP1_06_PIN + #endif + #endif + + // M2 on Driver Expansion Module + #define E3_STEP_PIN EXP2_03_PIN + #define E3_DIR_PIN EXP2_04_PIN + #if !EXP_MOT_USE_EXP2_ONLY + #define E3_ENABLE_PIN EXP1_08_PIN + #define E3_DIAG_PIN EXP1_03_PIN + #define E3_CS_PIN EXP1_04_PIN + #if HAS_TMC_UART + #define E3_SERIAL_TX_PIN EXP1_04_PIN + #define E3_SERIAL_RX_PIN EXP1_04_PIN + #endif + #else + #define E3_ENABLE_PIN EXP2_07_PIN + #endif + + // M3 on Driver Expansion Module + #define E4_STEP_PIN EXP2_01_PIN + #define E4_DIR_PIN EXP2_02_PIN + #if !EXP_MOT_USE_EXP2_ONLY + #define E4_ENABLE_PIN EXP1_07_PIN + #define E4_DIAG_PIN EXP1_01_PIN + #define E4_CS_PIN EXP1_02_PIN + #if HAS_TMC_UART + #define E4_SERIAL_TX_PIN EXP1_02_PIN + #define E4_SERIAL_RX_PIN EXP1_02_PIN + #endif + #else + #define E4_ENABLE_PIN EXP2_07_PIN + #endif + +#endif // BTT_MOTOR_EXPANSION + +// +// LCDs and Controllers +// +#if IS_TFTGLCD_PANEL + + #if ENABLED(TFTGLCD_PANEL_SPI) + #define TFTGLCD_CS EXP2_03_PIN + #endif + +#elif HAS_WIRED_LCD + + #define BEEPER_PIN EXP1_01_PIN + #define BTN_ENC EXP1_02_PIN + + #if ENABLED(CR10_STOCKDISPLAY) + + #define LCD_PINS_RS EXP1_07_PIN + + #define BTN_EN1 EXP1_03_PIN + #define BTN_EN2 EXP1_05_PIN + + #define LCD_PINS_EN EXP1_08_PIN + #define LCD_PINS_D4 EXP1_06_PIN + + #elif ENABLED(MKS_MINI_12864) + + #define DOGLCD_A0 EXP1_07_PIN + #define DOGLCD_CS EXP1_06_PIN + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN + + #else + + #define LCD_PINS_RS EXP1_04_PIN + + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN + + #define LCD_PINS_EN EXP1_03_PIN + #define LCD_PINS_D4 EXP1_05_PIN + + #if ENABLED(FYSETC_MINI_12864) + #define DOGLCD_CS EXP1_03_PIN + #define DOGLCD_A0 EXP1_04_PIN + //#define LCD_BACKLIGHT_PIN -1 + #define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally. + #if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) + #ifndef RGB_LED_R_PIN + #define RGB_LED_R_PIN EXP1_06_PIN + #endif + #ifndef RGB_LED_G_PIN + #define RGB_LED_G_PIN EXP1_07_PIN + #endif + #ifndef RGB_LED_B_PIN + #define RGB_LED_B_PIN EXP1_08_PIN + #endif + #elif ENABLED(FYSETC_MINI_12864_2_1) + #define NEOPIXEL_PIN EXP1_06_PIN + #endif + #endif // !FYSETC_MINI_12864 + + #if IS_ULTIPANEL + #define LCD_PINS_D5 EXP1_06_PIN + #define LCD_PINS_D6 EXP1_07_PIN + #define LCD_PINS_D7 EXP1_08_PIN + + #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) + #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder + #endif + + #endif + + #endif + +#endif // HAS_WIRED_LCD + +// Alter timing for graphical display +#if IS_U8GLIB_ST7920 + #ifndef BOARD_ST7920_DELAY_1 + #define BOARD_ST7920_DELAY_1 120 + #endif + #ifndef BOARD_ST7920_DELAY_2 + #define BOARD_ST7920_DELAY_2 80 + #endif + #ifndef BOARD_ST7920_DELAY_3 + #define BOARD_ST7920_DELAY_3 580 + #endif +#endif + +#if HAS_SPI_TFT + // + // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE) + // + #define TFT_CS_PIN EXP2_04_PIN + #define TFT_A0_PIN EXP2_07_PIN + #define TFT_SCK_PIN EXP2_02_PIN + #define TFT_MISO_PIN EXP2_01_PIN + #define TFT_MOSI_PIN EXP2_06_PIN + + #define TOUCH_INT_PIN EXP1_07_PIN + #define TOUCH_MISO_PIN EXP1_06_PIN + #define TOUCH_MOSI_PIN EXP1_03_PIN + #define TOUCH_SCK_PIN EXP1_05_PIN + #define TOUCH_CS_PIN EXP1_04_PIN + + #define BTN_EN1 EXP2_03_PIN + #define BTN_EN2 EXP2_05_PIN + #define BTN_ENC EXP1_02_PIN +#endif + +// +// NeoPixel LED +// +#ifndef BOARD_NEOPIXEL_PIN + #define BOARD_NEOPIXEL_PIN PE4 // RGB +#endif diff --git a/ini/renamed.ini b/ini/renamed.ini index fb5fce629711..f39cbec6adeb 100644 --- a/ini/renamed.ini +++ b/ini/renamed.ini @@ -102,9 +102,6 @@ extends = renamed [env:STM32G0B1RE_manta_btt_xfer] ;=> STM32G0B1RE_manta_btt extends = renamed -[env:STM32G0B1VE_btt_xfer] ;=> STM32G0B1VE_btt -extends = renamed - [env:BIGTREE_SKR_PRO] ;=> BTT_SKR_PRO extends = renamed diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini index 40493b3ff1e5..4a9d1e4f7ae5 100644 --- a/ini/stm32g0.ini +++ b/ini/stm32g0.ini @@ -90,6 +90,7 @@ build_flags = ${env:STM32G0B1RE_btt.build_flags} # # BigTreeTech Manta M8P V1.x (STM32G0B1VET6 ARM Cortex-M0+) +# BigTreeTech SKRat V1.0 (STM32G0B1VET6 ARM Cortex-M0+) # [env:STM32G0B1VE_btt] extends = stm32_variant @@ -108,3 +109,14 @@ build_flags = ${stm32_variant.build_flags} -Wl,--no-warn-rwx-segment upload_protocol = stlink debug_tool = stlink + +# +# BigTreeTech SKRat V1.0 (STM32G0B1VET6 ARM Cortex-M0+) +# Custom upload to SD via Marlin with Binary Protocol +# +[env:STM32G0B1VE_btt_xfer] +extends = env:STM32G0B1VE_btt +build_flags = ${env:STM32G0B1VE_btt.build_flags} -DXFER_BUILD +extra_scripts = ${env:STM32G0B1VE_btt.extra_scripts} + pre:buildroot/share/scripts/upload.py +upload_protocol = custom From bf1f512e5a9e5ba956471395dc9a2e189e171150 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 3 Oct 2024 13:22:46 -0500 Subject: [PATCH 2/3] not needed? --- buildroot/tests/ARMED | 3 --- buildroot/tests/BTT_BTT002 | 3 --- buildroot/tests/BTT_GTR_V1_0 | 3 --- buildroot/tests/BTT_GTR_V1_0_usb_flash_drive | 3 --- buildroot/tests/BTT_SKR_PRO | 3 --- buildroot/tests/BTT_SKR_SE_BX | 3 --- buildroot/tests/FYSETC_F6 | 3 --- buildroot/tests/I3DBEEZ9_V1 | 3 --- buildroot/tests/LERDGEK | 3 --- buildroot/tests/LERDGEX | 3 --- buildroot/tests/LPC1768 | 3 --- buildroot/tests/LPC1769 | 3 --- buildroot/tests/NUCLEO_F767ZI | 3 --- buildroot/tests/PANDA_PI_V29 | 3 --- buildroot/tests/REMRAM_V1 | 3 --- buildroot/tests/SAMD21_minitronics20 | 3 --- buildroot/tests/SAMD51_grandcentral_m4 | 3 --- buildroot/tests/STM32F103RC_btt | 3 --- buildroot/tests/STM32F103RC_btt_USB | 3 --- buildroot/tests/STM32F103RC_btt_USB_maple | 3 --- buildroot/tests/STM32F103RC_btt_maple | 3 --- buildroot/tests/STM32F103RC_fysetc | 3 --- buildroot/tests/STM32F103RC_fysetc_maple | 3 --- buildroot/tests/STM32F103RC_meeb_maple | 3 --- buildroot/tests/STM32F103RE_btt | 3 --- buildroot/tests/STM32F103RE_btt_USB | 3 --- buildroot/tests/STM32F103RE_creality | 3 --- buildroot/tests/STM32F401RC_creality | 3 --- buildroot/tests/STM32G0B1RE_btt | 3 --- buildroot/tests/STM32H743VI_btt | 3 --- buildroot/tests/at90usb1286_cdc | 3 --- buildroot/tests/at90usb1286_dfu | 3 --- buildroot/tests/chitu_f103 | 3 --- buildroot/tests/jgaurora_a5s_a1_maple | 3 --- buildroot/tests/mega1280 | 3 --- buildroot/tests/mega2560 | 3 --- buildroot/tests/melzi_optiboot | 3 --- buildroot/tests/rambo | 3 --- buildroot/tests/sanguino1284p | 3 --- buildroot/tests/sanguino644p | 3 --- buildroot/tests/teensy35 | 3 --- buildroot/tests/teensy41 | 3 --- 42 files changed, 126 deletions(-) diff --git a/buildroot/tests/ARMED b/buildroot/tests/ARMED index 7b9fef1eeb49..7e2981f368f9 100755 --- a/buildroot/tests/ARMED +++ b/buildroot/tests/ARMED @@ -14,6 +14,3 @@ use_example_configs ArmEd opt_set X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208 opt_enable LASER_SYNCHRONOUS_M106_M107 exec_test $1 $2 "ArmEd Example Configuration with mixed TMC Drivers" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/BTT_BTT002 b/buildroot/tests/BTT_BTT002 index 5398d30feae9..121aace8950b 100755 --- a/buildroot/tests/BTT_BTT002 +++ b/buildroot/tests/BTT_BTT002 @@ -21,6 +21,3 @@ exec_test $1 $2 "BigTreeTech BTT002 Default Configuration plus TMC steppers" "$3 # use_example_configs Prusa/MK3S-BigTreeTech-BTT002 exec_test $1 $2 "BigTreeTech BTT002 with Prusa MK3S and related options" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/BTT_GTR_V1_0 b/buildroot/tests/BTT_GTR_V1_0 index dcfd2b3eefb4..c6cb7d5feb6a 100755 --- a/buildroot/tests/BTT_GTR_V1_0 +++ b/buildroot/tests/BTT_GTR_V1_0 @@ -46,6 +46,3 @@ opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP MPC_EDIT_MENU MPC_AUTOTUNE MPC_AUTOTUNE_MENU opt_disable PIDTEMP exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive b/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive index 78aec1329558..da45592e58e4 100755 --- a/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive +++ b/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive @@ -19,6 +19,3 @@ opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_ FIL_RUNOUT4_STATE HIGH FIL_RUNOUT8_STATE HIGH opt_enable FIL_RUNOUT4_PULLUP FIL_RUNOUT8_PULLUP exec_test $1 $2 "GTT GTR | OTG USB Flash Drive | 8 Extruders | Auto-Fan | Mixed TMC Drivers | Runout Sensors (distinct)" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/BTT_SKR_PRO b/buildroot/tests/BTT_SKR_PRO index 3ffc9857a823..f20116d9a1fd 100755 --- a/buildroot/tests/BTT_SKR_PRO +++ b/buildroot/tests/BTT_SKR_PRO @@ -28,6 +28,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \ TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13 opt_enable LASER_FEATURE LASER_SAFETY_TIMEOUT_MS REPRAP_DISCOUNT_SMART_CONTROLLER exec_test $1 $2 "BigTreeTech SKR Pro | HD44780 | Laser (Percent) | Cooling | LCD" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/BTT_SKR_SE_BX b/buildroot/tests/BTT_SKR_SE_BX index 199cff14b9b0..8ba87da069d1 100755 --- a/buildroot/tests/BTT_SKR_SE_BX +++ b/buildroot/tests/BTT_SKR_SE_BX @@ -11,6 +11,3 @@ set -e # use_example_configs BIQU/BX exec_test $1 $2 "BIQU/BX" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/FYSETC_F6 index 713408b550e2..6dd7bb60fab6 100755 --- a/buildroot/tests/FYSETC_F6 +++ b/buildroot/tests/FYSETC_F6 @@ -73,6 +73,3 @@ opt_enable FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW FYSETC_242_OLED_12864 EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \ STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY EDGE_STEPPING exec_test $1 $2 "SCARA | Mixed TMC | EEPROM" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/I3DBEEZ9_V1 b/buildroot/tests/I3DBEEZ9_V1 index 7c11d2e6c879..810093282732 100755 --- a/buildroot/tests/I3DBEEZ9_V1 +++ b/buildroot/tests/I3DBEEZ9_V1 @@ -28,6 +28,3 @@ opt_set MOTHERBOARD BOARD_I3DBEEZ9_V1 SERIAL_PORT -1 \ TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13 opt_enable LASER_FEATURE LASER_SAFETY_TIMEOUT_MS REPRAP_DISCOUNT_SMART_CONTROLLER exec_test $1 $2 "I3DBEE Z9 Board | HD44780 | Laser (Percent) | Cooling | LCD" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/LERDGEK b/buildroot/tests/LERDGEK index b0806e90857c..347bdbf522ff 100755 --- a/buildroot/tests/LERDGEK +++ b/buildroot/tests/LERDGEK @@ -13,6 +13,3 @@ restore_configs opt_set MOTHERBOARD BOARD_LERDGE_K SERIAL_PORT 1 opt_enable TFT_GENERIC TFT_INTERFACE_FSMC TFT_COLOR_UI COMPACT_MARLIN_BOOT_LOGO exec_test $1 $2 "LERDGE K with Generic FSMC TFT with ColorUI" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/LERDGEX b/buildroot/tests/LERDGEX index cf7dfebfeabb..f7851db8f435 100755 --- a/buildroot/tests/LERDGEX +++ b/buildroot/tests/LERDGEX @@ -12,6 +12,3 @@ set -e restore_configs opt_set MOTHERBOARD BOARD_LERDGE_X SERIAL_PORT 1 exec_test $1 $2 "LERDGE X with Default Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768 index f932625fa738..a7240eb11aa3 100755 --- a/buildroot/tests/LPC1768 +++ b/buildroot/tests/LPC1768 @@ -93,6 +93,3 @@ opt_enable PIDTEMPBED S_CURVE_ACCELERATION \ opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FILAMENT_LOAD_UNLOAD_GCODES \ PARK_HEAD_ON_PAUSE exec_test $1 $2 "BigTreeTech SKR 1.4 | MMU2" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/LPC1769 b/buildroot/tests/LPC1769 index 6cdeb43582ec..1c3336d4fc48 100755 --- a/buildroot/tests/LPC1769 +++ b/buildroot/tests/LPC1769 @@ -98,6 +98,3 @@ opt_enable PIDTEMPBED S_CURVE_ACCELERATION \ MMU_SPOOL_JOIN_CONSUMES_ALL_FILAMENT MMU_MENUS MMU2_DEBUG opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE exec_test $1 $2 "BigTreeTech SKR 1.4 Turbo | MMU3" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/NUCLEO_F767ZI b/buildroot/tests/NUCLEO_F767ZI index a331618a0905..9f4e332591f3 100755 --- a/buildroot/tests/NUCLEO_F767ZI +++ b/buildroot/tests/NUCLEO_F767ZI @@ -13,6 +13,3 @@ restore_configs opt_set MOTHERBOARD BOARD_NUCLEO_F767ZI SERIAL_PORT -1 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2208 opt_enable BLTOUCH Z_SAFE_HOMING REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SPEAKER STARTUP_TUNE SOFTWARE_DRIVER_ENABLE exec_test $1 $2 "Mixed timer usage" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/PANDA_PI_V29 b/buildroot/tests/PANDA_PI_V29 index a176e571ba79..14f86715ea8c 100755 --- a/buildroot/tests/PANDA_PI_V29 +++ b/buildroot/tests/PANDA_PI_V29 @@ -14,6 +14,3 @@ opt_set MOTHERBOARD BOARD_PANDA_PI_V29 SERIAL_PORT -1 \ Z_CLEARANCE_DEPLOY_PROBE 0 Z_CLEARANCE_BETWEEN_PROBES 1 Z_CLEARANCE_MULTI_PROBE 1 opt_enable BD_SENSOR AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING BABYSTEPPING exec_test $1 $2 "Panda Pi V29 | BD Sensor | ABL-B" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/REMRAM_V1 b/buildroot/tests/REMRAM_V1 index f5944ff5af84..4ea63fa0a667 100755 --- a/buildroot/tests/REMRAM_V1 +++ b/buildroot/tests/REMRAM_V1 @@ -13,6 +13,3 @@ restore_configs opt_set MOTHERBOARD BOARD_REMRAM_V1 opt_set SERIAL_PORT 1 exec_test $1 $2 "Default Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/SAMD21_minitronics20 b/buildroot/tests/SAMD21_minitronics20 index ae9fa55ea42a..fb23e90be740 100755 --- a/buildroot/tests/SAMD21_minitronics20 +++ b/buildroot/tests/SAMD21_minitronics20 @@ -27,6 +27,3 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE BLTOUCH Z_MIN_PROBE_REPEATABILITY_TEST \ MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_GFX_OVERLAY \ LIN_ADVANCE ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE MONITOR_DRIVER_STATUS exec_test $1 $2 "Minitronics 2.0 with assorted features" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/SAMD51_grandcentral_m4 b/buildroot/tests/SAMD51_grandcentral_m4 index 312bd627ba0d..da2cdd30b0d0 100755 --- a/buildroot/tests/SAMD51_grandcentral_m4 +++ b/buildroot/tests/SAMD51_grandcentral_m4 @@ -29,6 +29,3 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_R SENSORLESS_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY Z2_STALL_SENSITIVITY \ EDGE_STEPPING TMC_DEBUG exec_test $1 $2 "Grand Central M4 with assorted features" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_btt b/buildroot/tests/STM32F103RC_btt index b9fff2b6c533..62ef7d96e5c4 100755 --- a/buildroot/tests/STM32F103RC_btt +++ b/buildroot/tests/STM32F103RC_btt @@ -14,6 +14,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \ X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209 opt_enable CR10_STOCKDISPLAY PINS_DEBUGGING Z_IDLE_HEIGHT FT_MOTION FT_MOTION_MENU ADAPTIVE_STEP_SMOOTHING NONLINEAR_EXTRUSION exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - TMC2209 HW Serial, FT_MOTION" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_btt_USB b/buildroot/tests/STM32F103RC_btt_USB index c8ee4f781473..922b8f8c11a3 100755 --- a/buildroot/tests/STM32F103RC_btt_USB +++ b/buildroot/tests/STM32F103RC_btt_USB @@ -12,6 +12,3 @@ set -e restore_configs opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 TEMP_SENSOR_SOC 100 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - SOC Temperature" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_btt_USB_maple b/buildroot/tests/STM32F103RC_btt_USB_maple index eeb460911acb..e9ce166e6710 100755 --- a/buildroot/tests/STM32F103RC_btt_USB_maple +++ b/buildroot/tests/STM32F103RC_btt_USB_maple @@ -12,6 +12,3 @@ set -e restore_configs opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_btt_maple b/buildroot/tests/STM32F103RC_btt_maple index 90e33ab52925..1ede07faef8e 100755 --- a/buildroot/tests/STM32F103RC_btt_maple +++ b/buildroot/tests/STM32F103RC_btt_maple @@ -14,6 +14,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \ X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209 opt_enable PINS_DEBUGGING Z_IDLE_HEIGHT exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - Basic Config with TMC2209 HW Serial" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_fysetc b/buildroot/tests/STM32F103RC_fysetc index 93b0fedf3d82..6a19e01e0dd5 100755 --- a/buildroot/tests/STM32F103RC_fysetc +++ b/buildroot/tests/STM32F103RC_fysetc @@ -11,6 +11,3 @@ set -e # use_example_configs "Creality/Ender-3/FYSETC Cheetah 1.2/BLTouch" exec_test $1 $2 "Ender-3 with Cheetah 1.2 | BLTouch" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_fysetc_maple b/buildroot/tests/STM32F103RC_fysetc_maple index 09dba7ef61fc..f401d1c00cbd 100755 --- a/buildroot/tests/STM32F103RC_fysetc_maple +++ b/buildroot/tests/STM32F103RC_fysetc_maple @@ -11,6 +11,3 @@ set -e # use_example_configs "Creality/Ender-3/FYSETC Cheetah 1.2/base" exec_test $1 $2 "Maple build of Cheetah 1.2 Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RC_meeb_maple b/buildroot/tests/STM32F103RC_meeb_maple index 3a191b4e7e2d..f2a05abee19a 100755 --- a/buildroot/tests/STM32F103RC_meeb_maple +++ b/buildroot/tests/STM32F103RC_meeb_maple @@ -13,6 +13,3 @@ restore_configs opt_set MOTHERBOARD BOARD_CCROBOT_MEEB_3DP SERIAL_PORT 1 SERIAL_PORT_2 -1 \ X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2208 Z_DRIVER_TYPE TMC2208 E0_DRIVER_TYPE TMC2208 exec_test $1 $2 "MEEB_3DP - Basic Config with TMC2208 SW Serial" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RE_btt b/buildroot/tests/STM32F103RE_btt index 197ca775989a..fdf1580e9880 100755 --- a/buildroot/tests/STM32F103RE_btt +++ b/buildroot/tests/STM32F103RE_btt @@ -15,6 +15,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP \ X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2130 opt_enable SERIAL_DMA exec_test $1 $2 "BTT SKR E3 DIP 1.0 | Mixed TMC Drivers" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RE_btt_USB b/buildroot/tests/STM32F103RE_btt_USB index 0bf5f616e4f3..ddf1903c9bcc 100755 --- a/buildroot/tests/STM32F103RE_btt_USB +++ b/buildroot/tests/STM32F103RE_btt_USB @@ -22,6 +22,3 @@ opt_enable CR10_STOCKDISPLAY SDSUPPORT EMERGENCY_PARSER FAN_SOFT_PWM \ PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING opt_disable NOZZLE_TO_PROBE_OFFSET exec_test $1 $2 "BigTreeTech SKR CR6 PROBE_ACTIVATION_SWITCH, Probe Tare" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality index 44d818b62400..d08b82f7bd62 100755 --- a/buildroot/tests/STM32F103RE_creality +++ b/buildroot/tests/STM32F103RE_creality @@ -47,6 +47,3 @@ opt_enable NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE LCD_BED_TRAMMING CLASSIC_J opt_add NO_CREALITY_422_DRIVER_WARNING opt_add NO_AUTO_ASSIGN_WARNING exec_test $1 $2 "Creality V4.2.2 with IA_CREALITY" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32F401RC_creality b/buildroot/tests/STM32F401RC_creality index 61b8d2ef9ce0..185599ecb339 100755 --- a/buildroot/tests/STM32F401RC_creality +++ b/buildroot/tests/STM32F401RC_creality @@ -11,6 +11,3 @@ opt_enable AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4 opt_add SDCARD_EEPROM_EMULATION exec_test $1 $2 "Ender-3 v2 with MarlinUI" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32G0B1RE_btt b/buildroot/tests/STM32G0B1RE_btt index 35ccf0f93688..04f740d2f9fa 100755 --- a/buildroot/tests/STM32G0B1RE_btt +++ b/buildroot/tests/STM32G0B1RE_btt @@ -11,6 +11,3 @@ set -e # use_example_configs "Creality/Ender-3/BigTreeTech SKR Mini E3 3.0" exec_test $1 $2 "Creality/Ender-3/BigTreeTech SKR Mini E3 3.0" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/STM32H743VI_btt b/buildroot/tests/STM32H743VI_btt index b77cdb09c1e8..ef9bc16bdd32 100755 --- a/buildroot/tests/STM32H743VI_btt +++ b/buildroot/tests/STM32H743VI_btt @@ -89,6 +89,3 @@ opt_enable PIDTEMPBED ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION \ MMU_MENUS MMU_SPOOL_JOIN_CONSUMES_ALL_FILAMENT MMU2_DEBUG opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE exec_test $1 $2 "BigTreeTech SKR 3 EZ | MMU3" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/at90usb1286_cdc b/buildroot/tests/at90usb1286_cdc index 7dcf8d541ab5..5f775ad83ac6 100755 --- a/buildroot/tests/at90usb1286_cdc +++ b/buildroot/tests/at90usb1286_cdc @@ -12,6 +12,3 @@ set -e restore_configs opt_set MOTHERBOARD BOARD_BRAINWAVE_PRO exec_test $1 $2 "Default Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/at90usb1286_dfu b/buildroot/tests/at90usb1286_dfu index a753097694c4..e1317ba0741a 100755 --- a/buildroot/tests/at90usb1286_dfu +++ b/buildroot/tests/at90usb1286_dfu @@ -17,6 +17,3 @@ restore_configs opt_set MOTHERBOARD BOARD_PRINTRBOARD_REVF opt_enable MINIPANEL exec_test $1 $2 "Printrboard RevF with MiniPanel and Stepper DAC (in pins file)" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/chitu_f103 b/buildroot/tests/chitu_f103 index 139c480e3e85..d09ddf7096cc 100755 --- a/buildroot/tests/chitu_f103 +++ b/buildroot/tests/chitu_f103 @@ -11,6 +11,3 @@ set -e # use_example_configs Tronxy/X5SA exec_test $1 $2 "Tronxy/X5SA" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/jgaurora_a5s_a1_maple b/buildroot/tests/jgaurora_a5s_a1_maple index e9be89eb30b8..d59100efc638 100755 --- a/buildroot/tests/jgaurora_a5s_a1_maple +++ b/buildroot/tests/jgaurora_a5s_a1_maple @@ -11,6 +11,3 @@ set -e # use_example_configs JGAurora/A5S exec_test $1 $2 "JGAurora/A5S Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280 index 7e99ee4a60f6..1d65b5ebf332 100755 --- a/buildroot/tests/mega1280 +++ b/buildroot/tests/mega1280 @@ -60,6 +60,3 @@ opt_set LCD_LANGUAGE cz \ Z_MIN_ENDSTOP_HIT_STATE HIGH opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560 index d61f17b51c6d..d7a149063c0b 100755 --- a/buildroot/tests/mega2560 +++ b/buildroot/tests/mega2560 @@ -290,6 +290,3 @@ exec_test $1 $2 "MEGA2560 RAMPS | 128x64 LIGHTWEIGHT_UI | progress rotation" "$3 opt_disable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER exec_test $1 $2 "MEGA2560 RAMPS | HD44780 | progress rotation" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/melzi_optiboot b/buildroot/tests/melzi_optiboot index 086fcc916923..0d9b87beb497 100755 --- a/buildroot/tests/melzi_optiboot +++ b/buildroot/tests/melzi_optiboot @@ -11,6 +11,3 @@ set -e # use_example_configs Creality/Ender-2 exec_test $1 $2 "Ender-2" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo index 698765f263d4..9ca5d22e8e63 100755 --- a/buildroot/tests/rambo +++ b/buildroot/tests/rambo @@ -144,6 +144,3 @@ opt_enable COREYX MIXING_EXTRUDER GRADIENT_MIX \ USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_USE_Z_ONLY opt_disable DISABLE_OTHER_EXTRUDERS exec_test $1 $2 "Rambo | CoreXY, Gradient Mix | Endstop Int. | Home Y > X | FW Retract ..." "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/sanguino1284p b/buildroot/tests/sanguino1284p index 7c2aa61f69be..345383cc70ff 100755 --- a/buildroot/tests/sanguino1284p +++ b/buildroot/tests/sanguino1284p @@ -23,6 +23,3 @@ restore_configs opt_set MOTHERBOARD BOARD_MELZI opt_enable ZONESTAR_LCD exec_test $1 $2 "Default Configuration | ZONESTAR_LCD " "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/sanguino644p b/buildroot/tests/sanguino644p index 12910a76fab8..81a202f4595d 100755 --- a/buildroot/tests/sanguino644p +++ b/buildroot/tests/sanguino644p @@ -12,6 +12,3 @@ set -e restore_configs opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12 exec_test $1 $2 "Default Configuration" "$3" - -# clean up -restore_configs diff --git a/buildroot/tests/teensy35 b/buildroot/tests/teensy35 index c7830aeaacf7..ef30d783b442 100755 --- a/buildroot/tests/teensy35 +++ b/buildroot/tests/teensy35 @@ -110,6 +110,3 @@ opt_set MOTHERBOARD BOARD_TEENSY35_36 Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z opt_enable Z_MULTI_ENDSTOPS pins_set ramps/RAMPS X_MAX_PIN -1 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3" - -# Clean up -restore_configs diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41 index 894abc15b97d..410a2b783870 100755 --- a/buildroot/tests/teensy41 +++ b/buildroot/tests/teensy41 @@ -109,6 +109,3 @@ opt_set MOTHERBOARD BOARD_TEENSY41 Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z2_M opt_enable Z_MULTI_ENDSTOPS pins_set ramps/RAMPS X_MAX_PIN -1 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3" - -# Clean up -restore_configs From d2ae8fe63a7068a4cfbe434102874025a0b754e0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 3 Oct 2024 13:36:13 -0500 Subject: [PATCH 3/3] allow override --- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 60 +++++++++++++++------ 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index 210df06d3c05..45b08b016a10 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -44,39 +44,69 @@ // Limit Switches // #ifdef X_STALL_SENSITIVITY - #define X_STOP_PIN X_DIAG_PIN + #ifndef X_STOP_PIN + #define X_STOP_PIN X_DIAG_PIN + #endif #if X_HOME_TO_MIN - #define X_MAX_PIN P1_28 // X+ + #ifndef X_MAX_PIN + #define X_MAX_PIN P1_28 // X+ + #endif #else - #define X_MIN_PIN P1_28 // X+ + #ifndef X_MIN_PIN + #define X_MIN_PIN P1_28 // X+ + #endif #endif #else - #define X_MIN_PIN P1_29 // X- - #define X_MAX_PIN P1_28 // X+ + #ifndef X_MIN_PIN + #define X_MIN_PIN P1_29 // X- + #endif + #ifndef X_MAX_PIN + #define X_MAX_PIN P1_28 // X+ + #endif #endif #ifdef Y_STALL_SENSITIVITY - #define Y_STOP_PIN Y_DIAG_PIN + #ifndef Y_STOP_PIN + #define Y_STOP_PIN Y_DIAG_PIN + #endif #if Y_HOME_TO_MIN - #define Y_MAX_PIN P1_26 // Y+ + #ifndef Y_MAX_PIN + #define Y_MAX_PIN P1_26 // Y+ + #endif #else - #define Y_MIN_PIN P1_26 // Y+ + #ifndef Y_MIN_PIN + #define Y_MIN_PIN P1_26 // Y+ + #endif #endif #else - #define Y_MIN_PIN P1_27 // Y- - #define Y_MAX_PIN P1_26 // Y+ + #ifndef Y_MIN_PIN + #define Y_MIN_PIN P1_27 // Y- + #endif + #ifndef Y_MAX_PIN + #define Y_MAX_PIN P1_26 // Y+ + #endif #endif #ifdef Z_STALL_SENSITIVITY - #define Z_STOP_PIN Z_DIAG_PIN + #ifndef Z_STOP_PIN + #define Z_STOP_PIN Z_DIAG_PIN + #endif #if Z_HOME_TO_MIN - #define Z_MAX_PIN P1_24 // Z+ + #ifndef Z_MAX_PIN + #define Z_MAX_PIN P1_24 // Z+ + #endif #else - #define Z_MIN_PIN P1_24 // Z+ + #ifndef Z_MIN_PIN + #define Z_MIN_PIN P1_24 // Z+ + #endif #endif #else - #define Z_MIN_PIN P1_25 // Z- - #define Z_MAX_PIN P1_24 // Z+ + #ifndef Z_MIN_PIN + #define Z_MIN_PIN P1_25 // Z- + #endif + #ifndef Z_MAX_PIN + #define Z_MAX_PIN P1_24 // Z+ + #endif #endif #define ONBOARD_ENDSTOPPULLUPS // Board has built-in pullups