Updated Marlin shapers

Author: thinkyhead

InputShaping.py

@@ -21,7 +21,10 @@ def getSettingDataString(self):
                     "type": "enum",
                     "options": {
                         "is": "M593 (ZV Input Shaping)",
-                        "ftm": "M493 (Fixed-Time Motion)"
+                        "oldis": "M593 (ZV Input Shaping - Beta)",
+                        "ftm": "M493 (Fixed-Time Motion)",
+                        "oldftm": "M493 (Fixed-Time Motion - Beta)",
+                        "voldftm": "M493 (Fixed-Time Motion - Alpha)"
                     },
                     "default_value": "is"
                 },
@@ -55,13 +58,26 @@ def execute(self, data):
                 elif line.startswith(';LAYER:'):
                     layer = float(line.strip(';LAYER:'))
                     hz = 0 if layer < 2 else start_hz + (end_hz-start_hz) * (layer - 2) / (max_layer-3)
-                    if gc == 'ftm':
-                        if layer == 0:
-                            lines[j] += '\n;TYPE:INPUTSHAPING\nM493 S11 D0 ;Enable ZVD Input Shaping'
+                    if layer == 0:
+                        params = ""
+                        if gc == 'voldftm':
+                            params = "S11"
+                        else if gc == 'oldftm':
+                            params = "S1 X11 Y11"
+                        else if gc == 'ftm':
+                            params = "S1 XY C11"
+                        if params:
+                            lines[j] += '\n;TYPE:INPUTSHAPING\nM493 %s D0 ;Enable ZVD Input Shaping' % params
+
+                    if gc in ('oldftm','voldftm'):
                         lines[j] += '\n;TYPE:INPUTSHAPING\nM493 A%f ;(Hz) X Input Shaping Test' % hz
                         lines[j] += '\nM493 B%f ;(Hz) Y Input Shaping Test' % hz
-                    if gc == 'is':
+                    else if gc == 'ftm':
+                        lines[j] += '\n;TYPE:INPUTSHAPING\nM493 XY A%f ;(Hz) XY Input Shaping Test' % hz
+                    else if gc == 'oldis':
                         lines[j] += '\n;TYPE:INPUTSHAPING\nM593 F%f ;(Hz) Input Shaping Test' % hz
+                    else if gc == 'is':
+                        lines[j] += '\n;TYPE:INPUTSHAPING\nM593 XY F%f ;(Hz) Input Shaping Test' % hz
             data[i] = '\n'.join(lines)
 
         return data