zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🚸 Better bed position

Browse source
This commit is contained in:
Scott Lahteine 2021-04-12 17:08:57 -05:00
parent 8b818f4ae5
commit bb1eb39ecb
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Marlin/src/lcd/dogm/dogm_Statusscreen.h
View file

@ -480,7 +480,7 @@
#endif #endif
#ifndef STATUS_CUTTER_TEXT_X #ifndef STATUS_CUTTER_TEXT_X
#define STATUS_CUTTER_TEXT_X (STATUS_CUTTER_X -1) #define STATUS_CUTTER_TEXT_X (STATUS_CUTTER_X - 1)
#endif #endif
#ifndef STATUS_CUTTER_TEXT_Y #ifndef STATUS_CUTTER_TEXT_Y
@ -488,12 +488,12 @@
#endif #endif
static_assert( static_assert(
sizeof(status_cutter_bmp) == (STATUS_CUTTER_BYTEWIDTH) * (STATUS_CUTTER_HEIGHT(0)), sizeof(status_cutter_bmp) == (STATUS_CUTTER_BYTEWIDTH) * STATUS_CUTTER_HEIGHT(0),
"Status cutter bitmap (status_cutter_bmp) dimensions don't match data." "Status cutter bitmap (status_cutter_bmp) dimensions don't match data."
); );
#ifdef STATUS_CUTTER_ANIM #ifdef STATUS_CUTTER_ANIM
static_assert( static_assert(
sizeof(status_cutter_on_bmp) == (STATUS_CUTTER_BYTEWIDTH) * (STATUS_CUTTER_HEIGHT(1)), sizeof(status_cutter_on_bmp) == (STATUS_CUTTER_BYTEWIDTH) * STATUS_CUTTER_HEIGHT(1),
"Status cutter bitmap (status_cutter_on_bmp) dimensions don't match data." "Status cutter bitmap (status_cutter_on_bmp) dimensions don't match data."
); );
#endif #endif
@ -530,12 +530,12 @@
#endif #endif
static_assert( static_assert(
sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(0)), sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * STATUS_CHAMBER_HEIGHT(0),
"Status chamber bitmap (status_chamber_bmp) dimensions don't match data." "Status chamber bitmap (status_chamber_bmp) dimensions don't match data."
); );
#ifdef STATUS_CHAMBER_ANIM #ifdef STATUS_CHAMBER_ANIM
static_assert( static_assert(
sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(1)), sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * STATUS_CHAMBER_HEIGHT(1),
"Status chamber bitmap (status_chamber_on_bmp) dimensions don't match data." "Status chamber bitmap (status_chamber_on_bmp) dimensions don't match data."
); );
#endif #endif
@ -565,12 +565,12 @@
#endif #endif
static_assert( static_assert(
sizeof(status_cooler_bmp1) == (STATUS_COOLER_BYTEWIDTH) * (STATUS_COOLER_HEIGHT(0)), sizeof(status_cooler_bmp1) == (STATUS_COOLER_BYTEWIDTH) * STATUS_COOLER_HEIGHT(0),
"Status cooler bitmap (status_cooler_bmp1) dimensions don't match data." "Status cooler bitmap (status_cooler_bmp1) dimensions don't match data."
); );
#ifdef STATUS_COOLER_ANIM #ifdef STATUS_COOLER_ANIM
static_assert( static_assert(
sizeof(status_cooler_bmp2) == (STATUS_COOLER_BYTEWIDTH) * (STATUS_COOLER_HEIGHT(1)), sizeof(status_cooler_bmp2) == (STATUS_COOLER_BYTEWIDTH) * STATUS_COOLER_HEIGHT(1),
"Status cooler bitmap (status_cooler_bmp2) dimensions don't match data." "Status cooler bitmap (status_cooler_bmp2) dimensions don't match data."
); );
#endif #endif
@ -647,7 +647,7 @@
#if STATUS_BED_WIDTH && !STATUS_HEATERS_WIDTH #if STATUS_BED_WIDTH && !STATUS_HEATERS_WIDTH
#ifndef STATUS_BED_X #ifndef STATUS_BED_X
#define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8) #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8 - TERN0(STATUS_HEAT_PERCENT, 4))
#endif #endif
#ifndef STATUS_BED_HEIGHT #ifndef STATUS_BED_HEIGHT
@ -667,12 +667,12 @@
#endif #endif
static_assert( static_assert(
sizeof(status_bed_bmp) == (STATUS_BED_BYTEWIDTH) * (STATUS_BED_HEIGHT(0)), sizeof(status_bed_bmp) == (STATUS_BED_BYTEWIDTH) * STATUS_BED_HEIGHT(0),
"Status bed bitmap (status_bed_bmp) dimensions don't match data." "Status bed bitmap (status_bed_bmp) dimensions don't match data."
); );
#ifdef STATUS_BED_ANIM #ifdef STATUS_BED_ANIM
static_assert( static_assert(
sizeof(status_bed_on_bmp) == (STATUS_BED_BYTEWIDTH) * (STATUS_BED_HEIGHT(1)), sizeof(status_bed_on_bmp) == (STATUS_BED_BYTEWIDTH) * STATUS_BED_HEIGHT(1),
"Status bed bitmap (status_bed_on_bmp) dimensions don't match data." "Status bed bitmap (status_bed_on_bmp) dimensions don't match data."
); );
#endif #endif

11
Marlin/src/lcd/dogm/status/bed.h
View file

@ -29,9 +29,7 @@
#define STATUS_BED_ANIM #define STATUS_BED_ANIM
#define STATUS_BED_WIDTH 24 #define STATUS_BED_WIDTH 24
#ifndef STATUS_BED_X
#define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8)
#endif
#define STATUS_BED_TEXT_X (STATUS_BED_X + 11) #define STATUS_BED_TEXT_X (STATUS_BED_X + 11)
const unsigned char status_bed_bmp[] PROGMEM = { const unsigned char status_bed_bmp[] PROGMEM = {
@ -62,9 +60,6 @@
#else #else
#define STATUS_BED_WIDTH 21 #define STATUS_BED_WIDTH 21
#ifndef STATUS_BED_X
#define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8)
#endif
#ifdef STATUS_BED_ANIM #ifdef STATUS_BED_ANIM
@ -108,3 +103,7 @@
#endif #endif
#endif #endif
#ifndef STATUS_BED_X
#define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8 - TERN0(STATUS_HEAT_PERCENT, 4))
#endif