From 773a7f31f4903d9ca4899c722f47e135410d5d6e Mon Sep 17 00:00:00 2001 From: belge96 Date: Wed, 9 Oct 2024 17:23:20 +0200 Subject: [PATCH 01/11] Update stm32f4.ini Added FLY_RRF_E3_V1 --- ini/stm32f4.ini | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 6334de6db214..02b57aa586eb 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -188,7 +188,19 @@ build_flags = ${stm32_variant.build_flags} -DSTM32F407_5VX -DMF_RX_BUFFER_SIZE=255 -DMF_TX_BUFFER_SIZE=255 - +# +# Mellow/Fly RRF E3 V1 (STM32F407VGT6 ARM Cortex-M4) +# +[env:FLY_RRF_E3_V1] +extends = stm32_variant +board = marlin_STM32F407VGT6_CCM +board_build.variant = MARLIN_FLY_RRF_E3_V1 +board_build.offset = 0x8000 +build_flags = ${stm32_variant.build_flags} + -DSTM32F407_5VX + -DMF_RX_BUFFER_SIZE=255 + -DMF_TX_BUFFER_SIZE=255 + # # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) # From 54aadf70a01a618d04d1fcf6287b62b289346560 Mon Sep 17 00:00:00 2001 From: belge96 Date: Wed, 9 Oct 2024 17:24:26 +0200 Subject: [PATCH 02/11] Added pins.h for Mellow/Fly RRF E3 V1 --- Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h | 342 +++++++++++++++++++ 1 file changed, 342 insertions(+) create mode 100644 Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h diff --git a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h b/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h new file mode 100644 index 000000000000..cbca9757befd --- /dev/null +++ b/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h @@ -0,0 +1,342 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +#if NOT_TARGET(STM32F4) + #error "Oops! Select an STM32F4 board in 'Tools > Board.'" +#endif + +#ifndef BOARD_INFO_NAME + #define BOARD_INFO_NAME "Fly RRF E3 V1" +#endif + +#define USES_DIAG_JUMPERS //you need Mellow/Fly's specific TMC2209's because they have a dip switch to turn off DIAG to disable auto home + +// Onboard I2C EEPROM +//#define I2C_EEPROM - this board doesn't have a real eeprom +#define MARLIN_EEPROM_SIZE 0x1000 // 4K + +// +// Servos +// +#define SERVO0_PIN PB0 // SERVOS + +// +// Limit Switches +// +#define X_STOP_PIN PA2 // X-STOP +#define Y_STOP_PIN PA1 // Y-STOP +#define Z_STOP_PIN PC5 // Z-STOP + +// +// Z Probe must be this pin +// +#define Z_MIN_PROBE_PIN PC4 // PROBE + +// +// Steppers +// + +#define X_ENABLE_PIN PC15 +#define X_STEP_PIN PC13 +#define X_DIR_PIN PC14 + +#define Y_ENABLE_PIN PE5 +#define Y_STEP_PIN PE3 +#define Y_DIR_PIN PE4 + +#define Z_ENABLE_PIN PE1 +#define Z_STEP_PIN PB9 +#define Z_DIR_PIN PE0 + +#define E0_ENABLE_PIN PB5 +#define E0_STEP_PIN PB3 +#define E0_DIR_PIN PB4 + +/** + * TMC2208/TMC2209 stepper drivers + */ +#if HAS_TMC_UART + #define X_SERIAL_TX_PIN PE6 + #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN + + #define Y_SERIAL_TX_PIN PE2 + #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN + + #define Z_SERIAL_TX_PIN PB8 + #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN + + #define E0_SERIAL_TX_PIN PD7 + #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN + + // Reduce baud rate to improve software serial reliability + #ifndef TMC_BAUD_RATE + #define TMC_BAUD_RATE 19200 + #endif + +#endif // HAS_TMC_UART + +// +// Temperature Sensors +// +#define TEMP_BED_PIN PA3 // Analog Input "TB" +#define TEMP_0_PIN PA4 // Analog Input "TH0" +// +// Heaters / Fans +// +#define HEATER_BED_PIN PA0 // "HB" +#define HEATER_0_PIN PA5 // "HE0" + +#define FAN0_PIN PA7 // "FAN0" + +#ifndef CONTROLLER_FAN_PIN + #define CONTROLLER_FAN_PIN PA6 // "FAN1" +#endif + +/** + * ------ + * (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) + * (BTN_EN1) PE10 | 3 4 | RESET + * (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) + * (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) + * GND | 9 10 | 5V + * ------ + * EXP1 + */ +#define EXP1_01_PIN PE12 +#define EXP1_02_PIN PE11 +#define EXP1_03_PIN PE10 +#define EXP1_04_PIN -1 // RESET +#define EXP1_05_PIN PE9 +#define EXP1_06_PIN PE8 +#define EXP1_07_PIN PE7 +#define EXP1_08_PIN PB1 + +#if HAS_WIRED_LCD + + #if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI) + + #define BEEPER_PIN EXP1_01_PIN + + #define BTN_ENC EXP1_02_PIN + #define BTN_EN1 EXP1_03_PIN + #define BTN_EN2 EXP1_05_PIN + + #define LCD_PINS_D4 EXP1_06_PIN + #define LCD_PINS_RS EXP1_07_PIN + #define LCD_PINS_EN EXP1_08_PIN + + #if ENABLED(LCD_FOR_MELZI) + + #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING + #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" + #endif + + /** LCD_FOR_MELZI display pinout + * + * Fly RRF E3 V1 Display Ribbon + * ------ ------ + * (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) GND |10 9 | 5V + * (BTN_EN1) PE10 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET) + * (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4) + * (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN) + * GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS) + * ------ ------ + * EXP1 LCD + * + * Needs custom cable: + * + * Board Adapter Display Ribbon (coming from display) + * ---------------------------------- + * EXP1-10 ---------- LCD-9 5V + * EXP1-9 ----------- LCD-10 GND + * EXP1-8 ----------- LCD-3 LCD_EN + * EXP1-7 ----------- LCD-1 LCD_RS + * EXP1-6 ----------- LCD-5 LCD_D4 + * EXP1-5 ----------- LCD-4 EN2 + * EXP1-4 ----------- LCD-7 RESET + * EXP1-3 ----------- LCD-2 EN1 + * EXP1-2 ----------- LCD-6 BTN + * EXP1-1 ----------- LCD-8 BEEPER + */ + + #endif + + #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD! + + #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING + #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" + #endif + + #define LCD_PINS_RS EXP1_06_PIN + #define LCD_PINS_EN EXP1_02_PIN + #define LCD_PINS_D4 EXP1_07_PIN + #define LCD_PINS_D5 EXP1_05_PIN + #define LCD_PINS_D6 EXP1_03_PIN + #define LCD_PINS_D7 EXP1_01_PIN + #define ADC_KEYPAD_PIN PB0 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD! + + #elif ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY) + + #define BTN_ENC EXP1_02_PIN + #define BTN_EN1 EXP1_03_PIN + #define BTN_EN2 EXP1_05_PIN + + #define DOGLCD_CS EXP1_07_PIN + #define DOGLCD_A0 EXP1_06_PIN + #define DOGLCD_SCK EXP1_01_PIN + #define DOGLCD_MOSI EXP1_08_PIN + + #define FORCE_SOFT_SPI + #define LCD_BACKLIGHT_PIN -1 + + #elif IS_TFTGLCD_PANEL + + #if ENABLED(TFTGLCD_PANEL_SPI) + + #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING + #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" + #endif + + /** + * TFTGLCD_PANEL_SPI display pinout + * + * Board Display + * ------ ------ + * (SD_DET) PE12 | 1 2 | PE11 (BEEPER) 5V |10 9 | GND + * (MOD_RESET) PE10 | 3 4 | RESET -- | 8 7 | (SD_DET) + * (SD_CS) PE9 5 6 | PE8 (MOSI) 6 5 | -- + * (LCD_CS) PE7 | 7 8 | PB1 (SD_CS) | 4 3 | (LCD_CS) + * GND | 9 10 | 5V (SCK) | 2 1 | (MISO) + * ------ ------ + * EXP1 EXP1 + * + * Needs custom cable: + * + * Board Adapter Display + * ---------------------------------- + * EXP1-10 ---------- EXP1-10 5V + * EXP1-9 ----------- EXP1-9 GND + * SPI1-4 ----------- EXP1-6 MOSI + * EXP1-7 ----------- n/c + * SPI1-3 ----------- EXP1-2 SCK + * EXP1-5 ----------- EXP1-4 SD_CS + * EXP1-4 ----------- n/c + * EXP1-3 ----------- EXP1-3 LCD_CS + * SPI1-1 ----------- EXP1-1 MISO + * EXP1-1 ----------- EXP1-7 SD_DET + */ + + #define TFTGLCD_CS EXP1_03_PIN + + #endif + + #else + #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the Mellow_RRF_E3_V1." + #endif + + // Alter timing for graphical display + #if ENABLED(LCD_FOR_MELZI) // LCD_FOR_MELZI default timing is too fast. This works but may be reduced. + #define BOARD_ST7920_DELAY_1 200 + #define BOARD_ST7920_DELAY_2 400 + #define BOARD_ST7920_DELAY_3 1200 + #elif IS_U8GLIB_ST7920 + #define BOARD_ST7920_DELAY_1 96 + #define BOARD_ST7920_DELAY_2 48 + #define BOARD_ST7920_DELAY_3 600 + #endif + +#endif // HAS_WIRED_LCD + +#if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) + + #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING + #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" + #endif + + /** FYSETC TFT TFT81050 display pinout + * + * Board Display + * ------ ------ + * (SD_DET) PE12 | 1 2 | PE11 (BEEPER) 5V |10 9 | GND + * (MOD_RESET) PE10 | 3 4 | RESET RESET | 8 7 | (SD_DET) + * (SD_CS) PE9 5 6 | PE8 (MOSI) | 6 5 | (LCD_CS) + * (LCD_CS) PE7 | 7 8 | PB1 (SD_CS) | 4 3 | (MOD_RESET) + * GND | 9 10 | 5V (SCK) | 2 1 | (MISO) + * ------ ------ + * EXP1 EXP1 + * + * + * Needs custom cable: + * + * Board Adapter Display + * ---------------------------------- + * EXP1-10 ---------- EXP1-10 5V + * EXP1-9 ----------- EXP1-9 GND + * SPI1-4 ----------- EXP1-6 MOSI + * EXP1-7 ----------- EXP1-5 LCD_CS + * SPI1-3 ----------- EXP1-2 SCK + * EXP1-5 ----------- EXP1-4 SD_CS + * EXP1-4 ----------- EXP1-8 RESET + * EXP1-3 ----------- EXP1-3 MOD_RST + * SPI1-1 ----------- EXP1-1 MISO + * EXP1-1 ----------- EXP1-7 SD_DET + */ + + #define CLCD_SPI_BUS 1 // SPI1 connector + + #define BEEPER_PIN EXP1_02_PIN + + #define CLCD_MOD_RESET EXP1_03_PIN + #define CLCD_SPI_CS EXP1_07_PIN + +#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050 + +// +// SD Support +// + +#ifndef SDCARD_CONNECTION + #define SDCARD_CONNECTION ONBOARD +#endif + +#if SD_CONNECTION_IS(ONBOARD) + #define ONBOARD_SDIO // Use SDIO for onboard SD + //#define SDIO_CLOCK 48000000 + #define SD_DETECT_PIN PA15 +#elif SD_CONNECTION_IS(CUSTOM_CABLE) + #error "SD CUSTOM_CABLE is not compatible with Fly RRF E3 V1." +#endif + +// TODO ? board has inbuilt WiFi (ESP8266) but probably already runs a version of DuetWebServer if you've ever used it on RRF before and i have no idea what you'd need to flash it with to get it to work +/* +#if ENABLED(WIFISUPPORT) + // + // WIFI + // + #define ESP_WIFI_MODULE_COM -1 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this // to do + #define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2 + #define ESP_WIFI_MODULE_RESET_PIN PE15 // this is the only thing i know forsure going on Mellows' pinout + #define ESP_WIFI_MODULE_ENABLE_PIN -1 // to do + #define ESP_WIFI_MODULE_GPIO0_PIN -1 // to do +#endif +*/ From 9297641fd1e9bfe3e292fce293e7132dd4235d19 Mon Sep 17 00:00:00 2001 From: belge96 Date: Wed, 9 Oct 2024 17:26:26 +0200 Subject: [PATCH 03/11] Update pins.h added FLY_RRF_E3_V1 --- Marlin/src/pins/pins.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index a8d97ecd233f..4c3c5e5262fb 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -843,7 +843,8 @@ #include "stm32f4/pins_BLACKBEEZMINI.h" // STM32F4 env:BLACKBEEZMINI_V1 #elif MB(XTLW_CLIMBER_8TH) #include "stm32f4/pins_XTLW_CLIMBER_8TH.h" // STM32F4 env:XTLW_CLIMBER_8TH - +#elif MB(FLY_RRF_E3_V1) + #include "stm32f4/pins_Fly_RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1 // // Other ARM Cortex-M4 // From ac6f2a8d2669f8a0bfa1c3869f7025f84d984f6a Mon Sep 17 00:00:00 2001 From: belge96 Date: Wed, 9 Oct 2024 17:29:29 +0200 Subject: [PATCH 04/11] Update boards.h Added Fly RRF E3 V1.0 --- Marlin/src/core/boards.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index fb17669161fd..0c6ed5a5e2d8 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -472,6 +472,7 @@ #define BOARD_MELLOW_FLY_E3_V2 5250 // Mellow Fly E3 V2 (STM32F407VG) #define BOARD_BLACKBEEZMINI_V1 5251 // BlackBeezMini V1 (STM32F401CCU6) #define BOARD_XTLW_CLIMBER_8TH 5252 // XTLW Climber-8th (STM32F407VGT6) +#define BOARD_FLY_RRF_E3_V1 5253 // Fly RRF E3 V1.0 (STM32F407VG) // // Other ARM Cortex-M4 From 706b11a8a233c2aa5890e5afd5125b1bc3bcfbe9 Mon Sep 17 00:00:00 2001 From: belge96 Date: Thu, 10 Oct 2024 07:24:39 +0200 Subject: [PATCH 05/11] Update pins_Fly_RRF_E3_V1.h added WiFi pinout (but EN is pulled up constantly) according to the schematic --- Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h b/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h index cbca9757befd..5f27bee0afc0 100644 --- a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h +++ b/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h @@ -328,15 +328,15 @@ #endif // TODO ? board has inbuilt WiFi (ESP8266) but probably already runs a version of DuetWebServer if you've ever used it on RRF before and i have no idea what you'd need to flash it with to get it to work -/* + #if ENABLED(WIFISUPPORT) // // WIFI // - #define ESP_WIFI_MODULE_COM -1 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this // to do + #define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this #define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2 - #define ESP_WIFI_MODULE_RESET_PIN PE15 // this is the only thing i know forsure going on Mellows' pinout - #define ESP_WIFI_MODULE_ENABLE_PIN -1 // to do - #define ESP_WIFI_MODULE_GPIO0_PIN -1 // to do + #define ESP_WIFI_MODULE_RESET_PIN PE15 + #define ESP_WIFI_MODULE_ENABLE_PIN -1 // EN is constantly pulled up to 3.3V on this board + #define ESP_WIFI_MODULE_GPIO0_PIN PE13 #endif -*/ + From 8bf670fc0ef8d28ac45e354958a13a812e506a7e Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Sat, 12 Oct 2024 17:10:38 +1300 Subject: [PATCH 06/11] reformat pins_Fly_RRF_E3_V1.h now will pass Marlin CI pin formatting --- Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h b/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h index 5f27bee0afc0..02bc864ef8b7 100644 --- a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h +++ b/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h @@ -112,7 +112,7 @@ #define CONTROLLER_FAN_PIN PA6 // "FAN1" #endif -/** +/** * ------ * (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) * (BTN_EN1) PE10 | 3 4 | RESET @@ -120,7 +120,7 @@ * (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) * GND | 9 10 | 5V * ------ - * EXP1 + * EXP1 */ #define EXP1_01_PIN PE12 #define EXP1_02_PIN PE11 @@ -162,7 +162,7 @@ * GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS) * ------ ------ * EXP1 LCD - * + * * Needs custom cable: * * Board Adapter Display Ribbon (coming from display) @@ -336,7 +336,6 @@ #define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this #define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2 #define ESP_WIFI_MODULE_RESET_PIN PE15 - #define ESP_WIFI_MODULE_ENABLE_PIN -1 // EN is constantly pulled up to 3.3V on this board + #define ESP_WIFI_MODULE_ENABLE_PIN -1 // EN is constantly pulled up to 3.3V on this board #define ESP_WIFI_MODULE_GPIO0_PIN PE13 #endif - From 11fa24fa73e2502238f859103e9f5de7f1097ac1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 3 Nov 2024 14:53:12 -0600 Subject: [PATCH 07/11] cleanup 1 --- Marlin/src/pins/pins.h | 3 ++- ...{pins_Fly_RRF_E3_V1.h => pins_FLY__RRF_E3_V1.h} | 14 ++------------ 2 files changed, 4 insertions(+), 13 deletions(-) rename Marlin/src/pins/stm32f4/{pins_Fly_RRF_E3_V1.h => pins_FLY__RRF_E3_V1.h} (97%) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 49e6351a6b2f..e8c4699cf84e 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -844,7 +844,8 @@ #elif MB(XTLW_CLIMBER_8TH) #include "stm32f4/pins_XTLW_CLIMBER_8TH.h" // STM32F4 env:XTLW_CLIMBER_8TH #elif MB(FLY_RRF_E3_V1) - #include "stm32f4/pins_Fly_RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1 + #include "stm32f4/pins_FLY__RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1 + // // Other ARM Cortex-M4 // diff --git a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h b/Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h similarity index 97% rename from Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h rename to Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h index 02bc864ef8b7..8c95858b0d80 100644 --- a/Marlin/src/pins/stm32f4/pins_Fly_RRF_E3_V1.h +++ b/Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h @@ -1,6 +1,6 @@ /** * Marlin 3D Printer Firmware - * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * * Based on Sprinter and grbl. * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm @@ -21,9 +21,7 @@ */ #pragma once -#if NOT_TARGET(STM32F4) - #error "Oops! Select an STM32F4 board in 'Tools > Board.'" -#endif +#include "env_validate.h" #ifndef BOARD_INFO_NAME #define BOARD_INFO_NAME "Fly RRF E3 V1" @@ -77,22 +75,14 @@ */ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PE6 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE2 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB8 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD7 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE #define TMC_BAUD_RATE 19200 #endif - #endif // HAS_TMC_UART // From 7e60a748fb18122e89d1c1102b475898cb83c6d2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 3 Nov 2024 14:53:29 -0600 Subject: [PATCH 08/11] =?UTF-8?q?=F0=9F=94=A7=20Automatic=20Trinamic=20TX?= =?UTF-8?q?=20pins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/pins/esp32/pins_FYSETC_E4.h | 9 +++----- Marlin/src/pins/gd32f1/pins_SOVOL_V131.h | 7 ------ Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 9 -------- Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 3 --- Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h | 11 --------- .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h | 9 -------- Marlin/src/pins/lpc1769/pins_FLY_CDY.h | 11 --------- Marlin/src/pins/lpc1769/pins_MKS_SGEN.h | 15 +++--------- Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h | 9 -------- .../pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h | 13 ----------- Marlin/src/pins/pins_postprocess.h | 1 + Marlin/src/pins/ramps/pins_DAGOMA_D6.h | 11 +++------ Marlin/src/pins/ramps/pins_FYSETC_F6_14.h | 6 ++--- Marlin/src/pins/ramps/pins_TT_OSCAR.h | 21 ++++++----------- Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 7 ------ .../pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h | 7 ------ .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 7 ------ Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h | 5 +--- Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h | 4 ---- Marlin/src/pins/stm32f1/pins_FLY_MINI.h | 4 ---- Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h | 6 ++--- .../pins/stm32f1/pins_FYSETC_CHEETAH_V12.h | 6 ++--- Marlin/src/pins/stm32f1/pins_MD_D301.h | 9 -------- Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h | 4 ---- Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h | 7 ------ .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 7 ------ .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 9 -------- .../src/pins/stm32f1/pins_ORCA_3D_SPRINGER.h | 13 ----------- Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h | 7 ------ Marlin/src/pins/stm32f4/pins_ARMED.h | 11 --------- .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h | 7 ------ Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h | 11 --------- Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h | 21 ----------------- .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 18 --------------- .../pins/stm32f4/pins_BTT_SKR_PRO_common.h | 14 ----------- .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 12 ---------- .../pins/stm32f4/pins_CREALITY_CR4NTXXC10.h | 1 + Marlin/src/pins/stm32f4/pins_FLYF407ZG.h | 17 -------------- Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h | 6 ----- Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h | 15 ------------ .../pins/stm32f4/pins_FYSETC_SPIDER_KING407.h | 23 +++---------------- Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h | 20 ---------------- Marlin/src/pins/stm32f4/pins_LERDGE_K.h | 9 ++++---- .../src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h | 12 ---------- .../pins/stm32f4/pins_MKS_MONSTER8_common.h | 15 ------------ .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 9 -------- .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h | 9 -------- Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h | 13 ----------- .../src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h | 11 --------- .../src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h | 11 --------- Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h | 11 --------- .../src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h | 11 --------- Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h | 7 ------ Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h | 1 - .../pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h | 9 -------- .../pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h | 7 ------ .../pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h | 9 -------- .../pins/stm32g0/pins_BTT_MANTA_M8P_V1_0.h | 5 ---- .../pins/stm32g0/pins_BTT_MANTA_M8P_V1_1.h | 5 ---- .../pins/stm32g0/pins_BTT_MANTA_M8P_common.h | 9 -------- Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h | 12 ---------- .../src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h | 3 --- .../pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h | 15 ------------ .../pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h | 21 ++--------------- .../stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h | 18 --------------- .../pins/stm32h7/pins_BTT_SKR_SE_BX_common.h | 10 -------- .../pins/stm32h7/pins_BTT_SKR_V3_0_common.h | 12 ---------- 67 files changed, 37 insertions(+), 630 deletions(-) diff --git a/Marlin/src/pins/esp32/pins_FYSETC_E4.h b/Marlin/src/pins/esp32/pins_FYSETC_E4.h index 4bcffb545ee0..4c31dfc1cec1 100644 --- a/Marlin/src/pins/esp32/pins_FYSETC_E4.h +++ b/Marlin/src/pins/esp32/pins_FYSETC_E4.h @@ -42,16 +42,13 @@ // // TMC2209 stepper drivers // - - // - // Hardware serial 1 - // #define X_HARDWARE_SERIAL Serial1 #define Y_HARDWARE_SERIAL Serial1 #define Z_HARDWARE_SERIAL Serial1 #define E0_HARDWARE_SERIAL Serial1 - - #define TMC_BAUD_RATE 115200 + #ifndef TMC_BAUD_RATE + #define TMC_BAUD_RATE 115200 + #endif #endif /** diff --git a/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h b/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h index 2f6dd12c493b..f8a279c11eb4 100644 --- a/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h +++ b/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h @@ -51,16 +51,9 @@ */ #define X_SERIAL_TX_PIN PC1 - #define X_SERIAL_RX_PIN PC1 - #define Y_SERIAL_TX_PIN PC0 - #define Y_SERIAL_RX_PIN PC0 - #define Z_SERIAL_TX_PIN PA15 - #define Z_SERIAL_RX_PIN PA15 - #define E0_SERIAL_TX_PIN PC14 - #define E0_SERIAL_RX_PIN PC14 // Default TMC slave addresses #ifndef X_SLAVE_ADDRESS diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 6345001b118b..2de1e459e1e6 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -234,19 +234,10 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN P1_10 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN P1_09 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN P1_08 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN P1_04 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN P1_01 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h index e6a2abc0f0f0..f38cab692ec2 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h @@ -173,7 +173,6 @@ #define E2_CS_PIN EXP1_06_PIN #if HAS_TMC_UART #define E2_SERIAL_TX_PIN EXP1_06_PIN - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN #endif #endif @@ -186,7 +185,6 @@ #define E3_CS_PIN EXP1_04_PIN #if HAS_TMC_UART #define E3_SERIAL_TX_PIN EXP1_04_PIN - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN #endif #else #define E3_ENABLE_PIN EXP2_07_PIN @@ -201,7 +199,6 @@ #define E4_CS_PIN EXP1_02_PIN #if HAS_TMC_UART #define E4_SERIAL_TX_PIN EXP1_02_PIN - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN #endif #else #define E4_ENABLE_PIN EXP2_07_PIN diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h index f785d3b7378c..4cb8a01a20f0 100644 --- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h +++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h @@ -87,22 +87,11 @@ // #if HAS_TMC_UART #define X_SERIAL_TX_PIN P1_00 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN P1_09 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN P1_16 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN P0_04 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN P2_02 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN P2_06 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h index 074ee067a69b..4156fd57079e 100644 --- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h +++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h @@ -144,19 +144,10 @@ */ #define X_SERIAL_TX_PIN P1_01 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN P1_10 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN P1_17 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN P0_05 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN P0_22 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h index 9b22214a7a1c..5a6fd050ed3f 100644 --- a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h +++ b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h @@ -107,22 +107,11 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN P1_04 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN P1_10 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN P1_16 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN P4_28 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN P2_12 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN P0_10 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h index 64abf5212f66..ecddbd2c6e43 100644 --- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h +++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h @@ -36,23 +36,14 @@ #include "../lpc1768/pins_MKS_SBASE.h" #if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - */ + // + // TMC2208/TMC2209 stepper drivers + // #define X_SERIAL_TX_PIN P1_22 // J8-2 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN P1_23 // J8-3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN P2_12 // J8-4 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN P2_11 // J8-5 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN P4_28 // J8-6 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h index aec4240276e7..5d7a703015d9 100644 --- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h +++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h @@ -186,19 +186,10 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN P1_01 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN P1_08 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN P1_10 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN P1_15 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN P1_17 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h b/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h index 17089b8fea34..f5a23ec5fb78 100644 --- a/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h +++ b/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h @@ -99,25 +99,12 @@ #endif #if HAS_TMC_UART - #define X_SERIAL_TX_PIN P1_04 - #define X_SERIAL_RX_PIN P1_04 - #define X2_SERIAL_TX_PIN P0_10 - #define X2_SERIAL_RX_PIN P0_10 - #define Y_SERIAL_TX_PIN P1_10 - #define Y_SERIAL_RX_PIN P1_10 - #define Z_SERIAL_TX_PIN P1_16 - #define Z_SERIAL_RX_PIN P1_16 - #define E0_SERIAL_TX_PIN P4_28 - #define E0_SERIAL_RX_PIN P4_28 - #define E1_SERIAL_TX_PIN P2_12 - #define E1_SERIAL_RX_PIN P2_12 - #endif // diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h index 0edd8f622867..9ca89ce85327 100644 --- a/Marlin/src/pins/pins_postprocess.h +++ b/Marlin/src/pins/pins_postprocess.h @@ -307,6 +307,7 @@ #define E7_CS_PIN -1 #endif +// If only TX is defined, use the same pin for RX #if HAS_TMC_UART #if !defined(X_SERIAL_RX_PIN) && PIN_EXISTS(X_SERIAL_TX) #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_D6.h b/Marlin/src/pins/ramps/pins_DAGOMA_D6.h index 2a89647376e1..f44657d2b55b 100644 --- a/Marlin/src/pins/ramps/pins_DAGOMA_D6.h +++ b/Marlin/src/pins/ramps/pins_DAGOMA_D6.h @@ -75,18 +75,13 @@ // the jumper next to the limit switch socket when using sensorless homing. // #if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - */ - #define X_SERIAL_RX_PIN 73 + // + // TMC2208/TMC2209 stepper drivers + // #define X_SERIAL_TX_PIN 73 - #define Y_SERIAL_RX_PIN 73 #define Y_SERIAL_TX_PIN 73 - #define Z_SERIAL_RX_PIN 73 #define Z_SERIAL_TX_PIN 73 - #define E0_SERIAL_RX_PIN 73 #define E0_SERIAL_TX_PIN 73 - #define E1_SERIAL_RX_PIN 12 #define E1_SERIAL_TX_PIN 12 // Default TMC slave addresses diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h index 5fdaa1941959..a21009b35378 100644 --- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h +++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h @@ -32,9 +32,9 @@ #define Z_MAX_PIN 2 #if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - */ + // + // TMC2208/TMC2209 stepper drivers + // #define X_SERIAL_TX_PIN 71 #define X_SERIAL_RX_PIN 72 diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index 0c573f25fc39..a4968eff3fb7 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -124,33 +124,26 @@ //#define E3_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN -1 // 59 - #define X_SERIAL_RX_PIN -1 // 63 + //#define X_SERIAL_RX_PIN -1 // 63 #define X2_SERIAL_TX_PIN -1 - #define X2_SERIAL_RX_PIN -1 #define Y_SERIAL_TX_PIN -1 // 64 - #define Y_SERIAL_RX_PIN -1 // 40 + //#define Y_SERIAL_RX_PIN -1 // 40 #define Y2_SERIAL_TX_PIN -1 - #define Y2_SERIAL_RX_PIN -1 #define Z_SERIAL_TX_PIN -1 // 44 - #define Z_SERIAL_RX_PIN -1 // 42 + //#define Z_SERIAL_RX_PIN -1 // 42 #define Z2_SERIAL_TX_PIN -1 - #define Z2_SERIAL_RX_PIN -1 #define E0_SERIAL_TX_PIN -1 // 66 - #define E0_SERIAL_RX_PIN -1 // 65 + //#define E0_SERIAL_RX_PIN -1 // 65 #define E1_SERIAL_TX_PIN -1 - #define E1_SERIAL_RX_PIN -1 #define E2_SERIAL_TX_PIN -1 - #define E2_SERIAL_RX_PIN -1 #define E3_SERIAL_TX_PIN -1 - #define E3_SERIAL_RX_PIN -1 #define E4_SERIAL_TX_PIN -1 - #define E4_SERIAL_RX_PIN -1 - #define E5_SERIAL_RX_PIN -1 - #define E6_SERIAL_RX_PIN -1 - #define E7_SERIAL_RX_PIN -1 + #define E5_SERIAL_TX_PIN -1 + #define E6_SERIAL_TX_PIN -1 + #define E7_SERIAL_TX_PIN -1 #endif // diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h index 3b42a0985283..de7ded7d52ac 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h @@ -126,16 +126,9 @@ //#define E0_HARDWARE_SERIAL MSerial1 #define X_SERIAL_TX_PIN PC10 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PC11 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC12 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD2 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h index 9209515b1a24..37e7ac8fc2a6 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h @@ -34,16 +34,9 @@ */ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PB15 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PC6 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC10 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PC11 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h index d0bd2944bc03..70f3f85747d4 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h @@ -81,16 +81,9 @@ #if HAS_TMC_UART // Shared with EXP1 #define X_SERIAL_TX_PIN PC10 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PC11 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC12 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PC14 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h index 98d9c88e1b06..95bd5e98ff97 100644 --- a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h +++ b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h @@ -81,21 +81,18 @@ // Steppers // #if HAS_TMC_UART + // Reduce baud rate to improve software serial reliability #define TMC_BAUD_RATE 19200 // Software serial #define X_SERIAL_TX_PIN PB12 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN #define X_DIAG_PIN PB10 #define Y_SERIAL_TX_PIN PB13 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN #define Y_DIAG_PIN PB11 #define Z_SERIAL_TX_PIN PB14 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #endif // HAS_TMC_UART // diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h index 55100b1efbd2..3372ae3aba59 100644 --- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h +++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h @@ -127,11 +127,8 @@ // SoftwareSerial with one pin per driver // Compatible with TMC2208 and TMC2209 drivers #define X_SERIAL_TX_PIN PA10 // RXD1 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN #define Y_SERIAL_TX_PIN PA9 // TXD1 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN #define Z_SERIAL_TX_PIN PC7 // IO1 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN #ifndef TMC_BAUD_RATE #define TMC_BAUD_RATE 19200 #endif @@ -174,7 +171,6 @@ // #if AXIS_DRIVER_TYPE_E0(TMC2208) || AXIS_DRIVER_TYPE_E0(TMC2209) #define E0_SERIAL_TX_PIN PA8 // IO0 - #define E0_SERIAL_RX_PIN PA8 // IO0 #else // Motor current PWM pins #define MOTOR_CURRENT_PWM_E_PIN PB0 // VREF1 CONTROL E diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h index e31d11f40827..22c977d8b92b 100644 --- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h +++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h @@ -95,13 +95,9 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PB0 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN #define Y_SERIAL_TX_PIN PA7 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN #define Z_SERIAL_TX_PIN PA4 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN #define E0_SERIAL_TX_PIN PC2 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN #endif // diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h index fc9e24b79016..d32479267de9 100644 --- a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h +++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h @@ -85,9 +85,9 @@ #define E0_ENABLE_PIN PC13 #if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - */ + // + // TMC2208/TMC2209 stepper drivers + // // Hardware serial with switch #define X_HARDWARE_SERIAL MSerial2 diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h index 96e90b701ca7..43bd8501d2f8 100644 --- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h +++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h @@ -38,9 +38,9 @@ #if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - */ + // + // TMC2208/TMC2209 stepper drivers + // #define X_SERIAL_TX_PIN PA11 #define X_SERIAL_RX_PIN PA12 diff --git a/Marlin/src/pins/stm32f1/pins_MD_D301.h b/Marlin/src/pins/stm32f1/pins_MD_D301.h index 19445998b2f5..5d7a2dbf886d 100644 --- a/Marlin/src/pins/stm32f1/pins_MD_D301.h +++ b/Marlin/src/pins/stm32f1/pins_MD_D301.h @@ -120,19 +120,10 @@ // Software serial // #define X_SERIAL_TX_PIN PD6 - #define X_SERIAL_RX_PIN PD6 - #define Y_SERIAL_TX_PIN PC11 - #define Y_SERIAL_RX_PIN PC11 - #define Z_SERIAL_TX_PIN PA8 - #define Z_SERIAL_RX_PIN PA8 - #define E0_SERIAL_TX_PIN PG2 - #define E0_SERIAL_RX_PIN PG2 - #define Z2_SERIAL_TX_PIN PG6 - #define Z2_SERIAL_RX_PIN PG6 // Reduce baud rate to improve software serial reliability #define TMC_BAUD_RATE 19200 diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h index b9ab65e36d28..b3fc52c89418 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h @@ -261,13 +261,9 @@ //#define TMC_SOFTWARE_SERIAL #if ENABLED(TMC_SOFTWARE_SERIAL) #define X_SERIAL_TX_PIN PF8 // SERVO3_PIN -- XS2 - 6 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN #define Y_SERIAL_TX_PIN PF9 // SERVO2_PIN -- XS2 - 5 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN #define Z_SERIAL_TX_PIN PA1 // SERVO1_PIN -- XS1 - 6 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN #define E0_SERIAL_TX_PIN PC3 // SERVO0_PIN -- XS1 - 5 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN #define TMC_BAUD_RATE 19200 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h index b7aaac12b9b7..01be779b1366 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h @@ -151,16 +151,9 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PD5 - #define X_SERIAL_RX_PIN PD5 - #define Y_SERIAL_TX_PIN PD7 - #define Y_SERIAL_RX_PIN PD7 - #define Z_SERIAL_TX_PIN PD4 - #define Z_SERIAL_RX_PIN PD4 - #define E0_SERIAL_TX_PIN PD9 - #define E0_SERIAL_RX_PIN PD9 // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h index 49f14866c04d..31ef7f5c24e9 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h @@ -107,16 +107,9 @@ //#define E0_HARDWARE_SERIAL MSerial1 #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 #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 357960d8a74c..67d60a97ede6 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -155,19 +155,10 @@ //#define E1_HARDWARE_SERIAL MSerial1 #define X_SERIAL_TX_PIN PD5 - #define X_SERIAL_RX_PIN PD5 - #define Y_SERIAL_TX_PIN PD7 - #define Y_SERIAL_RX_PIN PD7 - #define Z_SERIAL_TX_PIN PD4 - #define Z_SERIAL_RX_PIN PD4 - #define E0_SERIAL_TX_PIN PD9 - #define E0_SERIAL_RX_PIN PD9 - #define E1_SERIAL_TX_PIN PD8 - #define E1_SERIAL_RX_PIN PD8 // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_ORCA_3D_SPRINGER.h b/Marlin/src/pins/stm32f1/pins_ORCA_3D_SPRINGER.h index a376feb93a74..5c0c9aedd16b 100644 --- a/Marlin/src/pins/stm32f1/pins_ORCA_3D_SPRINGER.h +++ b/Marlin/src/pins/stm32f1/pins_ORCA_3D_SPRINGER.h @@ -137,25 +137,12 @@ //#define E1_HARDWARE_SERIAL MSerial1 #define X_SERIAL_TX_PIN PE3 - #define X_SERIAL_RX_PIN PE3 - #define Y_SERIAL_TX_PIN PE4 - #define Y_SERIAL_RX_PIN PE4 - #define Z_SERIAL_TX_PIN PB3 - #define Z_SERIAL_RX_PIN PB3 - #define E0_SERIAL_TX_PIN PB7 - #define E0_SERIAL_RX_PIN PB7 - #define E1_SERIAL_TX_PIN PD15 - #define E1_SERIAL_RX_PIN PD15 - #define E2_SERIAL_TX_PIN PD11 - #define E2_SERIAL_RX_PIN PD11 - #define E3_SERIAL_TX_PIN PD8 - #define E3_SERIAL_RX_PIN PD8 // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h index 8be9f5db8362..f2b903e96dc2 100644 --- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h +++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h @@ -113,16 +113,9 @@ //#define E0_HARDWARE_SERIAL MSerial1 #define X_SERIAL_TX_PIN PC10 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PC11 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC12 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD2 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h index b4661226380f..027faf82995e 100644 --- a/Marlin/src/pins/stm32f4/pins_ARMED.h +++ b/Marlin/src/pins/stm32f4/pins_ARMED.h @@ -206,21 +206,10 @@ #if HAS_TMC_UART // TMC2208/TMC2209 stepper drivers #define X_SERIAL_TX_PIN EXT0_PIN - #define X_SERIAL_RX_PIN EXT0_PIN - #define Y_SERIAL_TX_PIN EXT1_PIN - #define Y_SERIAL_RX_PIN EXT1_PIN - #define Z_SERIAL_TX_PIN EXT2_PIN - #define Z_SERIAL_RX_PIN EXT2_PIN - #define E0_SERIAL_TX_PIN EXT3_PIN - #define E0_SERIAL_RX_PIN EXT3_PIN - - #define E1_SERIAL_RX_PIN EXT4_PIN #define E1_SERIAL_TX_PIN EXT4_PIN - - #define Z2_SERIAL_RX_PIN EXT4_PIN #define Z2_SERIAL_TX_PIN EXT4_PIN #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h index 2abbf3452bed..42cc30407e3b 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h @@ -140,16 +140,9 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PE2 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE4 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD7 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h index 1ec7e7516335..e7fa7f8a5557 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h @@ -118,23 +118,12 @@ */ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PD6 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD1 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD15 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD11 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #if ENABLED(BTT_E3_RRF_IDEX_BOARD) #define X2_SERIAL_TX_PIN FPC12_PIN // X2UART - #define X2_SERIAL_RX_PIN X2_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN FPC6_PIN // E1UART - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN #endif // Reduce baud rate to improve software serial reliability diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h index cd5755539bfc..de3e026b05cd 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h @@ -255,38 +255,17 @@ //#define E7_HARDWARE_SERIAL Serial1 // M5 MOTOR 5 #define X_SERIAL_TX_PIN PC14 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE1 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB5 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PG10 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD4 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PC12 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #if ENABLED(M5_EXTENDER) #define E3_SERIAL_TX_PIN PG4 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN - #define E4_SERIAL_TX_PIN PE15 - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN - #define E5_SERIAL_TX_PIN PE7 - #define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN - #define E6_SERIAL_TX_PIN PF15 - #define E6_SERIAL_RX_PIN E6_SERIAL_TX_PIN - #define E7_SERIAL_TX_PIN PH14 - #define E7_SERIAL_RX_PIN E7_SERIAL_TX_PIN #endif // Reduce baud rate to improve software serial reliability diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h index 1bfc6c5492bb..980f3fa02a35 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h @@ -288,28 +288,13 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PC4 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD11 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC6 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define Z2_SERIAL_TX_PIN PC7 - #define Z2_SERIAL_RX_PIN Z2_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PF2 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PE4 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PE1 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PD3 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE @@ -390,7 +375,6 @@ #define E4_CS_PIN EXP1_06_PIN #if HAS_TMC_UART #define E4_SERIAL_TX_PIN EXP1_06_PIN - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN #endif // M2 on Driver Expansion Module @@ -401,7 +385,6 @@ #define E5_CS_PIN EXP1_04_PIN #if HAS_TMC_UART #define E5_SERIAL_TX_PIN EXP1_04_PIN - #define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN #endif // M3 on Driver Expansion Module @@ -412,7 +395,6 @@ #define E6_CS_PIN EXP1_02_PIN #if HAS_TMC_UART #define E6_SERIAL_TX_PIN EXP1_02_PIN - #define E6_SERIAL_RX_PIN E6_SERIAL_TX_PIN #endif #endif // BTT_MOTOR_EXPANSION diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h index c751f9b04119..0b8dd71f740b 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h @@ -211,22 +211,11 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PC13 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE1 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD4 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD1 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD6 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE @@ -395,7 +384,6 @@ #define E3_CS_PIN EXP1_06_PIN #if HAS_TMC_UART #define E3_SERIAL_TX_PIN EXP1_06_PIN - #define E3_SERIAL_RX_PIN EXP1_06_PIN #endif #endif @@ -408,7 +396,6 @@ #define E4_CS_PIN EXP1_04_PIN #if HAS_TMC_UART #define E4_SERIAL_TX_PIN EXP1_04_PIN - #define E4_SERIAL_RX_PIN EXP1_04_PIN #endif #else #define E4_ENABLE_PIN EXP2_07_PIN @@ -423,7 +410,6 @@ #define E5_CS_PIN EXP1_02_PIN #if HAS_TMC_UART #define E5_SERIAL_TX_PIN EXP1_02_PIN - #define E5_SERIAL_RX_PIN EXP1_02_PIN #endif #else #define E5_ENABLE_PIN EXP2_07_PIN diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h index 41514181f5a9..d0d78ed7f56c 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h @@ -305,19 +305,10 @@ // Software serial // #define X_SERIAL_TX_PIN PE0 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD0 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PC6 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD12 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE @@ -400,7 +391,6 @@ #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 @@ -413,7 +403,6 @@ #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 @@ -428,7 +417,6 @@ #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 diff --git a/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h b/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h index d1077cd5d0e0..683f68089a63 100644 --- a/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h +++ b/Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h @@ -139,6 +139,7 @@ #endif #if HAS_TMC_UART + // Reduce baud rate to improve software serial reliability #define TMC_BAUD_RATE 19200 diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h index d41a6eac754a..d63c6ea724cc 100644 --- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h +++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h @@ -253,31 +253,14 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PG13 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PG10 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD5 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD1 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PA14 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PG6 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PG3 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN - #define E4_SERIAL_TX_PIN PD10 - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN - #define E5_SERIAL_TX_PIN PB12 - #define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN #endif // diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h index a6035c2c6f01..9d9eb1d37cf9 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h @@ -39,17 +39,11 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PE8 - #define X_SERIAL_RX_PIN PE8 #define Y_SERIAL_TX_PIN PC4 - #define Y_SERIAL_RX_PIN PC4 #define Z_SERIAL_TX_PIN PD12 - #define Z_SERIAL_RX_PIN PD12 #define E0_SERIAL_TX_PIN PA15 - #define E0_SERIAL_RX_PIN PA15 #define E1_SERIAL_TX_PIN PC5 - #define E1_SERIAL_RX_PIN PC5 #define E2_SERIAL_TX_PIN PE0 - #define E2_SERIAL_RX_PIN PE0 #endif // diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h index 368f464f86ca..24055cb3cc3d 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h @@ -76,28 +76,13 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PE7 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define X2_SERIAL_TX_PIN PA15 - #define X2_SERIAL_RX_PIN X2_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE15 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD10 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define Z2_SERIAL_TX_PIN PD11 - #define Z2_SERIAL_RX_PIN Z2_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD7 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PC14 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PC15 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN #endif // diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h index 4a1960367cff..2164223d4433 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h @@ -144,37 +144,20 @@ // TMC2208/TMC2209 stepper drivers // #define X_SERIAL_TX_PIN PD2 - #define X_SERIAL_RX_PIN PD2 - #define X2_SERIAL_TX_PIN PE15 - #define X2_SERIAL_RX_PIN PE15 - #define Y_SERIAL_TX_PIN PD8 - #define Y_SERIAL_RX_PIN PD8 - #define Z_SERIAL_TX_PIN PD7 - #define Z_SERIAL_RX_PIN PD7 - #define Z2_SERIAL_TX_PIN PC14 - #define Z2_SERIAL_RX_PIN PC14 - #define E0_SERIAL_TX_PIN PC15 - #define E0_SERIAL_RX_PIN PC15 - #define E1_SERIAL_TX_PIN PG3 - #define E1_SERIAL_RX_PIN PG3 - #define E2_SERIAL_TX_PIN PD9 - #define E2_SERIAL_RX_PIN PD9 - #define E3_SERIAL_TX_PIN PF5 - #define E3_SERIAL_RX_PIN PF5 - #define E4_SERIAL_TX_PIN PG11 - #define E4_SERIAL_RX_PIN PG11 // Reduce baud rate to improve software serial reliability - #define TMC_BAUD_RATE 19200 + #ifndef TMC_BAUD_RATE + #define TMC_BAUD_RATE 19200 + #endif #endif // diff --git a/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h b/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h index 6cd09d3ac884..79599d59287b 100644 --- a/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h +++ b/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h @@ -253,31 +253,14 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PA15 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PB8 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB9 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PB3 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PG15 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PG12 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PE2 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN - #define E4_SERIAL_TX_PIN PG11 - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN - #define E5_SERIAL_TX_PIN PD2 - #define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #define TMC_BAUD_RATE 19200 @@ -443,7 +426,6 @@ #define E6_CS_PIN EXP1_06_PIN #if HAS_TMC_UART #define E6_SERIAL_TX_PIN EXP1_06_PIN - #define E6_SERIAL_RX_PIN EXP1_06_PIN #endif #endif @@ -456,7 +438,6 @@ #define E7_CS_PIN EXP1_04_PIN #if HAS_TMC_UART #define E7_SERIAL_TX_PIN EXP1_04_PIN - #define E7_SERIAL_RX_PIN EXP1_04_PIN #endif #else #define E7_ENABLE_PIN EXP2_07_PIN @@ -471,7 +452,6 @@ #define E8_CS_PIN EXP1_02_PIN #if HAS_TMC_UART #define E8_SERIAL_TX_PIN EXP1_02_PIN - #define E8_SERIAL_RX_PIN EXP1_02_PIN #endif #else #define E8_ENABLE_PIN EXP2_07_PIN diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h index f29d4ba2d502..4b6dc89f0675 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h @@ -114,9 +114,9 @@ //#endif #if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - */ + // + // TMC2208/TMC2209 stepper drivers + // #ifndef X_SERIAL_TX_PIN #define X_SERIAL_TX_PIN PB2 #endif @@ -136,10 +136,9 @@ #ifndef EX_SERIAL_TX_PIN #define EX_SERIAL_TX_PIN PE0 #endif - //#define Z2_SERIAL_RX_PIN EX_SERIAL_RX_PIN //#define Z2_SERIAL_TX_PIN EX_SERIAL_TX_PIN - //#define E2_SERIAL_RX_PIN EX_SERIAL_RX_PIN //#define E2_SERIAL_TX_PIN EX_SERIAL_TX_PIN + // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE #define TMC_BAUD_RATE 19200 diff --git a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h index 248fc514ac40..2d48a3c709e8 100644 --- a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h @@ -204,19 +204,10 @@ // Software serial // #define X_SERIAL_TX_PIN PC15 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PB6 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD7 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD4 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD0 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE @@ -297,7 +288,6 @@ #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 @@ -310,7 +300,6 @@ #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 @@ -325,7 +314,6 @@ #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 diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h index b832a14b2ac9..b15c7d7288c6 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h @@ -158,28 +158,13 @@ // No Hardware serial for steppers // #define X_SERIAL_TX_PIN PE6 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB7 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PB3 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD4 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD0 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PD15 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN - #define E4_SERIAL_TX_PIN PD11 - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h index 050c8f242462..a3f65712712c 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h @@ -100,19 +100,10 @@ // No Hardware serial for steppers // #define X_SERIAL_TX_PIN PD5 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD7 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD4 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD9 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD8 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h index 5af3cf53dd49..e8b9938c954f 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h @@ -152,19 +152,10 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PD5 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD7 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD4 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD9 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD8 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h index b20477a15db5..a0b088db4b3f 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h @@ -197,25 +197,12 @@ // #if HAS_TMC_UART #define X_SERIAL_TX_PIN PE6 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB7 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PB3 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD4 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD0 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PD15 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h index cf400335f531..010ae0ec0573 100644 --- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h +++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h @@ -123,22 +123,11 @@ #elif HAS_TMC_UART #define X_SERIAL_TX_PIN PD8 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PB12 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE8 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define I_SERIAL_TX_PIN PC5 - #define I_SERIAL_RX_PIN I_SERIAL_TX_PIN - #define J_SERIAL_TX_PIN PE12 - #define J_SERIAL_RX_PIN J_SERIAL_TX_PIN - #define K_SERIAL_TX_PIN PA2 - #define K_SERIAL_RX_PIN K_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h index 9c374eae4444..0f275788f927 100644 --- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h +++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h @@ -123,22 +123,11 @@ #elif HAS_TMC_UART #define X_SERIAL_TX_PIN PD8 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PB12 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE8 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define I_SERIAL_TX_PIN PC5 - #define I_SERIAL_RX_PIN I_SERIAL_TX_PIN - #define J_SERIAL_TX_PIN PE12 - #define J_SERIAL_RX_PIN J_SERIAL_TX_PIN - #define K_SERIAL_TX_PIN PA2 - #define K_SERIAL_RX_PIN K_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h index 2f3e121fe17a..1712b24f2bda 100644 --- a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h +++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h @@ -48,20 +48,9 @@ // TMC2208/TMC2209 Software Serial // #define X_SERIAL_TX_PIN PC14 // BTT Rumba32 only uses 1 pin for UART - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE4 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE0 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PC13 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD5 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD1 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN #endif diff --git a/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h b/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h index 2ce754847c26..9ab3331d4c15 100644 --- a/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h +++ b/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h @@ -146,22 +146,11 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PC15 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define X2_SERIAL_TX_PIN PA8 - #define X2_SERIAL_RX_PIN X2_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PB6 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD5 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD1 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PE9 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #define TMC_BAUD_RATE 19200 diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h index d9c542c6a281..46840868abdd 100644 --- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h +++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h @@ -130,16 +130,9 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PB9 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE12 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PG9 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN #endif // diff --git a/Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h b/Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h index ffa644c88c47..2d6cdb73f43c 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h @@ -97,7 +97,6 @@ //#define TMC_BAUD_RATE 250000 #define E0_SERIAL_TX_PIN PA15 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h index 3489fe5c8fc1..ee7ea42bde50 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h @@ -155,19 +155,10 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PB8 // X_CS_PIN - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PC9 // Y_CS_PIN - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PD0 // Z_CS_PIN - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD1 // E0_CS_PIN - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PB5 // E1_CS_PIN - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h index b7c5a8c470f8..4c4a6ca928ee 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h @@ -124,16 +124,9 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PB12 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PC10 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC9 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PA13 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h index 8d75638ee578..90379e06e62f 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h @@ -141,19 +141,10 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PD9 // X_CS_PIN - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD8 // Y_CS_PIN - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB10 // Z_CS_PIN - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PB2 // E0_CS_PIN - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PA6 // E1_CS_PIN - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_0.h index b81dbe0dac26..0b105118e13d 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_0.h @@ -55,13 +55,8 @@ #if HAS_TMC_UART #define E1_SERIAL_TX_PIN PF8 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD13 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PC7 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_1.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_1.h index 36aa3895c372..65071820d4e9 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_1.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_1.h @@ -54,13 +54,8 @@ #if HAS_TMC_UART #define E1_SERIAL_TX_PIN PF8 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD14 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PD10 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h index 327c5f1970ca..e00729208906 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h @@ -177,19 +177,10 @@ #if HAS_TMC_UART #define X_SERIAL_TX_PIN PC10 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PF13 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PF9 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define Z2_SERIAL_TX_PIN PD4 - #define Z2_SERIAL_RX_PIN Z2_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PD0 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h index c010e0232552..cbdb8ed896ae 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h @@ -310,19 +310,10 @@ // 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 @@ -415,7 +406,6 @@ #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 @@ -428,7 +418,6 @@ #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 @@ -443,7 +432,6 @@ #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 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h b/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h index 13bb1b7d8b03..9f67c7a14cea 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h @@ -426,7 +426,6 @@ #define E4_CS_PIN EXP1_06_PIN #if HAS_TMC_UART #define E4_SERIAL_TX_PIN EXP1_06_PIN - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN #endif // M2 on Driver Expansion Module @@ -437,7 +436,6 @@ #define E5_CS_PIN EXP1_04_PIN #if HAS_TMC_UART #define E5_SERIAL_TX_PIN EXP1_04_PIN - #define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN #endif // M3 on Driver Expansion Module @@ -448,7 +446,6 @@ #define E6_CS_PIN EXP1_02_PIN #if HAS_TMC_UART #define E6_SERIAL_TX_PIN EXP1_02_PIN - #define E6_SERIAL_RX_PIN E6_SERIAL_TX_PIN #endif #endif // BTT_MOTOR_EXPANSION diff --git a/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h b/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h index 2c5c4bc05e8b..496668513d41 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h @@ -315,28 +315,13 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PC13 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PB9 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define Z2_SERIAL_TX_PIN PB5 - #define Z2_SERIAL_RX_PIN Z2_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PG14 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PG10 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD5 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PC6 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h index 3ceb9561ab4d..a6948cd08c34 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h @@ -301,34 +301,17 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PG14 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PG13 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PG12 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define Z2_SERIAL_TX_PIN PG11 - #define Z2_SERIAL_RX_PIN Z2_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PG10 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PG9 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PD7 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PD6 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN - #define E4_SERIAL_TX_PIN PG8 - #define E4_SERIAL_RX_PIN E3_SERIAL_TX_PIN - + #define E4_SERIAL_RX_PIN E3_SERIAL_RX_PIN #define E5_SERIAL_TX_PIN PG7 - #define E5_SERIAL_RX_PIN E3_SERIAL_TX_PIN + #define E5_SERIAL_RX_PIN E3_SERIAL_RX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h index 113b7eac290c..45ca3c5588eb 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h @@ -293,28 +293,13 @@ //#define E4_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PC4 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD11 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PC6 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define Z2_SERIAL_TX_PIN PC7 - #define Z2_SERIAL_RX_PIN Z2_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PF2 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PE4 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN - #define E2_SERIAL_TX_PIN PE1 - #define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN - #define E3_SERIAL_TX_PIN PD3 - #define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE @@ -395,7 +380,6 @@ #define E4_CS_PIN EXP1_06_PIN #if HAS_TMC_UART #define E4_SERIAL_TX_PIN EXP1_06_PIN - #define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN #endif // M2 on Driver Expansion Module @@ -406,7 +390,6 @@ #define E5_CS_PIN EXP1_04_PIN #if HAS_TMC_UART #define E5_SERIAL_TX_PIN EXP1_04_PIN - #define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN #endif // M3 on Driver Expansion Module @@ -417,7 +400,6 @@ #define E6_CS_PIN EXP1_02_PIN #if HAS_TMC_UART #define E6_SERIAL_TX_PIN EXP1_02_PIN - #define E6_SERIAL_RX_PIN E6_SERIAL_TX_PIN #endif #endif // BTT_MOTOR_EXPANSION diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h index 7314ccc825d4..f6f8442cdfe9 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h @@ -159,28 +159,18 @@ //#define E7_HARDWARE_SERIAL Serial1 #define X_SERIAL_TX_PIN PG10 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD4 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #ifdef BX_SWAP_ZM_E1M #define Z_SERIAL_TX_PIN PC8 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN #else #define Z_SERIAL_TX_PIN PD5 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN #endif #define E0_SERIAL_TX_PIN PI8 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #ifdef BX_SWAP_ZM_E1M #define E1_SERIAL_TX_PIN PD5 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN #else #define E1_SERIAL_TX_PIN PC8 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN #endif // Reduce baud rate to improve software serial reliability diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h index b67992186315..fce16aebf112 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h @@ -298,19 +298,10 @@ // Software serial // #define X_SERIAL_TX_PIN PD5 - #define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - #define Y_SERIAL_TX_PIN PD0 - #define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - #define Z_SERIAL_TX_PIN PE1 - #define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - #define E0_SERIAL_TX_PIN PC6 - #define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - #define E1_SERIAL_TX_PIN PD12 - #define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN // Reduce baud rate to improve software serial reliability #ifndef TMC_BAUD_RATE @@ -394,7 +385,6 @@ #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 @@ -407,7 +397,6 @@ #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 @@ -422,7 +411,6 @@ #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 From d45baa322443e0e07e2416aec86ce840bbf7123f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 3 Nov 2024 14:59:54 -0600 Subject: [PATCH 09/11] cleanup 2 --- Marlin/src/HAL/HC32/inc/SanityCheck.h | 2 +- Marlin/src/lcd/sovol_rts/sovol_rts.h | 2 +- Marlin/src/module/motion.cpp | 2 +- Marlin/src/pins/pins.h | 2 +- Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h | 2 +- Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h | 8 +- Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h | 58 +++++++------ ..._FLY__RRF_E3_V1.h => pins_FLY_RRF_E3_V1.h} | 82 +++++++++---------- .../src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h | 4 +- ini/stm32f4.ini | 3 +- 10 files changed, 76 insertions(+), 89 deletions(-) rename Marlin/src/pins/stm32f4/{pins_FLY__RRF_E3_V1.h => pins_FLY_RRF_E3_V1.h} (78%) diff --git a/Marlin/src/HAL/HC32/inc/SanityCheck.h b/Marlin/src/HAL/HC32/inc/SanityCheck.h index 1e62f92bbf25..e38bce91e588 100644 --- a/Marlin/src/HAL/HC32/inc/SanityCheck.h +++ b/Marlin/src/HAL/HC32/inc/SanityCheck.h @@ -94,7 +94,7 @@ #error "SERIAL_DMA requires USART_RX_DMA_SUPPORT to be enabled in the arduino core." #endif - // Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement + // Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement // core_hook_usart_rx_irq, which is required for the emergency parser. // With 1.2.0, this was fixed (see https://github.com/shadow578/framework-arduino-hc32f46x/pull/25). #if ENABLED(EMERGENCY_PARSER) && ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 2, 0) diff --git a/Marlin/src/lcd/sovol_rts/sovol_rts.h b/Marlin/src/lcd/sovol_rts/sovol_rts.h index 8bebdf9a62c8..87132231184c 100644 --- a/Marlin/src/lcd/sovol_rts/sovol_rts.h +++ b/Marlin/src/lcd/sovol_rts/sovol_rts.h @@ -236,7 +236,7 @@ enum SovolPage : uint8_t { ID_AdvWarn_D = 49, ID_AdvWarn_L = 55 + ID_AdvWarn_D, // Warning when entering advanced settings ID_KillRunaway_D = 52, ID_KillRunaway_L = 55 + ID_KillRunaway_D, // Thermal runaway ID_KillHeat_D = 53, ID_KillHeat_L = 55 + ID_KillHeat_D, // Thermistor error - ID_KillBadTemp_D = 54, ID_KillBadTemp_L = 55 + ID_KillBadTemp_D, // Heating failed + ID_KillBadTemp_D = 54, ID_KillBadTemp_L = 55 + ID_KillBadTemp_D, // Heating failed ID_KillHome_D = 55, ID_KillHome_L = 55 + ID_KillHome_D, // Auto-home failed ID_Level5_D = 111, ID_Level5_L = 6 + ID_Level5_D, // Leveling screen 0.05mm ID_DriverError_D = 112, ID_DriverError_L = 6 + ID_DriverError_D, // Driver error diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index 174f16d5c570..820089d7eeda 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -148,7 +148,7 @@ feedRate_t feedrate_mm_s = MMM_TO_MMS(DEFAULT_FEEDRATE_MM_M); int16_t feedrate_percentage = 100; #if ENABLED(EDITABLE_HOMING_FEEDRATE) xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M; -#endif +#endif // Cartesian conversion result goes here: xyz_pos_t cartes; diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index e8c4699cf84e..eb26103380c1 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -844,7 +844,7 @@ #elif MB(XTLW_CLIMBER_8TH) #include "stm32f4/pins_XTLW_CLIMBER_8TH.h" // STM32F4 env:XTLW_CLIMBER_8TH #elif MB(FLY_RRF_E3_V1) - #include "stm32f4/pins_FLY__RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1 + #include "stm32f4/pins_FLY_RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1 // // Other ARM Cortex-M4 diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h index 502ec19bed03..3fe629aea1e3 100644 --- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h +++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h @@ -33,7 +33,7 @@ #define FLASH_EEPROM_EMULATION //#define I2C_EEPROM #endif -//#define E2END 0xFFF // 4K +#define MARLIN_EEPROM_SIZE 0x1000 // 4K #define HAL_TIMER_RATE F_CPU diff --git a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h index 64cce5630220..211782073663 100644 --- a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h +++ b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h @@ -21,14 +21,12 @@ */ #pragma once -#if NOT_TARGET(STM32F4) - #error "Oops! Select an STM32F4 board in 'Tools > Board.'" -#elif HOTENDS > 1 || E_STEPPERS > 1 +#include "env_validate.h" + +#if HOTENDS > 1 || E_STEPPERS > 1 #error "STM32F401CCU6 boards support one hotend / E-steppers only." #endif -#include "env_validate.h" - #ifndef BOARD_INFO_NAME #define BOARD_INFO_NAME "I3DBEE BP_01" #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h index 1ec7e7516335..d95fb70f91d5 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h @@ -21,9 +21,7 @@ */ #pragma once -#if NOT_TARGET(STM32F4) - #error "Oops! Select an STM32F4 board in 'Tools > Board.'" -#endif +#include "env_validate.h" #ifndef BOARD_INFO_NAME #define BOARD_INFO_NAME "BTT E3 RRF" @@ -225,33 +223,33 @@ CONTROLLER_WARNING("BTT_E3_RRF", "LCD_FOR_MELZI") - /** LCD_FOR_MELZI display pinout - * - * BTT E3 RRF Display Ribbon - * ------ ------ - * (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND |10 9 | 5V - * (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET) - * (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4) - * (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN) - * GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS) - * ------ ------ - * EXP1 LCD - * - * Needs custom cable: - * - * Board Adapter Display Ribbon (coming from display) - * ---------------------------------- - * EXP1-10 ---------- LCD-9 5V - * EXP1-9 ----------- LCD-10 GND - * EXP1-8 ----------- LCD-3 LCD_EN - * EXP1-7 ----------- LCD-1 LCD_RS - * EXP1-6 ----------- LCD-5 LCD_D4 - * EXP1-5 ----------- LCD-4 EN2 - * EXP1-4 ----------- LCD-7 RESET - * EXP1-3 ----------- LCD-2 EN1 - * EXP1-2 ----------- LCD-6 BTN - * EXP1-1 ----------- LCD-8 BEEPER - */ + /** LCD_FOR_MELZI display pinout + * + * BTT E3 RRF Display Ribbon + * ------ ------ + * (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND |10 9 | 5V + * (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET) + * (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4) + * (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN) + * GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS) + * ------ ------ + * EXP1 LCD + * + * Needs custom cable: + * + * Board Adapter Display Ribbon (coming from display) + * ---------------------------------- + * EXP1-10 ---------- LCD-9 5V + * EXP1-9 ----------- LCD-10 GND + * EXP1-8 ----------- LCD-3 LCD_EN + * EXP1-7 ----------- LCD-1 LCD_RS + * EXP1-6 ----------- LCD-5 LCD_D4 + * EXP1-5 ----------- LCD-4 EN2 + * EXP1-4 ----------- LCD-7 RESET + * EXP1-3 ----------- LCD-2 EN1 + * EXP1-2 ----------- LCD-6 BTN + * EXP1-1 ----------- LCD-8 BEEPER + */ #endif diff --git a/Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h b/Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h similarity index 78% rename from Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h rename to Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h index 8c95858b0d80..100128d69815 100644 --- a/Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h +++ b/Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h @@ -27,10 +27,11 @@ #define BOARD_INFO_NAME "Fly RRF E3 V1" #endif -#define USES_DIAG_JUMPERS //you need Mellow/Fly's specific TMC2209's because they have a dip switch to turn off DIAG to disable auto home +#define USES_DIAG_JUMPERS // Requires Mellow/Fly TMC2209 with DIAG disable dip switch -// Onboard I2C EEPROM -//#define I2C_EEPROM - this board doesn't have a real eeprom +#if NO_EEPROM_SELECTED + #define FLASH_EEPROM_EMULATION +#endif #define MARLIN_EEPROM_SIZE 0x1000 // 4K // @@ -137,45 +138,41 @@ #if ENABLED(LCD_FOR_MELZI) - #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING - #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" - #endif - - /** LCD_FOR_MELZI display pinout - * - * Fly RRF E3 V1 Display Ribbon - * ------ ------ - * (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) GND |10 9 | 5V - * (BTN_EN1) PE10 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET) - * (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4) - * (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN) - * GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS) - * ------ ------ - * EXP1 LCD - * - * Needs custom cable: - * - * Board Adapter Display Ribbon (coming from display) - * ---------------------------------- - * EXP1-10 ---------- LCD-9 5V - * EXP1-9 ----------- LCD-10 GND - * EXP1-8 ----------- LCD-3 LCD_EN - * EXP1-7 ----------- LCD-1 LCD_RS - * EXP1-6 ----------- LCD-5 LCD_D4 - * EXP1-5 ----------- LCD-4 EN2 - * EXP1-4 ----------- LCD-7 RESET - * EXP1-3 ----------- LCD-2 EN1 - * EXP1-2 ----------- LCD-6 BTN - * EXP1-1 ----------- LCD-8 BEEPER - */ + CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FOR_MELZI") + + /** LCD_FOR_MELZI display pinout + * + * Fly RRF E3 V1 Display Ribbon + * ------ ------ + * (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) GND |10 9 | 5V + * (BTN_EN1) PE10 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET) + * (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4) + * (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN) + * GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS) + * ------ ------ + * EXP1 LCD + * + * Needs custom cable: + * + * Board Adapter Display Ribbon (coming from display) + * ---------------------------------- + * EXP1-10 ---------- LCD-9 5V + * EXP1-9 ----------- LCD-10 GND + * EXP1-8 ----------- LCD-3 LCD_EN + * EXP1-7 ----------- LCD-1 LCD_RS + * EXP1-6 ----------- LCD-5 LCD_D4 + * EXP1-5 ----------- LCD-4 EN2 + * EXP1-4 ----------- LCD-7 RESET + * EXP1-3 ----------- LCD-2 EN1 + * EXP1-2 ----------- LCD-6 BTN + * EXP1-1 ----------- LCD-8 BEEPER + */ #endif #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD! - #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING - #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" - #endif + CONTROLLER_WARNING("FLY_RRF_E3_V1", "ZONESTAR_LCD") #define LCD_PINS_RS EXP1_06_PIN #define LCD_PINS_EN EXP1_02_PIN @@ -203,9 +200,7 @@ #if ENABLED(TFTGLCD_PANEL_SPI) - #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING - #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" - #endif + CONTROLLER_WARNING("FLY_RRF_E3_V1", "TFTGLCD_PANEL_SPI") /** * TFTGLCD_PANEL_SPI display pinout @@ -241,7 +236,7 @@ #endif #else - #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the Mellow_RRF_E3_V1." + #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the FLY_RRF_E3_V1." #endif // Alter timing for graphical display @@ -259,9 +254,7 @@ #if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) - #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING - #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" - #endif + CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FYSETC_TFT81050") /** FYSETC TFT TFT81050 display pinout * @@ -275,7 +268,6 @@ * ------ ------ * EXP1 EXP1 * - * * Needs custom cable: * * Board Adapter Display diff --git a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h index 248fc514ac40..5d231db87b66 100644 --- a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h @@ -21,9 +21,7 @@ */ #pragma once -#if NOT_TARGET(STM32F4) - #error "Oops! Select an STM32F4 board in 'Tools > Board.'" -#endif +#include "env_validate.h" #ifndef BOARD_INFO_NAME #define BOARD_INFO_NAME "Mellow Fly E3 V2" diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 74a15b0fbd03..1e8b029b479f 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -193,6 +193,7 @@ build_flags = ${stm32_variant.build_flags} -DSTM32F407_5VX -DMF_RX_BUFFER_SIZE=255 -DMF_TX_BUFFER_SIZE=255 + # # Mellow/Fly RRF E3 V1 (STM32F407VGT6 ARM Cortex-M4) # @@ -205,7 +206,7 @@ build_flags = ${stm32_variant.build_flags} -DSTM32F407_5VX -DMF_RX_BUFFER_SIZE=255 -DMF_TX_BUFFER_SIZE=255 - + # # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) # From 4830b1c8dc5362193c9bd7fdde9bb3d1a336654e Mon Sep 17 00:00:00 2001 From: fmuntean Date: Sun, 3 Nov 2024 16:34:35 -0500 Subject: [PATCH 10/11] =?UTF-8?q?=E2=9C=A8=20M820=20Report=20temporary=20M?= =?UTF-8?q?810-M819=20macros=20(#27458)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Scott Lahteine --- Marlin/src/core/language.h | 1 + Marlin/src/gcode/feature/macro/M820.cpp | 52 +++++++++++++++++++++++++ Marlin/src/gcode/gcode.cpp | 1 + Marlin/src/gcode/gcode.h | 1 + 4 files changed, 55 insertions(+) create mode 100644 Marlin/src/gcode/feature/macro/M820.cpp diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index 3a9a24a51c28..f64c7513dfce 100644 --- a/Marlin/src/core/language.h +++ b/Marlin/src/core/language.h @@ -324,6 +324,7 @@ #define STR_TEMPERATURE_UNITS "Temperature Units" #define STR_USER_THERMISTORS "User thermistors" #define STR_DELAYED_POWEROFF "Delayed poweroff" +#define STR_STORED_MACROS "Stored macros" // // General axis names diff --git a/Marlin/src/gcode/feature/macro/M820.cpp b/Marlin/src/gcode/feature/macro/M820.cpp new file mode 100644 index 000000000000..9759f482ec12 --- /dev/null +++ b/Marlin/src/gcode/feature/macro/M820.cpp @@ -0,0 +1,52 @@ +/** + * 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 . + * + */ + +#include "../../../inc/MarlinConfig.h" + +#if ENABLED(GCODE_MACROS) + +#include "../../gcode.h" +#include "../../queue.h" +#include "../../parser.h" + +extern char gcode_macros[GCODE_MACROS_SLOTS][GCODE_MACROS_SLOT_SIZE + 1]; + +/** + * M820: List defined M810 - M819 macros + */ +void GcodeSuite::M820() { + SERIAL_ECHOLNPGM(STR_STORED_MACROS); + bool some = false; + for (uint8_t i = 0; i < GCODE_MACROS_SLOTS; ++i) { + const char *cmd = gcode_macros[i]; + if (*cmd) { + SERIAL_ECHO(F("M81"), i, C(' ')); + char c; + while ((c = *cmd++)) SERIAL_CHAR(c == '\n' ? '|' : c); + SERIAL_EOL(); + some = true; + } + } + if (!some) SERIAL_ECHOLNPGM("None"); +} + +#endif // GCODE_MACROS diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 1a840e8b8171..9fed4dcada3f 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -1010,6 +1010,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { case 810: case 811: case 812: case 813: case 814: case 815: case 816: case 817: case 818: case 819: M810_819(); break; // M810-M819: Define/execute G-code macro + case 820: M820(); break; // M820: Report macros to serial output #endif #if HAS_BED_PROBE diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 2f725649971a..c6b4a40d9f69 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -1194,6 +1194,7 @@ class GcodeSuite { #if ENABLED(GCODE_MACROS) static void M810_819(); + static void M820(); #endif #if HAS_BED_PROBE From 731c8f5832e921730cfb4c9c21ab7dab13d5d695 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 24 Nov 2024 19:21:17 -0600 Subject: [PATCH 11/11] generic marlin_STM32F407VGT6_CCM --- Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h | 7 +++---- ini/stm32f4.ini | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h b/Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h index 100128d69815..2c61211dc20c 100644 --- a/Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h +++ b/Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h @@ -309,12 +309,11 @@ #error "SD CUSTOM_CABLE is not compatible with Fly RRF E3 V1." #endif -// TODO ? board has inbuilt WiFi (ESP8266) but probably already runs a version of DuetWebServer if you've ever used it on RRF before and i have no idea what you'd need to flash it with to get it to work +// +// WIFI +// #if ENABLED(WIFISUPPORT) - // - // WIFI - // #define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this #define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2 #define ESP_WIFI_MODULE_RESET_PIN PE15 diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 1e8b029b479f..7fdbc6980477 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -200,7 +200,7 @@ build_flags = ${stm32_variant.build_flags} [env:FLY_RRF_E3_V1] extends = stm32_variant board = marlin_STM32F407VGT6_CCM -board_build.variant = MARLIN_FLY_RRF_E3_V1 +#board_build.variant = MARLIN_BTT_E3_RRF board_build.offset = 0x8000 build_flags = ${stm32_variant.build_flags} -DSTM32F407_5VX