Allow more types of printers

z_v2settling_probe.py

@@ -21,7 +21,7 @@ def __init__(self, config):
             mcu_probe = probe_obj.mcu_probe
         else:
             mcu_probe = probe.ProbeEndstopWrapper(config)
-            
+
         #figure out a way to determine which type of printer we are running on
         #only call __init__ for z_v2settling_probe extension for the correct type of printer
         atypes = {  'none'       : None,     'cartesian'     : 'cartesian',              'corexy' : 'corexy',
@@ -30,9 +30,9 @@ def __init__(self, config):
                   'polar'        : 'polar',          'winch' : 'winch'         }
         kinematics_config = config.getsection('printer')
         kinematics_choice = kinematics_config.getchoice('kinematics', atypes, 'none')
-        if kinematics_choice in ['corexy','cartesian','corexz','hybrid_corexy','hybrid_corexz']:
+        if kinematics_choice in ['corexy','cartesian','corexz','hybrid_corexy','hybrid_corexz', 'rotary_delta', 'delta', 'deltesian', 'polar']:
             logging.info("z_v2settling_probe ::INFO:: Printer has the following "
-                         "kinematics: %s" % (kinematics_choice))  
+                         "kinematics: %s" % (kinematics_choice))
         else:
             logging.info("z_v2settling_probe ::ERROR:: Printer has the following "
                          "kinematics:\n    kinematics = %s\n"
@@ -69,7 +69,7 @@ def handle_ready(self):
         probe_obj = self.printer.objects.pop('probe', None)
         self.printer.objects['probe'] = self
         del probe_obj
-        
+
     def _run_settling_probe(self, gcmd):
         gcmd.respond_info("Settling sample (ignored)...")
         speed = gcmd.get_float("PROBE_SPEED", self.speed, above=0.)
@@ -80,31 +80,31 @@ def _run_settling_probe(self, gcmd):
         pos[2] += sample_retract_dist
         self._move(pos, lift_speed)
 
-    def run_probe(self, gcmd):                 
+    def run_probe(self, gcmd):
     # The following use self.run_probe : probe.PrinterProbe.cmd_PROBE; probe.PrinterProbe.cmd_PROBE_CALIBRATE;
     # and probe.ProbePointsHelper.start_probe
         if gcmd.get_int("SETTLING_SAMPLE", self.settling_sample):
             self._run_settling_probe(gcmd)
         return probe.PrinterProbe.run_probe(self, gcmd)
-        
+
     def cmd_PROBE_ACCURACY(self, gcmd):
     # the probe.PrinterProbe.cmd_PROBE_ACCURACY calls self._probe(speed) not self.run_probe(gcmd)
         if gcmd.get_int("SETTLING_SAMPLE", self.settling_sample):
             self._run_settling_probe(gcmd)
         return probe.PrinterProbe.cmd_PROBE_ACCURACY(self, gcmd)
-    
+
 class V2SettlingZCalibrationHelper(z_calibration.ZCalibrationHelper):
     def __init__(self, config):
         self.printer = config.get_printer()
         z_calibration_config = config.getsection('z_calibration')
-        
+
         # Unregister any pre-existing z_calibration commands first.
         self.gcode = self.printer.lookup_object('gcode')
         self.gcode.register_command('CALIBRATE_Z', None)
         self.gcode.register_command('PROBE_Z_ACCURACY', None)
         z_calibration.ZCalibrationHelper.__init__(self, z_calibration_config)
         self.printer.register_event_handler("klippy:ready", self.handle_ready)
-                                            
+
     def handle_ready(self):
         self.probe = self.printer.lookup_object('probe')
         self.settling_sample = self.probe.settling_sample
@@ -117,7 +117,7 @@ def handle_ready(self):
         z_calibration_obj = self.printer.objects.pop('z_calibration', None)
         self.printer.objects['z_calibration'] = self
         del z_calibration_obj
-        
+
     def move_to_z_endstop(self, gcmd, lift_speed):
         if self.z_homing is None:
             raise gcmd.error("Must home axes first")
@@ -129,19 +129,19 @@ def move_to_z_endstop(self, gcmd, lift_speed):
             self._move(pos, lift_speed)
         # move to z-endstop position
         self._move(list(self.nozzle_site), self.speed)
-        
+
     def _test_cmdline_param(self, gcmd):
         try:
             gcmd.get_int("SETTLING_SAMPLE")
         except:
             pass
         else:
-            gcmd.respond_info("Ignoring parameter 'SETTLING_SAMPLE'")    
-            
+            gcmd.respond_info("Ignoring parameter 'SETTLING_SAMPLE'")
+
     def _message_first_fast(self, gcmd):
         gcmd.respond_info("Settling sample (ignored)...for each probe location [endstop, switch body, and bed] ...")
         self._test_cmdline_param(gcmd)
-        
+
     # cmd_CALIBRATE_Z will always discard the settling_sample as long as self.first_fast is set to true
     def cmd_CALIBRATE_Z(self, gcmd):
         global_first_fast = self.first_fast
@@ -157,17 +157,17 @@ def cmd_CALIBRATE_Z(self, gcmd):
             self.first_fast = False
         else:
             return z_calibration.ZCalibrationHelper.cmd_CALIBRATE_Z(self, gcmd)
-        
+
     def cmd_PROBE_Z_ACCURACY(self, gcmd):
         speed = gcmd.get_float("PROBE_SPEED", self.second_speed, above=0.)
-        lift_speed = gcmd.get_float("LIFT_SPEED", self.lift_speed, above=0.)        
+        lift_speed = gcmd.get_float("LIFT_SPEED", self.lift_speed, above=0.)
         if gcmd.get_int("SETTLING_SAMPLE", self.settling_sample):
             self.move_to_z_endstop(gcmd, lift_speed)
-            gcmd.respond_info("Settling sample (ignored)...") 
+            gcmd.respond_info("Settling sample (ignored)...")
             #self._probe() does a probe and a retract
-            pos = self._probe(self.z_endstop, self.position_min, speed)  
-        return z_calibration.ZCalibrationHelper.cmd_PROBE_Z_ACCURACY(self, gcmd)    
-            
+            pos = self._probe(self.z_endstop, self.position_min, speed)
+        return z_calibration.ZCalibrationHelper.cmd_PROBE_Z_ACCURACY(self, gcmd)
+
 def load_config(config):
     try:
         z_calibration_obj = config.get_printer().lookup_object('z_calibration')
@@ -176,8 +176,7 @@ def load_config(config):
                      " command will not be available!\n"
                      "CALIBRATE_Z command will not be available!\n"
                      "This printer does not use the Klipper plugin for "
-                     "the self calibrating Z offset!")  
+                     "the self calibrating Z offset!")
         return V2SettlingProbe(config)
     else:
-        return V2SettlingProbe(config), V2SettlingZCalibrationHelper(config)    
-
+        return V2SettlingProbe(config), V2SettlingZCalibrationHelper(config)