🧑‍💻 Improve STATUS_BED_X

rwoelk · Mar 23, 2022 · 0b32c39 · 0b32c39
1 parent 6b47db3
commit 0b32c39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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