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

wizard for snmm fix

This commit is contained in:
PavelSindler 2017-10-11 18:49:49 +02:00
parent 635656cf0b
commit 5601dd276d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -1236,6 +1236,7 @@ void setup()
#ifndef DEBUG_DISABLE_STARTMSGS #ifndef DEBUG_DISABLE_STARTMSGS
check_babystep(); //checking if Z babystep is in allowed range 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) { if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
lcd_wizard(0); lcd_wizard(0);
} }
@ -1266,8 +1267,7 @@ void setup()
if (!previous_settings_retrieved) { if (!previous_settings_retrieved) {
lcd_show_fullscreen_message_and_wait_P(MSG_DEFAULT_SETTINGS_LOADED); 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 #endif //DEBUG_DISABLE_STARTMSGS
lcd_update_enable(true); lcd_update_enable(true);

3
Firmware/ultralcd.cpp
View File

@ -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); wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_WIZARD_FILAMENT_LOADED, false);
if (wizard_event) state = 8; if (wizard_event) state = 8;
else state = 6; else state = 6;
break; break;
case 6: //waiting for preheat nozzle for PLA; case 6: //waiting for preheat nozzle for PLA;
#ifndef SNMM
lcd_display_message_fullscreen_P(MSG_WIZARD_WILL_PREHEAT); lcd_display_message_fullscreen_P(MSG_WIZARD_WILL_PREHEAT);
current_position[Z_AXIS] = 100; //move in z axis to make space for loading filament 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); 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(); lcd_set_custom_characters();
delay_keep_alive(1000); delay_keep_alive(1000);
} }
#endif //not SNMM
state = 7; state = 7;
break; break;
case 7: //load filament case 7: //load filament