updating print bed for moved parts

OperationSmallKat · Jun 26, 2023 · 9217bcc · 9217bcc
1 parent 24d0275
commit 9217bcc
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 53 deletions.
diff --git a/MarcosCad.groovy b/MarcosCad.groovy
@@ -1296,16 +1296,12 @@ class cadGenMarcos implements ICadGenerator{
 
 		File calibrationJigFile = new File(workDir.getAbsolutePath()+"/Calibration-"+configHash+".stl")
 		System.out.println("Stand file "+calibrationJigFile.getAbsolutePath());
+		CSG spars
 		if(calibrationJigFile.exists()) {
 			println "Calibration Jig Exists "+calibrationJigFile.getAbsolutePath()
 			makeCalibration=false
-			CSG spars  = Vitamins.get(calibrationJigFile);
-			spars.setManufacturing({incoming -> return incoming.toZMin()})
-			spars.setName("CalibrationJig")
-			spars.getStorage().set("bedType", "ff-Three")
-			spars.setPrintBedNumber(3)
-			spars.setColor(Color.DARKRED)
-			back.add(spars)
+			spars  = Vitamins.get(calibrationJigFile);
+
 		}
 		if(makeCalibration) {
 			double blockDepth = 35
@@ -1375,7 +1371,7 @@ class cadGenMarcos implements ICadGenerator{
 					.hull()
 					.difference(footLeftRear)
 					.difference(footRightRear)
-			CSG spars = Center.union([
+			spars = Center.union([
 				FrontSpar,
 				RearSpar,
 				fCal,
@@ -1386,15 +1382,16 @@ class cadGenMarcos implements ICadGenerator{
 			//		CSG RightFrontbox=calBlock.move(tipRightFront.x, tipRightFront.y, tipRightFront.z).difference(footRightFront)
 			//		CSG LeftRearbox=calBlock.move(tipLeftRear.x, tipLeftRear.y, tipLeftRear.z).difference(footLeftRear)
 			//		CSG RightRearbox=calBlock.move(tipRightRear.x, tipRightRear.y, tipRightRear.z).difference(footRightRear)
-			spars.setName("CalibrationJig")
-			spars.getStorage().set("bedType", "ff-Three")
-			spars.setPrintBedNumber(3)
-			spars.setManufacturing({incoming -> return incoming.toZMin()})
 			FileUtil.write(Paths.get(calibrationJigFile.getAbsolutePath()),
 					spars.toStlString());
-			spars.setColor(Color.DARKRED)
-			back.addAll([spars])
 		}
+		spars.setManufacturing({incoming -> return incoming.rotz(90).toZMin()})
+		spars.setName("CalibrationJig")
+		spars.getStorage().set("bedType", "ff-Three")
+		spars.setPrintBedNumber(3)
+		spars.setColor(Color.DARKRED)
+		back.add(spars)
+
 		back.addAll([
 			battery,
 			batteryInterface,

diff --git a/printbed.json b/printbed.json
@@ -1,8 +1,8 @@
 {
   "locations": {
     "BodyCover": {
-      "x": -157.56408993164126,
-      "y": 93.95044624652523,
+      "x": -163.51738832868395,
+      "y": 121.12000274658203,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -14,8 +14,8 @@
       }
     },
     "ShoulderCoverRightRear": {
-      "x": -158.12193057972647,
-      "y": 261.8660413340893,
+      "x": -49.30117244172665,
+      "y": 421.82710195936573,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -66,8 +66,8 @@
       }
     },
     "ShoulderCoverRightFront": {
-      "x": -157.529902388503,
-      "y": 226.83734065507966,
+      "x": -100.72312748653792,
+      "y": 423.8401353612399,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -131,8 +131,8 @@
       }
     },
     "ServoCoverTopRightBack": {
-      "x": 46.78421513086826,
-      "y": -140.94596958163058,
+      "x": 38.21076903530079,
+      "y": -87.94315362128293,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -261,8 +261,8 @@
       }
     },
     "ServoCoverTopRightFront": {
-      "x": 44.93386014258909,
-      "y": -100.88853420915925,
+      "x": 79.30288237250822,
+      "y": -89.05739844707207,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -287,8 +287,8 @@
       }
     },
     "ServoCoverBottomRightBack": {
-      "x": 121.20004490228979,
-      "y": -138.06401394414044,
+      "x": 2.175034251483111,
+      "y": -125.00835439829596,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -365,8 +365,8 @@
       }
     },
     "ServoCoverBottomLeftBack": {
-      "x": 84.3193142856509,
-      "y": -135.28715261415914,
+      "x": 40.630262555984366,
+      "y": -203.26049608047288,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -482,8 +482,8 @@
       }
     },
     "ServoCoverTopLeftBack": {
-      "x": 92.77616803369025,
-      "y": -145.96831736488937,
+      "x": -5.6843418860808015E-14,
+      "y": -130.33847247592476,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -547,8 +547,8 @@
       }
     },
     "PassiveLinkHead": {
-      "x": 105.86549417618109,
-      "y": -28.988296855193248,
+      "x": 28.996272036182745,
+      "y": -50.14634059059578,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -560,8 +560,8 @@
       }
     },
     "ServoCoverTopLeftFront": {
-      "x": 143.44948618164486,
-      "y": -146.92607418430123,
+      "x": -5.6843418860808015E-14,
+      "y": -167.9083171843613,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -573,8 +573,8 @@
       }
     },
     "ShoulderLeftRear": {
-      "x": -117.85085095550336,
-      "y": -16.270827843773603,
+      "x": -120.8297350618998,
+      "y": -16.923268094673958,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -612,8 +612,8 @@
       }
     },
     "ShoulderLeftFront": {
-      "x": -169.5,
-      "y": -16.249999999999975,
+      "x": -177.10789984761743,
+      "y": -17.649374513031134,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -651,8 +651,8 @@
       }
     },
     "ShoulderRightRear": {
-      "x": -169.5,
-      "y": -60.06344755563553,
+      "x": -181.18321879573776,
+      "y": -57.07037708238612,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -690,8 +690,8 @@
       }
     },
     "Body": {
-      "x": -198.1294673169311,
-      "y": 282.1200027465821,
+      "x": -196.49999999999991,
+      "y": 304.53941006206827,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -781,8 +781,8 @@
       }
     },
     "PassiveLinkTail": {
-      "x": 47.49515917655784,
-      "y": -21.93229071752323,
+      "x": 20.54421873988914,
+      "y": -27.015709750486707,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -833,8 +833,8 @@
       }
     },
     "ServoCoverBottomLeftFront": {
-      "x": 7.301995781466356,
-      "y": -182.5268811996041,
+      "x": 41.25139583020217,
+      "y": -163.75226181506835,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -846,8 +846,8 @@
       }
     },
     "ServoCoverBottomRightFront": {
-      "x": 45.44936406972298,
-      "y": -216.58668099113288,
+      "x": 81.7344471995408,
+      "y": -164.7450702669512,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -950,8 +950,8 @@
       }
     },
     "ShoulderRightFront": {
-      "x": -66.0225261816103,
-      "y": -19.249999999999975,
+      "x": -67.85430540250658,
+      "y": -19.575446942384545,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -1028,8 +1028,8 @@
       }
     },
     "CalibrationJig": {
-      "x": 105.40872588649616,
-      "y": -48.71437136188453,
+      "x": 151.28562927246094,
+      "y": -105.40872955322266,
       "z": 0.0,
       "rotation": {
         "storage": {
@@ -1080,6 +1080,6 @@
       }
     }
   },
-  "bedX": 200.0,
+  "bedX": 240.0,
   "bedY": 200.0
 }