Skip to content

Commit

Permalink
refactor(shared-data): More minor labware definition model refactors (#…
Browse files Browse the repository at this point in the history 
…17543)
  • Loading branch information
@SyntaxColoring
SyntaxColoring authored Feb 20, 2025
1 parent 98f9277 commit ba1d6e1
Show file tree
Hide file tree
Showing 5 changed files with 206 additions and 461 deletions.
2 changes: 1 addition & 1 deletion shared-data/labware/schemas/2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
},
"stackLimit": {
"type": "number",
"description": "The limit representing the maximum stack size for a given labware."
"description": "The limit representing the maximum stack size for a given labware. Defaults to 1 when unspecified indicating a single labware with no labware below it."
}
}
}
107 changes: 71 additions & 36 deletions shared-data/labware/schemas/3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,24 @@
"enum": ["spherical"]
},
"radiusOfCurvature": {
"type": "number"
"type": "number",
"description": "radius of curvature of bottom subsection of wells"
},
"topHeight": {
"type": "number"
"type": "number",
"description": "The depth of a spherical bottom of a well"
},
"bottomHeight": {
"type": "number"
"type": "number",
"description": "Height of the bottom of the segment, must be 0.0"
},
"xCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
},
"yCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
}
}
},
Expand All @@ -223,22 +228,28 @@
"enum": ["conical"]
},
"bottomDiameter": {
"type": "number"
"type": "number",
"description": "The diameter at the bottom cross-section of a circular frustum"
},
"topDiameter": {
"type": "number"
"type": "number",
"description": "The diameter at the top cross-section of a circular frustum"
},
"topHeight": {
"type": "number"
"type": "number",
"description": "The height at the top of a bounded subsection of a well, relative to the bottom of the well"
},
"bottomHeight": {
"type": "number"
"type": "number",
"description": "The height at the bottom of a bounded subsection of a well, relative to the bottom of the well"
},
"xCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
},
"yCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
}
}
},
Expand All @@ -260,28 +271,36 @@
"enum": ["cuboidal"]
},
"bottomXDimension": {
"type": "number"
"type": "number",
"description": "x dimension of the bottom cross-section of a rectangular frustum"
},
"bottomYDimension": {
"type": "number"
"type": "number",
"description": "y dimension of the bottom cross-section of a rectangular frustum"
},
"topXDimension": {
"type": "number"
"type": "number",
"description": "x dimension of the top cross-section of a rectangular frustum"
},
"topYDimension": {
"type": "number"
"type": "number",
"description": "y dimension of the top cross-section of a rectangular frustum"
},
"topHeight": {
"type": "number"
"type": "number",
"description": "The height at the top of a bounded subsection of a well, relative to the bottom of the well"
},
"bottomHeight": {
"type": "number"
"type": "number",
"description": "The height at the bottom of a bounded subsection of a well, relative to the bottom of the well"
},
"xCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
},
"yCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
}
}
},
Expand All @@ -304,28 +323,36 @@
},
"bottomCrossSection": {
"type": "string",
"enum": ["circular", "rectangular"]
"enum": ["circular", "rectangular"],
"description": "Denote if the shape is going from circular to rectangular or vise versa"
},
"circleDiameter": {
"type": "number"
"type": "number",
"description": "diameter of the circular face of a truncated circular segment"
},
"rectangleXDimension": {
"type": "number"
"type": "number",
"description": "x dimension of the rectangular face of a truncated circular segment"
},
"rectangleYDimension": {
"type": "number"
"type": "number",
"description": "y dimension of the rectangular face of a truncated circular segment"
},
"topHeight": {
"type": "number"
"type": "number",
"description": "The height at the top of a bounded subsection of a well, relative to the bottom of the well"
},
"bottomHeight": {
"type": "number"
"type": "number",
"description": "The height at the bottom of a bounded subsection of a well, relative to the bottom of the well"
},
"xCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
},
"yCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
}
}
},
Expand All @@ -348,28 +375,36 @@
},
"bottomCrossSection": {
"type": "string",
"enum": ["circular", "rectangular"]
"enum": ["circular", "rectangular"],
"description": "Denote if the shape is going from circular to rectangular or vise versa"
},
"circleDiameter": {
"type": "number"
"type": "number",
"description": "diameter of the circular face of a rounded rectangular segment"
},
"rectangleXDimension": {
"type": "number"
"type": "number",
"description": "x dimension of the rectangular face of a rounded rectangular segment"
},
"rectangleYDimension": {
"type": "number"
"type": "number",
"description": "y dimension of the rectangular face of a rounded rectangular segment"
},
"topHeight": {
"type": "number"
"type": "number",
"description": "The height at the top of a bounded subsection of a well, relative to the bottom"
},
"bottomHeight": {
"type": "number"
"type": "number",
"description": "The height at the bottom of a bounded subsection of a well, relative to the bottom of the well"
},
"xCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
},
"yCount": {
"type": "integer"
"type": "integer",
"description": "Number of instances of this shape in the stackup, used for wells that have multiple sub-wells"
}
}
},
Expand Down Expand Up @@ -633,7 +668,7 @@
},
"stackLimit": {
"type": "number",
"description": "The limit representing the maximum stack size for a given labware."
"description": "The limit representing the maximum stack size for a given labware. Defaults to 1 when unspecified indicating a single labware with no labware below it."
},
"compatibleParentLabware": {
"type": "array",
Expand Down
Loading

0 comments on commit ba1d6e1

Please sign in to comment.