MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scroll static screens more simply

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-08 15:08:56 -07:00
parent 5051723c2e
commit 13dc619f43
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Marlin/ultralcd.cpp
View File

@ -214,18 +214,18 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
* START_SCREEN generates the init code for a screen function * START_SCREEN generates the init code for a screen function
* *
* encoderLine is the position based on the encoder * encoderLine is the position based on the encoder
* currentMenuViewOffset is the top menu line to display * encoderTopLine is the top menu line to display
* _drawLineNr is the index of the LCD line (0-3) * _drawLineNr is the index of the LCD line (0-3)
* _lineNr is the menu item to draw and process * _lineNr is the menu item to draw and process
* _menuItemNr is the index of each MENU_ITEM * _menuItemNr is the index of each MENU_ITEM
*/ */
#define _START_SCREEN(CODE) do { \ #define _START_SCREEN(CODE) \
ENCODER_DIRECTION_MENUS(); \ ENCODER_DIRECTION_MENUS(); \
encoderRateMultiplierEnabled = false; \ encoderRateMultiplierEnabled = false; \
if (encoderPosition > 0x8000) encoderPosition = 0; \ if (encoderPosition > 0x8000) encoderPosition = 0; \
uint8_t encoderLine = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM; \ uint8_t encoderLine = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM; \
NOMORE(currentMenuViewOffset, encoderLine); \ NOMORE(encoderTopLine, encoderLine); \
uint8_t _lineNr = currentMenuViewOffset, _menuItemNr; \ uint8_t _lineNr = encoderTopLine, _menuItemNr; \
CODE; \ CODE; \
for (uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \ for (uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
_menuItemNr = 0; _menuItemNr = 0;
@ -292,19 +292,25 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
_menuItemNr++ _menuItemNr++
#define END_SCREEN() \ #define END_SCREEN() \
if (encoderLine >= _menuItemNr) { \
encoderPosition = _menuItemNr * (ENCODER_STEPS_PER_MENU_ITEM) - 1; \
encoderLine = _menuItemNr - 1; \
} \ } \
if (encoderLine >= currentMenuViewOffset + LCD_HEIGHT) { \ NOMORE(encoderLine, _menuItemNr - LCD_HEIGHT); \
currentMenuViewOffset = encoderLine - (LCD_HEIGHT) + 1; \ NOLESS(encoderLine, 0); \
encoderPosition = encoderLine * (ENCODER_STEPS_PER_MENU_ITEM); \
if (encoderTopLine != encoderLine) { \
encoderTopLine = encoderLine; \
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \ lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \
_lineNr = currentMenuViewOffset - 1; \ }
_drawLineNr = -1; \
} \
} } while(0)
#define END_MENU() END_SCREEN() #define END_MENU() \
} \
if (encoderLine >= _menuItemNr) { \
encoderLine = _menuItemNr - 1; \
encoderPosition = encoderLine * (ENCODER_STEPS_PER_MENU_ITEM); \
} \
if (encoderLine >= encoderTopLine + LCD_HEIGHT) { \
encoderTopLine = encoderLine - (LCD_HEIGHT - 1); \
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \
}
#if ENABLED(ENCODER_RATE_MULTIPLIER) #if ENABLED(ENCODER_RATE_MULTIPLIER)
@ -342,7 +348,7 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
#if ENABLED(LCD_HAS_SLOW_BUTTONS) #if ENABLED(LCD_HAS_SLOW_BUTTONS)
volatile uint8_t slow_buttons; // Bits of the pressed buttons. volatile uint8_t slow_buttons; // Bits of the pressed buttons.
#endif #endif
uint8_t currentMenuViewOffset; /* scroll offset in the current menu */ int8_t encoderTopLine; /* scroll offset in the current menu */
millis_t next_button_update_ms; millis_t next_button_update_ms;
uint8_t lastEncoderBits; uint8_t lastEncoderBits;
uint32_t encoderPosition; uint32_t encoderPosition;
@ -1888,13 +1894,13 @@ void kill_screen(const char* lcd_msg) {
#if !PIN_EXISTS(SD_DETECT) #if !PIN_EXISTS(SD_DETECT)
static void lcd_sd_refresh() { static void lcd_sd_refresh() {
card.initsd(); card.initsd();
currentMenuViewOffset = 0; encoderTopLine = 0;
} }
#endif #endif
static void lcd_sd_updir() { static void lcd_sd_updir() {
card.updir(); card.updir();
currentMenuViewOffset = 0; encoderTopLine = 0;
} }
/** /**