some fixture changes, json schema test still failing

Opentrons · Sep 30, 2024 · 25a0ecd · 25a0ecd
1 parent 706ad7b
commit 25a0ecd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git a/shared-data/labware/fixtures/3/fixture_2_plate.json b/shared-data/labware/fixtures/3/fixture_2_plate.json
@@ -62,39 +62,33 @@
   },
   "innerLabwareGeometry": {
     "daiwudhadfhiew": {
-      "frusta": [
+      "sections": [
         {
           "shape": "rectangular",
-          "xDimension": 127.76,
-          "yDimension": 85.8,
-          "topHeight": 42.16
-        },
-        {
-          "shape": "rectangular",
-          "xDimension": 70.0,
-          "yDimension": 50.0,
-          "topHeight": 20.0
+          "topXDimension": 127.76,
+          "topYDimension": 85.8,
+          "bottomXDimension": 70.0,
+          "bottomYDimension": 50.0,
+          "topHeight": 42.16,
+          "bottomHeight": 20.0
         }
       ]
     },
     "iuweofiuwhfn": {
-      "frusta": [
+      "sections": [
         {
           "shape": "circular",
-          "diameter": 35.0,
-          "topHeight": 42.16
+          "bottomDiameter": 35.0,
+          "topDiameter": 35.0,
+          "topHeight": 42.16,
+          "bottomHeight": 10.0
         },
         {
-          "shape": "circular",
-          "diameter": 35.0,
-          "topHeight": 20.0
+          "shape": "spherical",
+          "radiusOfCurvature": 20.0,
+          "topHeight": 10.0
         }
-      ],
-      "bottomShape": {
-        "shape": "spherical",
-        "radiusOfCurvature": 20.0,
-        "depth": 6.0
-      }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/fixtures/3/fixture_corning_24_plate.json b/shared-data/labware/fixtures/3/fixture_corning_24_plate.json
@@ -323,16 +323,13 @@
   },
   "innerLabwareGeometry": {
     "venirhgerug": {
-      "frusta": [
+      "sections": [
         {
           "shape": "circular",
-          "diameter": 16.26,
-          "topHeight": 17.4
-        },
-        {
-          "shape": "circular",
-          "diameter": 16.26,
-          "topHeight": 0.0
+          "bottomDiameter": 16.26,
+          "topDiameter": 16.26,
+          "topHeight": 17.4,
+          "bottomHeight": 0.0
         }
       ]
     }