ohh javascript

Opentrons · Oct 7, 2024 · 59e4130 · 59e4130
1 parent 070e119
commit 59e4130
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 13 deletions.
diff --git a/shared-data/js/types.ts b/shared-data/js/types.ts
@@ -162,25 +162,52 @@ export type LabwareWell = LabwareWellProperties & {
 export interface SphericalSegment {
   shape: 'spherical'
   radiusOfCurvature: number
-  depth: number
+  topHeight: number
+  bottomHeight: number
 }
 
-export interface CircularBoundedSection {
-  shape: 'circular'
-  diameter: number
+export interface ConicalFrustum {
+  shape: 'conical'
+  bottomDiameter: number
+  topDiameter: number
   topHeight: number
+  bottomHeight: number
 }
 
-export interface RectangularBoundedSection {
-  shape: 'rectangular'
-  xDimension: number
-  yDimension: number
+export interface CuboidalFrustum {
+  shape: 'cuboidal'
+  bottomXDimension: number
+  bottomYDimension: number
+  topXDimension: number
+  topYDimension: number
   topHeight: number
+  bottomHeight: number
 }
 
-export interface InnerWellGeometry {
-  frusta: CircularBoundedSection[] | RectangularBoundedSection[]
-  bottomShape?: SphericalSegment | null
+export interface SquaredConeSegment {
+  shape: 'squaredcone'
+  bottomCrossSection: string
+  circleDiameter: number
+  rectangleXDimension: number
+  rectangleYDimension: number
+  topHeight: number
+  bottomHeight: number
+}
+
+export interface RoundedCuboidSegment {
+  shape: 'roundedcuboid'
+  bottomCrossSection: string
+  circleDiameter: number
+  rectangleXDimension: number
+  rectangleYDimension: number
+  topHeight: number
+  bottomHeight: number
+}
+
+export type WellSegment =  CuboidalFrustum | ConicalFrustum | SquaredConeSegment | SphericalSegment | RoundedCuboidSegment
+
+export type InnerWellGeometry  = {
+  sections: WellSegment[]
 }
 
 // TODO(mc, 2019-03-21): exact object is tough to use with the initial value in

diff --git a/shared-data/labware/fixtures/3/fixture_2_plate.json b/shared-data/labware/fixtures/3/fixture_2_plate.json
@@ -64,7 +64,7 @@
     "daiwudhadfhiew": {
       "sections": [
         {
-          "shape": "pyramidal",
+          "shape": "cuboidal",
           "topXDimension": 127.76,
           "topYDimension": 85.8,
           "bottomXDimension": 70.0,

diff --git a/shared-data/labware/schemas/3.json b/shared-data/labware/schemas/3.json
@@ -205,7 +205,7 @@
       "properties": {
         "shape": {
           "type": "string",
-          "enum": ["roundedpyramid"]
+          "enum": ["roundedcuboid"]
         },
         "bottomCrossSection": {
           "type": "string",