Merge branch 'grblHAL:master' into master

gcode.h

@@ -241,7 +241,9 @@ typedef enum {
     LaserPPI_Enable = 126,              //!< 126 - M126
     LaserPPI_Rate = 127,                //!< 127 - M127
     LaserPPI_PulseLength = 128,         //!< 128 - M128
+    RGB_WriteLEDs = 150,                //!< 150 - M150, Marlin format
     OpenPNP_SetAcceleration = 204,      //!< 204 - M204
+    PWMServo_SetPosition= 280,          //!< 280 - M280, Marlin format
     RGB_Inspection_Light = 356,         //!< 356 - M356
     OpenPNP_FinishMoves = 400,          //!< 400 - M400
     Probe_Deploy = 401,                 //!< 401 - M401, Marlin format
@@ -389,6 +391,24 @@ typedef struct {
     float q;                   //!< User defined M-code parameter, M67 output value, G64 naive CAM tolerance, G83 delta increment
     float r;                   //!< Arc radius or retract position
     float s;                   //!< Spindle speed - single-meaning word
+#ifndef A_AXIS
+    float a;
+#endif
+#ifndef B_AXIS
+    float b;
+#endif
+#ifndef C_AXIS
+    float c;
+#endif
+#if !defined(U_AXIS) && !AXIS_REMAP_ABC2UVW
+    float u;
+#endif
+#if !defined(V_AXIS) && !AXIS_REMAP_ABC2UVW
+    float v;
+#endif
+#if !AXIS_REMAP_ABC2UVW
+    float w;
+#endif
     float xyz[N_AXIS];         //!< X,Y,Z (and A,B,C,U,V when enabled) translational axes
 #if LATHE_UVW_OPTION
     float uvw[3];              //!< U,V,W lathe mode incremental mode motion