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

Jump to bottom

Add active extruder indicator for DOGM UI LCD #26152

Merged
merged 6 commits into from
Jan 23, 2024
Merged

Add active extruder indicator for DOGM UI LCD #26152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa3e945
Update hotend.h
ansonl Aug 5, 2023
c06631c
Update status_screen_DOGM.cpp
ansonl Aug 5, 2023
cefb88e
Merge branch 'MarlinFirmware:bugfix-2.1.x' into active-extruder-ui-in…
ansonl Dec 8, 2023
03d1be0
Merge branch 'bugfix-2.1.x' into pr/26152
thinkyhead Jan 23, 2024
8eb3788
merge followup
thinkyhead Jan 23, 2024
1d46abc
prevent negative X
thinkyhead Jan 23, 2024
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: 8 additions & 0 deletions Marlin/src/lcd/dogm/status/hotend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@

#elif STATUS_HOTEND_BITMAPS > 1

const unsigned char status_active_extruder_indicator_bmp[] PROGMEM = {
B00110000,
B00011000,
B00001100,
B00011000,
B00110000
};

#ifdef STATUS_HOTEND_ANIM

const unsigned char status_hotend1_a_bmp[] PROGMEM = {
Expand Down
5 changes: 5 additions & 0 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 @@ -323,6 +323,11 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co

} // PAGE_CONTAINS

#if HAS_MULTI_EXTRUDER && DISABLED(SLIM_LCD_MENUS)
if (active_extruder == heater_id)
u8g.drawBitmapP(_MAX(0, STATUS_HOTEND_X(heater_id) - 6), STATUS_HEATERS_Y + 3, 1, 5, status_active_extruder_indicator_bmp);
#endif

#endif // !STATUS_COMBINE_HEATERS

if (PAGE_UNDER(7)) {
Expand Down
Loading