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

Merge pull request #98 from PavelSindler/MK3

Browse Source 
timeout to status prolonged, no timeout allowed when MSG_WIZARD_RERUN
This commit is contained in:
PavelSindler 2017-11-23 15:58:52 +01:00 committed by GitHub
commit 44156097da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/ultralcd.cpp
View File

@ -3444,7 +3444,7 @@ void lcd_v2_calibration() {
void lcd_wizard() { void lcd_wizard() {
bool result = true; bool result = true;
if (calibration_status() != CALIBRATION_STATUS_ASSEMBLED) { if (calibration_status() != CALIBRATION_STATUS_ASSEMBLED) {
result = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_RERUN, true, false); result = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_RERUN, false, false);
} }
if (result) { if (result) {
calibration_status_store(CALIBRATION_STATUS_ASSEMBLED); calibration_status_store(CALIBRATION_STATUS_ASSEMBLED);

2
Firmware/ultralcd.h
View File

@ -83,7 +83,7 @@ void lcd_mylang();
#define LCD_ALERTMESSAGERPGM(x) lcd_setalertstatuspgm((x)) #define LCD_ALERTMESSAGERPGM(x) lcd_setalertstatuspgm((x))
#define LCD_UPDATE_INTERVAL 100 #define LCD_UPDATE_INTERVAL 100
#define LCD_TIMEOUT_TO_STATUS 15000 #define LCD_TIMEOUT_TO_STATUS 30000
#ifdef ULTIPANEL #ifdef ULTIPANEL
void lcd_buttons_update(); void lcd_buttons_update();