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

Fix progress DOGM compile error #25319

Merged
merged 14 commits into from
Feb 1, 2023
Merged

Fix progress DOGM compile error #25319

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6c4046f
🎨 Rename *_temp_error to *temp_error
thinkyhead Jan 4, 2023
48f533e
[cron] Bump distribution date (2023-01-04)
thinkyhead Jan 4, 2023
f8283a4
🧑‍💻 Add Temperature::is_above_target
thinkyhead Jan 4, 2023
5eb2a87
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 8, 2023
e9d6b56
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 9, 2023
d16b1ba
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 11, 2023
8b00f58
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 20, 2023
fed88ed
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 23, 2023
9339086
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 23, 2023
92711ae
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 24, 2023
6d26425
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 26, 2023
90bea80
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 27, 2023
d75bd71
add additional times to define variables
Bob-the-Kuhn Jan 30, 2023
d8b6f40
sp
thinkyhead Feb 1, 2023
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
8 changes: 6 additions & 2 deletions Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,12 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
}

// Prepare strings for progress display
#if HAS_EXTRA_PROGRESS
#if EITHER(HAS_EXTRA_PROGRESS, HAS_PRINT_PROGRESS)
static MarlinUI::progress_t progress = 0;
static char bufferc[13];
#endif

#if HAS_EXTRA_PROGRESS

static void prepare_time_string(const duration_t &time, char prefix) {
char str[13];
Expand Down Expand Up @@ -484,7 +487,8 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
if (printJobOngoing())
prepare_time_string(print_job_timer.duration(), 'E'); }
#endif
#endif // HAS_PRINT_PROGRESS

#endif // HAS_EXTRA_PROGRESS

/**
* Draw the Status Screen for a 128x64 DOGM (U8glib) display.
Expand Down