Add advise if use RAMPS board with LCD_FYSETC_TFT81050

MarlinFirmware · Apr 27, 2020 · 68ce3da · 68ce3da
1 parent 04a6d1a
commit 68ce3da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -753,6 +753,7 @@
    *   EXP2-1 ----------- EXP1-2
    *  EXP1-10 ----------- EXP1-1
    *
+   *  NOTE: MISO pin whould make problems with if the MISO is 5V signal. just use a 1N4148 diode (cut the MISO wire and insert it between the two wires).
    */
 
   #define BEEPER_PIN                          37

diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -171,13 +171,9 @@
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
-<<<<<<< HEAD
-  #define BTN_EN1                           EXPA1_08_PIN // TODO: Rename to BNT_EN2 when fix the SKR E3/DIP EXT1 mapping
-=======
   #define BEEPER_PIN                        EXPA1_10_PIN
 
   #define BTN_EN2                           EXPA1_08_PIN
->>>>>>> b1a195207f... Rearangle again
 
   #define CLCD_SPI_BUS 2
   //#define CLCD_USE_SOFT_SPI