Updating to the rib form factor cad

OperationSmallKat · Mar 13, 2024 · b165017 · b165017
1 parent d1a66f2
commit b165017
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/BodyCover.stl b/BodyCover.stl
diff --git a/Body.stl → BodyRib.stl b/Body.stl → BodyRib.stl
diff --git a/CoverHinged.stl b/CoverHinged.stl
diff --git a/Latch.stl b/Latch.stl
diff --git a/MarcosCad.groovy b/MarcosCad.groovy
@@ -782,13 +782,13 @@ class cadGenMarcos implements ICadGenerator{
 		}
 		//reorent the horn for resin printing
 		myServoHorn.setManufacturing({incoming ->
-			return reverseDHValues(incoming, d, linkIndex).roty(linkIndex==0?(front?180:0):(left?180:0)).toZMin()
+			return null;//reverseDHValues(incoming, d, linkIndex).roty(linkIndex==0?(front?180:0):(left?180:0)).toZMin()
 			//.roty(45)
 			//.movez(5)
 		})
-		myServoHorn.getStorage().set("bedType", "resin")
-		myServoHorn.setPrintBedNumber(4)
-		myServoHorn.setName("Resin Horn "+linkIndex+" "+d.getScriptingName())
+		//myServoHorn.getStorage().set("bedType", "resin")
+		//myServoHorn.setPrintBedNumber(4)
+		//myServoHorn.setName("Resin Horn "+linkIndex+" "+d.getScriptingName())
 		// attach this links manipulator
 		myServoHorn.setManipulator(dGetLinkObjectManipulator)
 		back.add(myServoHorn)
@@ -1301,17 +1301,20 @@ class cadGenMarcos implements ICadGenerator{
 
 		CSG body  = Vitamins.get(ScriptingEngine.fileFromGit(
 				"https://github.com/OperationSmallKat/Marcos.git",
-				"Body.stl")).movez(zCenterLine);
+				"BodyRib.stl")).movez(zCenterLine);
 		CSG bodyCOver  = Vitamins.get(ScriptingEngine.fileFromGit(
 				"https://github.com/OperationSmallKat/Marcos.git",
-				"BodyCover.stl")).movez(zCenterLine);
+				"CoverHinged.stl")).movez(zCenterLine);
+		CSG bodyLatch  = Vitamins.get(ScriptingEngine.fileFromGit(
+				"https://github.com/OperationSmallKat/Marcos.git",
+				"Latch.stl")).movez(zCenterLine);
 		CSG topCOver  = Vitamins.get(ScriptingEngine.fileFromGit(
 				"https://github.com/OperationSmallKat/Marcos.git",
 				"BodyServoCoverTop.stl")).movez(zCenterLine);
 		CSG BottomCover  = Vitamins.get(ScriptingEngine.fileFromGit(
 				"https://github.com/OperationSmallKat/Marcos.git",
 				"BodyCoverBottom.stl")).movez(zCenterLine);
-		ArrayList<CSG> back =[body, bodyCOver]
+		ArrayList<CSG> back =[body, bodyCOver,bodyLatch]
 		for(CSG c:back) {
 			c.getStorage().set("bedType", "ff-One")
 			c.setPrintBedNumber(5)
@@ -1395,6 +1398,10 @@ class cadGenMarcos implements ICadGenerator{
 		bodyCOver.setName("BodyCover")
 		bodyCOver.addAssemblyStep(6, new Transform().movez(80))
 		body.setName("Body")
+		bodyLatch.setName("Latch")
+		bodyLatch.setManufacturing({ incoming ->
+			return incoming.toZMin().toXMin().toYMin()
+		})
 		body.setManufacturing({ incoming ->
 			return incoming.rotx(180).toZMin().toXMin().toYMin()
 		})

diff --git a/printbed.json b/printbed.json
@@ -1,7 +1,7 @@
 {
   "locations": {
     "BodyCover": {
-      "x": -163.51738832868395,
+      "x": -171.05033226993706,
       "y": 121.12000274658203,
       "z": 0.0,
       "rotation": {
@@ -79,8 +79,8 @@
       }
     },
     "Head_Head": {
-      "x": -97.70369162302464,
-      "y": 130.5737533569336,
+      "x": -114.29362746337146,
+      "y": 143.96000904231553,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -1040,6 +1040,19 @@
         }
       }
     },
+    "Latch": {
+      "x": -156.48960846775893,
+      "y": 405.7274849075315,
+      "z": 0.0,
+      "rotation": {
+        "storage": {
+          "q0": 1.0,
+          "q1": 0.0,
+          "q2": 0.0,
+          "q3": 0.0
+        }
+      }
+    },
     "Resin Horn 2 LeftRear": {
       "x": 54.01005893814598,
       "y": 31.011142291845015,