jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak probe preheat to wait for cooldown, bypass block on unload prime

Browse Source
This commit is contained in:
InsanityAutomation
2021-02-14 14:13:41 -05:00
parent 09dcc85328
commit 6118d41baa
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+1 -1
View File
@@ -128,7 +128,7 @@
// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_CREALITY_V452
#define MOTHERBOARD BOARD_CREALITY_V453
#endif
// Name displayed in the LCD "Ready" message and Info menu
Marlin/Configuration_adv.h
+2 -2
View File
@@ -2181,7 +2181,7 @@
// For direct drive, the full length of the nozzle.
//#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
#define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
#define ADVANCED_PAUSE_PURGE_LENGTH 0 // (mm) Length to extrude after loading.
#define ADVANCED_PAUSE_PURGE_LENGTH 2 // (mm) Length to extrude after loading.
// Set to 0 for manual extrusion.
// Filament can be extruded repeatedly from the Filament Change menu
// until extrusion is consistent, and to purge old filament.
@@ -2189,7 +2189,7 @@
//#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
// Filament Unload does a Retract, Delay, and Purge first:
#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
#define FILAMENT_UNLOAD_PURGE_RETRACT 3 // (mm) Unload initial retract length.
#define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract.
#define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged.
#define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload
Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/EstepsHandler.cpp
+3 -3
View File
@@ -44,7 +44,7 @@ void EstepsHandler::Init() {
void EstepsHandler::HandleStartButton(DGUS_VP_Variable &var, void *val_ptr) {
static_assert(ADVANCED_PAUSE_PURGE_LENGTH == 0, "Assuming PURGE_LENGTH is 0 so we can use M701");
//static_assert(ADVANCED_PAUSE_PURGE_LENGTH == 0, "Assuming PURGE_LENGTH is 0 so we can use M701");
// Validate
if (calibration_temperature < EXTRUDE_MINTEMP) {
@@ -81,7 +81,7 @@ void EstepsHandler::HandleStartButton(DGUS_VP_Variable &var, void *val_ptr) {
}
planner.synchronize();
// Set-up command
SetStatusMessage(PSTR("Extruding..."));
@@ -119,7 +119,7 @@ void EstepsHandler::HandleApplyButton(DGUS_VP_Variable &var, void *val_ptr) {
settings.save();
ScreenHandler.Buzzer(0, 250);
ScreenHandler.PopToOldScreen();
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN, false);
Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/PIDHandler.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ void PIDHandler::Init() {
void PIDHandler::HandleStartButton(DGUS_VP_Variable &var, void *val_ptr) {
static_assert(ADVANCED_PAUSE_PURGE_LENGTH == 0, "Assuming PURGE_LENGTH is 0 so we can use M701");
//static_assert(ADVANCED_PAUSE_PURGE_LENGTH == 0, "Assuming PURGE_LENGTH is 0 so we can use M701");
// Validate
if (calibration_temperature < EXTRUDE_MINTEMP) {
Marlin/src/module/probe.cpp
+2 -2
View File
@@ -380,8 +380,8 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
DEBUG_EOL();
TERN_(WAIT_FOR_NOZZLE_HEAT, if (hotend_temp > thermalManager.degHotend(0) + (TEMP_WINDOW)) thermalManager.wait_for_hotend(0));
TERN_(WAIT_FOR_BED_HEAT, if (bed_temp > thermalManager.degBed() + (TEMP_BED_WINDOW)) thermalManager.wait_for_bed_heating());
TERN_(WAIT_FOR_NOZZLE_HEAT, if (!WITHIN(thermalManager.degHotend(0), (thermalManager.degTargetHotend(0) - TEMP_HYSTERESIS), (thermalManager.degTargetHotend(0) + TEMP_HYSTERESIS))) thermalManager.wait_for_hotend(0, false));
TERN_(WAIT_FOR_BED_HEAT, if (!WITHIN(thermalManager.degBed(), (thermalManager.degTargetBed() - TEMP_BED_HYSTERESIS), (thermalManager.degTargetBed() + TEMP_BED_HYSTERESIS))) thermalManager.wait_for_bed_heating(false));
}
#endif
Marlin/src/module/temperature.cpp
+3 -3
View File
@@ -3526,11 +3526,11 @@ void Temperature::tick() {
return false;
}
void Temperature::wait_for_bed_heating() {
if (isHeatingBed()) {
void Temperature::wait_for_bed_heating(const bool no_wait_for_cooling/*=true*/) {
if (isHeatingBed() || !no_wait_for_cooling ) {
SERIAL_ECHOLNPGM("Wait for bed heating...");
LCD_MESSAGEPGM(MSG_BED_HEATING);
wait_for_bed();
wait_for_bed(no_wait_for_cooling);
ui.reset_status();
}
}
Marlin/src/module/temperature.h
+1 -1
View File
@@ -672,7 +672,7 @@ class Temperature {
#endif
);
static void wait_for_bed_heating();
static void wait_for_bed_heating(const bool no_wait_for_cooling=true);
FORCE_INLINE static bool degBedNear(const float &temp) {
return ABS(degBed() - temp) < (TEMP_BED_HYSTERESIS);