bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use PSTR for common labels

Browse Source
This commit is contained in:
Scott Lahteine
2020-03-01 07:36:25 -06:00
parent f7d663c7db
commit 5e9a10dbae
9 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View File

@ -1212,10 +1212,10 @@ void MarlinUI::draw_status_screen() {
#define _LCD_W_POS 12
#define _PLOT_X 1
#define _MAP_X 3
#define _LABEL(C,X,Y) lcd_put_u8str(X, Y, C)
#define _XLABEL(X,Y) _LABEL("X:",X,Y)
#define _YLABEL(X,Y) _LABEL("Y:",X,Y)
#define _ZLABEL(X,Y) _LABEL("Z:",X,Y)
#define _LABEL(C,X,Y) lcd_put_u8str_P(X, Y, C)
#define _XLABEL(X,Y) _LABEL(X_LBL,X,Y)
#define _YLABEL(X,Y) _LABEL(Y_LBL,X,Y)
#define _ZLABEL(X,Y) _LABEL(Z_LBL,X,Y)
#else
#define _LCD_W_POS 8
#define _PLOT_X 0

4
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -652,11 +652,11 @@ void MarlinUI::draw_status_screen() {
}
}
else if (progress_state == 2 && estimation_string[0]) {
lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "R:");
lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, PSTR("R:"));
lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
}
else if (elapsed_string[0]) {
lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "E:");
lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, E_LBL);
lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
}

6
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View File

@ -548,9 +548,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
if (PAGE_UNDER(7)) {
const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
lpos = pos.asLogical();
lcd_put_u8str(5, 7, "X:");
lcd_put_u8str_P(5, 7, X_LBL);
lcd_put_u8str(ftostr52(lpos.x));
lcd_put_u8str(74, 7, "Y:");
lcd_put_u8str_P(74, 7, Y_LBL);
lcd_put_u8str(ftostr52(lpos.y));
}
@ -563,7 +563,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
lcd_put_wchar(')');
// Show the location value
lcd_put_u8str(74, LCD_PIXEL_HEIGHT, "Z:");
lcd_put_u8str_P(74, LCD_PIXEL_HEIGHT, Z_LBL);
if (!isnan(ubl.z_values[x_plot][y_plot]))
lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
else