SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

G12 E soft endstops parameter (#17788)

Browse source
This commit is contained in:
Scott Lahteine 2020-04-29 03:25:35 -05:00 committed by GitHub
parent 36adbfa41c
commit 2d758663db
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/calibrate/G425.cpp
View file

@ -92,8 +92,6 @@ struct measurements_t {
xy_float_t nozzle_outer_dimension = nod; xy_float_t nozzle_outer_dimension = nod;
}; };
#define TEMPORARY_SOFT_ENDSTOP_STATE(enable) REMEMBER(tes, soft_endstops_enabled, enable);
#if ENABLED(BACKLASH_GCODE) #if ENABLED(BACKLASH_GCODE)
#define TEMPORARY_BACKLASH_CORRECTION(value) REMEMBER(tbst, backlash.correction, value) #define TEMPORARY_BACKLASH_CORRECTION(value) REMEMBER(tbst, backlash.correction, value)
#else #else

13
Marlin/src/gcode/feature/clean/G12.cpp
View file

@ -37,6 +37,11 @@
/** /**
* G12: Clean the nozzle * G12: Clean the nozzle
*
* E<bool> : 0=Never or 1=Always apply the "software endstop" limits
* P0 S<strokes> : Stroke cleaning with S strokes
* P1 Sn T<objects> : Zigzag cleaning with S repeats and T zigzags
* P2 Sn R<radius> : Circle cleaning with S repeats and R radius
*/ */
void GcodeSuite::G12() { void GcodeSuite::G12() {
// Don't allow nozzle cleaning without homing first // Don't allow nozzle cleaning without homing first
@ -45,14 +50,12 @@ void GcodeSuite::G12() {
const uint8_t pattern = parser.ushortval('P', 0), const uint8_t pattern = parser.ushortval('P', 0),
strokes = parser.ushortval('S', NOZZLE_CLEAN_STROKES), strokes = parser.ushortval('S', NOZZLE_CLEAN_STROKES),
objects = parser.ushortval('T', NOZZLE_CLEAN_TRIANGLES); objects = parser.ushortval('T', NOZZLE_CLEAN_TRIANGLES);
const float radius = parser.floatval('R', NOZZLE_CLEAN_CIRCLE_RADIUS); const float radius = parser.linearval('R', NOZZLE_CLEAN_CIRCLE_RADIUS);
const bool seenxyz = parser.seen("XYZ"); const bool seenxyz = parser.seen("XYZ");
const uint8_t cleans = (!seenxyz || parser.boolval('X') ? _BV(X_AXIS) : 0) const uint8_t cleans = (!seenxyz || parser.boolval('X') ? _BV(X_AXIS) : 0)
| (!seenxyz || parser.boolval('Y') ? _BV(Y_AXIS) : 0) | (!seenxyz || parser.boolval('Y') ? _BV(Y_AXIS) : 0)
#if DISABLED(NOZZLE_CLEAN_NO_Z) | TERN(NOZZLE_CLEAN_NO_Z, 0, (!seenxyz || parser.boolval('Z') ? _BV(Z_AXIS) : 0))
| (!seenxyz || parser.boolval('Z') ? _BV(Z_AXIS) : 0)
#endif
; ;
#if HAS_LEVELING #if HAS_LEVELING
@ -60,6 +63,8 @@ void GcodeSuite::G12() {
TEMPORARY_BED_LEVELING_STATE(!TEST(cleans, Z_AXIS) && planner.leveling_active); TEMPORARY_BED_LEVELING_STATE(!TEST(cleans, Z_AXIS) && planner.leveling_active);
#endif #endif
TEMPORARY_SOFT_ENDSTOP_STATE(parser.boolval('E'));
nozzle.clean(pattern, strokes, radius, objects, cleans); nozzle.clean(pattern, strokes, radius, objects, cleans);
} }

22
Marlin/src/libs/nozzle.cpp
View file

@ -152,18 +152,20 @@ Nozzle nozzle;
LIMIT( end[arrPos].A, soft_endstop.min.A, soft_endstop.max.A); \ LIMIT( end[arrPos].A, soft_endstop.min.A, soft_endstop.max.A); \
}while(0) }while(0)
LIMIT_AXIS(x); if (soft_endstops_enabled) {
LIMIT_AXIS(y);
LIMIT_AXIS(z);
const bool radiusOutOfRange = (middle[arrPos].x + radius > soft_endstop.max.x) LIMIT_AXIS(x);
|| (middle[arrPos].x - radius < soft_endstop.min.x) LIMIT_AXIS(y);
|| (middle[arrPos].y + radius > soft_endstop.max.y) LIMIT_AXIS(z);
|| (middle[arrPos].y - radius < soft_endstop.min.y); const bool radiusOutOfRange = (middle[arrPos].x + radius > soft_endstop.max.x)
|| (middle[arrPos].x - radius < soft_endstop.min.x)
|| (middle[arrPos].y + radius > soft_endstop.max.y)
|| (middle[arrPos].y - radius < soft_endstop.min.y);
if (radiusOutOfRange && pattern == 2) {
SERIAL_ECHOLNPGM("Warning: Radius Out of Range");
return;
}
if (radiusOutOfRange && pattern == 2) {
SERIAL_ECHOLNPGM("Warning: Radius Out of Range");
return;
} }
#endif #endif

2
Marlin/src/module/motion.h
View file

@ -152,6 +152,7 @@ typedef struct { xyz_pos_t min, max; } axis_limits_t;
, const uint8_t old_tool_index=0, const uint8_t new_tool_index=0 , const uint8_t old_tool_index=0, const uint8_t new_tool_index=0
#endif #endif
); );
#define TEMPORARY_SOFT_ENDSTOP_STATE(enable) REMEMBER(tes, soft_endstops_enabled, enable);
#else #else
constexpr bool soft_endstops_enabled = false; constexpr bool soft_endstops_enabled = false;
//constexpr axis_limits_t soft_endstop = { //constexpr axis_limits_t soft_endstop = {
@ -159,6 +160,7 @@ typedef struct { xyz_pos_t min, max; } axis_limits_t;
// { X_MAX_POS, Y_MAX_POS, Z_MAX_POS } }; // { X_MAX_POS, Y_MAX_POS, Z_MAX_POS } };
#define apply_motion_limits(V) NOOP #define apply_motion_limits(V) NOOP
#define update_software_endstops(...) NOOP #define update_software_endstops(...) NOOP
#define TEMPORARY_SOFT_ENDSTOP_STATE(...) NOOP
#endif #endif
void report_real_position(); void report_real_position();