diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 80df94763..363d5b532 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2312,9 +2312,8 @@ void lcd_load_filament_color_check() #ifdef FILAMENT_SENSOR 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..."),nlines);////MSG_AUTOLOADING_ENABLED c=20 r=4 - menu_back_if_clicked(); + 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 + menu_back_if_clicked(); } #endif //FILAMENT_SENSOR @@ -3038,10 +3037,9 @@ static inline bool pgm_is_interpunction(const char *c_addr) * * This function is non-blocking * @param msg message to be displayed from PROGMEM - * @param nlines * @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); 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]); } - nlines = row; 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. lcd_update_enable(false); lcd_clear(); -// uint8_t nlines; - 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); + return lcd_display_message_fullscreen_nonBlocking_P(msg); } diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 86d785217..717e9950c 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -71,7 +71,6 @@ enum ButtonChoice 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 void lcd_return_to_status();