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

Merge pull request #3124 from prusa3d/MK3

Browse source 
Sync MK3 -> MK3_3.10.0
This commit is contained in:
DRracer 2021-04-22 13:31:56 +02:00 committed by GitHub
commit be776f88f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Firmware/Configuration.h
View file

@ -551,9 +551,10 @@ enum CalibrationStatus
// Try to maintain a minimum distance from the bed even when Z is // Try to maintain a minimum distance from the bed even when Z is
// unknown when doing the following operations // unknown when doing the following operations
#define MIN_Z_FOR_LOAD 50 #define MIN_Z_FOR_LOAD 50 // lcd filament loading or autoload
#define MIN_Z_FOR_UNLOAD 50 #define MIN_Z_FOR_UNLOAD 50 // lcd filament unloading
#define MIN_Z_FOR_PREHEAT 10 #define MIN_Z_FOR_SWAP 27 // filament change (including M600)
#define MIN_Z_FOR_PREHEAT 10 // lcd preheat
#include "Configuration_adv.h" #include "Configuration_adv.h"
#include "thermistortables.h" #include "thermistortables.h"

12
Firmware/Marlin_main.cpp
View file

@ -3622,12 +3622,12 @@ static T gcode_M600_filament_change_z_shift()
#ifdef FILAMENTCHANGE_ZADD #ifdef FILAMENTCHANGE_ZADD
static_assert(Z_MAX_POS < (255 - FILAMENTCHANGE_ZADD), "Z-range too high, change the T type from uint8_t to uint16_t"); static_assert(Z_MAX_POS < (255 - FILAMENTCHANGE_ZADD), "Z-range too high, change the T type from uint8_t to uint16_t");
// avoid floating point arithmetics when not necessary - results in shorter code // avoid floating point arithmetics when not necessary - results in shorter code
T z_shift = T(FILAMENTCHANGE_ZADD); // always move above printout
T ztmp = T( current_position[Z_AXIS] ); T ztmp = T( current_position[Z_AXIS] );
T z_shift = 0; if((ztmp + z_shift) < T(MIN_Z_FOR_SWAP)){
if(ztmp < T(25)){ z_shift = T(MIN_Z_FOR_SWAP) - ztmp; // make sure to be at least 25mm above the heat bed
z_shift = T(25) - ztmp; // make sure to be at least 25mm above the heat bed }
} return z_shift;
return z_shift + T(FILAMENTCHANGE_ZADD); // always move above printout
#else #else
return T(0); return T(0);
#endif #endif
@ -3676,7 +3676,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
// Unload filament // Unload filament
if (mmu_enabled) extr_unload(); //unload just current filament for multimaterial printers (used also in M702) if (mmu_enabled) extr_unload(); //unload just current filament for multimaterial printers (used also in M702)
else unload_filament(); //unload filament for single material (used also in M702) else unload_filament(true); //unload filament for single material (used also in M702)
//finish moves //finish moves
st_synchronize(); st_synchronize();

20
Firmware/ultralcd.cpp
View file

@ -2201,15 +2201,16 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
} }
else else
{ {
lcd_set_cursor(0, 0);
lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0));
if (!bFilamentWaitingFlag) if (!bFilamentWaitingFlag)
{ {
// First run after the filament preheat selection: // First run after the filament preheat selection:
// setup the fixed LCD parts and raise Z as we wait // setup the fixed LCD parts and raise Z as we wait
bFilamentWaitingFlag = true; bFilamentWaitingFlag = true;
lcd_clear();
lcd_draw_update = 1;
lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_ c=20 r=1
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
switch (eFilamentAction) switch (eFilamentAction)
{ {
@ -2236,9 +2237,11 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
// handled earlier // handled earlier
break; break;
} }
lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_ c=20 r=1
} }
lcd_set_cursor(0, 0);
lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0));
if (lcd_clicked()) if (lcd_clicked())
{ {
bFilamentWaitingFlag = false; bFilamentWaitingFlag = false;
@ -4885,7 +4888,7 @@ void lcd_wizard(WizState state)
lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA."));
wait_preheat(); wait_preheat();
//unload current filament //unload current filament
unload_filament(); unload_filament(true);
//load filament //load filament
lcd_wizard_load(); lcd_wizard_load();
setTargetHotend(0, 0); //we are finished, cooldown nozzle setTargetHotend(0, 0); //we are finished, cooldown nozzle
@ -6200,13 +6203,14 @@ static void change_extr_menu(){
} }
#endif //SNMM #endif //SNMM
//unload filament for single material printer (used in M702 gcode) // unload filament for single material printer (used in M702 gcode)
void unload_filament() // @param automatic: If true, unload_filament is part of a unload+load sequence (M600)
void unload_filament(bool automatic)
{ {
custom_message_type = CustomMsg::FilamentLoading; custom_message_type = CustomMsg::FilamentLoading;
lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT)); lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT));
raise_z_above(MIN_Z_FOR_UNLOAD); raise_z_above(automatic? MIN_Z_FOR_SWAP: MIN_Z_FOR_UNLOAD);
// extr_unload2(); // extr_unload2();

2
Firmware/ultralcd.h
View file

@ -195,7 +195,7 @@ extern bool bFilamentAction;
void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void mFilamentItem(uint16_t nTemp,uint16_t nTempBed);
void mFilamentItemForce(); void mFilamentItemForce();
void lcd_generic_preheat_menu(); void lcd_generic_preheat_menu();
void unload_filament(); void unload_filament(bool automatic = false);
void stack_error(); void stack_error();
void lcd_printer_connected(); void lcd_printer_connected();