Revert "repetitions to instances update"

This reverts commit f4cb114.
KittyCAD · Oct 15, 2024 · 365ae68 · 365ae68
1 parent f4cb114
commit 365ae68
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 47 deletions.
diff --git a/ball-bearing/ball-bearing.kcl b/ball-bearing/ball-bearing.kcl
@@ -54,7 +54,7 @@ balls = revolve({
       arcDegrees: 360,
       axis: [0, 0, 1],
       center: [0, 0, 0],
-      instances: nBalls,
+      repetitions: nBalls-1,
       rotateDuplicates: true
   }, %)
 
@@ -78,7 +78,7 @@ chainHead = revolve({
     arcDegrees: 360,
     axis: [0, 0, 1],
     center: [0, 0, 0],
-    instances: nBalls,
+    repetitions: nBalls-1,
     rotateDuplicates: true,
   }, %)
 
@@ -98,7 +98,7 @@ linkRevolve = revolve({
     arcDegrees: 360,
     axis: [0, 0, 1],
     center: [0, 0, 0],
-    instances: nBalls,
+    repetitions: nBalls-1,
     rotateDuplicates: true,
   }, %)
 

diff --git a/car-wheel-assembly/car-wheel-assembly.kcl b/car-wheel-assembly/car-wheel-assembly.kcl
@@ -20,7 +20,7 @@ circles = startSketchOn('XZ')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: lugCount - 1,
+       repetitions: lugCount - 1,
        rotateDuplicates: true
      }, %)
 
@@ -65,7 +65,7 @@ sketch005 = startSketchOn(sketch002, 'END')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: lugCount,
+       repetitions: lugCount - 1,
        rotateDuplicates: true
      }, %)
 
@@ -162,7 +162,7 @@ sketch009 = extrude(20, sketch007)
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, -2000, 0],
-       instances: 6,
+       repetitions: 5,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -171,7 +171,7 @@ sketch0010 = extrude(-20, sketch008)
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, -2000, 0],
-       instances: 6,
+       repetitions: 5,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -233,7 +233,7 @@ fn lugPattern = (plane) => {
   |> patternCircular2d({
     arcDegrees: 360,
     center: [0, 0],
-    instances: lugCount,
+    repetitions: lugCount - 1,
     rotateDuplicates: true,
   }, %)
   return lugHolePattern
@@ -271,7 +271,7 @@ spacerSketch = startSketchOn(rotorSecondaryPlatePlane)
   |> patternCircular2d({
     arcDegrees: 360,
     center: [0, 0],
-    instances: spacerCount,
+    repetitions: spacerCount,
     rotateDuplicates: true,
   }, %)
 
@@ -329,7 +329,7 @@ lug(customPlane, lugLength, lugDiameter)
       arcDegrees: 360,
       axis: [0, 1, 0],
       center: [0, 0, 0],
-      instances: 5,
+      repetitions: 4,
       rotateDuplicates: false,
     }, %)
 

diff --git a/car-wheel/car-wheel.kcl b/car-wheel/car-wheel.kcl
@@ -48,7 +48,7 @@ lugClearance = startSketchOn(lugExtrusion, 'END')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: lugCount,
+       repetitions: lugCount - 1,
        rotateDuplicates: true
      }, %)
   |> extrude(-wheelWidth / 10, %)
@@ -62,7 +62,7 @@ lugHoles = startSketchOn(lugBase, 'END')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: lugCount,
+       repetitions: lugCount - 1,
        rotateDuplicates: true
      }, %)
   |> extrude(-wheelWidth / 20, %)
@@ -146,7 +146,7 @@ fn spoke = (spokeGap, spokeAngle, spokeThickness) => {
     |> patternCircular3d({
          axis: [0, 1, 0],
          center: [0, -2000, 0],
-         instances: 6,
+         repetitions: 5,
          arcDegrees: 360,
          rotateDuplicates: true
        }, %)

diff --git a/flange-with-patterns/flange-with-patterns.kcl b/flange-with-patterns/flange-with-patterns.kcl
@@ -25,7 +25,7 @@ circles = startSketchOn('XY')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: nHoles,
+       repetitions: nHoles - 1,
        rotateDuplicates: true
      }, %)
 

diff --git a/focusrite-scarlett-mounting-bracket/focusrite-scarlett-mounting-bracket.kcl b/focusrite-scarlett-mounting-bracket/focusrite-scarlett-mounting-bracket.kcl
@@ -96,7 +96,7 @@ tabsR = startSketchOn(tabPlane)
      }, %)
   |> patternLinear3d({
        axis: [0, -1, 0],
-       instances: 2,
+       repetitions: 1,
        distance: length + 2 * thk - (tabLength * 4 / 3)
      }, %)
 
@@ -123,7 +123,7 @@ tabsL = startSketchOn(tabPlane)
      }, %)
   |> patternLinear3d({
        axis: [0, -1, 0],
-       instances: 2,
+       repetitions: 1,
        distance: length + 2 * thk - (tabLength * 4 / 3)
      }, %)
 

diff --git a/french-press/french-press.kcl b/french-press/french-press.kcl
@@ -86,7 +86,7 @@ sketch002 = startSketchOn(plane001)
   |> patternCircular3d({
        axis: [0, 0, 1],
        center: [0, 0, 0],
-       instances: 5,
+       repetitions: 3,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -112,7 +112,7 @@ sketch004 = startSketchOn(extrude001, 'END')
   |> close(%)
   |> patternCircular2d({
        center: [0, 0],
-       instances: 3,
+       repetitions: 2,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -162,7 +162,7 @@ sketch008 = startSketchOn(extrude003, 'END')
   |> circle({ center: [1.4, 0], radius: .3 }, %)
   |> patternCircular2d({
        center: [0, 0],
-       instances: 8,
+       repetitions: 7,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -174,7 +174,7 @@ sketch009 = startSketchOn(extrude003, 'END')
   |> circle({ center: [0.6, 0], radius: .2 }, %)
   |> patternCircular2d({
        center: [0, 0],
-       instances: 4,
+       repetitions: 3,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)

diff --git a/gear-rack/gear-rack.kcl b/gear-rack/gear-rack.kcl
@@ -38,7 +38,7 @@ teeth = tooth()
   |> patternLinear3d({
        axis: [10, 0, 0],
        distance: 1.570796,
-       instances: 63
+       repetitions: 62
      }, %)
 
 // Sketch and extrude the first end cap. This is a partial tooth

diff --git a/gear/gear.kcl b/gear/gear.kcl
@@ -59,7 +59,7 @@ teeth = tooth()
        arcDegrees: 360,
        axis: [0, 0, 1],
        center: [0, 0, 0],
-       instances: nTeeth,
+       repetitions: nTeeth - 1,
        rotateDuplicates: true
      }, %)
 

diff --git a/lego/lego.kcl b/lego/lego.kcl
@@ -75,12 +75,12 @@ peg = startSketchOn(s, 'end')
      }, %)
   |> patternLinear2d({
        axis: [1, 0],
-       instances: wbumps,
+       repetitions: wbumps - 1,
        distance: pitch
      }, %)
   |> patternLinear2d({
        axis: [0, 1],
-       instances: lbumps,
+       repetitions: lbumps - 1,
        distance: pitch
      }, %)
   |> extrude(bumpHeight, %)
@@ -96,12 +96,12 @@ tubePattern = startSketchOn(tubeFace)
      }, %)
   |> patternLinear2d({
        axis: [1, 0],
-       instances: wbumps - 1,
+       repetitions: wbumps - 2,
        distance: pitch
      }, %)
   |> patternLinear2d({
        axis: [0, 1],
-       instances: lbumps - 1,
+       repetitions: lbumps - 2,
        distance: pitch
      }, %)
   |> extrude(-bumpHeight, %)
diff --git a/multi-axis-robot/multi-axis-robot.kcl b/multi-axis-robot/multi-axis-robot.kcl
@@ -61,7 +61,7 @@ sketch4A = startSketchOn(extrude001, 'END')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: 5,
+       repetitions: 3,
        rotateDuplicates: true
      }, %)
 
@@ -78,7 +78,7 @@ sketch4B = startSketchOn(extrude001, 'END')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: 5,
+       repetitions: 3,
        rotateDuplicates: true
      }, %)
 
@@ -157,7 +157,7 @@ sketch008 = startSketchOn(extrude007, 'END')
          1.75 * cos(toRadians(axisJ1)) / abs(cos(toRadians(axisJ1))),
          8
        ],
-       instances: 5,
+       repetitions: 3,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -253,7 +253,7 @@ sketch014 = startSketchOn(extrude012, 'END')
   |> circle({ center: [-1.75, 6.75], radius: 0.2 }, %)
   |> patternCircular2d({
        center: [-1.75, 8],
-       instances: 9,
+       repetitions: 7,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -273,7 +273,7 @@ sketch015 = startSketchOn(extrude013, 'END')
          -1.75 - (axisJ2ArmLength * cos(toRadians(axisJ2))),
          8 + axisJ2ArmLength * sin(toRadians(axisJ2))
        ],
-       instances: 5,
+       repetitions: 3,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -350,7 +350,7 @@ sketch019 = startSketchOn(extrude018, 'END')
          1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)),
          8 + axisJ2ArmLength * sin(toRadians(axisJ2))
        ],
-       instances: 9,
+       repetitions: 7,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)

diff --git a/pipe-flange-assembly/pipe-flange-assembly.kcl b/pipe-flange-assembly/pipe-flange-assembly.kcl
@@ -159,7 +159,7 @@ mountingHolePattern = startSketchOn('XZ')
   |> patternCircular2d({
        arcDegrees: 360,
        center: [0, 0],
-       instances: 7,
+       repetitions: 6,
        rotateDuplicates: true
      }, %)
 
@@ -213,7 +213,7 @@ washer(workingPlane, [screwStart[2], screwStart[0]], 0.0625, screwDia + tol, 0.6
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, 0, 0],
-       instances: 7,
+       repetitions: 6,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -227,7 +227,7 @@ capScrew([
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, 0, 0],
-       instances: 7,
+       repetitions: 6,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -238,7 +238,7 @@ screwBody = extrude(-screwLength, screwBodySketch)
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, 0, 0],
-       instances: 7,
+       repetitions: 6,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -262,7 +262,7 @@ washer(backSideWasherPlane, [screwStart[2], screwStart[0]], 0.0625, screwDia + t
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, 0, 0],
-       instances: 7,
+       repetitions: 6,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
@@ -276,7 +276,7 @@ hexNut([
   |> patternCircular3d({
        axis: [0, 1, 0],
        center: [0, 0, 0],
-       instances: 7,
+       repetitions: 6,
        arcDegrees: 360,
        rotateDuplicates: true
      }, %)
diff --git a/router-template-slate/router-template-slate.kcl b/router-template-slate/router-template-slate.kcl
@@ -1,7 +1,6 @@
 // Router template for a slate
 // A guide for routing a slate for a cross bar.
 
-
 // Define constants
 routerDiameter = 12.7 // mm
 mmInInch = 25.4 // mm