josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused parameter nlines to simplify things 

This allows us to remove one overload
of lcd_display_message_fullscreen_P
This commit is contained in:
Guðni Már Gilbert 2022-05-22 10:51:46 +00:00 committed by D.R.racer
parent e817a2d321
commit 3b0fba14ac
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Firmware/ultralcd.cpp
View File

@ -2312,9 +2312,8 @@ void lcd_load_filament_color_check()
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
static void lcd_menu_AutoLoadFilament() static void lcd_menu_AutoLoadFilament()
{ {
uint8_t nlines; lcd_display_message_fullscreen_nonBlocking_P(_i("Autoloading filament is active, just press the knob and insert filament..."));////MSG_AUTOLOADING_ENABLED c=20 r=4
lcd_display_message_fullscreen_nonBlocking_P(_i("Autoloading filament is active, just press the knob and insert filament..."),nlines);////MSG_AUTOLOADING_ENABLED c=20 r=4 menu_back_if_clicked();
menu_back_if_clicked();
} }
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
@ -3038,10 +3037,9 @@ static inline bool pgm_is_interpunction(const char *c_addr)
* *
* This function is non-blocking * This function is non-blocking
* @param msg message to be displayed from PROGMEM * @param msg message to be displayed from PROGMEM
* @param nlines
* @return rest of the text (to be displayed on next page) * @return rest of the text (to be displayed on next page)
*/ */
static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg, uint8_t &nlines) static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg)
{ {
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
const char *msgend = msg; const char *msgend = msg;
@ -3090,22 +3088,15 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg,
lcd_print(LCD_STR_ARROW_2_DOWN[0]); lcd_print(LCD_STR_ARROW_2_DOWN[0]);
} }
nlines = row;
return multi_screen ? msgend : NULL; return multi_screen ? msgend : NULL;
} }
const char* lcd_display_message_fullscreen_P(const char *msg, uint8_t &nlines) const char* lcd_display_message_fullscreen_P(const char *msg)
{ {
// Disable update of the screen by the usual lcd_update(0) routine. // Disable update of the screen by the usual lcd_update(0) routine.
lcd_update_enable(false); lcd_update_enable(false);
lcd_clear(); lcd_clear();
// uint8_t nlines; return lcd_display_message_fullscreen_nonBlocking_P(msg);
return lcd_display_message_fullscreen_nonBlocking_P(msg, nlines);
}
const char* lcd_display_message_fullscreen_P(const char *msg)
{
uint8_t nlines;
return lcd_display_message_fullscreen_P(msg, nlines);
} }

1
Firmware/ultralcd.h
View File

@ -71,7 +71,6 @@ enum ButtonChoice
RIGHT_BUTTON_CHOICE = 2, RIGHT_BUTTON_CHOICE = 2,
}; };
extern const char* lcd_display_message_fullscreen_P(const char *msg, uint8_t &nlines);
extern const char* lcd_display_message_fullscreen_P(const char *msg); extern const char* lcd_display_message_fullscreen_P(const char *msg);
extern void lcd_return_to_status(); extern void lcd_return_to_status();