minor changes

scripts/addons/cam/curvecamcreate.py

@@ -715,7 +715,7 @@ class CamCurvePuzzle(bpy.types.Operator):
             puzzle_joinery.multiangle(self.radius, self.height, math.pi/3, self.diameter, self.finger_tolerance,
                                       self.finger_amount,
                                       stem=self.stem_size, twist=self.twist_lock, tneck=self.twist_percent,
-                                      tthick=self.twist_thick, twist_keep=self.twist_keep,
+                                      tthick=self.twist_thick,
                                       combination=self.multiangle_gender)
 
         elif self.interlock_type == 'T':

scripts/addons/cam/curvecamtools.py

@@ -106,7 +106,7 @@ class CamCurveIntarsion(bpy.types.Operator):
     def execute(self, context):
         selected = context.selected_objects  # save original selected items
 
-        simple.removeMultiple('intarsion_')
+        simple.remove_multiple('intarsion_')
 
         for ob in selected:
             ob.select_set(True)  # select original curves
@@ -622,8 +622,8 @@ class CamOffsetSilhouete(bpy.types.Operator):
             for v in obj.data.vertices:  # extract X,Y coordinates from the vertices data
                 coords.append((v.co.x, v.co.y))
 
-            simple.removeMultiple('temp_mesh')  # delete temporary mesh
-            simple.removeMultiple('dilation')  # delete old dilation objects
+            simple.remove_multiple('temp_mesh')  # delete temporary mesh
+            simple.remove_multiple('dilation')  # delete old dilation objects
 
             line = LineString(coords)  # convert coordinates to shapely LineString datastructure
             print("line length=", round(line.length * 1000), 'mm')

scripts/addons/cam/joinery.py

@@ -105,8 +105,8 @@ def twist_line(length, thickness, finger_play, percentage, amount, distance, cen
 
 
 def twist_separator_slot(length, thickness, finger_play=0.00005, percentage=0.5):
-    simple.add_rectangle(thickness+finger_play, length, center_y=False)
-    simple.move(y=((length*percentage-finger_play)/2))
+    simple.add_rectangle(thickness+finger_play/2, length, center_y=False)
+    simple.move(y=((length*percentage-finger_play/2)/2))
     simple.duplicate()
     simple.mirrory()
     simple.join_multiple('simple_rectangle')
@@ -117,7 +117,7 @@ def interlock_twist_separator(length, thickness, amount, spacing, edge_distance,
                               start='rounded', end='rounded'):
     amount -= 1
     base_width = 2*edge_distance+spacing*amount+thickness
-    simple.add_rectangle(base_width, length, center_x=False)
+    simple.add_rectangle(base_width, length-finger_play*2, center_x=False)
     simple.active_name('_base')
     twist_separator_slot(length, thickness, finger_play, percentage)
     while amount > 0:
@@ -483,7 +483,7 @@ def single_interlock(finger_depth, finger_thick, finger_tolerance, x, y, groove_
     elif type == "TWIST":
         interlock_twist(finger_depth, finger_thick, finger_tolerance, x, y, groove_angle, percentage=twist_percentage)
     elif type == "PUZZLE":
-        puzzle_joinery.fingers(finger_thick, finger_tolerance, amount)
+        puzzle_joinery.fingers(finger_thick, finger_tolerance)
 
 
 def distributed_interlock(loop, loop_length, finger_depth, finger_thick, finger_tolerance, finger_amount, tangent=0,

scripts/addons/cam/puzzle_joinery.py

@@ -88,7 +88,7 @@ def finger(diameter, stem=2):
     simple.rename('_sum', "_puzzle")
 
 
-def fingers(diameter, inside, amount, stem=1):
+def fingers(diameter, inside, amount=1, stem=1):
     # diameter = diameter of the tool for joint creation
     # inside = Tolerance in the joint receptacle
     global DT  # Bit diameter tolerance