Ender-3 V2 with Jyers UI (#22422)

This commit is contained in:
Jyers
2021-09-06 21:06:27 -07:00
committed by GitHub
parent ed0c5aefd8
commit 43a9c71ef7
29 changed files with 6575 additions and 40 deletions

View File

@@ -55,7 +55,7 @@
#include "../module/printcounter.h"
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
#include "../feature/pause.h"
#include "../module/motion.h" // for active_extruder
#endif
@@ -76,8 +76,6 @@
uint8_t get_ADC_keyValue();
#endif
#define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
#if HAS_LCD_MENU
#include "lcdprint.h"
@@ -95,6 +93,10 @@
#endif // HAS_WIRED_LCD
#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
#define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
#endif
#if HAS_MARLINUI_U8GLIB
enum MarlinFont : uint8_t {
FONT_STATUSMENU = 1,
@@ -363,6 +365,10 @@ public:
static void poweroff();
#endif
#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
static bool get_blink();
#endif
#if HAS_WIRED_LCD
static millis_t next_button_update_ms;
@@ -451,7 +457,6 @@ public:
static bool did_first_redraw;
#endif
static bool get_blink();
static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
static void draw_kill_screen();
@@ -580,7 +585,7 @@ public:
static inline bool use_click() { return false; }
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
#else
static inline void _pause_show_message() {}