Skip to content

Commit d0ff21c

Browse files
sfoster1github-actions[bot]y3rsh
authored
fix(shared-data): tc lids are schema v2 now (#17427)
We need to not use any schema v3 labware in 8.3 because we're going to change the schema. The thermocycler lids were only available in schema 3. Change that by making the lid v1 def a schema 2 def, and making a lid v2 def that is a schema 3 def. All the data is the same, and we even kept the stackLimit and added it to labware schema 2, so all the machine behavior should be exactly the same. The only other thing that's not in schema 2 now is the new lid stuff support, but that code isn't in 8.3 so we should be good. Closes EXEC-1180 ## review - seem ok? ## testing - run a smoke test for these. the data is literally all the same and nothing identity checks schemas, just whether data is there, and the same data is all still there. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: y3rsh <[email protected]>
1 parent dd148b6 commit d0ff21c

File tree

6 files changed

+140
-49
lines changed

6 files changed

+140
-49
lines changed

‎analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[2b866b03f3][Flex_S_v2_21_P1000_96_GRIP_HS_MB_TC_TM_Smoke].json

+5-40
Original file line numberDiff line numberDiff line change
@@ -1248,13 +1248,6 @@
12481248
"brand": "Opentrons",
12491249
"brandId": []
12501250
},
1251-
"compatibleParentLabware": [
1252-
"armadillo_96_wellplate_200ul_pcr_full_skirt",
1253-
"biorad_96_wellplate_200ul_pcr",
1254-
"opentrons_96_wellplate_200ul_pcr_full_skirt",
1255-
"opentrons_flex_deck_riser",
1256-
"opentrons_tough_pcr_auto_sealing_lid"
1257-
],
12581251
"cornerOffsetFromSlot": {
12591252
"x": 0,
12601253
"y": 0,
@@ -1326,7 +1319,7 @@
13261319
"loadName": "opentrons_tough_pcr_auto_sealing_lid",
13271320
"quirks": []
13281321
},
1329-
"schemaVersion": 3,
1322+
"schemaVersion": 2,
13301323
"stackLimit": 5,
13311324
"stackingOffsetWithLabware": {
13321325
"armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1400,13 +1393,6 @@
14001393
"brand": "Opentrons",
14011394
"brandId": []
14021395
},
1403-
"compatibleParentLabware": [
1404-
"armadillo_96_wellplate_200ul_pcr_full_skirt",
1405-
"biorad_96_wellplate_200ul_pcr",
1406-
"opentrons_96_wellplate_200ul_pcr_full_skirt",
1407-
"opentrons_flex_deck_riser",
1408-
"opentrons_tough_pcr_auto_sealing_lid"
1409-
],
14101396
"cornerOffsetFromSlot": {
14111397
"x": 0,
14121398
"y": 0,
@@ -1478,7 +1464,7 @@
14781464
"loadName": "opentrons_tough_pcr_auto_sealing_lid",
14791465
"quirks": []
14801466
},
1481-
"schemaVersion": 3,
1467+
"schemaVersion": 2,
14821468
"stackLimit": 5,
14831469
"stackingOffsetWithLabware": {
14841470
"armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1552,13 +1538,6 @@
15521538
"brand": "Opentrons",
15531539
"brandId": []
15541540
},
1555-
"compatibleParentLabware": [
1556-
"armadillo_96_wellplate_200ul_pcr_full_skirt",
1557-
"biorad_96_wellplate_200ul_pcr",
1558-
"opentrons_96_wellplate_200ul_pcr_full_skirt",
1559-
"opentrons_flex_deck_riser",
1560-
"opentrons_tough_pcr_auto_sealing_lid"
1561-
],
15621541
"cornerOffsetFromSlot": {
15631542
"x": 0,
15641543
"y": 0,
@@ -1630,7 +1609,7 @@
16301609
"loadName": "opentrons_tough_pcr_auto_sealing_lid",
16311610
"quirks": []
16321611
},
1633-
"schemaVersion": 3,
1612+
"schemaVersion": 2,
16341613
"stackLimit": 5,
16351614
"stackingOffsetWithLabware": {
16361615
"armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1704,13 +1683,6 @@
17041683
"brand": "Opentrons",
17051684
"brandId": []
17061685
},
1707-
"compatibleParentLabware": [
1708-
"armadillo_96_wellplate_200ul_pcr_full_skirt",
1709-
"biorad_96_wellplate_200ul_pcr",
1710-
"opentrons_96_wellplate_200ul_pcr_full_skirt",
1711-
"opentrons_flex_deck_riser",
1712-
"opentrons_tough_pcr_auto_sealing_lid"
1713-
],
17141686
"cornerOffsetFromSlot": {
17151687
"x": 0,
17161688
"y": 0,
@@ -1782,7 +1754,7 @@
17821754
"loadName": "opentrons_tough_pcr_auto_sealing_lid",
17831755
"quirks": []
17841756
},
1785-
"schemaVersion": 3,
1757+
"schemaVersion": 2,
17861758
"stackLimit": 5,
17871759
"stackingOffsetWithLabware": {
17881760
"armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1856,13 +1828,6 @@
18561828
"brand": "Opentrons",
18571829
"brandId": []
18581830
},
1859-
"compatibleParentLabware": [
1860-
"armadillo_96_wellplate_200ul_pcr_full_skirt",
1861-
"biorad_96_wellplate_200ul_pcr",
1862-
"opentrons_96_wellplate_200ul_pcr_full_skirt",
1863-
"opentrons_flex_deck_riser",
1864-
"opentrons_tough_pcr_auto_sealing_lid"
1865-
],
18661831
"cornerOffsetFromSlot": {
18671832
"x": 0,
18681833
"y": 0,
@@ -1934,7 +1899,7 @@
19341899
"loadName": "opentrons_tough_pcr_auto_sealing_lid",
19351900
"quirks": []
19361901
},
1937-
"schemaVersion": 3,
1902+
"schemaVersion": 2,
19381903
"stackLimit": 5,
19391904
"stackingOffsetWithLabware": {
19401905
"armadillo_96_wellplate_200ul_pcr_full_skirt": {

‎shared-data/js/labware.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ import opentronsFlex96Tiprack50UlV1Uncasted from '../labware/definitions/2/opent
112112
import opentronsFlex96TiprackAdapterV1Uncasted from '../labware/definitions/2/opentrons_flex_96_tiprack_adapter/1.json'
113113
import opentronsFlexDeckRiserV1Uncasted from '../labware/definitions/2/opentrons_flex_deck_riser/1.json'
114114
import opentronsFlexLidAbsorbancePlateReaderModuleV1Uncasted from '../labware/definitions/2/opentrons_flex_lid_absorbance_plate_reader_module/1.json'
115-
import opentronsToughPcrAutoSealingLidV1Uncasted from '../labware/definitions/3/opentrons_tough_pcr_auto_sealing_lid/1.json'
115+
import opentronsToughPcrAutoSealingLidV1Uncasted from '../labware/definitions/2/opentrons_tough_pcr_auto_sealing_lid/1.json'
116116
import opentronsUniversalFlatAdapterV1Uncasted from '../labware/definitions/2/opentrons_universal_flat_adapter/1.json'
117117
import opentronsUniversalFlatAdapterCorning384Wellplate112UlFlatV1Uncasted from '../labware/definitions/2/opentrons_universal_flat_adapter_corning_384_wellplate_112ul_flat/1.json'
118118
import opentrons96DeepWellTempModAdapterV1Uncasted from '../labware/definitions/2/opentrons_96_deep_well_temp_mod_adapter/1.json'

‎shared-data/js/types.ts

+1
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ export interface LabwareDefinition2 {
256256
allowedRoles?: LabwareRoles[]
257257
stackingOffsetWithLabware?: Record<string, LabwareOffset>
258258
stackingOffsetWithModule?: Record<string, LabwareOffset>
259+
stackLimit?: number
259260
}
260261

261262
export interface LabwareDefinition3 {

‎shared-data/labware/definitions/3/opentrons_tough_pcr_auto_sealing_lid/1.json ‎shared-data/labware/definitions/2/opentrons_tough_pcr_auto_sealing_lid/1.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"namespace": "opentrons",
3939
"version": 1,
40-
"schemaVersion": 3,
40+
"schemaVersion": 2,
4141
"stackingOffsetWithModule": {
4242
"thermocyclerModuleV2": {
4343
"x": 0,
@@ -78,13 +78,6 @@
7878
}
7979
},
8080
"stackLimit": 5,
81-
"compatibleParentLabware": [
82-
"armadillo_96_wellplate_200ul_pcr_full_skirt",
83-
"opentrons_96_wellplate_200ul_pcr_full_skirt",
84-
"opentrons_tough_pcr_auto_sealing_lid",
85-
"biorad_96_wellplate_200ul_pcr",
86-
"opentrons_flex_deck_riser"
87-
],
8881
"gripForce": 15,
8982
"gripHeightFromLabwareBottom": 7.91,
9083
"gripperOffsets": {

‎shared-data/labware/definitions/3/opentrons_tough_pcr_auto_sealing_lid/2.json

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
{
2+
"allowedRoles": ["labware", "lid"],
3+
"ordering": [],
4+
"brand": {
5+
"brand": "Opentrons",
6+
"brandId": []
7+
},
8+
"metadata": {
9+
"displayName": "Opentrons Tough PCR Auto-Sealing Lid",
10+
"displayCategory": "lid",
11+
"displayVolumeUnits": "\u00b5L",
12+
"tags": []
13+
},
14+
"dimensions": {
15+
"xDimension": 127.7,
16+
"yDimension": 85.48,
17+
"zDimension": 12.8
18+
},
19+
"wells": {},
20+
"groups": [
21+
{
22+
"metadata": {},
23+
"wells": []
24+
}
25+
],
26+
"cornerOffsetFromSlot": {
27+
"x": 0,
28+
"y": 0,
29+
"z": -0.71
30+
},
31+
"parameters": {
32+
"format": "irregular",
33+
"quirks": [],
34+
"isTiprack": false,
35+
"isMagneticModuleCompatible": false,
36+
"loadName": "opentrons_tough_pcr_auto_sealing_lid"
37+
},
38+
"namespace": "opentrons",
39+
"version": 2,
40+
"schemaVersion": 2,
41+
"stackingOffsetWithModule": {
42+
"thermocyclerModuleV2": {
43+
"x": 0,
44+
"y": 0,
45+
"z": 0
46+
}
47+
},
48+
"stackingOffsetWithLabware": {
49+
"default": {
50+
"x": 0,
51+
"y": 0,
52+
"z": 8.193
53+
},
54+
"opentrons_tough_pcr_auto_sealing_lid": {
55+
"x": 0,
56+
"y": 0,
57+
"z": 6.492
58+
},
59+
"armadillo_96_wellplate_200ul_pcr_full_skirt": {
60+
"x": 0,
61+
"y": 0,
62+
"z": 8.193
63+
},
64+
"opentrons_96_wellplate_200ul_pcr_full_skirt": {
65+
"x": 0,
66+
"y": 0,
67+
"z": 8.193
68+
},
69+
"biorad_96_wellplate_200ul_pcr": {
70+
"x": 0,
71+
"y": 0,
72+
"z": 8.08
73+
},
74+
"opentrons_flex_deck_riser": {
75+
"x": 0,
76+
"y": 0,
77+
"z": 34
78+
}
79+
},
80+
"stackLimit": 5,
81+
"compatibleParentLabware": [
82+
"armadillo_96_wellplate_200ul_pcr_full_skirt",
83+
"opentrons_96_wellplate_200ul_pcr_full_skirt",
84+
"opentrons_tough_pcr_auto_sealing_lid",
85+
"biorad_96_wellplate_200ul_pcr",
86+
"opentrons_flex_deck_riser"
87+
],
88+
"gripForce": 15,
89+
"gripHeightFromLabwareBottom": 7.91,
90+
"gripperOffsets": {
91+
"default": {
92+
"pickUpOffset": {
93+
"x": 0,
94+
"y": 0,
95+
"z": 1.5
96+
},
97+
"dropOffset": {
98+
"x": 0,
99+
"y": 0.52,
100+
"z": -6
101+
}
102+
},
103+
"lidOffsets": {
104+
"pickUpOffset": {
105+
"x": 0.5,
106+
"y": 0,
107+
"z": -5
108+
},
109+
"dropOffset": {
110+
"x": 0.5,
111+
"y": 0,
112+
"z": -1
113+
}
114+
},
115+
"lidDisposalOffsets": {
116+
"pickUpOffset": {
117+
"x": 0,
118+
"y": 0,
119+
"z": 0
120+
},
121+
"dropOffset": {
122+
"x": 0,
123+
"y": 5.0,
124+
"z": 50.0
125+
}
126+
}
127+
}
128+
}

‎shared-data/labware/schemas/2.json

+4
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@
391391
"gripHeightFromLabwareBottom": {
392392
"type": "number",
393393
"description": "Recommended Z-height, from labware bottom to the center of gripper pads, when gripping the labware."
394+
},
395+
"stackLimit": {
396+
"type": "number",
397+
"description": "The limit representing the maximum stack size for a given labware."
394398
}
395399
}
396400
}

0 commit comments

Comments
 (0)