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

Add threshold distance to Z calibration 

Add missing if statement
This commit is contained in:
Simon Benoit 2019-07-23 21:20:37 -04:00
parent 717b710abe
commit 49d2866b48
9 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -2876,7 +2876,8 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
#endif //TMC2130
enable_endstops(endstops_enabled);
if (st_get_position_mm(Z_AXIS) == MESH_HOME_Z_SEARCH)
if ((st_get_position_mm(Z_AXIS) <= (MESH_HOME_Z_SEARCH + HOME_Z_SEARCH_THRESHOLD)) ||
(st_get_position_mm(Z_AXIS) >= (MESH_HOME_Z_SEARCH - HOME_Z_SEARCH_THRESHOLD)))
{
if (onlyZ)
{

3
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

@ -257,7 +257,8 @@ BED SETTINGS
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

@ -256,7 +256,8 @@ BED SETTINGS
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View File

@ -314,7 +314,8 @@
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View File

@ -315,7 +315,8 @@
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h
View File

@ -314,7 +314,8 @@
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h
View File

@ -315,7 +315,8 @@
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View File

@ -422,7 +422,8 @@
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind

3
Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View File

@ -424,7 +424,8 @@
#define BED_ADJUSTMENT_UM_MAX 100
#define MESH_HOME_Z_CALIB 0.2
#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc.
#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration
#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind