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

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/menu/menu.cpp
View File

@ -213,14 +213,14 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
clear_lcd();
// Re-initialize custom characters that may be re-used
#if HAS_CHARACTER_LCD
#if HAS_MARLINUI_HD44780
if (TERN1(AUTO_BED_LEVELING_UBL, !ubl.lcd_map_control))
set_custom_characters(on_status_screen() ? CHARSET_INFO : CHARSET_MENU);
#endif
refresh(LCDVIEW_CALL_REDRAW_NEXT);
screen_changed = true;
TERN_(HAS_GRAPHICAL_LCD, drawing_screen = false);
TERN_(HAS_MARLINUI_U8GLIB, drawing_screen = false);
TERN_(HAS_LCD_MENU, encoder_direction_normal());

4
Marlin/src/lcd/menu/menu.h
View File

@ -39,7 +39,7 @@ typedef void (*selectFunc_t)();
#define SS_INVERT 0x02
#define SS_DEFAULT SS_CENTER
#if HAS_GRAPHICAL_LCD && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
#if HAS_MARLINUI_U8GLIB && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
void _lcd_zoffset_overlay_gfx(const float zvalue);
#endif
@ -215,7 +215,7 @@ void _lcd_draw_homing();
void line_to_z(const float &z);
#endif
#if HAS_GRAPHICAL_LCD && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
#if HAS_MARLINUI_U8GLIB && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
void _lcd_zoffset_overlay_gfx(const float zvalue);
#endif

8
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -60,7 +60,9 @@ void menu_advanced_settings();
static int8_t bar_percent = 0;
if (ui.use_click()) {
ui.goto_previous_screen();
ui.set_custom_characters(CHARSET_MENU);
#if HAS_MARLINUI_HD44780
ui.set_custom_characters(CHARSET_MENU);
#endif
return;
}
bar_percent += (int8_t)ui.encoderPosition;
@ -73,7 +75,9 @@ void menu_advanced_settings();
void _progress_bar_test() {
ui.goto_screen(progress_bar_test);
ui.set_custom_characters(CHARSET_INFO);
#if HAS_MARLINUI_HD44780
ui.set_custom_characters(CHARSET_INFO);
#endif
}
#endif // LCD_PROGRESS_BAR_TEST

4
Marlin/src/lcd/menu/menu_media.cpp
View File

@ -99,7 +99,7 @@ class MenuItem_sdfolder : public MenuItem_sdbase {
encoderTopLine = 0;
ui.encoderPosition = 2 * (ENCODER_STEPS_PER_MENU_ITEM);
ui.screen_changed = true;
TERN_(HAS_GRAPHICAL_LCD, ui.drawing_screen = false);
TERN_(HAS_MARLINUI_U8GLIB, ui.drawing_screen = false);
ui.refresh();
}
};
@ -107,7 +107,7 @@ class MenuItem_sdfolder : public MenuItem_sdbase {
void menu_media() {
ui.encoder_direction_menus();
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
static uint16_t fileCnt;
if (ui.first_page) fileCnt = card.get_num_Files();
#else

2
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -205,7 +205,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
#if DISABLED(HAS_GRAPHICAL_TFT)
extern const char NUL_STR[];
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_CHARACTER_LCD));
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
lcd_put_u8str(tmp);
MENU_ITEM_ADDON_END();
#else

8
Marlin/src/lcd/menu/menu_tune.cpp
View File

@ -46,7 +46,7 @@
#include "../../feature/babystep.h"
#include "../lcdprint.h"
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#include "../dogm/ultralcd_DOGM.h"
#endif
@ -68,10 +68,10 @@
const float spm = planner.steps_to_mm[axis];
MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
const bool in_view = TERN1(HAS_GRAPHICAL_LCD, PAGE_CONTAINS(LCD_PIXEL_HEIGHT - MENU_FONT_HEIGHT, LCD_PIXEL_HEIGHT - 1));
const bool in_view = TERN1(HAS_MARLINUI_U8GLIB, PAGE_CONTAINS(LCD_PIXEL_HEIGHT - MENU_FONT_HEIGHT, LCD_PIXEL_HEIGHT - 1));
if (in_view) {
TERN_(HAS_GRAPHICAL_LCD, ui.set_font(FONT_MENU));
lcd_moveto(0, TERN(HAS_GRAPHICAL_LCD, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU));
lcd_moveto(0, TERN(HAS_MARLINUI_U8GLIB, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
lcd_put_wchar(':');
lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));