|
|
@ -45,6 +45,7 @@
|
|
|
|
#include "ultralcd.h"
|
|
|
|
#include "ultralcd.h"
|
|
|
|
#include "ultralcd_st7920_u8glib_rrd.h"
|
|
|
|
#include "ultralcd_st7920_u8glib_rrd.h"
|
|
|
|
#include "dogm_bitmaps.h"
|
|
|
|
#include "dogm_bitmaps.h"
|
|
|
|
|
|
|
|
#include "utility.h"
|
|
|
|
#include "duration_t.h"
|
|
|
|
#include "duration_t.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include <U8glib.h>
|
|
|
|
#include <U8glib.h>
|
|
|
@ -200,26 +201,20 @@ char lcd_print(char c) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
char lcd_print(const char* str) {
|
|
|
|
char lcd_print(const char* str) {
|
|
|
|
char c;
|
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
int i = 0;
|
|
|
|
char n = 0;
|
|
|
|
char c, n = 0;
|
|
|
|
while ((c = str[i++])) {
|
|
|
|
while ((c = str[i++])) n += lcd_print(c);
|
|
|
|
n += lcd_print(c);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Arduino < 1.0.0 is missing a function to print PROGMEM strings, so we need to implement our own */
|
|
|
|
// Needed for Arduino < 1.0.0
|
|
|
|
char lcd_printPGM(const char* str) {
|
|
|
|
char lcd_printPGM(const char* str) {
|
|
|
|
char c;
|
|
|
|
char c, n = 0;
|
|
|
|
char n = 0;
|
|
|
|
while ((c = pgm_read_byte(str++))) n += lcd_print(c);
|
|
|
|
while ((c = pgm_read_byte(str++))) {
|
|
|
|
|
|
|
|
n += lcd_print(c);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Warning: This function is called from interrupt context */
|
|
|
|
// Initialize or re-initializw the LCD
|
|
|
|
static void lcd_implementation_init() {
|
|
|
|
static void lcd_implementation_init() {
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight
|
|
|
|
#if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight
|
|
|
@ -290,6 +285,7 @@ static void lcd_implementation_init() {
|
|
|
|
#endif // SHOW_BOOTSCREEN
|
|
|
|
#endif // SHOW_BOOTSCREEN
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// The kill screen is displayed for unrecoverable conditions
|
|
|
|
void lcd_kill_screen() {
|
|
|
|
void lcd_kill_screen() {
|
|
|
|
lcd_setFont(FONT_MENU);
|
|
|
|
lcd_setFont(FONT_MENU);
|
|
|
|
u8g.setPrintPos(0, u8g.getHeight()/4*1);
|
|
|
|
u8g.setPrintPos(0, u8g.getHeight()/4*1);
|
|
|
@ -302,6 +298,10 @@ void lcd_kill_screen() {
|
|
|
|
|
|
|
|
|
|
|
|
static void lcd_implementation_clear() { } // Automatically cleared by Picture Loop
|
|
|
|
static void lcd_implementation_clear() { } // Automatically cleared by Picture Loop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// Status Screen
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
FORCE_INLINE void _draw_centered_temp(int temp, int x, int y) {
|
|
|
|
FORCE_INLINE void _draw_centered_temp(int temp, int x, int y) {
|
|
|
|
int degsize = 6 * (temp >= 100 ? 3 : temp >= 10 ? 2 : 1); // number's pixel width
|
|
|
|
int degsize = 6 * (temp >= 100 ? 3 : temp >= 10 ? 2 : 1); // number's pixel width
|
|
|
|
u8g.setPrintPos(x - (18 - degsize) / 2, y); // move left if shorter
|
|
|
|
u8g.setPrintPos(x - (18 - degsize) / 2, y); // move left if shorter
|
|
|
@ -472,6 +472,9 @@ static void lcd_implementation_status_screen() {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Set the colors for a menu item based on whether it is selected
|
|
|
|
static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
|
|
|
static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
|
|
|
if (isSelected) {
|
|
|
|
if (isSelected) {
|
|
|
|
u8g.setColorIndex(1); // black on white
|
|
|
|
u8g.setColorIndex(1); // black on white
|
|
|
@ -486,6 +489,7 @@ static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
|
|
|
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Draw a static line of text in the same idiom as a menu item
|
|
|
|
static void lcd_implementation_drawmenu_static(uint8_t row, const char* pstr, bool center=true, bool invert=false, const char* valstr=NULL) {
|
|
|
|
static void lcd_implementation_drawmenu_static(uint8_t row, const char* pstr, bool center=true, bool invert=false, const char* valstr=NULL) {
|
|
|
|
|
|
|
|
|
|
|
|
lcd_implementation_mark_as_selected(row, invert);
|
|
|
|
lcd_implementation_mark_as_selected(row, invert);
|
|
|
@ -510,6 +514,7 @@ static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
|
|
|
|
|
|
|
|
|
|
|
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
|
|
|
|
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Draw a generic menu item
|
|
|
|
static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, const char* pstr, char pre_char, char post_char) {
|
|
|
|
static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, const char* pstr, char pre_char, char post_char) {
|
|
|
|
UNUSED(pre_char);
|
|
|
|
UNUSED(pre_char);
|
|
|
|
|
|
|
|
|
|
|
@ -528,6 +533,13 @@ static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, co
|
|
|
|
lcd_print(' ');
|
|
|
|
lcd_print(' ');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Macros for specific types of menu items
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_back(sel, row, pstr) lcd_implementation_drawmenu_generic(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0])
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_submenu(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0])
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_gcode(sel, row, pstr, gcode) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Draw a menu item with an editable value
|
|
|
|
static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
|
|
|
|
static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
|
|
|
|
char c;
|
|
|
|
char c;
|
|
|
|
uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
|
|
|
|
uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
|
|
|
@ -545,6 +557,7 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c
|
|
|
|
if (pgm) lcd_printPGM(data); else lcd_print((char*)data);
|
|
|
|
if (pgm) lcd_printPGM(data); else lcd_print((char*)data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Macros for edit items
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, false)
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, false)
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true)
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true)
|
|
|
|
|
|
|
|
|
|
|
@ -558,7 +571,6 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_long5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_long5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_bool(sel, row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
|
|
|
|
|
|
|
|
|
|
|
|
//Add version for callback functions
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_callback_int3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, itostr3(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_callback_int3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, itostr3(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_callback_float3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr3(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_callback_float3(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr3(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_callback_float32(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr32(*(data)))
|
|
|
|
#define lcd_implementation_drawmenu_setting_edit_callback_float32(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr32(*(data)))
|
|
|
@ -627,9 +639,6 @@ void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
|
|
|
|
|
|
|
|
|
|
|
#endif // SDSUPPORT
|
|
|
|
#endif // SDSUPPORT
|
|
|
|
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_back(sel, row, pstr) lcd_implementation_drawmenu_generic(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0])
|
|
|
|
#endif // ULTIPANEL
|
|
|
|
#define lcd_implementation_drawmenu_submenu(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0])
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_gcode(sel, row, pstr, gcode) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
|
|
|
|
|
|
|
#define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif //__ULTRALCD_IMPL_DOGM_H
|
|
|
|
#endif //__ULTRALCD_IMPL_DOGM_H
|
|
|
|