Re-enabled the Z Offset graphics overlay.

- Re-enabled the Z offset graphics overlay that was pushed to upstream Marlin by us.
- Restored the look of the arrows since upstream decided to change it and introduced some missed pixels in the process.
master
Marcio Teixeira 7 years ago
parent b1b309b33d
commit df04231957

@ -13,7 +13,7 @@
* got disabled. * got disabled.
*/ */
#define LULZBOT_FW_VERSION ".1" // Change this with each update #define LULZBOT_FW_VERSION ".2" // Change this with each update
#if ( \ #if ( \
!defined(LULZBOT_Gladiola_Mini) && \ !defined(LULZBOT_Gladiola_Mini) && \
@ -1823,6 +1823,8 @@
#endif #endif
#define LULZBOT_LCD_SET_PROGRESS_MANUALLY #define LULZBOT_LCD_SET_PROGRESS_MANUALLY
#define LULZBOT_SCROLL_LONG_FILENAMES #define LULZBOT_SCROLL_LONG_FILENAMES
#define LULZBOT_BABYSTEP_ZPROBE_GFX_OVERLAY
#define LULZBOT_THIN_OVERLAY_ARROWS
#endif #endif
/* Marlin requires static PSTRs to display on the LCD display, because of this */ /* Marlin requires static PSTRs to display on the LCD display, because of this */

@ -676,7 +676,7 @@
//#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
// Note: Extra time may be added to mitigate controller latency. // Note: Extra time may be added to mitigate controller latency.
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor #define BABYSTEP_ZPROBE_GFX_OVERLAY LULZBOT_BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
#endif #endif
// @section extruder // @section extruder

@ -474,6 +474,7 @@
#if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(MESH_EDIT_GFX_OVERLAY) #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(MESH_EDIT_GFX_OVERLAY)
#if !defined(LULZBOT_THIN_OVERLAY_ARROWS)
const unsigned char cw_bmp[] PROGMEM = { const unsigned char cw_bmp[] PROGMEM = {
0x03,0xF8,0x00, // 000000111111100000000000 0x03,0xF8,0x00, // 000000111111100000000000
0x0F,0xF7,0x00, // 000011111111111000000000 0x0F,0xF7,0x00, // 000011111111111000000000
@ -511,6 +512,7 @@
0x07,0xFF,0x00, // 000001111111111100000000 0x07,0xFF,0x00, // 000001111111111100000000
0x01,0xFC,0x00 // 000000011111110000000000 0x01,0xFC,0x00 // 000000011111110000000000
}; };
#endif
const unsigned char up_arrow_bmp[] PROGMEM = { const unsigned char up_arrow_bmp[] PROGMEM = {
0x04,0x00, // 000001000000 0x04,0x00, // 000001000000

@ -122,86 +122,4 @@ const unsigned char ccw_bmp[] PROGMEM = { //AVR-GCC, WinAVR
0x00,0x00,0x80, 0x00,0x00,0x80,
0x03,0x03,0x00, 0x03,0x03,0x00,
0x01,0xfe,0x00 0x01,0xfe,0x00
};
const unsigned char up_arrow_bmp[] PROGMEM = { //AVR-GCC, WinAVR
/*0000 0110 0000
0000 1111 0000
0001 1111 1000
0011 1111 1100
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000*/
0x06,0x00,
0x0F,0x00,
0x1F,0x80,
0x3F,0xC0,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00
};
const unsigned char down_arrow_bmp[] PROGMEM = { //AVR-GCC, WinAVR
/*0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0000 0110 0000
0011 1111 1100
0001 1111 1000
0000 1111 0000
0000 0110 0000*/
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x06,0x00,
0x3F,0xC0,
0x1F,0x80,
0x0F,0x00,
0x06,0x00
};
const unsigned char offset_bedline_bmp[] PROGMEM = { //AVR-GCC, WinAVR
//1111 1111 1111 1111 1111 1111
0xFF,0xFF,0xFF
};
const unsigned char nozzle_bmp[] PROGMEM = { //AVR-GCC, WinAVR
0x7F,0x80,
0xFF,0xC0,
0xFF,0xC0,
0xFF,0xC0,
0x7F,0x80,
0x7F,0x80,
0xFF,0xC0,
0xFF,0xC0,
0xFF,0xC0,
0x3F,0x00,
0x1E,0x00,
0x0C,0x00
}; };
Loading…
Cancel
Save