Attempt to address Bernhard's comments

Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
This commit is contained in:
Robert F-C
2013-03-01 01:17:07 +11:00
parent 839bef6d5d
commit 6beb42cdf6
4 changed files with 134 additions and 142 deletions

View File

@@ -705,7 +705,9 @@ void lcd_init()
lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > -1)
lcd_buttons_update();
#ifdef ULTIPANEL
encoderDiff = 0;
#endif
}
void lcd_update()
@@ -714,8 +716,8 @@ void lcd_update()
lcd_buttons_update();
#ifdef LCD_HAS_EXTRA_BUTTONS
buttons |= lcd_read_extra_buttons(); // buttons which take too long to read in interrupt context
#ifdef LCD_HAS_SLOW_BUTTONS
buttons |= lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
#endif
#if (SDCARDDETECT > -1)
@@ -751,8 +753,12 @@ void lcd_update()
if (LCD_CLICKED)
timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
#endif//ULTIPANEL
(*currentMenu)();
#ifdef LCD_HAS_STATUS_INDICATORS
lcd_implementation_update_indicators();
#endif
#ifdef ULTIPANEL
if(timeoutToStatus < millis() && currentMenu != lcd_status_screen)
{
@@ -860,12 +866,12 @@ void lcd_buttons_update()
}
lastEncoderBits = enc;
}
#endif//ULTIPANEL
bool lcd_clicked()
{
return LCD_CLICKED;
}
#endif//ULTIPANEL
/********************************/
/** Float conversion utilities **/