hardware cad updates to the usa-12-well

Opentrons · Dec 20, 2024 · 998393f · 998393f
1 parent f6b0fba
commit 998393f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/api/tests/opentrons/protocol_engine/state/inner_geometry_test_params.py b/api/tests/opentrons/protocol_engine/state/inner_geometry_test_params.py
@@ -115,7 +115,7 @@
         3.0,
     ],
     # failed - squared cone
-    ["usascientific_12_reservoir_22ml", "cuboidalWell", 492.8, 21111.5, 3.0, 3.0],
+    ["usascientific_12_reservoir_22ml", "cuboidalWell", 528.88, 21111.5, 3.0, 3.0],
     ["thermoscientificnunc_96_wellplate_2000ul", "conicalWell", 73.5, 1768.0, 3.0, 3.0],
     # skipped usascientific_96_wellplate_2.4ml_deep since it doesnt have a definition yet
     # weird one

diff --git a/shared-data/labware/definitions/3/usascientific_12_reservoir_22ml/2.json b/shared-data/labware/definitions/3/usascientific_12_reservoir_22ml/2.json
@@ -205,31 +205,30 @@
     "cuboidalWell": {
       "sections": [
         {
-          "shape": "conical",
-          "bottomDiameter": 1.95,
-          "topDiameter": 8.1,
-          "topHeight": 3.2,
-          "bottomHeight": 0,
+          "shape": "spherical",
+          "radiusOfCurvature": 1.5362,
+          "topHeight": 0.25,
+          "bottomHeight": 0.0,
           "yCount": 8
         },
         {
           "shape": "squaredcone",
           "bottomCrossSection": "circular",
-          "circleDiameter": 8.1,
-          "rectangleXDimension": 8.1,
-          "rectangleYDimension": 8.9688,
-          "topHeight": 3.94,
-          "bottomHeight": 3.2,
+          "circleDiameter": 1.68,
+          "rectangleXDimension": 7.9,
+          "rectangleYDimension": 7.9,
+          "topHeight": 4.00,
+          "bottomHeight": 0.25,
           "yCount": 8
         },
         {
           "shape": "cuboidal",
           "topXDimension": 8.34,
           "topYDimension": 71.85,
-          "bottomXDimension": 7.98,
-          "bottomYDimension": 70.98,
+          "bottomXDimension": 7.9,
+          "bottomYDimension": 71.75,
           "topHeight": 41.75,
-          "bottomHeight": 3.94
+          "bottomHeight": 4.0
         }
       ]
     }