3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update _Statusscreen.h

Browse source
This commit is contained in:
Foxies 2020-10-08 11:14:21 +02:00
parent 8f8c0d5942
commit bf077386bc
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Marlin/_Statusscreen.h
View file

@ -74,6 +74,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
// //
<<<<<<< Updated upstream <<<<<<< Updated upstream
<<<<<<< Updated upstream <<<<<<< Updated upstream
<<<<<<< Updated upstream
#define STATUS_HEATERS_X 48 #define STATUS_HEATERS_X 48
#define STATUS_BED_X 70 #define STATUS_BED_X 70
======= =======
@ -84,3 +85,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
#define STATUS_HEATERS_X 48 //48 #define STATUS_HEATERS_X 48 //48
#define STATUS_BED_X 70 //74 #define STATUS_BED_X 70 //74
>>>>>>> Stashed changes >>>>>>> Stashed changes
=======
#define STATUS_HEATERS_X 48 //48
#define STATUS_BED_X 70 //74
>>>>>>> Stashed changes