thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚸 Renumber EXP pins to match schematics/RRF/Klipper

Browse Source
This commit is contained in:
Scott Lahteine
2022-07-16 16:26:36 -05:00
parent 05a7be7b25
commit 504fec9823
53 changed files with 2587 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View File

@@ -133,11 +133,11 @@
/**
* EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
* ------
* (BEEPER) PC9 |10 9 | PC12 (BTN_ENC)
* (BTN_EN2) PC11 | 8 7 | PB14 (LCD_RS / MISO)
* (BTN_EN1) PC10 6 5 | PB13 (SCK)
* (LCD_EN) PB12 | 4 3 | PB15 (MOSI)
* GND | 2 1 | 5V
* (BEEPER) PC9 | 1 2 | PC12 (BTN_ENC)
* (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
* (BTN_EN1) PC10 5 6 | PB13 (SCK)
* (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
* GND | 9 10 | 5V
* ------
* EXP1
*
@@ -146,23 +146,23 @@
* - Functionally the pins are assigned in the same order as on the Ender-3 board.
* - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
*/
#define EXP1_03_PIN PB15
#define EXP1_04_PIN PB12
#define EXP1_05_PIN PB13
#define EXP1_06_PIN PC10
#define EXP1_07_PIN PB14
#define EXP1_08_PIN PC11
#define EXP1_09_PIN PC12
#define EXP1_10_PIN PC9
#define EXP1_08_PIN PB15
#define EXP1_07_PIN PB12
#define EXP1_06_PIN PB13
#define EXP1_05_PIN PC10
#define EXP1_04_PIN PB14
#define EXP1_03_PIN PC11
#define EXP1_02_PIN PC12
#define EXP1_01_PIN PC9
#if HAS_WIRED_LCD
#define BEEPER_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_01_PIN
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_SCK EXP1_05_PIN
#define DOGLCD_MOSI EXP1_03_PIN
#define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_SCK EXP1_06_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
#define FORCE_SOFT_SPI
@@ -170,30 +170,30 @@
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_05_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_03_PIN // DATA MOSI
#define LCD_PINS_RS EXP1_07_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_06_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_08_PIN // DATA MOSI
//#define LCD_CONTRAST_INIT 190
#if IS_NEWPANEL
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_08_PIN
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_03_PIN
#define BTN_ENC EXP1_02_PIN
#endif
#endif
#if ENABLED(TOUCH_UI_FTDI_EVE)
#define BEEPER_PIN EXP1_10_PIN
#define CLCD_MOD_RESET EXP1_08_PIN
#define CLCD_SPI_CS EXP1_04_PIN
#define BEEPER_PIN EXP1_01_PIN
#define CLCD_MOD_RESET EXP1_03_PIN
#define CLCD_SPI_CS EXP1_07_PIN
//#define CLCD_USE_SOFT_SPI // the Cheetah can use hardware-SPI so we do not really need this
#if ENABLED(CLCD_USE_SOFT_SPI)
#define CLCD_SOFT_SPI_MOSI EXP1_03_PIN
#define CLCD_SOFT_SPI_MISO EXP1_07_PIN
#define CLCD_SOFT_SPI_SCLK EXP1_05_PIN
#define CLCD_SOFT_SPI_MOSI EXP1_08_PIN
#define CLCD_SOFT_SPI_MISO EXP1_04_PIN
#define CLCD_SOFT_SPI_SCLK EXP1_06_PIN
#else
#define CLCD_SPI_BUS 2
#endif