From 3d153486da36d3722b7109658c37c8ab6de5769e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 18 Jul 2019 04:36:08 -0500 Subject: [PATCH] Fysetc rename Part 2 --- Marlin/Makefile | 2 +- Marlin/src/core/boards.h | 2 +- Marlin/src/inc/SanityCheck.h | 2 +- Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 18 +++++++++--------- Marlin/src/pins/ramps/pins_FYSETC_F6_13.h | 2 +- .../{_FYSETC => FYSETC}/AIO_II/Configuration.h | 0 .../AIO_II/Configuration_adv.h | 0 .../Cheetah/Configuration.h | 0 .../Cheetah/Configuration_adv.h | 0 .../{_FYSETC => FYSETC}/F6_13/Configuration.h | 0 .../F6_13/Configuration_adv.h | 0 11 files changed, 13 insertions(+), 13 deletions(-) rename config/examples/{_FYSETC => FYSETC}/AIO_II/Configuration.h (100%) rename config/examples/{_FYSETC => FYSETC}/AIO_II/Configuration_adv.h (100%) rename config/examples/{_FYSETC => FYSETC}/Cheetah/Configuration.h (100%) rename config/examples/{_FYSETC => FYSETC}/Cheetah/Configuration_adv.h (100%) rename config/examples/{_FYSETC => FYSETC}/F6_13/Configuration.h (100%) rename config/examples/{_FYSETC => FYSETC}/F6_13/Configuration_adv.h (100%) diff --git a/Marlin/Makefile b/Marlin/Makefile index 87331b9de..473cafcdb 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -237,7 +237,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1134) else ifeq ($(HARDWARE_MOTHERBOARD),1135) # Dagoma F5 else ifeq ($(HARDWARE_MOTHERBOARD),1136) -# Fysetc F6 +# FYSETC F6 else ifeq ($(HARDWARE_MOTHERBOARD),1137) # Duplicator i3 Plus else ifeq ($(HARDWARE_MOTHERBOARD),1138) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 01dce4f50..abc232d07 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -88,7 +88,7 @@ #define BOARD_RAMPS_ENDER_4 1134 // Creality: Ender-4, CR-8 #define BOARD_RAMPS_CREALITY 1135 // Creality: CR10S, CR20, CR-X #define BOARD_RAMPS_DAGOMA 1136 // Dagoma F5 -#define BOARD_FYSETC_F6_13 1137 // Fysetc F6 +#define BOARD_FYSETC_F6_13 1137 // FYSETC F6 #define BOARD_DUPLICATOR_I3_PLUS 1138 // Wanhao Duplicator i3 Plus #define BOARD_VORON 1139 // VORON Design #define BOARD_TRONXY_V3_1_0 1140 // Tronxy TRONXY-V3-1.0 diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index d73f64242..7fdf877ac 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1561,7 +1561,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS * LED Backlight Timeout */ #if defined(LED_BACKLIGHT_TIMEOUT) && !(EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) && HAS_POWER_SWITCH) - #error "LED_BACKLIGHT_TIMEOUT requires a Fysetc Mini Panel and a Power Switch." + #error "LED_BACKLIGHT_TIMEOUT requires a FYSETC Mini Panel and a Power Switch." #endif /** diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h index fa1402305..b3d307d3b 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h @@ -231,33 +231,33 @@ #if ENABLED(FYSETC_MINI_12864) /** - * The Fysetc display can NOT use the SCK and MOSI pins on EXP2, so a + * The FYSETC display can NOT use the SCK and MOSI pins on EXP2, so a * special cable is needed to go between EXP2 on the FYSETC and the * controller board's EXP2 and J8. It also means that a software SPI * is needed to drive those pins. * - * The Fysetc requires mode 3 SPI interface. + * The FYSETC requires mode 3 SPI interface. * * Pins 6, 7 & 8 on EXP2 are no connects. That means a second special * cable will be needed if the RGB LEDs are to be active. */ - #define DOGLCD_CS LCD_PINS_ENABLE // EXP1.3 (LCD_EN on Fysetc schematic) - #define DOGLCD_A0 LCD_PINS_RS // EXP1.4 (LCD_A0 on Fysetc schematic) - #define DOGLCD_SCK P2_11 // J8-5 (SCK on Fysetc schematic) - #define DOGLCD_MOSI P4_28 // J8-6 (MOSI on Fysetc schematic) + #define DOGLCD_CS LCD_PINS_ENABLE // EXP1.3 (LCD_EN on FYSETC schematic) + #define DOGLCD_A0 LCD_PINS_RS // EXP1.4 (LCD_A0 on FYSETC schematic) + #define DOGLCD_SCK P2_11 // J8-5 (SCK on FYSETC schematic) + #define DOGLCD_MOSI P4_28 // J8-6 (MOSI on FYSETC schematic) //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems // results in LCD soft SPI mode 3, SD soft SPI mode 0 #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #ifndef RGB_LED_R_PIN - #define RGB_LED_R_PIN P2_12 // J8-4 (LCD_D6 on Fysetc schematic) + #define RGB_LED_R_PIN P2_12 // J8-4 (LCD_D6 on FYSETC schematic) #endif #ifndef RGB_LED_G_PIN - #define RGB_LED_G_PIN P1_23 // J8-3 (LCD_D5 on Fysetc schematic) + #define RGB_LED_G_PIN P1_23 // J8-3 (LCD_D5 on FYSETC schematic) #endif #ifndef RGB_LED_B_PIN - #define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on Fysetc schematic) + #define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on FYSETC schematic) #endif #elif ENABLED(FYSETC_MINI_12864_2_1) #define NEOPIXEL_PIN P2_12 diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h index 1a3c5d239..678b9c30a 100644 --- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h +++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h @@ -22,7 +22,7 @@ #pragma once // -// Fysetc F6 pin assignments +// FYSETC F6 pin assignments // #ifndef __AVR_ATmega2560__ diff --git a/config/examples/_FYSETC/AIO_II/Configuration.h b/config/examples/FYSETC/AIO_II/Configuration.h similarity index 100% rename from config/examples/_FYSETC/AIO_II/Configuration.h rename to config/examples/FYSETC/AIO_II/Configuration.h diff --git a/config/examples/_FYSETC/AIO_II/Configuration_adv.h b/config/examples/FYSETC/AIO_II/Configuration_adv.h similarity index 100% rename from config/examples/_FYSETC/AIO_II/Configuration_adv.h rename to config/examples/FYSETC/AIO_II/Configuration_adv.h diff --git a/config/examples/_FYSETC/Cheetah/Configuration.h b/config/examples/FYSETC/Cheetah/Configuration.h similarity index 100% rename from config/examples/_FYSETC/Cheetah/Configuration.h rename to config/examples/FYSETC/Cheetah/Configuration.h diff --git a/config/examples/_FYSETC/Cheetah/Configuration_adv.h b/config/examples/FYSETC/Cheetah/Configuration_adv.h similarity index 100% rename from config/examples/_FYSETC/Cheetah/Configuration_adv.h rename to config/examples/FYSETC/Cheetah/Configuration_adv.h diff --git a/config/examples/_FYSETC/F6_13/Configuration.h b/config/examples/FYSETC/F6_13/Configuration.h similarity index 100% rename from config/examples/_FYSETC/F6_13/Configuration.h rename to config/examples/FYSETC/F6_13/Configuration.h diff --git a/config/examples/_FYSETC/F6_13/Configuration_adv.h b/config/examples/FYSETC/F6_13/Configuration_adv.h similarity index 100% rename from config/examples/_FYSETC/F6_13/Configuration_adv.h rename to config/examples/FYSETC/F6_13/Configuration_adv.h