Wrap ULTIPANEL-dependent code
This commit is contained in:
Scott Lahteine
parent
305913545e
commit
71319adbb8
@ -2585,12 +2585,12 @@ void lcd_update() {
|
|||||||
lcd_implementation_update_indicators();
|
lcd_implementation_update_indicators();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
|
|
||||||
slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
|
|
||||||
|
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
|
||||||
|
slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||||
|
|
||||||
static uint8_t keypad_debounce = 0;
|
static uint8_t keypad_debounce = 0;
|
||||||
|
|||||||
@ -303,6 +303,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
|
||||||
@ -473,164 +477,173 @@ static void lcd_implementation_status_screen() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
#if ENABLED(ULTIPANEL)
|
||||||
if (isSelected) {
|
|
||||||
u8g.setColorIndex(1); // black on white
|
|
||||||
u8g.drawBox(0, row * (DOG_CHAR_HEIGHT) + 3 - (TALL_FONT_CORRECTION), LCD_PIXEL_WIDTH, DOG_CHAR_HEIGHT);
|
|
||||||
u8g.setColorIndex(0); // following text must be white on black
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
u8g.setColorIndex(1); // unmarked text is black on white
|
|
||||||
}
|
|
||||||
u8g.setPrintPos((START_COL) * (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
|
|
||||||
}
|
|
||||||
|
|
||||||
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
// 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_drawmenu_static(uint8_t row, const char* pstr, bool center=true, bool invert=false, const char* valstr=NULL) {
|
if (isSelected) {
|
||||||
|
u8g.setColorIndex(1); // black on white
|
||||||
lcd_implementation_mark_as_selected(row, invert);
|
u8g.drawBox(0, row * (DOG_CHAR_HEIGHT) + 3 - (TALL_FONT_CORRECTION), LCD_PIXEL_WIDTH, DOG_CHAR_HEIGHT);
|
||||||
|
u8g.setColorIndex(0); // following text must be white on black
|
||||||
char c;
|
|
||||||
int8_t n = LCD_WIDTH - (START_COL);
|
|
||||||
|
|
||||||
if (center && !valstr) {
|
|
||||||
int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
|
|
||||||
while (--pad >= 0) { lcd_print(' '); n--; }
|
|
||||||
}
|
|
||||||
while (n > 0 && (c = pgm_read_byte(pstr))) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
pstr++;
|
|
||||||
}
|
|
||||||
if (valstr) while (n > 0 && (c = *valstr)) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
valstr++;
|
|
||||||
}
|
|
||||||
while (n-- > 0) lcd_print(' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
|
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, const char* pstr, char pre_char, char post_char) {
|
|
||||||
UNUSED(pre_char);
|
|
||||||
|
|
||||||
char c;
|
|
||||||
uint8_t n = LCD_WIDTH - (START_COL) - 2;
|
|
||||||
|
|
||||||
lcd_implementation_mark_as_selected(row, isSelected);
|
|
||||||
|
|
||||||
while (c = pgm_read_byte(pstr)) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
pstr++;
|
|
||||||
}
|
|
||||||
while (n--) lcd_print(' ');
|
|
||||||
u8g.setPrintPos(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
|
|
||||||
lcd_print(post_char);
|
|
||||||
lcd_print(' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
|
|
||||||
char c;
|
|
||||||
uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
|
|
||||||
uint8_t n = LCD_WIDTH - (START_COL) - 2 - vallen;
|
|
||||||
|
|
||||||
lcd_implementation_mark_as_selected(row, isSelected);
|
|
||||||
|
|
||||||
while (c = pgm_read_byte(pstr)) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
pstr++;
|
|
||||||
}
|
|
||||||
lcd_print(':');
|
|
||||||
while (n--) lcd_print(' ');
|
|
||||||
u8g.setPrintPos(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH) * vallen, (row + 1) * (DOG_CHAR_HEIGHT));
|
|
||||||
if (pgm) lcd_printPGM(data); else lcd_print((char*)data);
|
|
||||||
}
|
|
||||||
|
|
||||||
#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_int3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, itostr3(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr3(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float32(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr32(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51sign(*(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))
|
|
||||||
|
|
||||||
//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_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_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
|
|
||||||
|
|
||||||
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
|
||||||
uint8_t rows = 1;
|
|
||||||
uint8_t lcd_width = LCD_WIDTH - (START_COL), char_width = DOG_CHAR_WIDTH;
|
|
||||||
uint8_t vallen = lcd_strlen(value);
|
|
||||||
|
|
||||||
#if ENABLED(USE_BIG_EDIT_FONT)
|
|
||||||
if (lcd_strlen_P(pstr) <= LCD_WIDTH_EDIT - 1) {
|
|
||||||
lcd_setFont(FONT_MENU_EDIT);
|
|
||||||
lcd_width = LCD_WIDTH_EDIT + 1;
|
|
||||||
char_width = DOG_CHAR_WIDTH_EDIT;
|
|
||||||
if (lcd_strlen_P(pstr) >= LCD_WIDTH_EDIT - vallen) rows = 2;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
lcd_setFont(FONT_MENU);
|
u8g.setColorIndex(1); // unmarked text is black on white
|
||||||
}
|
}
|
||||||
#endif
|
u8g.setPrintPos((START_COL) * (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
|
||||||
|
|
||||||
if (lcd_strlen_P(pstr) > LCD_WIDTH - 2 - vallen) rows = 2;
|
|
||||||
|
|
||||||
const float kHalfChar = (DOG_CHAR_HEIGHT_EDIT) / 2;
|
|
||||||
float rowHeight = u8g.getHeight() / (rows + 1); // 1/(rows+1) = 1/2 or 1/3
|
|
||||||
|
|
||||||
u8g.setPrintPos(0, rowHeight + kHalfChar);
|
|
||||||
lcd_printPGM(pstr);
|
|
||||||
if (value != NULL) {
|
|
||||||
lcd_print(':');
|
|
||||||
u8g.setPrintPos((lcd_width - 1 - vallen) * char_width, rows * rowHeight + kHalfChar);
|
|
||||||
lcd_print(value);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#if ENABLED(SDSUPPORT)
|
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
||||||
|
|
||||||
static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) {
|
// Draw a static line of text in the same idiom as a menu item
|
||||||
UNUSED(pstr);
|
static void lcd_implementation_drawmenu_static(uint8_t row, const char* pstr, bool center=true, bool invert=false, const char* valstr=NULL) {
|
||||||
char c;
|
|
||||||
uint8_t n = LCD_WIDTH - (START_COL) - 1;
|
|
||||||
|
|
||||||
if (longFilename[0]) {
|
lcd_implementation_mark_as_selected(row, invert);
|
||||||
filename = longFilename;
|
|
||||||
longFilename[n] = '\0';
|
char c;
|
||||||
|
int8_t n = LCD_WIDTH - (START_COL);
|
||||||
|
|
||||||
|
if (center && !valstr) {
|
||||||
|
int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
|
||||||
|
while (--pad >= 0) { lcd_print(' '); n--; }
|
||||||
|
}
|
||||||
|
while (n > 0 && (c = pgm_read_byte(pstr))) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
pstr++;
|
||||||
|
}
|
||||||
|
if (valstr) while (n > 0 && (c = *valstr)) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
valstr++;
|
||||||
|
}
|
||||||
|
while (n-- > 0) lcd_print(' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#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) {
|
||||||
|
UNUSED(pre_char);
|
||||||
|
|
||||||
|
char c;
|
||||||
|
uint8_t n = LCD_WIDTH - (START_COL) - 2;
|
||||||
|
|
||||||
lcd_implementation_mark_as_selected(row, isSelected);
|
lcd_implementation_mark_as_selected(row, isSelected);
|
||||||
|
|
||||||
if (isDir) lcd_print(LCD_STR_FOLDER[0]);
|
while (c = pgm_read_byte(pstr)) {
|
||||||
while ((c = *filename)) {
|
|
||||||
n -= lcd_print(c);
|
n -= lcd_print(c);
|
||||||
filename++;
|
pstr++;
|
||||||
}
|
}
|
||||||
while (n--) lcd_print(' ');
|
while (n--) lcd_print(' ');
|
||||||
|
u8g.setPrintPos(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
|
||||||
|
lcd_print(post_char);
|
||||||
|
lcd_print(' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
#define lcd_implementation_drawmenu_sdfile(sel, row, pstr, filename, longFilename) _drawmenu_sd(sel, row, pstr, filename, longFilename, false)
|
// Macros for specific types of menu items
|
||||||
#define lcd_implementation_drawmenu_sddirectory(sel, row, pstr, filename, longFilename) _drawmenu_sd(sel, row, pstr, filename, longFilename, true)
|
#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, '>', ' ')
|
||||||
|
|
||||||
#endif //SDSUPPORT
|
// 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) {
|
||||||
|
char c;
|
||||||
|
uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
|
||||||
|
uint8_t n = LCD_WIDTH - (START_COL) - 2 - vallen;
|
||||||
|
|
||||||
#define lcd_implementation_drawmenu_back(sel, row, pstr) lcd_implementation_drawmenu_generic(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0])
|
lcd_implementation_mark_as_selected(row, isSelected);
|
||||||
#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, '>', ' ')
|
while (c = pgm_read_byte(pstr)) {
|
||||||
#define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
n -= lcd_print(c);
|
||||||
|
pstr++;
|
||||||
|
}
|
||||||
|
lcd_print(':');
|
||||||
|
while (n--) lcd_print(' ');
|
||||||
|
u8g.setPrintPos(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH) * vallen, (row + 1) * (DOG_CHAR_HEIGHT));
|
||||||
|
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_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true)
|
||||||
|
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_int3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, itostr3(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr3(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float32(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr32(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51sign(*(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_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_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_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr43sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr52sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr51sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, ftostr5rj(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
|
||||||
|
|
||||||
|
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
||||||
|
uint8_t rows = 1;
|
||||||
|
uint8_t lcd_width = LCD_WIDTH - (START_COL), char_width = DOG_CHAR_WIDTH;
|
||||||
|
uint8_t vallen = lcd_strlen(value);
|
||||||
|
|
||||||
|
#if ENABLED(USE_BIG_EDIT_FONT)
|
||||||
|
if (lcd_strlen_P(pstr) <= LCD_WIDTH_EDIT - 1) {
|
||||||
|
lcd_setFont(FONT_MENU_EDIT);
|
||||||
|
lcd_width = LCD_WIDTH_EDIT + 1;
|
||||||
|
char_width = DOG_CHAR_WIDTH_EDIT;
|
||||||
|
if (lcd_strlen_P(pstr) >= LCD_WIDTH_EDIT - vallen) rows = 2;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
lcd_setFont(FONT_MENU);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (lcd_strlen_P(pstr) > LCD_WIDTH - 2 - vallen) rows = 2;
|
||||||
|
|
||||||
|
const float kHalfChar = (DOG_CHAR_HEIGHT_EDIT) / 2;
|
||||||
|
float rowHeight = u8g.getHeight() / (rows + 1); // 1/(rows+1) = 1/2 or 1/3
|
||||||
|
|
||||||
|
u8g.setPrintPos(0, rowHeight + kHalfChar);
|
||||||
|
lcd_printPGM(pstr);
|
||||||
|
if (value != NULL) {
|
||||||
|
lcd_print(':');
|
||||||
|
u8g.setPrintPos((lcd_width - 1 - vallen) * char_width, rows * rowHeight + kHalfChar);
|
||||||
|
lcd_print(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ENABLED(SDSUPPORT)
|
||||||
|
|
||||||
|
static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) {
|
||||||
|
UNUSED(pstr);
|
||||||
|
char c;
|
||||||
|
uint8_t n = LCD_WIDTH - (START_COL) - 1;
|
||||||
|
|
||||||
|
if (longFilename[0]) {
|
||||||
|
filename = longFilename;
|
||||||
|
longFilename[n] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
lcd_implementation_mark_as_selected(row, isSelected);
|
||||||
|
|
||||||
|
if (isDir) lcd_print(LCD_STR_FOLDER[0]);
|
||||||
|
while ((c = *filename)) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
filename++;
|
||||||
|
}
|
||||||
|
while (n--) lcd_print(' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
#define lcd_implementation_drawmenu_sdfile(sel, row, pstr, filename, longFilename) _drawmenu_sd(sel, row, pstr, filename, longFilename, false)
|
||||||
|
#define lcd_implementation_drawmenu_sddirectory(sel, row, pstr, filename, longFilename) _drawmenu_sd(sel, row, pstr, filename, longFilename, true)
|
||||||
|
|
||||||
|
#endif // SDSUPPORT
|
||||||
|
|
||||||
|
#endif // ULTIPANEL
|
||||||
|
|
||||||
#endif //__ULTRALCD_IMPL_DOGM_H
|
#endif //__ULTRALCD_IMPL_DOGM_H
|
||||||
|
|||||||
@ -789,135 +789,158 @@ static void lcd_implementation_status_screen() {
|
|||||||
lcd_print(lcd_status_message);
|
lcd_print(lcd_status_message);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
#if ENABLED(ULTIPANEL)
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_static(uint8_t row, const char* pstr, bool center=true, bool invert=false, const char *valstr=NULL) {
|
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
||||||
UNUSED(invert);
|
|
||||||
char c;
|
static void lcd_implementation_drawmenu_static(uint8_t row, const char* pstr, bool center=true, bool invert=false, const char *valstr=NULL) {
|
||||||
int8_t n = LCD_WIDTH;
|
UNUSED(invert);
|
||||||
lcd.setCursor(0, row);
|
char c;
|
||||||
if (center && !valstr) {
|
int8_t n = LCD_WIDTH;
|
||||||
int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
|
lcd.setCursor(0, row);
|
||||||
while (--pad >= 0) { lcd.print(' '); n--; }
|
if (center && !valstr) {
|
||||||
|
int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
|
||||||
|
while (--pad >= 0) { lcd.print(' '); n--; }
|
||||||
|
}
|
||||||
|
while (n > 0 && (c = pgm_read_byte(pstr))) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
pstr++;
|
||||||
|
}
|
||||||
|
if (valstr) while (n > 0 && (c = *valstr)) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
valstr++;
|
||||||
|
}
|
||||||
|
while (n-- > 0) lcd.print(' ');
|
||||||
}
|
}
|
||||||
while (n > 0 && (c = pgm_read_byte(pstr))) {
|
|
||||||
|
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
|
||||||
|
|
||||||
|
static void lcd_implementation_drawmenu_generic(bool sel, uint8_t row, const char* pstr, char pre_char, char post_char) {
|
||||||
|
char c;
|
||||||
|
uint8_t n = LCD_WIDTH - 2;
|
||||||
|
lcd.setCursor(0, row);
|
||||||
|
lcd.print(sel ? pre_char : ' ');
|
||||||
|
while ((c = pgm_read_byte(pstr)) && n > 0) {
|
||||||
n -= lcd_print(c);
|
n -= lcd_print(c);
|
||||||
pstr++;
|
pstr++;
|
||||||
}
|
}
|
||||||
if (valstr) while (n > 0 && (c = *valstr)) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
valstr++;
|
|
||||||
}
|
|
||||||
while (n-- > 0) lcd.print(' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
|
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_generic(bool sel, uint8_t row, const char* pstr, char pre_char, char post_char) {
|
|
||||||
char c;
|
|
||||||
uint8_t n = LCD_WIDTH - 2;
|
|
||||||
lcd.setCursor(0, row);
|
|
||||||
lcd.print(sel ? pre_char : ' ');
|
|
||||||
while ((c = pgm_read_byte(pstr)) && n > 0) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
pstr++;
|
|
||||||
}
|
|
||||||
while (n--) lcd.print(' ');
|
|
||||||
lcd.print(post_char);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_setting_edit_generic(bool sel, uint8_t row, const char* pstr, char pre_char, char* data) {
|
|
||||||
char c;
|
|
||||||
uint8_t n = LCD_WIDTH - 2 - lcd_strlen(data);
|
|
||||||
lcd.setCursor(0, row);
|
|
||||||
lcd.print(sel ? pre_char : ' ');
|
|
||||||
while ((c = pgm_read_byte(pstr)) && n > 0) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
pstr++;
|
|
||||||
}
|
|
||||||
lcd.print(':');
|
|
||||||
while (n--) lcd.print(' ');
|
|
||||||
lcd_print(data);
|
|
||||||
}
|
|
||||||
static void lcd_implementation_drawmenu_setting_edit_generic_P(bool sel, uint8_t row, const char* pstr, char pre_char, const char* data) {
|
|
||||||
char c;
|
|
||||||
uint8_t n = LCD_WIDTH - 2 - lcd_strlen_P(data);
|
|
||||||
lcd.setCursor(0, row);
|
|
||||||
lcd.print(sel ? pre_char : ' ');
|
|
||||||
while ((c = pgm_read_byte(pstr)) && n > 0) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
pstr++;
|
|
||||||
}
|
|
||||||
lcd.print(':');
|
|
||||||
while (n--) lcd.print(' ');
|
|
||||||
lcd_printPGM(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_int3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', itostr3(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr3(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float32(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr32(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51sign(*(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))
|
|
||||||
|
|
||||||
//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_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_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51sign(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
|
|
||||||
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
|
|
||||||
|
|
||||||
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
|
||||||
lcd.setCursor(1, 1);
|
|
||||||
lcd_printPGM(pstr);
|
|
||||||
if (value != NULL) {
|
|
||||||
lcd.print(':');
|
|
||||||
lcd.setCursor(LCD_WIDTH - lcd_strlen(value), 1);
|
|
||||||
lcd_print(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if ENABLED(SDSUPPORT)
|
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_sd(bool sel, uint8_t row, const char* pstr, const char* filename, char* longFilename, uint8_t concat, char post_char) {
|
|
||||||
UNUSED(pstr);
|
|
||||||
char c;
|
|
||||||
uint8_t n = LCD_WIDTH - concat;
|
|
||||||
lcd.setCursor(0, row);
|
|
||||||
lcd.print(sel ? '>' : ' ');
|
|
||||||
if (longFilename[0]) {
|
|
||||||
filename = longFilename;
|
|
||||||
longFilename[n] = '\0';
|
|
||||||
}
|
|
||||||
while ((c = *filename) && n > 0) {
|
|
||||||
n -= lcd_print(c);
|
|
||||||
filename++;
|
|
||||||
}
|
|
||||||
while (n--) lcd.print(' ');
|
while (n--) lcd.print(' ');
|
||||||
lcd.print(post_char);
|
lcd.print(post_char);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_sdfile(bool sel, uint8_t row, const char* pstr, const char* filename, char* longFilename) {
|
static void lcd_implementation_drawmenu_setting_edit_generic(bool sel, uint8_t row, const char* pstr, char pre_char, char* data) {
|
||||||
lcd_implementation_drawmenu_sd(sel, row, pstr, filename, longFilename, 2, ' ');
|
char c;
|
||||||
|
uint8_t n = LCD_WIDTH - 2 - lcd_strlen(data);
|
||||||
|
lcd.setCursor(0, row);
|
||||||
|
lcd.print(sel ? pre_char : ' ');
|
||||||
|
while ((c = pgm_read_byte(pstr)) && n > 0) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
pstr++;
|
||||||
|
}
|
||||||
|
lcd.print(':');
|
||||||
|
while (n--) lcd.print(' ');
|
||||||
|
lcd_print(data);
|
||||||
|
}
|
||||||
|
static void lcd_implementation_drawmenu_setting_edit_generic_P(bool sel, uint8_t row, const char* pstr, char pre_char, const char* data) {
|
||||||
|
char c;
|
||||||
|
uint8_t n = LCD_WIDTH - 2 - lcd_strlen_P(data);
|
||||||
|
lcd.setCursor(0, row);
|
||||||
|
lcd.print(sel ? pre_char : ' ');
|
||||||
|
while ((c = pgm_read_byte(pstr)) && n > 0) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
pstr++;
|
||||||
|
}
|
||||||
|
lcd.print(':');
|
||||||
|
while (n--) lcd.print(' ');
|
||||||
|
lcd_printPGM(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lcd_implementation_drawmenu_sddirectory(bool sel, uint8_t row, const char* pstr, const char* filename, char* longFilename) {
|
#define lcd_implementation_drawmenu_setting_edit_int3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', itostr3(*(data)))
|
||||||
lcd_implementation_drawmenu_sd(sel, row, pstr, filename, longFilename, 2, LCD_STR_FOLDER[0]);
|
#define lcd_implementation_drawmenu_setting_edit_float3(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr3(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float32(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr32(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float43(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float5(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float52(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_float51(sel, row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51sign(*(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))
|
||||||
|
|
||||||
|
//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_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_float43(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr43sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_float5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_float52(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr52sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_float51(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr51sign(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_long5(sel, row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', ftostr5rj(*(data)))
|
||||||
|
#define lcd_implementation_drawmenu_setting_edit_callback_bool(sel, row, pstr, pstr2, data, callback) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
|
||||||
|
|
||||||
|
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
||||||
|
lcd.setCursor(1, 1);
|
||||||
|
lcd_printPGM(pstr);
|
||||||
|
if (value != NULL) {
|
||||||
|
lcd.print(':');
|
||||||
|
lcd.setCursor(LCD_WIDTH - lcd_strlen(value), 1);
|
||||||
|
lcd_print(value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //SDSUPPORT
|
#if ENABLED(SDSUPPORT)
|
||||||
|
|
||||||
#define lcd_implementation_drawmenu_back(sel, row, pstr) lcd_implementation_drawmenu_generic(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0])
|
static void lcd_implementation_drawmenu_sd(bool sel, uint8_t row, const char* pstr, const char* filename, char* longFilename, uint8_t concat, char post_char) {
|
||||||
#define lcd_implementation_drawmenu_submenu(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0])
|
UNUSED(pstr);
|
||||||
#define lcd_implementation_drawmenu_gcode(sel, row, pstr, gcode) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
char c;
|
||||||
#define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
|
uint8_t n = LCD_WIDTH - concat;
|
||||||
|
lcd.setCursor(0, row);
|
||||||
|
lcd.print(sel ? '>' : ' ');
|
||||||
|
if (longFilename[0]) {
|
||||||
|
filename = longFilename;
|
||||||
|
longFilename[n] = '\0';
|
||||||
|
}
|
||||||
|
while ((c = *filename) && n > 0) {
|
||||||
|
n -= lcd_print(c);
|
||||||
|
filename++;
|
||||||
|
}
|
||||||
|
while (n--) lcd.print(' ');
|
||||||
|
lcd.print(post_char);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lcd_implementation_drawmenu_sdfile(bool sel, uint8_t row, const char* pstr, const char* filename, char* longFilename) {
|
||||||
|
lcd_implementation_drawmenu_sd(sel, row, pstr, filename, longFilename, 2, ' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lcd_implementation_drawmenu_sddirectory(bool sel, uint8_t row, const char* pstr, const char* filename, char* longFilename) {
|
||||||
|
lcd_implementation_drawmenu_sd(sel, row, pstr, filename, longFilename, 2, LCD_STR_FOLDER[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#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])
|
||||||
|
#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, '>', ' ')
|
||||||
|
|
||||||
|
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
|
||||||
|
|
||||||
|
extern millis_t next_button_update_ms;
|
||||||
|
|
||||||
|
static uint8_t lcd_implementation_read_slow_buttons() {
|
||||||
|
#if ENABLED(LCD_I2C_TYPE_MCP23017)
|
||||||
|
// Reading these buttons this is likely to be too slow to call inside interrupt context
|
||||||
|
// so they are called during normal lcd_update
|
||||||
|
uint8_t slow_bits = lcd.readButtons() << B_I2C_BTN_OFFSET;
|
||||||
|
#if ENABLED(LCD_I2C_VIKI)
|
||||||
|
if ((slow_bits & (B_MI | B_RI)) && PENDING(millis(), next_button_update_ms)) // LCD clicked
|
||||||
|
slow_bits &= ~(B_MI | B_RI); // Disable LCD clicked buttons if screen is updated
|
||||||
|
#endif // LCD_I2C_VIKI
|
||||||
|
return slow_bits;
|
||||||
|
#endif // LCD_I2C_TYPE_MCP23017
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // LCD_HAS_SLOW_BUTTONS
|
||||||
|
|
||||||
|
#endif // ULTIPANEL
|
||||||
|
|
||||||
#if ENABLED(LCD_HAS_STATUS_INDICATORS)
|
#if ENABLED(LCD_HAS_STATUS_INDICATORS)
|
||||||
|
|
||||||
@ -957,23 +980,4 @@ void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
|||||||
|
|
||||||
#endif // LCD_HAS_STATUS_INDICATORS
|
#endif // LCD_HAS_STATUS_INDICATORS
|
||||||
|
|
||||||
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
|
|
||||||
|
|
||||||
extern millis_t next_button_update_ms;
|
|
||||||
|
|
||||||
static uint8_t lcd_implementation_read_slow_buttons() {
|
|
||||||
#if ENABLED(LCD_I2C_TYPE_MCP23017)
|
|
||||||
// Reading these buttons this is likely to be too slow to call inside interrupt context
|
|
||||||
// so they are called during normal lcd_update
|
|
||||||
uint8_t slow_bits = lcd.readButtons() << B_I2C_BTN_OFFSET;
|
|
||||||
#if ENABLED(LCD_I2C_VIKI)
|
|
||||||
if ((slow_bits & (B_MI | B_RI)) && PENDING(millis(), next_button_update_ms)) // LCD clicked
|
|
||||||
slow_bits &= ~(B_MI | B_RI); // Disable LCD clicked buttons if screen is updated
|
|
||||||
#endif // LCD_I2C_VIKI
|
|
||||||
return slow_bits;
|
|
||||||
#endif // LCD_I2C_TYPE_MCP23017
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // LCD_HAS_SLOW_BUTTONS
|
|
||||||
|
|
||||||
#endif // ULTRALCD_IMPL_HD44780_H
|
#endif // ULTRALCD_IMPL_HD44780_H
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user