Skip to content

Commit 466282f

Browse files
authored
🩹 Misc. changes from ProUI / ExtUI updates (#26928)
1 parent 1759429 commit 466282f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+363
-244
lines changed

Marlin/src/feature/leds/printer_event_leds.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class PrinterEventLEDs {
5656

5757
#if HAS_TEMP_HOTEND || HAS_HEATED_BED || HAS_HEATED_CHAMBER
5858
static void onHeatingDone() { leds.set_white(); }
59-
static void onPidTuningDone(LEDColor c) { leds.set_color(c); }
59+
static void onPIDTuningDone(LEDColor c) { leds.set_color(c); }
6060
#endif
6161

6262
#if HAS_MEDIA

Marlin/src/feature/pause.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,14 @@ enum PauseMessage : char {
5252
PAUSE_MESSAGE_RESUME,
5353
PAUSE_MESSAGE_HEAT,
5454
PAUSE_MESSAGE_HEATING,
55-
PAUSE_MESSAGE_STATUS
55+
PAUSE_MESSAGE_STATUS,
56+
PAUSE_MESSAGE_COUNT
5657
};
5758

5859
#if M600_PURGE_MORE_RESUMABLE
60+
/**
61+
* Input methods can Purge More, Resume, or request input
62+
*/
5963
enum PauseMenuResponse : char {
6064
PAUSE_RESPONSE_WAIT_FOR,
6165
PAUSE_RESPONSE_EXTRUDE_MORE,

Marlin/src/gcode/temp/M303.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void GcodeSuite::M303() {
6868
default:
6969
SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
7070
SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
71-
TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_HEATER_ID));
71+
TERN_(EXTENSIBLE_UI, ExtUI::onPIDTuning(ExtUI::result_t::PID_BAD_HEATER_ID));
7272
TERN_(PROUI_PID_TUNE, dwinPidTuning(PID_BAD_HEATER_ID));
7373
return;
7474
}

Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ void ST7920_Lite_Status_Screen::update_status_or_position(bool forceUpdate) {
886886
* If STATUS_EXPIRE_SECONDS is zero, only the status is shown.
887887
*/
888888
if (forceUpdate || status_changed()) {
889-
TERN_(STATUS_MESSAGE_SCROLLING, ui.status_scroll_offset = 0);
889+
TERN_(STATUS_MESSAGE_SCROLLING, ui.reset_status_scroll());
890890
#if STATUS_EXPIRE_SECONDS
891891
countdown = !ui.status_message.empty() ? STATUS_EXPIRE_SECONDS : 0;
892892
#endif

Marlin/src/lcd/e3v2/common/dwin_api.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323

2424
#include "../../../inc/MarlinConfig.h"
2525

26+
//
27+
// e3v2/common/dwin_api.h
28+
//
29+
// Included by: e3v2/*/dwin_lcd.h
30+
//
31+
2632
#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
2733
#define DWIN_WIDTH 480
2834
#define DWIN_HEIGHT 272

Marlin/src/lcd/e3v2/common/dwin_font.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*/
2222
#pragma once
2323

24+
#include <stdint.h>
25+
2426
typedef uint8_t fontid_t;
2527

2628
/**

Marlin/src/lcd/e3v2/creality/dwin.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,8 +1822,6 @@ void MarlinUI::update() {
18221822
dwinHandleScreen(); // Rotary encoder update
18231823
}
18241824

1825-
void MarlinUI::refresh() { /* Nothing to see here */ }
1826-
18271825
#if HAS_LCD_BRIGHTNESS
18281826
void MarlinUI::_set_brightness() { dwinLCDBrightness(backlight ? brightness : 0); }
18291827
#endif

Marlin/src/lcd/e3v2/jyersui/dwin.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5158,6 +5158,7 @@ void MarlinUI::init_lcd() {
51585158

51595159
#if ENABLED(ADVANCED_PAUSE_FEATURE)
51605160
void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
5161+
if (mode != PAUSE_MODE_SAME) pause_mode = mode;
51615162
switch (message) {
51625163
case PAUSE_MESSAGE_INSERT: jyersDWIN.confirmHandler(Popup_FilInsert); break;
51635164
case PAUSE_MESSAGE_PURGE:

Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,3 @@
7676
#include "../common/dwin_color.h"
7777

7878
#define Color_Bg_Heading 0x3344 // Static Heading
79-
80-
// Character matrix width x height
81-
//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
82-
//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)

Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ extern dwin_font_t dwin_font;
7272
#define EXTRA_ROW_HEIGHT 8
7373
#define MENU_LINE_HEIGHT (MENU_FONT_HEIGHT + EXTRA_ROW_HEIGHT)
7474

75+
// Character matrix width x height based on menu font
76+
#define LCD_PIXEL_WIDTH DWIN_WIDTH
77+
#define LCD_PIXEL_HEIGHT DWIN_HEIGHT
78+
#define LCD_WIDTH ((LCD_PIXEL_WIDTH) / (MENU_FONT_WIDTH))
79+
#define LCD_HEIGHT ((LCD_PIXEL_HEIGHT) / (MENU_LINE_HEIGHT))
80+
7581
#if DWIN_FONT_EDIT == font6x12
7682
#define EDIT_FONT_WIDTH 6
7783
#define EDIT_FONT_ASCENT 10

0 commit comments

Comments
 (0)