Skip to content

Commit

Permalink
Fix Cheetah pins alias (#17882)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sl1pkn07
sl1pkn07 authored May 6, 2020
1 parent 544b166 commit 0332666
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@
#error "This pin mapping requires Marlin."
#endif

#define CLCD_MOD_RESET BTN_EN2
#define CLCD_MOD_RESET BTN_EN1
#define CLCD_SPI_CS LCD_PINS_RS

#if ENABLED(CLCD_USE_SOFT_SPI)
#define CLCD_SOFT_SPI_MOSI LCD_PINS_ENABLE
#define CLCD_SOFT_SPI_MISO LCD_PINS_RS
#define CLCD_SOFT_SPI_MISO LCD_PINS_SCK
#define CLCD_SOFT_SPI_SCLK LCD_PINS_D4
#endif
#endif
10 changes: 6 additions & 4 deletions Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,15 @@
#if ENABLED(TOUCH_UI_FTDI_EVE)
#define BEEPER_PIN EXPA1_10_PIN

#define BTN_EN2 EXPA1_08_PIN
#define BTN_EN1 EXPA1_06_PIN

#define LCD_PINS_RS EXPA1_04_PIN

#define CLCD_SPI_BUS 2
//#define CLCD_USE_SOFT_SPI
#if ENABLED(CLCD_USE_SOFT_SPI)
#define LCD_PINS_RS EXPA1_04_PIN
#define LCD_PINS_D4 EXPA1_07_PIN
#define LCD_PINS_ENABLE EXPA1_05_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_SCK EXPA1_07_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#endif
#endif

2 comments on commit 0332666

@RudolphRiedel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How the heck is this fixing anything?

#define CLCD_SOFT_SPI_MISO           LCD_PINS_SCK
#define CLCD_SOFT_SPI_SCLK           LCD_PINS_D4

Why???

@thinkyhead
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is true that sometimes submitters are jumping the gun and are not considering the side effects of some patch that works for them.

Truly, if you have a better idea than another contributor, submit the correction and @ mention the original author with your patch. We rely on the expertise of many others and cannot validate every submission except with the help of those —like yourself— who know better.

Please sign in to comment.