From 5601dd276d722f9cfc5447d8298daf2e1ef72eef Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 11 Oct 2017 18:49:49 +0200 Subject: [PATCH] wizard for snmm fix --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/ultralcd.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ba53c1ec3..5b16c2d54 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1236,6 +1236,7 @@ void setup() #ifndef DEBUG_DISABLE_STARTMSGS check_babystep(); //checking if Z babystep is in allowed range + for (int i = 0; i < 4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { lcd_wizard(0); } @@ -1266,8 +1267,7 @@ void setup() if (!previous_settings_retrieved) { lcd_show_fullscreen_message_and_wait_P(MSG_DEFAULT_SETTINGS_LOADED); } - } - for (int i = 0; i < 4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); + } #endif //DEBUG_DISABLE_STARTMSGS lcd_update_enable(true); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 180ab3eda..58e316089 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3332,8 +3332,10 @@ void lcd_wizard(int state) { wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_WIZARD_FILAMENT_LOADED, false); if (wizard_event) state = 8; else state = 6; + break; case 6: //waiting for preheat nozzle for PLA; +#ifndef SNMM lcd_display_message_fullscreen_P(MSG_WIZARD_WILL_PREHEAT); current_position[Z_AXIS] = 100; //move in z axis to make space for loading filament plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder); @@ -3351,6 +3353,7 @@ void lcd_wizard(int state) { lcd_set_custom_characters(); delay_keep_alive(1000); } +#endif //not SNMM state = 7; break; case 7: //load filament