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

Merge pull request #105 from PavelSindler/wizard

Browse Source 
First layer cal. : force timeouting to status
This commit is contained in:
PavelSindler 2017-11-27 01:26:18 +01:00 committed by GitHub
commit 20f73fbaa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/ultralcd.cpp
View File

@ -1114,14 +1114,14 @@ 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())
{ {
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);
} }