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

Encoder direction: Wrangle, Revert select screen change (#14628)

Browse Source
This commit is contained in:
Robby Candra
2019-07-18 07:41:15 +07:00
committed by Scott Lahteine
parent 9e19f004d0
commit c9aa68ef7a
12 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/lcd/ultralcd.cpp
View File

@@ -392,7 +392,7 @@ bool MarlinUI::get_blink() {
#if HAS_ENCODER_ACTION
refresh(LCDVIEW_REDRAW_NOW);
#if HAS_LCD_MENU
if (encoderDirection == -1) { // ADC_KEYPAD forces REVERSE_MENU_DIRECTION, so this indicates menu navigation
if (encoderDirection == -(ENCODERBASE)) { // ADC_KEYPAD forces REVERSE_MENU_DIRECTION, so this indicates menu navigation
if (RRK(EN_KEYPAD_UP)) encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
else if (RRK(EN_KEYPAD_DOWN)) encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
else if (RRK(EN_KEYPAD_LEFT)) { MenuItem_back::action(); quick_feedback(); }
@@ -480,7 +480,6 @@ bool MarlinUI::get_blink() {
void MarlinUI::status_screen() {
#if HAS_LCD_MENU
encoder_direction_normal();
ENCODER_RATE_MULTIPLY(false);
#endif