diff --git a/MarcosCad.groovy b/MarcosCad.groovy index eaa85ae..aeba023 100644 --- a/MarcosCad.groovy +++ b/MarcosCad.groovy @@ -895,7 +895,7 @@ class cadGenMarcos implements ICadGenerator{ return incoming.rotx(90).roty(90-numbers.FootAngle).toZMin().rotz(front?180:0) }) foot.getStorage().set("bedType", "ff-Two") - foot.setPrintBedNumber(2) + foot.setPrintBedNumber(3) foot.setName("Foot"+d.getScriptingName()) back.add(foot) } @@ -1074,7 +1074,7 @@ class cadGenMarcos implements ICadGenerator{ return incoming.roty(180).toZMin().toXMin().toYMin() }) link.getStorage().set("bedType", "ff-Three") - link.setPrintBedNumber(3) + link.setPrintBedNumber(2) back.add(link) CSG gearLink= Vitamins.get(ScriptingEngine.fileFromGit( "https://github.com/OperationSmallKat/Marcos.git", diff --git a/printbed.json b/printbed.json index b990e0c..a0736c8 100644 --- a/printbed.json +++ b/printbed.json @@ -118,8 +118,8 @@ } }, "ShoulderCoverLeftRear": { - "x": -8.881784197001252E-16, - "y": -16.249999999999975, + "x": -16.95649651192563, + "y": -140.19411849884426, "z": 0.0, "rotation": { "storage": { @@ -131,8 +131,8 @@ } }, "ServoCoverTopRightBack": { - "x": 38.21076903530079, - "y": -87.94315362128293, + "x": 39.67998966981497, + "y": -81.14773905340486, "z": 0.0, "rotation": { "storage": { @@ -144,8 +144,8 @@ } }, "DriveLink 0 LeftRear": { - "x": -187.31562355303862, - "y": -189.0430953799335, + "x": -191.042025682598, + "y": -191.00000003925155, "z": 0.0, "rotation": { "storage": { @@ -222,7 +222,7 @@ } }, "DriveLink 2 RightRear": { - "x": 4.376699041721466, + "x": -4.077994068942658, "y": -97.19665787652143, "z": 0.0, "rotation": { @@ -235,8 +235,8 @@ } }, "DriveLink 2 LeftFront": { - "x": -109.33184232772356, - "y": -201.83512270986324, + "x": -103.86737300407565, + "y": -137.75097940849346, "z": 0.0, "rotation": { "storage": { @@ -248,8 +248,8 @@ } }, "FootLeftRear": { - "x": -29.80681032657778, - "y": -151.90723610884018, + "x": 59.34943579305716, + "y": -171.78888664273944, "z": 0.0, "rotation": { "storage": { @@ -287,8 +287,8 @@ } }, "ServoCoverBottomRightBack": { - "x": 2.175034251483111, - "y": -125.00835439829596, + "x": 2.844754168052867, + "y": -112.86693888362575, "z": 0.0, "rotation": { "storage": { @@ -365,8 +365,8 @@ } }, "ServoCoverBottomLeftBack": { - "x": 40.630262555984366, - "y": -203.26049608047288, + "x": 2.858750660737182, + "y": -269.6841060965961, "z": 0.0, "rotation": { "storage": { @@ -430,8 +430,8 @@ } }, "DriveLink 2 LeftRear": { - "x": -203.45844358822885, - "y": -142.29864647407825, + "x": -201.4160733372425, + "y": -141.4522654022491, "z": 0.0, "rotation": { "storage": { @@ -469,8 +469,8 @@ } }, "FootLeftFront": { - "x": -62.24488368953406, - "y": -123.39991637856157, + "x": 47.93278071459273, + "y": -131.35897460413395, "z": 0.0, "rotation": { "storage": { @@ -482,8 +482,8 @@ } }, "ServoCoverTopLeftBack": { - "x": -5.6843418860808015E-14, - "y": -130.33847247592476, + "x": 37.824594870459194, + "y": -236.16986053567015, "z": 0.0, "rotation": { "storage": { @@ -521,8 +521,8 @@ } }, "FootRightRear": { - "x": -41.43865545878585, - "y": -100.9852630543038, + "x": 60.1107193613079, + "y": -110.07681585655621, "z": 0.0, "rotation": { "storage": { @@ -534,8 +534,8 @@ } }, "FootRightFront": { - "x": -62.47761733801338, - "y": -174.56989398130116, + "x": 45.05337784122042, + "y": -189.4142979244712, "z": 0.0, "rotation": { "storage": { @@ -547,8 +547,8 @@ } }, "PassiveLinkHead": { - "x": 20.282339980725492, - "y": -50.17541427473076, + "x": -90.50975284705744, + "y": -189.62044662860262, "z": 0.0, "rotation": { "storage": { @@ -560,8 +560,8 @@ } }, "ServoCoverTopLeftFront": { - "x": -5.6843418860808015E-14, - "y": -167.9083171843613, + "x": 56.69662929273143, + "y": -42.06336653735735, "z": 0.0, "rotation": { "storage": { @@ -625,8 +625,8 @@ } }, "DriveLink 0 RightRear": { - "x": -191.0, - "y": -148.8213790294917, + "x": -83.3025704573963, + "y": -150.39869876779758, "z": 0.0, "rotation": { "storage": { @@ -781,8 +781,8 @@ } }, "PassiveLinkTail": { - "x": 20.54421873988914, - "y": -27.015709750486707, + "x": -47.51690232081026, + "y": -120.45734586203405, "z": 0.0, "rotation": { "storage": { @@ -833,8 +833,8 @@ } }, "ServoCoverBottomLeftFront": { - "x": 41.25139583020217, - "y": -163.75226181506835, + "x": 20.339065833384236, + "y": -73.84866342241043, "z": 0.0, "rotation": { "storage": { @@ -846,8 +846,8 @@ } }, "ServoCoverBottomRightFront": { - "x": 81.7344471995408, - "y": -164.7450702669512, + "x": 99.8804333083557, + "y": -171.25494272044236, "z": 0.0, "rotation": { "storage": { @@ -859,7 +859,7 @@ } }, "DriveLink 2 RightFront": { - "x": 3.9346193205784616, + "x": -4.078816874216116, "y": -77.77522148497889, "z": 0.0, "rotation": { @@ -963,8 +963,8 @@ } }, "DriveLink 1 RightFront": { - "x": -34.87665407614769, - "y": -151.35612987243823, + "x": -71.2669542235088, + "y": -68.9124902495901, "z": 0.0, "rotation": { "storage": { @@ -976,8 +976,8 @@ } }, "PassiveLinkRightFront2": { - "x": -84.86115697914173, - "y": -93.90425724618282, + "x": -82.76318473535912, + "y": -92.96766014850213, "z": 0.0, "rotation": { "storage": { @@ -1028,8 +1028,8 @@ } }, "CalibrationJig": { - "x": 151.28562849883713, - "y": -105.40872955322266, + "x": 151.2721710205078, + "y": -114.93162536621094, "z": 0.0, "rotation": { "storage": {