bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🚸 Better M350, M114 with more axes (#23986)

Browse Source
This commit is contained in:
DerAndere 2022-04-04 04:43:42 +02:00 committed by Scott Lahteine
parent 494a2fc80c
commit 85599abba7
6 changed files with 115 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/src/gcode/control/M350_M351.cpp
View File

@ -27,35 +27,45 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../module/stepper.h" #include "../../module/stepper.h"
#if NUM_AXES == XYZ && EXTRUDERS >= 1
#define HAS_M350_B_PARAM 1 // "5th axis" (after E0) for an original XYZEB setup.
#if AXIS_COLLISION('B')
#error "M350 parameter 'B' collision with axis name."
#endif
#endif
/** /**
* M350: Set axis microstepping modes. S sets mode for all drivers. * M350: Set axis microstepping modes. S sets mode for all drivers.
* *
* Warning: Steps-per-unit remains unchanged. * Warning: Steps-per-unit remains unchanged.
*/ */
void GcodeSuite::M350() { void GcodeSuite::M350() {
if (parser.seen('S')) LOOP_LE_N(i, 4) stepper.microstep_mode(i, parser.value_byte()); if (parser.seen('S')) LOOP_DISTINCT_AXES(i) stepper.microstep_mode(i, parser.value_byte());
LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) stepper.microstep_mode(i, parser.value_byte()); LOOP_LOGICAL_AXES(i) if (parser.seen(AXIS_CHAR(i))) stepper.microstep_mode(i, parser.value_byte());
if (parser.seen('B')) stepper.microstep_mode(4, parser.value_byte()); TERN_(HAS_M350_B_PARAM, if (parser.seenval('B')) stepper.microstep_mode(E_AXIS + 1, parser.value_byte()));
stepper.microstep_readings(); stepper.microstep_readings();
} }
/** /**
* M351: Toggle MS1 MS2 pins directly with axis codes X Y Z . . . E [B] * M351: Toggle MS1 MS2 pins directly with axis codes X Y Z . . . E [B]
* S# determines MS1, MS2 or MS3, X# sets the pin high/low. * S# determines MS1, MS2 or MS3, X# sets the pin high/low.
*
* Parameter 'B' sets "5th axis" (after E0) only for an original XYZEB setup.
*/ */
void GcodeSuite::M351() { void GcodeSuite::M351() {
const int8_t bval = TERN(HAS_M350_B_PARAM, parser.byteval('B', -1), -1); UNUSED(bval);
if (parser.seenval('S')) switch (parser.value_byte()) { if (parser.seenval('S')) switch (parser.value_byte()) {
case 1: case 1:
LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, parser.value_byte(), -1, -1); LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, parser.value_byte(), -1, -1);
if (parser.seenval('B')) stepper.microstep_ms(4, parser.value_byte(), -1, -1); TERN_(HAS_M350_B_PARAM, if (bval >= 0) stepper.microstep_ms(E_AXIS + 1, bval != 0, -1, -1));
break; break;
case 2: case 2:
LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, parser.value_byte(), -1); LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, parser.value_byte(), -1);
if (parser.seenval('B')) stepper.microstep_ms(4, -1, parser.value_byte(), -1); TERN_(HAS_M350_B_PARAM, if (bval >= 0) stepper.microstep_ms(E_AXIS + 1, -1, bval != 0, -1));
break; break;
case 3: case 3:
LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, -1, parser.value_byte()); LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, -1, parser.value_byte());
if (parser.seenval('B')) stepper.microstep_ms(4, -1, -1, parser.value_byte()); TERN_(HAS_M350_B_PARAM, if (bval >= 0) stepper.microstep_ms(E_AXIS + 1, -1, -1, bval != 0));
break; break;
} }
stepper.microstep_readings(); stepper.microstep_readings();

2
Marlin/src/gcode/feature/L6470/M906.cpp
View File

@ -25,7 +25,7 @@
#if HAS_L64XX #if HAS_L64XX
#if AXIS_COLLISION('I') #if AXIS_COLLISION('I')
#error "M906 parameter collision with axis name." #error "M906 parameter 'I' collision with axis name."
#endif #endif
#include "../../gcode.h" #include "../../gcode.h"

2
Marlin/src/gcode/feature/trinamic/M569.cpp
View File

@ -25,7 +25,7 @@
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
#if AXIS_COLLISION('I') #if AXIS_COLLISION('I')
#error "M569 parameter collision with axis name." #error "M569 parameter 'I' collision with axis name."
#endif #endif
#include "../../gcode.h" #include "../../gcode.h"

2
Marlin/src/gcode/feature/trinamic/M919.cpp
View File

@ -25,7 +25,7 @@
#if HAS_TRINAMIC_CONFIG #if HAS_TRINAMIC_CONFIG
#if AXIS_COLLISION('I') #if AXIS_COLLISION('I')
#error "M919 parameter collision with axis name." #error "M919 parameter 'I' collision with axis name."
#endif #endif
#include "../../gcode.h" #include "../../gcode.h"

2
Marlin/src/gcode/motion/G5.cpp
View File

@ -25,7 +25,7 @@
#if ENABLED(BEZIER_CURVE_SUPPORT) #if ENABLED(BEZIER_CURVE_SUPPORT)
#if AXIS_COLLISION('I') || AXIS_COLLISION('J') #if AXIS_COLLISION('I') || AXIS_COLLISION('J')
#error "G5 parameter collision with axis name." #error "G5 parameter 'I' or 'J' collision with axis name."
#endif #endif
#include "../../module/motion.h" #include "../../module/motion.h"

172
Marlin/src/module/stepper.cpp
View File

@ -3679,7 +3679,7 @@ void Stepper::report_positions() {
void Stepper::microstep_ms(const uint8_t driver, const int8_t ms1, const int8_t ms2, const int8_t ms3) { void Stepper::microstep_ms(const uint8_t driver, const int8_t ms1, const int8_t ms2, const int8_t ms3) {
if (ms1 >= 0) switch (driver) { if (ms1 >= 0) switch (driver) {
#if HAS_X_MS_PINS || HAS_X2_MS_PINS #if HAS_X_MS_PINS || HAS_X2_MS_PINS
case 0: case X_AXIS:
#if HAS_X_MS_PINS #if HAS_X_MS_PINS
WRITE(X_MS1_PIN, ms1); WRITE(X_MS1_PIN, ms1);
#endif #endif
@ -3689,7 +3689,7 @@ void Stepper::report_positions() {
break; break;
#endif #endif
#if HAS_Y_MS_PINS || HAS_Y2_MS_PINS #if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
case 1: case Y_AXIS:
#if HAS_Y_MS_PINS #if HAS_Y_MS_PINS
WRITE(Y_MS1_PIN, ms1); WRITE(Y_MS1_PIN, ms1);
#endif #endif
@ -3699,7 +3699,7 @@ void Stepper::report_positions() {
break; break;
#endif #endif
#if HAS_SOME_Z_MS_PINS #if HAS_SOME_Z_MS_PINS
case 2: case Z_AXIS:
#if HAS_Z_MS_PINS #if HAS_Z_MS_PINS
WRITE(Z_MS1_PIN, ms1); WRITE(Z_MS1_PIN, ms1);
#endif #endif
@ -3714,52 +3714,52 @@ void Stepper::report_positions() {
#endif #endif
break; break;
#endif #endif
#if HAS_E0_MS_PINS
case 3: WRITE(E0_MS1_PIN, ms1); break;
#endif
#if HAS_E1_MS_PINS
case 4: WRITE(E1_MS1_PIN, ms1); break;
#endif
#if HAS_E2_MS_PINS
case 5: WRITE(E2_MS1_PIN, ms1); break;
#endif
#if HAS_E3_MS_PINS
case 6: WRITE(E3_MS1_PIN, ms1); break;
#endif
#if HAS_E4_MS_PINS
case 7: WRITE(E4_MS1_PIN, ms1); break;
#endif
#if HAS_E5_MS_PINS
case 8: WRITE(E5_MS1_PIN, ms1); break;
#endif
#if HAS_E6_MS_PINS
case 9: WRITE(E6_MS1_PIN, ms1); break;
#endif
#if HAS_E7_MS_PINS
case 10: WRITE(E7_MS1_PIN, ms1); break;
#endif
#if HAS_I_MS_PINS #if HAS_I_MS_PINS
case 11: WRITE(I_MS1_PIN, ms1); break case I_AXIS: WRITE(I_MS1_PIN, ms1); break
#endif #endif
#if HAS_J_MS_PINS #if HAS_J_MS_PINS
case 12: WRITE(J_MS1_PIN, ms1); break case J_AXIS: WRITE(J_MS1_PIN, ms1); break
#endif #endif
#if HAS_K_MS_PINS #if HAS_K_MS_PINS
case 13: WRITE(K_MS1_PIN, ms1); break case K_AXIS: WRITE(K_MS1_PIN, ms1); break
#endif #endif
#if HAS_U_MS_PINS #if HAS_U_MS_PINS
case 14: WRITE(U_MS1_PIN, ms1); break case U_AXIS: WRITE(U_MS1_PIN, ms1); break
#endif #endif
#if HAS_V_MS_PINS #if HAS_V_MS_PINS
case 15: WRITE(V_MS1_PIN, ms1); break case V_AXIS: WRITE(V_MS1_PIN, ms1); break
#endif #endif
#if HAS_W_MS_PINS #if HAS_W_MS_PINS
case 16: WRITE(W_MS1_PIN, ms1); break case W_AXIS: WRITE(W_MS1_PIN, ms1); break
#endif
#if HAS_E0_MS_PINS
case E_AXIS: WRITE(E0_MS1_PIN, ms1); break;
#endif
#if HAS_E1_MS_PINS
case (E_AXIS + 1): WRITE(E1_MS1_PIN, ms1); break;
#endif
#if HAS_E2_MS_PINS
case (E_AXIS + 2): WRITE(E2_MS1_PIN, ms1); break;
#endif
#if HAS_E3_MS_PINS
case (E_AXIS + 3): WRITE(E3_MS1_PIN, ms1); break;
#endif
#if HAS_E4_MS_PINS
case (E_AXIS + 4): WRITE(E4_MS1_PIN, ms1); break;
#endif
#if HAS_E5_MS_PINS
case (E_AXIS + 5): WRITE(E5_MS1_PIN, ms1); break;
#endif
#if HAS_E6_MS_PINS
case (E_AXIS + 6): WRITE(E6_MS1_PIN, ms1); break;
#endif
#if HAS_E7_MS_PINS
case (E_AXIS + 7): WRITE(E7_MS1_PIN, ms1); break;
#endif #endif
} }
if (ms2 >= 0) switch (driver) { if (ms2 >= 0) switch (driver) {
#if HAS_X_MS_PINS || HAS_X2_MS_PINS #if HAS_X_MS_PINS || HAS_X2_MS_PINS
case 0: case X_AXIS:
#if HAS_X_MS_PINS #if HAS_X_MS_PINS
WRITE(X_MS2_PIN, ms2); WRITE(X_MS2_PIN, ms2);
#endif #endif
@ -3769,7 +3769,7 @@ void Stepper::report_positions() {
break; break;
#endif #endif
#if HAS_Y_MS_PINS || HAS_Y2_MS_PINS #if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
case 1: case Y_AXIS:
#if HAS_Y_MS_PINS #if HAS_Y_MS_PINS
WRITE(Y_MS2_PIN, ms2); WRITE(Y_MS2_PIN, ms2);
#endif #endif
@ -3779,7 +3779,7 @@ void Stepper::report_positions() {
break; break;
#endif #endif
#if HAS_SOME_Z_MS_PINS #if HAS_SOME_Z_MS_PINS
case 2: case Z_AXIS:
#if HAS_Z_MS_PINS #if HAS_Z_MS_PINS
WRITE(Z_MS2_PIN, ms2); WRITE(Z_MS2_PIN, ms2);
#endif #endif
@ -3794,52 +3794,52 @@ void Stepper::report_positions() {
#endif #endif
break; break;
#endif #endif
#if HAS_E0_MS_PINS
case 3: WRITE(E0_MS2_PIN, ms2); break;
#endif
#if HAS_E1_MS_PINS
case 4: WRITE(E1_MS2_PIN, ms2); break;
#endif
#if HAS_E2_MS_PINS
case 5: WRITE(E2_MS2_PIN, ms2); break;
#endif
#if HAS_E3_MS_PINS
case 6: WRITE(E3_MS2_PIN, ms2); break;
#endif
#if HAS_E4_MS_PINS
case 7: WRITE(E4_MS2_PIN, ms2); break;
#endif
#if HAS_E5_MS_PINS
case 8: WRITE(E5_MS2_PIN, ms2); break;
#endif
#if HAS_E6_MS_PINS
case 9: WRITE(E6_MS2_PIN, ms2); break;
#endif
#if HAS_E7_MS_PINS
case 10: WRITE(E7_MS2_PIN, ms2); break;
#endif
#if HAS_I_MS_PINS #if HAS_I_MS_PINS
case 11: WRITE(I_MS2_PIN, ms2); break case I_AXIS: WRITE(I_MS2_PIN, ms2); break
#endif #endif
#if HAS_J_MS_PINS #if HAS_J_MS_PINS
case 12: WRITE(J_MS2_PIN, ms2); break case J_AXIS: WRITE(J_MS2_PIN, ms2); break
#endif #endif
#if HAS_K_MS_PINS #if HAS_K_MS_PINS
case 13: WRITE(K_MS2_PIN, ms2); break case K_AXIS: WRITE(K_MS2_PIN, ms2); break
#endif #endif
#if HAS_U_MS_PINS #if HAS_U_MS_PINS
case 14: WRITE(U_MS2_PIN, ms2); break case U_AXIS: WRITE(U_MS2_PIN, ms2); break
#endif #endif
#if HAS_V_MS_PINS #if HAS_V_MS_PINS
case 15: WRITE(V_MS2_PIN, ms2); break case V_AXIS: WRITE(V_MS2_PIN, ms2); break
#endif #endif
#if HAS_W_MS_PINS #if HAS_W_MS_PINS
case 16: WRITE(W_MS2_PIN, ms2); break case W_AXIS: WRITE(W_MS2_PIN, ms2); break
#endif
#if HAS_E0_MS_PINS
case E_AXIS: WRITE(E0_MS2_PIN, ms2); break;
#endif
#if HAS_E1_MS_PINS
case (E_AXIS + 1): WRITE(E1_MS2_PIN, ms2); break;
#endif
#if HAS_E2_MS_PINS
case (E_AXIS + 2): WRITE(E2_MS2_PIN, ms2); break;
#endif
#if HAS_E3_MS_PINS
case (E_AXIS + 3): WRITE(E3_MS2_PIN, ms2); break;
#endif
#if HAS_E4_MS_PINS
case (E_AXIS + 4): WRITE(E4_MS2_PIN, ms2); break;
#endif
#if HAS_E5_MS_PINS
case (E_AXIS + 5): WRITE(E5_MS2_PIN, ms2); break;
#endif
#if HAS_E6_MS_PINS
case (E_AXIS + 6): WRITE(E6_MS2_PIN, ms2); break;
#endif
#if HAS_E7_MS_PINS
case (E_AXIS + 7): WRITE(E7_MS2_PIN, ms2); break;
#endif #endif
} }
if (ms3 >= 0) switch (driver) { if (ms3 >= 0) switch (driver) {
#if HAS_X_MS_PINS || HAS_X2_MS_PINS #if HAS_X_MS_PINS || HAS_X2_MS_PINS
case 0: case X_AXIS:
#if HAS_X_MS_PINS && PIN_EXISTS(X_MS3) #if HAS_X_MS_PINS && PIN_EXISTS(X_MS3)
WRITE(X_MS3_PIN, ms3); WRITE(X_MS3_PIN, ms3);
#endif #endif
@ -3849,7 +3849,7 @@ void Stepper::report_positions() {
break; break;
#endif #endif
#if HAS_Y_MS_PINS || HAS_Y2_MS_PINS #if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
case 1: case Y_AXIS:
#if HAS_Y_MS_PINS && PIN_EXISTS(Y_MS3) #if HAS_Y_MS_PINS && PIN_EXISTS(Y_MS3)
WRITE(Y_MS3_PIN, ms3); WRITE(Y_MS3_PIN, ms3);
#endif #endif
@ -3859,7 +3859,7 @@ void Stepper::report_positions() {
break; break;
#endif #endif
#if HAS_SOME_Z_MS_PINS #if HAS_SOME_Z_MS_PINS
case 2: case Z_AXIS:
#if HAS_Z_MS_PINS && PIN_EXISTS(Z_MS3) #if HAS_Z_MS_PINS && PIN_EXISTS(Z_MS3)
WRITE(Z_MS3_PIN, ms3); WRITE(Z_MS3_PIN, ms3);
#endif #endif
@ -3874,29 +3874,47 @@ void Stepper::report_positions() {
#endif #endif
break; break;
#endif #endif
#if HAS_I_MS_PINS
case I_AXIS: WRITE(I_MS3_PIN, ms3); break
#endif
#if HAS_J_MS_PINS
case J_AXIS: WRITE(J_MS3_PIN, ms3); break
#endif
#if HAS_K_MS_PINS
case K_AXIS: WRITE(K_MS3_PIN, ms3); break
#endif
#if HAS_U_MS_PINS
case U_AXIS: WRITE(U_MS3_PIN, ms3); break
#endif
#if HAS_V_MS_PINS
case V_AXIS: WRITE(V_MS3_PIN, ms3); break
#endif
#if HAS_W_MS_PINS
case W_AXIS: WRITE(W_MS3_PIN, ms3); break
#endif
#if HAS_E0_MS_PINS && PIN_EXISTS(E0_MS3) #if HAS_E0_MS_PINS && PIN_EXISTS(E0_MS3)
case 3: WRITE(E0_MS3_PIN, ms3); break; case E_AXIS: WRITE(E0_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E1_MS_PINS && PIN_EXISTS(E1_MS3) #if HAS_E1_MS_PINS && PIN_EXISTS(E1_MS3)
case 4: WRITE(E1_MS3_PIN, ms3); break; case (E_AXIS + 1): WRITE(E1_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E2_MS_PINS && PIN_EXISTS(E2_MS3) #if HAS_E2_MS_PINS && PIN_EXISTS(E2_MS3)
case 5: WRITE(E2_MS3_PIN, ms3); break; case (E_AXIS + 2): WRITE(E2_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E3_MS_PINS && PIN_EXISTS(E3_MS3) #if HAS_E3_MS_PINS && PIN_EXISTS(E3_MS3)
case 6: WRITE(E3_MS3_PIN, ms3); break; case (E_AXIS + 3): WRITE(E3_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E4_MS_PINS && PIN_EXISTS(E4_MS3) #if HAS_E4_MS_PINS && PIN_EXISTS(E4_MS3)
case 7: WRITE(E4_MS3_PIN, ms3); break; case (E_AXIS + 4): WRITE(E4_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E5_MS_PINS && PIN_EXISTS(E5_MS3) #if HAS_E5_MS_PINS && PIN_EXISTS(E5_MS3)
case 8: WRITE(E5_MS3_PIN, ms3); break; case (E_AXIS + 5): WRITE(E5_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E6_MS_PINS && PIN_EXISTS(E6_MS3) #if HAS_E6_MS_PINS && PIN_EXISTS(E6_MS3)
case 9: WRITE(E6_MS3_PIN, ms3); break; case (E_AXIS + 6): WRITE(E6_MS3_PIN, ms3); break;
#endif #endif
#if HAS_E7_MS_PINS && PIN_EXISTS(E7_MS3) #if HAS_E7_MS_PINS && PIN_EXISTS(E7_MS3)
case 10: WRITE(E7_MS3_PIN, ms3); break; case (E_AXIS + 7): WRITE(E7_MS3_PIN, ms3); break;
#endif #endif
} }
} }