mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2025-03-13 17:56:14 +00:00
Clean up hasty PR
This commit is contained in:
parent
c8f9a32610
commit
eb7f75461a
1 changed files with 13 additions and 14 deletions
|
@ -43,7 +43,7 @@
|
|||
//
|
||||
// Note: MKS Robin board is using SPI2 interface.
|
||||
//
|
||||
#define SPI_DEVICE 2
|
||||
#define SPI_DEVICE 2
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
@ -188,7 +188,7 @@
|
|||
// SD Card
|
||||
//
|
||||
#ifndef SDCARD_CONNECTION
|
||||
#define SDCARD_CONNECTION ONBOARD
|
||||
#define SDCARD_CONNECTION ONBOARD
|
||||
#endif
|
||||
|
||||
#if SD_CONNECTION_IS(LCD)
|
||||
|
@ -211,15 +211,15 @@
|
|||
* to let the bootloader init the screen.
|
||||
*/
|
||||
#if HAS_FSMC_TFT
|
||||
#define FSMC_CS_PIN PD7 // NE4
|
||||
#define FSMC_RS_PIN PD11 // A0
|
||||
#define TFT_CS_PIN FSMC_CS_PIN
|
||||
#define TFT_RS_PIN FSMC_RS_PIN
|
||||
#define FSMC_CS_PIN PD7 // NE4
|
||||
#define FSMC_RS_PIN PD11 // A0
|
||||
#define TFT_CS_PIN FSMC_CS_PIN
|
||||
#define TFT_RS_PIN FSMC_RS_PIN
|
||||
|
||||
#define LCD_RESET_PIN PF6
|
||||
#define LCD_BACKLIGHT_PIN PD13
|
||||
#define TFT_RESET_PIN LCD_RESET_PIN
|
||||
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
|
||||
#define TFT_RESET_PIN LCD_RESET_PIN
|
||||
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
|
||||
|
||||
#if NEED_TOUCH_PINS
|
||||
#define TOUCH_CS_PIN PA7
|
||||
|
@ -255,8 +255,7 @@
|
|||
#define DOGLCD_SCK PB13
|
||||
#define DOGLCD_MOSI PB15
|
||||
|
||||
#else
|
||||
// !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
|
||||
#else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
|
||||
|
||||
#define LCD_PINS_D4 PF14
|
||||
#if IS_ULTIPANEL
|
||||
|
@ -265,7 +264,7 @@
|
|||
#define LCD_PINS_D7 PF13
|
||||
|
||||
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
|
||||
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -284,10 +283,10 @@
|
|||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
||||
#endif
|
||||
|
||||
#define HAS_SPI_FLASH 1
|
||||
#define HAS_SPI_FLASH 1
|
||||
#if HAS_SPI_FLASH
|
||||
#define SPI_FLASH_SIZE 0x1000000 // 16MB
|
||||
#define W25QXX_CS_PIN PB12 // Flash chip-select
|
||||
#define SPI_FLASH_SIZE 0x1000000 // 16MB
|
||||
#define W25QXX_CS_PIN PB12 // Flash chip-select
|
||||
#define W25QXX_MOSI_PIN PB15
|
||||
#define W25QXX_MISO_PIN PB14
|
||||
#define W25QXX_SCK_PIN PB13
|
||||
|
|
Loading…
Add table
Reference in a new issue