|
@ -74,25 +74,25 @@ |
|
|
|
|
|
|
|
|
#if HAS_HEATED_BED && HOTENDS <= 3 |
|
|
#if HAS_HEATED_BED && HOTENDS <= 3 |
|
|
|
|
|
|
|
|
#define STATUS_BED_WIDTH 18 |
|
|
#define STATUS_BED_WIDTH 21 |
|
|
|
|
|
|
|
|
#if HOTENDS == 0 |
|
|
#if HOTENDS == 0 |
|
|
|
|
|
|
|
|
#define STATUS_HEATERS_WIDTH 18 |
|
|
#define STATUS_HEATERS_WIDTH 21 |
|
|
|
|
|
|
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
B00100000,B10000010,B00000000, |
|
|
B00000100,B00010000,B01000000, |
|
|
|
|
|
B00000010,B00001000,B00100000, |
|
|
|
|
|
B00000010,B00001000,B00100000, |
|
|
|
|
|
B00000100,B00010000,B01000000, |
|
|
|
|
|
B00001000,B00100000,B10000000, |
|
|
B00010000,B01000001,B00000000, |
|
|
B00010000,B01000001,B00000000, |
|
|
B00010000,B01000001,B00000000, |
|
|
B00010000,B01000001,B00000000, |
|
|
B00100000,B10000010,B00000000, |
|
|
B00001000,B00100000,B10000000, |
|
|
B01000001,B00000100,B00000000, |
|
|
B00000100,B00010000,B01000000, |
|
|
B10000010,B00001000,B00000000, |
|
|
|
|
|
B10000010,B00001000,B00000000, |
|
|
|
|
|
B01000001,B00000100,B00000000, |
|
|
|
|
|
B00100000,B10000010,B00000000, |
|
|
|
|
|
B00000000,B00000000,B00000000, |
|
|
B00000000,B00000000,B00000000, |
|
|
B11111111,B11111111,B11000000, |
|
|
B00011111,B11111111,B11111000, |
|
|
B11111111,B11111111,B11000000 |
|
|
B00011111,B11111111,B11111000 |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
#elif HOTENDS == 1 |
|
|
#elif HOTENDS == 1 |
|
@ -101,18 +101,18 @@ |
|
|
#define STATUS_BED_X 80 |
|
|
#define STATUS_BED_X 80 |
|
|
|
|
|
|
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000010,B00001000,B00100000, |
|
|
|
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000010,B00001000,B00100000, |
|
|
|
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000, |
|
|
|
|
|
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001000,B00100000,B10000000, |
|
|
|
|
|
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001000,B00100000,B10000000, |
|
|
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01000001,B00000100,B00000000, |
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B10000010,B00001000,B00000000, |
|
|
|
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B10000010,B00001000,B00000000, |
|
|
|
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01000001,B00000100,B00000000, |
|
|
|
|
|
B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B10000010,B00000000, |
|
|
|
|
|
B00001111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000, |
|
|
B00001111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000, |
|
|
B00000111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11000000, |
|
|
B00000111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,B11111000, |
|
|
B00000011,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11000000 |
|
|
B00000011,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,B11111000 |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
#elif HOTENDS == 2 |
|
|
#elif HOTENDS == 2 |
|
@ -120,18 +120,18 @@ |
|
|
#define STATUS_HEATERS_WIDTH 90 |
|
|
#define STATUS_HEATERS_WIDTH 90 |
|
|
|
|
|
|
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00111110,B11110000,B00000000,B00111100,B11110000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111100,B11110000,B00000000,B00000000,B00000000,B00000000,B00000010,B00001000,B00100000, |
|
|
B00111100,B11110000,B00000000,B00111011,B01110000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111100,B11110000,B00000000,B00111011,B01110000,B00000000,B00000000,B00000000,B00000000,B00000010,B00001000,B00100000, |
|
|
B00111010,B11110000,B00000000,B00111111,B01110000,B00000000,B00000000,B00000000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00111010,B11110000,B00000000,B00111111,B01110000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00011110,B11100000,B00000000,B00011110,B11100000,B00000000,B00000000,B00000000,B00000000,B01000001,B00000100,B00000000, |
|
|
B00011110,B11100000,B00000000,B00011110,B11100000,B00000000,B00000000,B00000000,B00000000,B00001000,B00100000,B10000000, |
|
|
B00011110,B11100000,B00000000,B00011101,B11100000,B00000000,B00000000,B00000000,B00000000,B10000010,B00001000,B00000000, |
|
|
B00011110,B11100000,B00000000,B00011101,B11100000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111011,B11110000,B00000000,B00000000,B00000000,B00000000,B10000010,B00001000,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111011,B11110000,B00000000,B00000000,B00000000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111000,B01110000,B00000000,B00000000,B00000000,B00000000,B01000001,B00000100,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111000,B01110000,B00000000,B00000000,B00000000,B00000000,B00001000,B00100000,B10000000, |
|
|
B00111111,B11110000,B00000000,B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00111111,B11110000,B00000000,B00111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00001111,B11000000,B00000000,B00001111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000, |
|
|
B00001111,B11000000,B00000000,B00001111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000, |
|
|
B00000111,B10000000,B00000000,B00000111,B10000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11000000, |
|
|
B00000111,B10000000,B00000000,B00000111,B10000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,B11111000, |
|
|
B00000011,B00000000,B00000000,B00000011,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11000000 |
|
|
B00000011,B00000000,B00000000,B00000011,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111111,B11111000 |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
#else // HOTENDS > 2
|
|
|
#else // HOTENDS > 2
|
|
@ -139,18 +139,18 @@ |
|
|
#define STATUS_HEATERS_WIDTH 90 |
|
|
#define STATUS_HEATERS_WIDTH 90 |
|
|
|
|
|
|
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
const unsigned char status_heaters_bmp[] PROGMEM = { |
|
|
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00111110,B11110000,B00000000,B00111100,B11110000,B00000000,B00111100,B11110000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111100,B11110000,B00000000,B00111100,B11110000,B00000000,B00000010,B00001000,B00100000, |
|
|
B00111100,B11110000,B00000000,B00111011,B01110000,B00000000,B00111011,B01110000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111100,B11110000,B00000000,B00111011,B01110000,B00000000,B00111011,B01110000,B00000000,B00000010,B00001000,B00100000, |
|
|
B00111010,B11110000,B00000000,B00111111,B01110000,B00000000,B00111111,B01110000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00111010,B11110000,B00000000,B00111111,B01110000,B00000000,B00111111,B01110000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00011110,B11100000,B00000000,B00011110,B11100000,B00000000,B00011100,B11100000,B00000000,B01000001,B00000100,B00000000, |
|
|
B00011110,B11100000,B00000000,B00011110,B11100000,B00000000,B00011100,B11100000,B00000000,B00001000,B00100000,B10000000, |
|
|
B00011110,B11100000,B00000000,B00011101,B11100000,B00000000,B00011111,B01100000,B00000000,B10000010,B00001000,B00000000, |
|
|
B00011110,B11100000,B00000000,B00011101,B11100000,B00000000,B00011111,B01100000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111011,B11110000,B00000000,B00111011,B01110000,B00000000,B10000010,B00001000,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111011,B11110000,B00000000,B00111011,B01110000,B00000000,B00010000,B01000001,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111000,B01110000,B00000000,B00111100,B11110000,B00000000,B01000001,B00000100,B00000000, |
|
|
B00111110,B11110000,B00000000,B00111000,B01110000,B00000000,B00111100,B11110000,B00000000,B00001000,B00100000,B10000000, |
|
|
B00111111,B11110000,B00000000,B00111111,B11110000,B00000000,B00111111,B11110000,B00000000,B00100000,B10000010,B00000000, |
|
|
B00111111,B11110000,B00000000,B00111111,B11110000,B00000000,B00111111,B11110000,B00000000,B00000100,B00010000,B01000000, |
|
|
B00001111,B11000000,B00000000,B00001111,B11000000,B00000000,B00001111,B11000000,B00000000,B00000000,B00000000,B00000000, |
|
|
B00001111,B11000000,B00000000,B00001111,B11000000,B00000000,B00001111,B11000000,B00000000,B00000000,B00000000,B00000000, |
|
|
B00000111,B10000000,B00000000,B00000111,B10000000,B00000000,B00000111,B10000000,B00000000,B11111111,B11111111,B11000000, |
|
|
B00000111,B10000000,B00000000,B00000111,B10000000,B00000000,B00000111,B10000000,B00000000,B00011111,B11111111,B11111000, |
|
|
B00000011,B00000000,B00000000,B00000011,B00000000,B00000000,B00000011,B00000000,B00000000,B11111111,B11111111,B11000000 |
|
|
B00000011,B00000000,B00000000,B00000011,B00000000,B00000000,B00000011,B00000000,B00000000,B00011111,B11111111,B11111000 |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
#endif // HOTENDS
|
|
|
#endif // HOTENDS
|
|
@ -611,7 +611,7 @@ |
|
|
|
|
|
|
|
|
#else |
|
|
#else |
|
|
|
|
|
|
|
|
#define STATUS_BED_WIDTH 18 |
|
|
#define STATUS_BED_WIDTH 21 |
|
|
#ifndef STATUS_BED_X |
|
|
#ifndef STATUS_BED_X |
|
|
#define STATUS_BED_X 80 |
|
|
#define STATUS_BED_X 80 |
|
|
#endif |
|
|
#endif |
|
@ -619,8 +619,8 @@ |
|
|
#ifdef STATUS_BED_ANIM |
|
|
#ifdef STATUS_BED_ANIM |
|
|
|
|
|
|
|
|
const unsigned char status_bed_bmp[] PROGMEM = { |
|
|
const unsigned char status_bed_bmp[] PROGMEM = { |
|
|
B11111111,B11111111,B11000000, |
|
|
B00011111,B11111111,B11111000, |
|
|
B11111111,B11111111,B11000000 |
|
|
B00011111,B11111111,B11111000 |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
const unsigned char status_bed_on_bmp[] PROGMEM = { |
|
|
const unsigned char status_bed_on_bmp[] PROGMEM = { |
|
|