Unify M91x parameter I meaning, simplify reports (#11249)

Marlin/src/gcode/feature/trinamic/M906.cpp

@@ -88,32 +88,25 @@ void GcodeSuite::M906() {
     }
   }
 
-  if (report) LOOP_XYZE(i) switch (i) {
+  if (report) {
-    case X_AXIS:
     #if X_IS_TRINAMIC
       TMC_SAY_CURRENT(X);
     #endif
     #if X2_IS_TRINAMIC
       TMC_SAY_CURRENT(X2);
     #endif
-      break;
-    case Y_AXIS:
     #if Y_IS_TRINAMIC
       TMC_SAY_CURRENT(Y);
     #endif
     #if Y2_IS_TRINAMIC
       TMC_SAY_CURRENT(Y2);
     #endif
-      break;
-    case Z_AXIS:
     #if Z_IS_TRINAMIC
       TMC_SAY_CURRENT(Z);
     #endif
     #if Z2_IS_TRINAMIC
       TMC_SAY_CURRENT(Z2);
     #endif
-      break;
-    case E_AXIS:
     #if E0_IS_TRINAMIC
       TMC_SAY_CURRENT(E0);
     #endif
@@ -129,7 +122,6 @@ void GcodeSuite::M906() {
     #if E4_IS_TRINAMIC
       TMC_SAY_CURRENT(E4);
     #endif
-      break;
   }
 }
 

Marlin/src/gcode/feature/trinamic/M911-M915.cpp

@@ -208,32 +208,25 @@ void GcodeSuite::M912() {
       }
     }
 
-    if (report) LOOP_XYZE(i) switch (i) {
+    if (report) {
-      case X_AXIS:
       #if X_IS_TRINAMIC
         TMC_SAY_PWMTHRS(X,X);
       #endif
       #if X2_IS_TRINAMIC
         TMC_SAY_PWMTHRS(X,X2);
       #endif
-        break;
-      case Y_AXIS:
       #if Y_IS_TRINAMIC
         TMC_SAY_PWMTHRS(Y,Y);
       #endif
       #if Y2_IS_TRINAMIC
         TMC_SAY_PWMTHRS(Y,Y2);
       #endif
-        break;
-      case Z_AXIS:
       #if Z_IS_TRINAMIC
         TMC_SAY_PWMTHRS(Z,Z);
       #endif
       #if Z2_IS_TRINAMIC
         TMC_SAY_PWMTHRS(Z,Z2);
       #endif
-        break;
-      case E_AXIS:
       #if E0_IS_TRINAMIC
         TMC_SAY_PWMTHRS_E(0);
       #endif
@@ -249,7 +242,6 @@ void GcodeSuite::M912() {
       #if E_STEPPERS > 4 && E4_IS_TRINAMIC
         TMC_SAY_PWMTHRS_E(4);
       #endif
-        break;
     }
   }
 #endif // HYBRID_THRESHOLD
@@ -271,66 +263,60 @@ void GcodeSuite::M912() {
         #if X_SENSORLESS
           case X_AXIS:
             #if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
-              if (index == 0) TMC_SET_SGT(X);
+              if (index < 2) TMC_SET_SGT(X);
             #endif
             #if ENABLED(X2_IS_TMC2130)
-              if (index == 1) TMC_SET_SGT(X2);
+              if (!(index & 1)) TMC_SET_SGT(X2);
             #endif
             break;
         #endif
         #if Y_SENSORLESS
           case Y_AXIS:
             #if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
-              if (index == 0) TMC_SET_SGT(Y);
+              if (index < 2) TMC_SET_SGT(Y);
             #endif
             #if ENABLED(Y2_IS_TMC2130)
-              if (index == 1) TMC_SET_SGT(Y2);
+              if (!(index & 1)) TMC_SET_SGT(Y2);
             #endif
             break;
         #endif
         #if Z_SENSORLESS
           case Z_AXIS:
             #if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
-              if (index == 0) TMC_SET_SGT(Z);
+              if (index < 2) TMC_SET_SGT(Z);
             #endif
             #if ENABLED(Z2_IS_TMC2130)
-              if (index == 1) TMC_SET_SGT(Z2);
+              if (!(index & 1)) TMC_SET_SGT(Z2);
             #endif
             break;
         #endif
       }
     }
 
-    if (report) LOOP_XYZ(i) switch (i) {
+    if (report) {
       #if X_SENSORLESS
-        case X_AXIS:
         #if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
           TMC_SAY_SGT(X);
         #endif
         #if ENABLED(X2_IS_TMC2130)
           TMC_SAY_SGT(X2);
         #endif
-          break;
       #endif
       #if Y_SENSORLESS
-        case Y_AXIS:
         #if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
           TMC_SAY_SGT(Y);
         #endif
         #if ENABLED(Y2_IS_TMC2130)
           TMC_SAY_SGT(Y2);
         #endif
-          break;
       #endif
       #if Z_SENSORLESS
-        case Z_AXIS:
         #if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
           TMC_SAY_SGT(Z);
         #endif
         #if ENABLED(Z2_IS_TMC2130)
           TMC_SAY_SGT(Z2);
         #endif
-          break;
       #endif
     }
   }