Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Save bytes for custom chars (Hitachi LCD) #4553

Merged
merged 3 commits into from
Aug 7, 2016
Merged

Save bytes for custom chars (Hitachi LCD) #4553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e47c8b9
Save bytes for custom chars (Hitachi LCD)
thinkyhead Aug 6, 2016
a6d2c24
Minor cleanup of lcd_goto_screen calls
thinkyhead Aug 6, 2016
4292753
Explicitly clear the screen in lcd_goto_screen
thinkyhead Aug 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions Marlin/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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();
Expand All @@ -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
Expand Down
183 changes: 91 additions & 92 deletions Marlin/ultralcd_impl_HD44780.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -212,7 +212,7 @@ static void lcd_set_custom_characters(
B00000,
B00000
};
byte thermometer[8] = {
static byte thermometer[8] = {
B00100,
B01010,
B01010,
Expand All @@ -222,37 +222,7 @@ static void lcd_set_custom_characters(
B10001,
B01110
};
byte uplevel[8] = {
B00100,
B01110,
B11111,
B00100,
B11100,
B00000,
B00000,
B00000
}; //thanks joris
byte refresh[8] = {
B00000,
B00110,
B11001,
B11000,
B00011,
B10011,
B01100,
B00000,
}; //thanks joris
byte folder[8] = {
B00000,
B11100,
B11111,
B10001,
B10001,
B11111,
B00000,
B00000
}; //thanks joris
byte feedrate[8] = {
static byte feedrate[8] = {
B11100,
B10000,
B11000,
Expand All @@ -262,7 +232,7 @@ static void lcd_set_custom_characters(
B00101,
B00000
}; //thanks Sonny Mounicou
byte clock[8] = {
static byte clock[8] = {
B00000,
B01110,
B10011,
Expand All @@ -273,69 +243,97 @@ static void lcd_set_custom_characters(
B00000
}; //thanks Sonny Mounicou

#if ENABLED(LCD_PROGRESS_BAR)
static bool char_mode = false;
byte progress[3][8] = { {
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,
B00100,
B11100,
B00000,
B10000,
B10000,
B10000,
B10000,
B10000,
B10000,
B00000
}, {
B00000,
B10100,
B10100,
B10100,
B10100,
B10100,
B10100,
B00000
}, {
}; //thanks joris
static byte refresh[8] = {
B00000,
B00110,
B11001,
B11000,
B00011,
B10011,
B01100,
B00000,
}; //thanks joris
static byte folder[8] = {
B00000,
B11100,
B11111,
B10001,
B10001,
B11111,
B00000,
B10101,
B10101,
B10101,
B10101,
B10101,
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
for (int i = 3; i--;) lcd.createChar(LCD_STR_PROGRESS[i], progress[i]);
}
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);
}; //thanks joris

#if ENABLED(LCD_PROGRESS_BAR)
static byte progress[3][8] = { {
B00000,
B10000,
B10000,
B10000,
B10000,
B10000,
B10000,
B00000
}, {
B00000,
B10100,
B10100,
B10100,
B10100,
B10100,
B10100,
B00000
}, {
B00000,
B10101,
B10101,
B10101,
B10101,
B10101,
B10101,
B00000
} };
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
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);
#else
lcd.createChar(LCD_STR_UPLEVEL[0], uplevel);
lcd.createChar(LCD_STR_REFRESH[0], refresh);
lcd.createChar(LCD_STR_FOLDER[0], folder);
#endif

#endif
}

static void lcd_implementation_init(
#if ENABLED(LCD_PROGRESS_BAR)
bool progress_bar_set = true
bool info_screen_charset = true
#endif
) {

Expand Down Expand Up @@ -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
);

Expand Down Expand Up @@ -528,10 +526,11 @@ 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
#endif
#if ENABLED(LCD_PROGRESS_BAR)
false
#endif
);
}

Expand Down