Tweaks

MarlinFirmware · Jan 17, 2020 · ccbb7e5 · ccbb7e5
1 parent 665fab9
commit ccbb7e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1948,8 +1948,7 @@
 //#define FYSETC_MINI_12864_1_2    // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0    // Type A/B. Discreet RGB Backlight
 //#define FYSETC_MINI_12864_2_1    // Type A/B. Neopixel RGB Backlight
-#define FYSETC_GENERIC_12864_1_1 // Like FYSETC_MINI_12864 but bigger and need to control backlight
-
+//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
 
 //
 // Factory display for Creality CR-10

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -262,7 +262,7 @@
 #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
   #define _LCD_CONTRAST_MIN  120
   #define _LCD_CONTRAST_INIT 195
-#elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1)
+#elif ENABLED(FYSETC_MINI_12864)
   #define _LCD_CONTRAST_INIT 220
 #elif ENABLED(ULTI_CONTROLLER)
   #define _LCD_CONTRAST_INIT 127

diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -228,8 +228,8 @@
   #if ENABLED(FYSETC_GENERIC_12864_1_1)
     #define LCD_BACKLIGHT_PIN 27
   #endif
-  #define KILL_PIN         41
 
+  #define KILL_PIN         41
   #define LCD_RESET_PIN    23   // Must be high or open for LCD to operate normally.
                                 // Seems to work best if left open.
 

diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
@@ -39,7 +39,7 @@
 
 //
 // EEPROM Emulation
-// 
+//
 #define FLASH_EEPROM_EMULATION
 //#define SRAM_EEPROM_EMULATION
 //#define I2C_EEPROM
@@ -98,10 +98,9 @@
 #define E2_CS_PIN          PC15
 
 #if HAS_TMC220x
-  /**
-   * TMC2208/TMC2209 stepper drivers
-   *
-   */
+  //
+  // TMC2208/TMC2209 stepper drivers
+  //
 
   //
   // Software serial
@@ -197,7 +196,7 @@
     #define LCD_PINS_ENABLE PC11
     #define LCD_PINS_D4    PC10
 
-    #if ENABLED(FYSETC_MINI_12864)    
+    #if ENABLED(FYSETC_MINI_12864)
      // See https://wiki.fysetc.com/Mini12864_Panel
       #define DOGLCD_CS    PC11
       #define DOGLCD_A0    PD2