bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rotary encoder cleanup (#20753)

Browse Source
This commit is contained in:
Scott Lahteine
2021-01-12 20:43:52 -06:00
committed by GitHub
parent 2b928b4754
commit 4a89731025
30 changed files with 484 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -504,10 +504,10 @@
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
//#define SHIFT_OUT 40
//#define SHIFT_EN 17
//#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN 42
//#define SHIFT_OUT_PIN 40
//#define SHIFT_EN_PIN 17
#endif
#endif
@ -722,9 +722,9 @@
#endif // HAS_WIRED_LCD
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42
#define SHIFT_OUT_PIN 40
#define SHIFT_CLK_PIN 44
#define SHIFT_LD_PIN 42
#ifndef BTN_EN1
#define BTN_EN1 64
#endif

14
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View File

@ -342,10 +342,10 @@
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
//#define SHIFT_OUT 40
//#define SHIFT_EN 17
//#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN 42
//#define SHIFT_OUT_PIN 40
//#define SHIFT_EN_PIN 17
#endif
#endif
@ -491,9 +491,9 @@
// Buttons are directly attached to AUX-2
#if IS_RRW_KEYPAD
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42
#define SHIFT_OUT_PIN 40
#define SHIFT_CLK_PIN 44
#define SHIFT_LD_PIN 42
#define BTN_EN1 64
#define BTN_EN2 59
#define BTN_ENC 63

8
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View File

@ -142,10 +142,10 @@
#else // !IS_NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40
#define SHIFT_EN 17
#define SHIFT_CLK_PIN 38
#define SHIFT_LD_PIN 42
#define SHIFT_OUT_PIN 40
#define SHIFT_EN_PIN 17
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 5

8
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -197,10 +197,10 @@
#else // !IS_NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40
#define SHIFT_EN 17
#define SHIFT_CLK_PIN 38
#define SHIFT_LD_PIN 42
#define SHIFT_OUT_PIN 40
#define SHIFT_EN_PIN 17
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 5

6
Marlin/src/pins/ramps/pins_ZRIB_V20.h
View File

@ -69,9 +69,9 @@
#undef ADC_KEYPAD_PIN
#undef BEEPER_PIN
#undef SHIFT_OUT
#undef SHIFT_CLK
#undef SHIFT_LD
#undef SHIFT_OUT_PIN
#undef SHIFT_CLK_PIN
#undef SHIFT_LD_PIN
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC