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

Change formatting.

This commit is contained in:
Marek Bel 2019-03-04 22:17:43 +01:00
parent b2255c8be9
commit f161d3ade4
2 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -9090,17 +9090,19 @@ void load_filament_final_feed()
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED_FINAL, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED_FINAL, active_extruder);
} }
//! @brief Wait for user to check the state
//! @par nozzle_temp nozzle temperature to load filament //! @par nozzle_temp nozzle temperature to load filament
void M600_check_state(float nozzle_temp) void M600_check_state(float nozzle_temp)
{ {
//Wait for user to check the state
lcd_change_fil_state = 0; lcd_change_fil_state = 0;
while (lcd_change_fil_state != 1){ while (lcd_change_fil_state != 1)
{
lcd_change_fil_state = 0; lcd_change_fil_state = 0;
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
lcd_alright(); lcd_alright();
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
switch(lcd_change_fil_state){ switch(lcd_change_fil_state)
{
// Filament failed to load so load it again // Filament failed to load so load it again
case 2: case 2:
if (mmu_enabled) if (mmu_enabled)

14
Firmware/mmu.cpp
View File

@ -835,13 +835,15 @@ void mmu_M600_wait_and_beep() {
void mmu_M600_load_filament(bool automatic, float nozzle_temp) void mmu_M600_load_filament(bool automatic, float nozzle_temp)
{ {
tmp_extruder = mmu_extruder; tmp_extruder = mmu_extruder;
if (!automatic) { if (!automatic)
#ifdef MMU_M600_SWITCH_EXTRUDER {
#ifdef MMU_M600_SWITCH_EXTRUDER
bool yes = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Do you want to switch extruder?"), false); bool yes = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Do you want to switch extruder?"), false);
if(yes) tmp_extruder = choose_extruder_menu(); if(yes) tmp_extruder = choose_extruder_menu();
#endif //MMU_M600_SWITCH_EXTRUDER #endif //MMU_M600_SWITCH_EXTRUDER
} }
else { else
{
tmp_extruder = ad_getAlternative(tmp_extruder); tmp_extruder = ad_getAlternative(tmp_extruder);
} }
lcd_update_enable(false); lcd_update_enable(false);
@ -851,8 +853,8 @@ void mmu_M600_load_filament(bool automatic, float nozzle_temp)
lcd_print(tmp_extruder + 1); lcd_print(tmp_extruder + 1);
snmm_filaments_used |= (1 << tmp_extruder); //for stop print snmm_filaments_used |= (1 << tmp_extruder); //for stop print
// printf_P(PSTR("T code: %d \n"), tmp_extruder); //printf_P(PSTR("T code: %d \n"), tmp_extruder);
// mmu_printf_P(PSTR("T%d\n"), tmp_extruder); //mmu_printf_P(PSTR("T%d\n"), tmp_extruder);
setTargetHotend(nozzle_temp,active_extruder); setTargetHotend(nozzle_temp,active_extruder);
mmu_wait_for_heater_blocking(); mmu_wait_for_heater_blocking();