|
@@ -2299,11 +2299,11 @@ void show_preheat_nozzle_warning()
|
|
|
|
|
|
void lcd_load_filament_color_check()
|
|
|
{
|
|
|
- bool clean = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, true);
|
|
|
+ bool clean = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LEFT_BUTTON_CHOICE);
|
|
|
while (clean == MIDDLE_BUTTON_CHOICE) {
|
|
|
load_filament_final_feed();
|
|
|
st_synchronize();
|
|
|
- clean = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, true);
|
|
|
+ clean = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LEFT_BUTTON_CHOICE);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3655,7 +3655,7 @@ void menu_setlang(unsigned char lang)
|
|
|
{
|
|
|
if (!lang_select(lang))
|
|
|
{
|
|
|
- if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, true) == LEFT_BUTTON_CHOICE)////MSG_COPY_SEL_LANG c=20 r=3
|
|
|
+ if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, LEFT_BUTTON_CHOICE) == LEFT_BUTTON_CHOICE)////MSG_COPY_SEL_LANG c=20 r=3
|
|
|
lang_boot_update_start(lang);
|
|
|
lcd_update_enable(true);
|
|
|
lcd_clear();
|
|
@@ -3848,7 +3848,7 @@ void lcd_v2_calibration()
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- loaded = !lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, true);
|
|
|
+ loaded = !lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, LEFT_BUTTON_CHOICE);
|
|
|
lcd_update_enabled = true;
|
|
|
|
|
|
}
|
|
@@ -3878,7 +3878,7 @@ void lcd_v2_calibration()
|
|
|
void lcd_wizard() {
|
|
|
bool result = true;
|
|
|
if (calibration_status() != CALIBRATION_STATUS_ASSEMBLED) {
|
|
|
- result = !lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Running Wizard will delete current calibration results and start from the beginning. Continue?"), false, false);////MSG_WIZARD_RERUN c=20 r=7
|
|
|
+ result = !lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Running Wizard will delete current calibration results and start from the beginning. Continue?"), false);////MSG_WIZARD_RERUN c=20 r=7
|
|
|
}
|
|
|
if (result) {
|
|
|
calibration_status_store(CALIBRATION_STATUS_ASSEMBLED);
|
|
@@ -4040,7 +4040,7 @@ void lcd_wizard(WizState state)
|
|
|
lcd_show_fullscreen_message_and_wait_P(_T(MSG_WIZARD_WELCOME_SHIPPING));
|
|
|
state = S::Restore;
|
|
|
} else {
|
|
|
- wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_WIZARD_WELCOME), false, true);
|
|
|
+ wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_WIZARD_WELCOME), false, LEFT_BUTTON_CHOICE);
|
|
|
if (wizard_event == LEFT_BUTTON_CHOICE) {
|
|
|
state = S::Restore;
|
|
|
eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
|
|
@@ -4079,7 +4079,7 @@ void lcd_wizard(WizState state)
|
|
|
lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first."));////MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
|
|
|
lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet."));////MSG_REMOVE_TEST_PRINT c=20 r=4
|
|
|
lcd_show_fullscreen_message_and_wait_P(_i("I will run z calibration now."));////MSG_WIZARD_Z_CAL c=20 r=8
|
|
|
- wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_STEEL_SHEET_CHECK), false, false);
|
|
|
+ wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_STEEL_SHEET_CHECK), false);
|
|
|
if (wizard_event == MIDDLE_BUTTON_CHOICE) {
|
|
|
lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET));
|
|
|
}
|
|
@@ -5091,7 +5091,7 @@ char reset_menu() {
|
|
|
|
|
|
static void lcd_disable_farm_mode()
|
|
|
{
|
|
|
- int8_t disable = lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Disable farm mode?"), true, false); //allow timeouting, default no
|
|
|
+ int8_t disable = lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Disable farm mode?"), true); //allow timeouting, default no
|
|
|
if (disable == LEFT_BUTTON_CHOICE)
|
|
|
{
|
|
|
enquecommand_P(PSTR("G99"));
|
|
@@ -7461,7 +7461,7 @@ static void menu_action_sdfile(const char* filename)
|
|
|
//filename is just a pointer to card.filename, which changes everytime you try to open a file by filename. So you can't use filename directly
|
|
|
//to open a file. Instead, the cached filename in cmd is used as that one is static for the whole lifetime of this function.
|
|
|
if (!check_file(cmd + 4)) {
|
|
|
- result = !lcd_show_fullscreen_message_yes_no_and_wait_P(_i("File incomplete. Continue anyway?"), false, false);////MSG_FILE_INCOMPLETE c=20 r=3
|
|
|
+ result = !lcd_show_fullscreen_message_yes_no_and_wait_P(_i("File incomplete. Continue anyway?"), false);////MSG_FILE_INCOMPLETE c=20 r=3
|
|
|
}
|
|
|
if (result) {
|
|
|
enquecommand(cmd);
|