andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #4553 from thinkyhead/rc_lcd_chars_save_ram 

Save bytes for custom chars (Hitachi LCD)
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
0a1a2fea30 42927530fe
commit
cffe77c537
2 changed files with 113 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      Marlin/ultralcd.cpp
  2. 93
      Marlin/ultralcd_impl_HD44780.h

42
Marlin/ultralcd.cpp
View File

@ -367,22 +367,22 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
/**
* General function to go directly to a menu
* Remembers the previous position
*/
static void lcd_goto_screen(screenFunc_t screen, const bool feedback = false, const uint32_t encoder = 0) {
if (currentScreen != screen) {
currentScreen = screen;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
encoderPosition = encoder;
if (feedback) lcd_quick_feedback();
if (screen == lcd_status_screen) {
defer_return_to_status = false;
screen_history_depth = 0;
}
if (feedback) lcd_quick_feedback();
lcd_implementation_clear();
#if ENABLED(LCD_PROGRESS_BAR)
// For LCD_PROGRESS_BAR re-initialize custom characters
lcd_set_custom_characters(screen == lcd_status_screen);
#endif
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
}
}
@ -484,15 +484,15 @@ static void lcd_status_screen() {
}
if (current_click) {
lcd_goto_screen(lcd_main_menu, true);
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR) && ENABLED(ULTIPANEL)
currentScreen == lcd_status_screen
#endif
);
#if ENABLED(FILAMENT_LCD_DISPLAY)
previous_lcd_status_ms = millis(); // get status message to show up for a while
#endif
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR)
false
#endif
);
lcd_goto_screen(lcd_main_menu, true);
}
#if ENABLED(ULTIPANEL_FEEDMULTIPLY)
@ -2091,7 +2091,6 @@ void kill_screen(const char* lcd_msg) {
static void lcd_filament_change_resume_print() {
filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;
lcdDrawUpdate = 2;
lcd_goto_screen(lcd_status_screen);
}
@ -2377,12 +2376,15 @@ void kill_screen(const char* lcd_msg) {
(*callback)();
}
#endif //ULTIPANEL
#endif // ULTIPANEL
/** LCD API **/
void lcd_init() {
lcd_implementation_init();
lcd_implementation_init(
#if ENABLED(LCD_PROGRESS_BAR)
true
#endif
);
#if ENABLED(NEWPANEL)
#if BUTTON_EXISTS(EN1)
@ -2537,12 +2539,7 @@ void lcd_update() {
bool sd_status = IS_SD_INSERTED;
if (sd_status != lcd_sd_status && lcd_detected()) {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR) && ENABLED(ULTIPANEL)
currentScreen == lcd_status_screen
#endif
);
lcd_sd_status = sd_status;
if (sd_status) {
card.initsd();
@ -2553,7 +2550,12 @@ void lcd_update() {
if (lcd_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_REMOVED);
}
lcd_sd_status = sd_status;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR)
currentScreen == lcd_status_screen
#endif
);
}
#endif //SDSUPPORT && SD_DETECT_PIN

93
Marlin/ultralcd_impl_HD44780.h
View File

@ -189,10 +189,10 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
static void lcd_set_custom_characters(
#if ENABLED(LCD_PROGRESS_BAR)
bool progress_bar_set = true
bool info_screen_charset = true
#endif
) {
byte bedTemp[8] = {
static byte bedTemp[8] = {
B00000,
B11111,
B10101,
@ -202,7 +202,7 @@ static void lcd_set_custom_characters(
B00000,
B00000
}; //thanks Sonny Mounicou
byte degree[8] = {
static byte degree[8] = {
B01100,
B10010,
B10010,
@ -212,7 +212,7 @@ static void lcd_set_custom_characters(
B00000,
B00000
};
byte thermometer[8] = {
static byte thermometer[8] = {
B00100,
B01010,
B01010,
@ -222,7 +222,35 @@ static void lcd_set_custom_characters(
B10001,
B01110
};
byte uplevel[8] = {
static byte feedrate[8] = {
B11100,
B10000,
B11000,
B10111,
B00101,
B00110,
B00101,
B00000
}; //thanks Sonny Mounicou
static byte clock[8] = {
B00000,
B01110,
B10011,
B10101,
B10001,
B01110,
B00000,
B00000
}; //thanks Sonny Mounicou
lcd.createChar(LCD_STR_BEDTEMP[0], bedTemp);
lcd.createChar(LCD_STR_DEGREE[0], degree);
lcd.createChar(LCD_STR_THERMOMETER[0], thermometer);
lcd.createChar(LCD_STR_FEEDRATE[0], feedrate);
lcd.createChar(LCD_STR_CLOCK[0], clock);
#if ENABLED(SDSUPPORT)
static byte uplevel[8] = {
B00100,
B01110,
B11111,
@ -232,7 +260,7 @@ static void lcd_set_custom_characters(
B00000,
B00000
}; //thanks joris
byte refresh[8] = {
static byte refresh[8] = {
B00000,
B00110,
B11001,
@ -242,7 +270,7 @@ static void lcd_set_custom_characters(
B01100,
B00000,
}; //thanks joris
byte folder[8] = {
static byte folder[8] = {
B00000,
B11100,
B11111,
@ -252,30 +280,9 @@ static void lcd_set_custom_characters(
B00000,
B00000
}; //thanks joris
byte feedrate[8] = {
B11100,
B10000,
B11000,
B10111,
B00101,
B00110,
B00101,
B00000
}; //thanks Sonny Mounicou
byte clock[8] = {
B00000,
B01110,
B10011,
B10101,
B10001,
B01110,
B00000,
B00000
}; //thanks Sonny Mounicou
#if ENABLED(LCD_PROGRESS_BAR)
static bool char_mode = false;
byte progress[3][8] = { {
static byte progress[3][8] = { {
B00000,
B10000,
B10000,
@ -303,39 +310,30 @@ static void lcd_set_custom_characters(
B10101,
B00000
} };
if (progress_bar_set != char_mode) {
char_mode = progress_bar_set;
lcd.createChar(LCD_STR_BEDTEMP[0], bedTemp);
lcd.createChar(LCD_STR_DEGREE[0], degree);
lcd.createChar(LCD_STR_THERMOMETER[0], thermometer);
lcd.createChar(LCD_STR_FEEDRATE[0], feedrate);
lcd.createChar(LCD_STR_CLOCK[0], clock);
if (progress_bar_set) {
// Progress bar characters for info screen
static bool char_mode = false;
if (info_screen_charset != char_mode) {
char_mode = info_screen_charset;
if (info_screen_charset) { // Progress bar characters for info screen
for (int i = 3; i--;) lcd.createChar(LCD_STR_PROGRESS[i], progress[i]);
}
else {
// Custom characters for submenus
else { // Custom characters for submenus
lcd.createChar(LCD_STR_UPLEVEL[0], uplevel);
lcd.createChar(LCD_STR_REFRESH[0], refresh);
lcd.createChar(LCD_STR_FOLDER[0], folder);
}
}
#else
lcd.createChar(LCD_STR_BEDTEMP[0], bedTemp);
lcd.createChar(LCD_STR_DEGREE[0], degree);
lcd.createChar(LCD_STR_THERMOMETER[0], thermometer);
lcd.createChar(LCD_STR_UPLEVEL[0], uplevel);
lcd.createChar(LCD_STR_REFRESH[0], refresh);
lcd.createChar(LCD_STR_FOLDER[0], folder);
lcd.createChar(LCD_STR_FEEDRATE[0], feedrate);
lcd.createChar(LCD_STR_CLOCK[0], clock);
#endif
#endif
}
static void lcd_implementation_init(
#if ENABLED(LCD_PROGRESS_BAR)
bool progress_bar_set = true
bool info_screen_charset = true
#endif
) {
@ -365,7 +363,7 @@ static void lcd_implementation_init(
lcd_set_custom_characters(
#if ENABLED(LCD_PROGRESS_BAR)
progress_bar_set
info_screen_charset
#endif
);
@ -528,6 +526,7 @@ unsigned lcd_print(char c) { return charset_mapper(c); }
logo_lines(PSTR(""));
safe_delay(2000);
#endif
lcd_set_custom_characters(
#if ENABLED(LCD_PROGRESS_BAR)
false

Write Preview
Loading…
Cancel
Save