From f8e177a43efa3e7a173e2799562d354ab95544ab Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:39:53 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Improve=20S?=
=?UTF-8?q?TATUS=5FBED=5FX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/lcd/dogm/dogm_Statusscreen.h | 1 +
Marlin/src/lcd/dogm/status/combined.h | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index f17dd06365..8d0ab4efbe 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -37,6 +37,7 @@
#undef STATUS_HEATERS_X
#undef STATUS_BED_X
+
/**
* Custom _Statusscreen.h files can define:
* - A custom logo image
diff --git a/Marlin/src/lcd/dogm/status/combined.h b/Marlin/src/lcd/dogm/status/combined.h
index ca18f21af6..070fe6b027 100644
--- a/Marlin/src/lcd/dogm/status/combined.h
+++ b/Marlin/src/lcd/dogm/status/combined.h
@@ -37,6 +37,7 @@
#if HOTENDS == 0
#define STATUS_HEATERS_WIDTH 96
+ #define STATUS_BED_X 74
const unsigned char status_heaters_bmp[] PROGMEM = {
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000,
@@ -56,6 +57,7 @@
#elif HOTENDS == 1
#define STATUS_HEATERS_WIDTH 96
+ #define STATUS_BED_X 74
const unsigned char status_heaters_bmp[] PROGMEM = {
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000,
@@ -75,6 +77,7 @@
#elif HOTENDS == 2
#define STATUS_HEATERS_WIDTH 96
+ #define STATUS_BED_X 74
const unsigned char status_heaters_bmp[] PROGMEM = {
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000,
@@ -104,6 +107,7 @@
#elif HOTENDS == 3
#define STATUS_HEATERS_WIDTH 96
+ #define STATUS_BED_X 74
const unsigned char status_heaters_bmp[] PROGMEM = {
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000100,B00010000,B01000000,
@@ -133,6 +137,7 @@
#else // HOTENDS > 3
#define STATUS_HEATERS_WIDTH 120
+ #define STATUS_BED_X 98
const unsigned char status_heaters_bmp[] PROGMEM = {
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000100,B00010000,B01000000,
@@ -161,7 +166,8 @@
#endif // HOTENDS
- #define STATUS_BED_TEXT_X (STATUS_HEATERS_WIDTH - 10)
+ #define STATUS_BED_WIDTH 20
+ #define STATUS_BED_TEXT_X (STATUS_BED_X + STATUS_BED_WIDTH / 2)
#else // !HAS_HEATED_BED || HOTENDS > 3