wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Adapt new setAxis implementation

Browse Source
This commit is contained in:
Knutwurst
2021-11-07 11:25:06 +01:00
parent 3669004077
commit 8bf38f49a0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@@ -1534,7 +1534,6 @@
#endif #endif
#if ENABLED(KNUTWURST_TFT_LEVELING) #if ENABLED(KNUTWURST_TFT_LEVELING)
//#define NOZZLE_TO_PROBE_OFFSET { 0, 0, -17 } // Chiron Default Value!
#define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 } #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 }
#endif #endif

7
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -79,8 +79,9 @@ char _conv[8];
void setAxisPosition_mm(const float position, const axis_t axis, const feedRate_t feedrate/*=0*/) { void setAxisPosition_mm(const float position, const axis_t axis, const feedRate_t feedrate/*=0*/) {
// Get motion limit from software endstops, if any // Get motion limit from software endstops, if any
float min, max; float min, max;
max = soft_endstop.max[axis]; //max = soft_endstop.max[axis];
min = soft_endstop.min[axis]; //min = soft_endstop.min[axis];
soft_endstop.get_manual_axis_limits((AxisEnum)axis, min, max);
current_position[axis] = constrain(position, min, max); current_position[axis] = constrain(position, min, max);
line_to_current_position(feedrate ?: 60); line_to_current_position(feedrate ?: 60);
@@ -94,7 +95,7 @@ char _conv[8];
#endif #endif
ABL_VAR xy_pos_t probe_position_lf, probe_position_rb; ABL_VAR xy_pos_t probe_position_lf, probe_position_rb;
ABL_VAR xy_float_t gridSpacing = { 0, 0 }; //ABL_VAR xy_float_t gridSpacing = { 0, 0 };
const float x_min = probe.min_x(), x_max = probe.max_x(), const float x_min = probe.min_x(), x_max = probe.max_x(),
y_min = probe.min_y(), y_max = probe.max_y(); y_min = probe.min_y(), y_max = probe.max_y();