tweak

MarlinFirmware · Mar 2, 2024 · f389d71 · f389d71
1 parent 8662393
commit f389d71
Showing 1 changed file with 12 additions and 36 deletions.
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
@@ -63,40 +63,18 @@
  */
 void GcodeSuite::M115() {
 
-    #if ENABLED(COREXY)
-      #define MACHINE_KINEMATICS "COREXY"
-    #elif ENABLED(COREXZ)
-      #define MACHINE_KINEMATICS "COREXZ"
-    #elif ENABLED(COREYZ)
-      #define MACHINE_KINEMATICS "COREYZ"
-    #elif ENABLED(COREYX)
-      #define MACHINE_KINEMATICS "COREYX"
-    #elif ENABLED(COREZX)
-      #define MACHINE_KINEMATICS "COREZX"
-    #elif ENABLED(COREZY)
-      #define MACHINE_KINEMATICS "COREZY"
-    #elif ENABLED(MARKFORGED_XY)
-      #define MACHINE_KINEMATICS "MARKFORGED_XY"
-    #elif ENABLED(MARKFORGED_YX)
-      #define MACHINE_KINEMATICS "MARKFORGED_YX"
-    #elif ENABLED(BELTPRINTER)
-      #define MACHINE_KINEMATICS "BELTPRINTER"
-    #elif ENABLED(POLARGRAPH)
-      #define MACHINE_KINEMATICS "POLARGRAPH"
-    #elif ENABLED(DELTA)
-      #define MACHINE_KINEMATICS "DELTA"
-    #elif ENABLED(MORGAN_SCARA)
-      #define MACHINE_KINEMATICS "MORGAN_SCARA"
-    #elif ENABLED(MP_SCARA)
-      #define MACHINE_KINEMATICS "MP_SCARA"
-    #elif ENABLED(AXEL_TPARA)
-      #define MACHINE_KINEMATICS "AXEL_TPARA"
-    #elif ENABLED(POLAR)
-      #define MACHINE_KINEMATICS "POLAR"
-    #else
-      #define MACHINE_KINEMATICS "CARTESIAN"
-    #endif
-
+  // Hosts should match one of these
+  #define MACHINE_KINEMATICS \
+    TERN_(COREXY, "COREXY") TERN_(COREXZ, "COREXZ") \
+    TERN_(COREYZ, "COREYZ") TERN_(COREYX, "COREYX") \
+    TERN_(COREZX, "COREZX") TERN_(COREZY, "COREZY") \
+    TERN_(MARKFORGED_XY, "MARKFORGED_XY") TERN_(MARKFORGED_YX, "MARKFORGED_YX") \
+    TERN_(POLARGRAPH, "POLARGRAPH") \
+    TERN_(POLAR, "POLAR") \
+    TERN_(DELTA, "DELTA") \
+    TERN_(IS_SCARA, "SCARA") \
+    TERN_(IS_CARTESIAN, "Cartesian") \
+    TERN_(BELTPRINTER, " BELTPRINTER")
 
   SERIAL_ECHOPGM("FIRMWARE_NAME:Marlin"
     " " DETAILED_BUILD_VERSION " (" __DATE__ " " __TIME__ ")"
@@ -116,8 +94,6 @@ void GcodeSuite::M115() {
     #endif
   );
 
-  #undef MACHINE_KINEMATICS
-
   #if !defined(MACHINE_UUID) && ENABLED(HAS_STM32_UID)
     /**
      * STM32-based devices have a 96-bit CPU device serial number.