updated teh bom

OperationSmallKat · Jun 20, 2023 · 61c5316 · 61c5316
1 parent d145088
commit 61c5316
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 172 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 /.classpath
 /.cproject
 /cache/
-/*.class
+/*.class
+/Calibration-*.stl
diff --git a/GearLink.stl → GearLinkChamfer.stl b/GearLink.stl → GearLinkChamfer.stl
diff --git a/MarcosCad.groovy b/MarcosCad.groovy
@@ -24,6 +24,7 @@ import javafx.scene.paint.Color
 import javafx.scene.transform.Affine
 import eu.mihosoft.vrl.v3d.ChamferedCylinder
 import java.lang.reflect.Type
+import java.nio.file.Paths
 
 import javax.xml.transform.TransformerFactory
 
@@ -1070,7 +1071,7 @@ class cadGenMarcos implements ICadGenerator{
 			back.add(link)
 			CSG gearLink= Vitamins.get(ScriptingEngine.fileFromGit(
 					"https://github.com/OperationSmallKat/Marcos.git",
-					"GearLink.stl"))
+					"GearLinkChamfer.stl"))
 
 					.movez(16.25)
 			gearLink.addAssemblyStep(4, new Transform().movez(30))
@@ -1292,7 +1293,16 @@ class cadGenMarcos implements ICadGenerator{
 		bodyCOver.setManufacturing({ incoming ->
 			return incoming.toZMin().toXMin().toYMin().movey(body.getTotalY()+1)
 		})
-
+
+		String configHash = arg0.getXml().hashCode();
+		File calibrationJigFile = new File(ScriptingEngine.getRepositoryCloneDirectory(arg0.getGitSelfSource()[0]).getAbsolutePath()+"/Calibration-"+configHash+".stl")
+
+		if(calibrationJigFile.exists()) {
+			println "Calibration Jig Exists "+calibrationJigFile.getAbsolutePath()
+			makeCalibration=false
+			CSG jig  = Vitamins.get(calibrationJigFile);
+			back.add(jig)
+		}
 		if(makeCalibration) {
 
 			Transform tipLeftFront = TransformFactory.nrToCSG(getByName(arg0,"LeftFront").calcHome())
@@ -1355,7 +1365,8 @@ class cadGenMarcos implements ICadGenerator{
 			spars.getStorage().set("bedType", "ff-Three")
 			spars.setPrintBedNumber(3)
 			spars.setManufacturing({incoming -> return incoming.toZMin()})
-
+			FileUtil.write(Paths.get(calibrationJigFile.getAbsolutePath()),
+				spars.toStlString());
 			back.addAll([spars])
 		}
 		back.addAll([

diff --git a/manufacturing/bom.csv b/manufacturing/bom.csv
@@ -1,11 +1,11 @@
 name,qty,source
 hobbyServo:mg92b,16,https://www.aliexpress.us/item/3256801883704529.html?spm=a2g0o.detail.1000014.1.7a771b29SLCuHw
-chamferedScrew:M3x16,37,https://www.mcmaster.com/91294A134/
+chamferedScrew:M3x16,31,https://www.mcmaster.com/91294A134/
 smallKatElectronics:motherboard,1,https://commonwealthrobotics.com/
-PhillipsRoundedHeadThreadFormingScrews:M2x8,56,https://www.mcmaster.com/90380A327/
 smallKatElectronics:batteryInterface,1,https://commonwealthrobotics.com/
+PhillipsRoundedHeadThreadFormingScrews:M2x8,56,https://www.mcmaster.com/90380A327/
 squareNut:M3,70,https://www.mcmaster.com/97259A101/
 PhillipsRoundedHeadThreadFormingScrews:M3x6,6,https://www.mcmaster.com/99461A939/
-capScrew:M3x16,4,https://www.mcmaster.com/91290A120/
+capScrew:M3x16,2,https://www.mcmaster.com/91290A120/
 conePointSetScrew:M3x8,32,https://www.mcmaster.com/91210A101/
 smallKatElectronics:dji-mavic-pro-battery,1,https://www.aliexpress.us/item/3256803158664022.html?spm=a2g0o.productlist.main.35.2f0b2192nAw7fe
diff --git a/manufacturing/bom.json b/manufacturing/bom.json
@@ -362,24 +362,6 @@
         }
       }
     },
-    {
-      "name": "RightLinkScrewTail:1",
-      "type": "chamferedScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 32.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
-    },
     {
       "name": "LeftLinkScrewLeftRear:0",
       "type": "chamferedScrew",
@@ -813,79 +795,7 @@
       }
     },
     {
-      "name": "LeftLinkScrewDummyLeftRear:0",
-      "type": "chamferedScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
-    },
-    {
-      "name": "RightLinkScrewDummyLeftRear:0",
-      "type": "chamferedScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
-    },
-    {
-      "name": "LeftLinkScrewDummyRightFront:0",
-      "type": "chamferedScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
-    },
-    {
-      "name": "RightLinkScrewDummyRightFront:0",
-      "type": "chamferedScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
-    },
-    {
-      "name": "LeftLinkScrewDummyLeftFront:0",
+      "name": "LeftLinkScrewHead:1",
       "type": "chamferedScrew",
       "size": "M3x16",
       "pose": {
@@ -903,11 +813,11 @@
       }
     },
     {
-      "name": "RightLinkScrewDummyLeftFront:0",
+      "name": "RightLinkScrewTail:1",
       "type": "chamferedScrew",
       "size": "M3x16",
       "pose": {
-        "x": 0.0,
+        "x": 32.0,
         "y": 0.0,
         "z": 0.0,
         "rotation": {
@@ -921,7 +831,7 @@
       }
     },
     {
-      "name": "LeftLinkScrewDummyRightRear:0",
+      "name": "LeftLinkScrewTail:1",
       "type": "chamferedScrew",
       "size": "M3x16",
       "pose": {
@@ -937,15 +847,17 @@
           }
         }
       }
-    },
+    }
+  ],
+  "smallKatElectronics:motherboard": [
     {
-      "name": "RightLinkScrewDummyRightRear:0",
-      "type": "chamferedScrew",
-      "size": "M3x16",
+      "name": "motherboard",
+      "type": "smallKatElectronics",
+      "size": "motherboard",
       "pose": {
-        "x": 0.0,
+        "x": -1.5,
         "y": 0.0,
-        "z": 0.0,
+        "z": 139.535,
         "rotation": {
           "storage": {
             "q0": 1.0,
@@ -957,21 +869,21 @@
       }
     }
   ],
-  "smallKatElectronics:motherboard": [
+  "smallKatElectronics:batteryInterface": [
     {
-      "name": "motherboard",
+      "name": "batteryInterface",
       "type": "smallKatElectronics",
-      "size": "motherboard",
+      "size": "batteryInterface",
       "pose": {
-        "x": -1.5,
+        "x": 49.25,
         "y": 0.0,
-        "z": 139.535,
+        "z": 113.535,
         "rotation": {
           "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
+            "q0": -4.329780281177467E-17,
+            "q1": 0.7071067811865476,
+            "q2": -0.7071067811865475,
+            "q3": 4.329780281177466E-17
           }
         }
       }
@@ -1987,26 +1899,6 @@
       }
     }
   ],
-  "smallKatElectronics:batteryInterface": [
-    {
-      "name": "batteryInterface",
-      "type": "smallKatElectronics",
-      "size": "batteryInterface",
-      "pose": {
-        "x": 49.25,
-        "y": 0.0,
-        "z": 113.535,
-        "rotation": {
-          "storage": {
-            "q0": -4.329780281177467E-17,
-            "q1": 0.7071067811865476,
-            "q2": -0.7071067811865475,
-            "q3": 4.329780281177466E-17
-          }
-        }
-      }
-    }
-  ],
   "squareNut:M3": [
     {
       "name": "LeftLinkNutLeftRear:0",
@@ -3398,24 +3290,6 @@
         }
       }
     },
-    {
-      "name": "LeftLinkScrewHead:1",
-      "type": "capScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
-    },
     {
       "name": "MountScrewTail:0",
       "type": "capScrew",
@@ -3433,24 +3307,6 @@
           }
         }
       }
-    },
-    {
-      "name": "LeftLinkScrewTail:1",
-      "type": "capScrew",
-      "size": "M3x16",
-      "pose": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "rotation": {
-          "storage": {
-            "q0": 1.0,
-            "q1": 0.0,
-            "q2": 0.0,
-            "q3": 0.0
-          }
-        }
-      }
     }
   ],
   "conePointSetScrew:M3x8": [