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

Do not ask for preheat temperature twice if calibrating first layer from wizard without filament.

Browse source
This commit is contained in:
Marek Bel 2019-09-16 21:14:17 +02:00
parent e1cfd6dc4f
commit c66b4bd876
2 changed files with 41 additions and 16 deletions

51
Firmware/ultralcd.cpp
View file

@ -2152,7 +2152,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
} }
else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
{ {
lcd_wizard(WizState::LoadFil); lcd_wizard(WizState::LoadFilHot);
} }
return; return;
} }
@ -4637,6 +4637,24 @@ bool lcd_autoDepleteEnabled()
return (lcd_autoDeplete && fsensor_enabled); return (lcd_autoDeplete && fsensor_enabled);
} }
static void wizard_lay1cal_message(bool cold)
{
lcd_show_fullscreen_message_and_wait_P(
_i("Now I will calibrate distance between tip of the nozzle and heatbed surface.")); ////MSG_WIZARD_V2_CAL c=20 r=8
if (mmu_enabled)
{
lcd_show_fullscreen_message_and_wait_P(
_i("First you will select filament you wish to use for calibration. Then select temperature which matches your material."));
}
else if (cold)
{
lcd_show_fullscreen_message_and_wait_P(
_i("Select temperature which matches your material."));
}
lcd_show_fullscreen_message_and_wait_P(
_i("I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration.")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12
}
//! @brief Printer first run wizard (Selftest and calibration) //! @brief Printer first run wizard (Selftest and calibration)
//! //!
//! //!
@ -4753,10 +4771,10 @@ void lcd_wizard(WizState state)
{ {
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
} }
if (wizard_event) state = S::Lay1Cal; if (wizard_event) state = S::Lay1CalCold;
else else
{ {
if(mmu_enabled) state = S::LoadFil; if(mmu_enabled) state = S::LoadFilCold;
else state = S::Preheat; else state = S::Preheat;
} }
break; break;
@ -4765,27 +4783,31 @@ void lcd_wizard(WizState state)
lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material.")); lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));
end = true; // Leave wizard temporarily for lcd_preheat_menu end = true; // Leave wizard temporarily for lcd_preheat_menu
break; break;
case S::LoadFil: //load filament case S::LoadFilHot: //load filament
wait_preheat(); wait_preheat();
lcd_wizard_load(); lcd_wizard_load();
state = S::Lay1Cal; state = S::Lay1CalHot;
break; break;
case S::Lay1Cal: case S::LoadFilCold: //load filament
lcd_show_fullscreen_message_and_wait_P(_i("Now I will calibrate distance between tip of the nozzle and heatbed surface."));////MSG_WIZARD_V2_CAL c=20 r=8 lcd_wizard_load();
if(mmu_enabled) state = S::Lay1CalCold;
{ break;
lcd_show_fullscreen_message_and_wait_P(_i("First you will select filament you wish to use for calibration.")); case S::Lay1CalCold:
} wizard_lay1cal_message(true);
lcd_show_fullscreen_message_and_wait_P(_i("Select temperature which matches your material. Then I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration."));////MSG_WIZARD_V2_CAL_2 c=20 r=12
menu_goto(lcd_v2_calibration,0,false,true); menu_goto(lcd_v2_calibration,0,false,true);
end = true; // Leave wizard temporarily for lcd_v2_calibration end = true; // Leave wizard temporarily for lcd_v2_calibration
break; break;
case S::Lay1CalHot:
wizard_lay1cal_message(false);
lcd_commands_type = LcdCommands::Layer1Cal;
end = true; // Leave wizard temporarily for lcd_v2_calibration
break;
case S::RepeatLay1Cal: //repeat first layer cal.? case S::RepeatLay1Cal: //repeat first layer cal.?
wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
if (wizard_event) if (wizard_event)
{ {
lcd_show_fullscreen_message_and_wait_P(_i("Please clean heatbed and then press the knob."));////MSG_WIZARD_CLEAN_HEATBED c=20 r=8 lcd_show_fullscreen_message_and_wait_P(_i("Please clean heatbed and then press the knob."));////MSG_WIZARD_CLEAN_HEATBED c=20 r=8
state = S::Lay1Cal; state = S::Lay1CalCold;
} }
else else
{ {
@ -4825,7 +4847,8 @@ void lcd_wizard(WizState state)
break; break;
} }
if (!((S::Lay1Cal == state) || (S::Preheat == state))) { if (!((S::Lay1CalCold == state) || (S::Lay1CalHot == state) || (S::Preheat == state)))
{
lcd_show_fullscreen_message_and_wait_P(msg); lcd_show_fullscreen_message_and_wait_P(msg);
} }
lcd_update_enable(true); lcd_update_enable(true);

6
Firmware/ultralcd.h
View file

@ -231,9 +231,11 @@ enum class WizState : uint8_t
IsFil, //!< Is filament loaded? Entry point for 1st layer calibration IsFil, //!< Is filament loaded? Entry point for 1st layer calibration
PreheatPla, //!< waiting for preheat nozzle for PLA PreheatPla, //!< waiting for preheat nozzle for PLA
Preheat, //!< Preheat for any material Preheat, //!< Preheat for any material
LoadFil, //!< Load filament LoadFilCold, //!< Load filament for MMU
LoadFilHot, //!< Load filament without MMU
IsPla, //!< Is PLA filament? IsPla, //!< Is PLA filament?
Lay1Cal, //!< First layer calibration Lay1CalCold, //!< First layer calibration, temperature not selected yet
Lay1CalHot, //!< First layer calibration, temperature already selected
RepeatLay1Cal, //!< Repeat first layer calibration? RepeatLay1Cal, //!< Repeat first layer calibration?
Finish, //!< Deactivate wizard Finish, //!< Deactivate wizard
}; };