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

Merge pull request #388 from PavelSindler/first_layer_saving 

Live adjust Z saving using timeout
This commit is contained in:
PavelSindler 2018-01-11 17:49:40 +01:00 committed by GitHub
parent 97bd56d560 5c1db284b0
commit f5ed12817d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/ultralcd.cpp
View File

@ -651,7 +651,7 @@ void lcd_commands()
float extr = count_e(0.2, width, length); float extr = count_e(0.2, width, length);
float extr_short_segment = count_e(0.2, width, width); float extr_short_segment = count_e(0.2, width, width);
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; if (lcd_commands_step>1) lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen
if (lcd_commands_step == 0) if (lcd_commands_step == 0)
{ {
lcd_commands_step = 10; lcd_commands_step = 10;
@ -915,7 +915,7 @@ void lcd_commands()
float length = 20 - width; float length = 20 - width;
float extr = count_e(0.2, width, length); float extr = count_e(0.2, width, length);
float extr_short_segment = count_e(0.2, width, width); float extr_short_segment = count_e(0.2, width, width);
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; if(lcd_commands_step>1) lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen
if (lcd_commands_step == 0) if (lcd_commands_step == 0)
{ {
lcd_commands_step = 9; lcd_commands_step = 9;
@ -3703,7 +3703,6 @@ void lcd_wizard(int state) {
if (wizard_event) { if (wizard_event) {
//reset status and live adjust z value in eeprom //reset status and live adjust z value in eeprom
calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
EEPROM_save_B(EEPROM_BABYSTEP_Z, 0);
lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED); lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED);
state = 9; state = 9;
} }