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

Fix lcd_show_multiscreen_message_yes_no_and_wait_P after rebase

This commit is contained in:
Guðni Már Gilbert 2022-07-28 08:47:58 +00:00 committed by D.R.racer
parent be3f9376ba
commit 2fc8b50f11
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Firmware/ultralcd.cpp
View File

@ -3243,15 +3243,15 @@ void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const
//! @param second_choice text caption of second possible choice. Must be in PROGMEM //! @param second_choice text caption of second possible choice. Must be in PROGMEM
//! @param third_choice text caption of second possible choice. Must be in PROGMEM. When not set to nullptr first_choice and second_choice may not be more than 5 characters long. //! @param third_choice text caption of second possible choice. Must be in PROGMEM. When not set to nullptr first_choice and second_choice may not be more than 5 characters long.
//! @param second_col column on LCD where second_choice starts //! @param second_col column on LCD where second_choice starts
//! @param multiscreen_cb an optional call back that will be called periodically when the printer is paused for user
//! @retval 0 first choice selected by user //! @retval 0 first choice selected by user
//! @retval 1 first choice selected by user //! @retval 1 first choice selected by user
//! @retval 2 third choice selected by user //! @retval 2 third choice selected by user
//! @retval -1 screen timed out (only possible if allow_timeouting is true) //! @retval -1 screen timed out (only possible if allow_timeouting is true)
int8_t lcd_show_multiscreen_message_with_choices_and_wait_P(const char * const msg, bool allow_timeouting, uint8_t default_selection, int8_t lcd_show_multiscreen_message_with_choices_and_wait_P(
const char * const first_choice, const char * const second_choice, const char * const third_choice, uint8_t second_col, const char *const msg, bool allow_timeouting, uint8_t default_selection,
void (*multiscreen_cb)(void)) const char *const first_choice, const char *const second_choice, const char *const third_choice,
{ uint8_t second_col
) {
const char *msg_next = msg ? lcd_display_message_fullscreen_P(msg) : NULL; const char *msg_next = msg ? lcd_display_message_fullscreen_P(msg) : NULL;
bool multi_screen = msg_next != NULL; bool multi_screen = msg_next != NULL;
lcd_set_custom_characters_nextpage(); lcd_set_custom_characters_nextpage();
@ -3275,12 +3275,6 @@ int8_t lcd_show_multiscreen_message_with_choices_and_wait_P(const char * const m
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
if (multiscreen_cb) {
multiscreen_cb();
}
if (abs(enc_dif - lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { if (abs(enc_dif - lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) {
if (msg_next == NULL) { if (msg_next == NULL) {
if (third_choice) { // third_choice is not nullptr, safe to dereference if (third_choice) { // third_choice is not nullptr, safe to dereference

7
Firmware/ultralcd.h
View File

@ -81,9 +81,10 @@ extern void lcd_show_fullscreen_message_and_wait_P(const char *msg);
extern int8_t lcd_show_yes_no_and_wait(bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE); extern int8_t lcd_show_yes_no_and_wait(bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE);
// 1: no, 0: yes, -1: timeouted // 1: no, 0: yes, -1: timeouted
extern int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE); extern int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE);
extern int8_t lcd_show_multiscreen_message_with_choices_and_wait_P(const char * const msg, bool allow_timeouting, uint8_t default_selection, extern int8_t lcd_show_multiscreen_message_with_choices_and_wait_P(
const char * const first_choice, const char * const second_choice, const char * const third_choice = nullptr, uint8_t second_col = 7, const char * const msg, bool allow_timeouting, uint8_t default_selection,
void (*multiscreen_cb)(void) = nullptr); const char * const first_choice, const char * const second_choice, const char * const third_choice = nullptr,
uint8_t second_col = 7);
extern int8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE); extern int8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE);
// Ask the user to move the Z axis up to the end stoppers and let // Ask the user to move the Z axis up to the end stoppers and let
// the user confirm that it has been done. // the user confirm that it has been done.