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

timeouting to status in the end of first layer cal.

This commit is contained in:
PavelSindler 2017-11-27 01:23:11 +01:00
parent 7de187d813
commit a7b40d43e3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/ultralcd.cpp
View File

@ -36,6 +36,7 @@ extern bool fans_check_enabled = true;
typedef void (*menuFunc_t)(); typedef void (*menuFunc_t)();
static void lcd_sd_updir(); static void lcd_sd_updir();
static void lcd_return_to_status();
struct EditMenuParentState struct EditMenuParentState
{ {
@ -1114,6 +1115,7 @@ void lcd_commands()
enquecommand_P(PSTR("G1 Z10 F1300.000")); enquecommand_P(PSTR("G1 Z10 F1300.000"));
enquecommand_P(PSTR("G1 X10 Y180 F4000")); //home X axis enquecommand_P(PSTR("G1 X10 Y180 F4000")); //home X axis
enquecommand_P(PSTR("M84"));// disable motors enquecommand_P(PSTR("M84"));// disable motors
lcd_timeoutToStatus = millis() - 1; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen
lcd_commands_step = 1; lcd_commands_step = 1;
} }
if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty())
@ -1121,7 +1123,6 @@ void lcd_commands()
lcd_setstatuspgm(WELCOME_MSG); lcd_setstatuspgm(WELCOME_MSG);
lcd_commands_step = 0; lcd_commands_step = 0;
lcd_commands_type = 0; lcd_commands_type = 0;
menuExiting = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by going to status screen
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
lcd_wizard(10); lcd_wizard(10);
} }