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

Minor tweaks

Browse Source
This commit is contained in:
InsanityAutomation
2020-12-27 16:53:14 -05:00
parent 6305bda964
commit d03227d564
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+6 -6
View File
@@ -128,7 +128,7 @@
// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_CREALITY_V453
#define MOTHERBOARD BOARD_CREALITY_V452
#endif
// Name displayed in the LCD "Ready" message and Info menu
@@ -984,7 +984,7 @@
// Most probes should stay away from the edges of the bed, but
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
#define PROBING_MARGIN 10
#define PROBING_MARGIN 5
// X and Y axis travel speed (mm/min) between probes
#define XY_PROBE_SPEED (133*60)
@@ -1072,12 +1072,12 @@
* These options are most useful for the BLTouch probe, but may also improve
* readings with inductive probes and piezo sensors.
*/
//#define PROBING_HEATERS_OFF // Turn heaters off when probing
#define PROBING_HEATERS_OFF // Turn heaters off when probing
#if ENABLED(PROBING_HEATERS_OFF)
#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy)
#endif
//#define PROBING_FANS_OFF // Turn fans off when probing
//#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing
#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing
//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
// Require minimum nozzle or bed temperature for probing. Currently applies only to the first extruder.
@@ -1307,7 +1307,7 @@
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
#define PROBE_Y_FIRST
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
@@ -1416,7 +1416,7 @@
// Homing speeds (mm/min)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
#define HOMING_FEEDRATE_Z (10*60)
// Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS
Marlin/Configuration_adv.h
+1 -1
View File
@@ -3340,7 +3340,7 @@
*
* Implement M486 to allow Marlin to skip objects
*/
//#define CANCEL_OBJECTS
#define CANCEL_OBJECTS
/**
* I2C position encoders for closed loop control.
Marlin/src/module/probe.cpp
+22 -20
View File
@@ -348,28 +348,30 @@ bool Probe::set_deployed(const bool deploy) {
constexpr bool deploy_stow_condition = true;
#endif
#if defined(PROBE_REQUIRES_MINTEMP_NOZZLE) && (PROBE_REQUIRES_MINTEMP_NOZZLE) > 0 && HAS_TEMP_HOTEND
#define WAIT_FOR_NOZZLE_HEAT 1
bool setting_hotend = thermalManager.degTargetHotend(0) < (PROBE_REQUIRES_MINTEMP_NOZZLE);
if (setting_hotend) {
uint16_t hotendTemperature = (PROBE_REQUIRES_MINTEMP_NOZZLE);
SERIAL_ECHOLNPAIR("Preheating hotend to ", hotendTemperature);
thermalManager.setTargetHotend(hotendTemperature, 0);
}
#endif
if (deploy) {
#if defined(PROBE_REQUIRES_MINTEMP_NOZZLE) && (PROBE_REQUIRES_MINTEMP_NOZZLE) > 0 && HAS_TEMP_HOTEND
#define WAIT_FOR_NOZZLE_HEAT 1
bool setting_hotend = thermalManager.degTargetHotend(0) < (PROBE_REQUIRES_MINTEMP_NOZZLE);
if (setting_hotend) {
uint16_t hotendTemperature = (PROBE_REQUIRES_MINTEMP_NOZZLE);
SERIAL_ECHOLNPAIR("Preheating hotend to ", hotendTemperature);
thermalManager.setTargetHotend(hotendTemperature, 0);
}
#endif
#if defined(PROBE_REQUIRES_MINTEMP_BED) && (PROBE_REQUIRES_MINTEMP_BED) > 0 && HAS_HEATED_BED
#define WAIT_FOR_BED_HEAT 1
bool setting_bed = thermalManager.degBed() < (PROBE_REQUIRES_MINTEMP_BED);
if (setting_bed) {
uint16_t bedTemperature = (PROBE_REQUIRES_MINTEMP_BED);
SERIAL_ECHOLNPAIR("Preheating bed to ", bedTemperature);
thermalManager.setTargetBed(bedTemperature);
}
#endif
#if defined(PROBE_REQUIRES_MINTEMP_BED) && (PROBE_REQUIRES_MINTEMP_BED) > 0 && HAS_HEATED_BED
#define WAIT_FOR_BED_HEAT 1
bool setting_bed = thermalManager.degBed() < (PROBE_REQUIRES_MINTEMP_BED);
if (setting_bed) {
uint16_t bedTemperature = (PROBE_REQUIRES_MINTEMP_BED);
SERIAL_ECHOLNPAIR("Preheating bed to ", bedTemperature);
thermalManager.setTargetBed(bedTemperature);
}
#endif
TERN_(WAIT_FOR_NOZZLE_HEAT, if (setting_hotend) thermalManager.wait_for_hotend(0));
TERN_(WAIT_FOR_BED_HEAT, if (setting_bed) thermalManager.wait_for_bed_heating());
TERN_(WAIT_FOR_NOZZLE_HEAT, if (setting_hotend) thermalManager.wait_for_hotend(0));
TERN_(WAIT_FOR_BED_HEAT, if (setting_bed) thermalManager.wait_for_bed_heating());
}
// For beds that fall when Z is powered off only raise for trusted Z
#if ENABLED(UNKNOWN_Z_NO_RAISE)