Skip to content

Commit

Permalink
chore(shared-data): Adds new P1000S model v3.7 to support new accurac…
Browse files Browse the repository at this point in the history 
…y function (#15335)
  • Loading branch information
@andySigler
andySigler authored Jun 5, 2024
1 parent 366e223 commit 38f6bd1
Show file tree
Hide file tree
Showing 4 changed files with 294 additions and 2 deletions.
65 changes: 65 additions & 0 deletions shared-data/pipette/definitions/2/general/single_channel/p1000/3_7.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
"displayName": "Flex 1-Channel 1000 μL",
"model": "p1000",
"displayCategory": "FLEX",
"pickUpTipConfigurations": {
"pressFit": {
"presses": 1,
"speedByTipCount": {
"1": 10.0
},
"increment": 0.0,
"distanceByTipCount": {
"1": 13.0
},
"currentByTipCount": {
"1": 0.2
}
}
},
"dropTipConfigurations": {
"plungerEject": {
"current": 1.0,
"speed": 15
}
},
"plungerMotorConfigurations": {
"idle": 0.3,
"run": 1.0
},
"plungerPositionsConfigurations": {
"default": {
"top": 0.0,
"bottom": 71.5,
"blowout": 76.5,
"drop": 90.5
}
},
"availableSensors": {
"sensors": ["pressure", "capacitive", "environment"],
"pressure": {
"count": 1
},
"capacitive": {
"count": 1
},
"environment": {
"count": 1
}
},
"partialTipConfigurations": {
"partialTipSupported": false,
"availableConfigurations": null
},
"backCompatNames": [],
"channels": 1,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904,
"backlashDistance": 0.1,
"quirks": [],
"plungerHomingConfigurations": {
"current": 1.0,
"speed": 30
}
}
14 changes: 14 additions & 0 deletions shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_7.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json",
"pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf",
"nozzleOffset": [-8.0, -22.0, -259.15],
"pipetteBoundingBoxOffsets": {
"backLeftCorner": [-8.0, -22.0, -259.15],
"frontRightCorner": [-8.0, -22.0, -259.15]
},
"orderedRows": [{ "key": "A", "orderedNozzles": ["A1"] }],
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [-8.0, -22.0, -259.15]
}
}
213 changes: 213 additions & 0 deletions shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_7.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
{
"$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
"supportedTips": {
"t50": {
"uiMaxFlowRate": 785.2,
"defaultAspirateFlowRate": {
"default": 478,
"valuesByApiLevel": { "2.14": 478 }
},
"defaultDispenseFlowRate": {
"default": 478,
"valuesByApiLevel": { "2.14": 478 }
},
"defaultBlowOutFlowRate": {
"default": 478,
"valuesByApiLevel": { "2.14": 478 }
},
"defaultFlowAcceleration": 24000.0,
"defaultTipLength": 57.9,
"defaultReturnTipHeight": 0.71,
"aspirate": {
"default": {
"1": [
[0.7033, 4.9393, 0.669],
[1.0911, 4.233, 1.1657],
[1.7256, 2.8983, 2.6221],
[2.1344, 1.9062, 4.334],
[2.57, 1.3331, 5.5573],
[2.9178, 0.2816, 8.2595],
[3.0222, -3.2737, 18.6333],
[3.2233, 0.8766, 6.09],
[3.5033, 1.324, 4.648],
[4.4567, 1.7683, 3.0913],
[5.3878, 0.8747, 7.0738],
[6.1956, 0.3393, 9.9586],
[8.7911, 0.2504, 10.5095],
[10.5322, 0.1577, 11.3246],
[13.8389, 0.1047, 11.8827],
[23.01, 0.0579, 12.5301],
[29.4811, 0.0285, 13.2057],
[48.0456, 0.0147, 13.612],
[54.06, 0.0016, 14.2446]
]
}
},
"dispense": {
"default": {
"1": [
[0.7033, 4.9393, 0.669],
[1.0911, 4.233, 1.1657],
[1.7256, 2.8983, 2.6221],
[2.1344, 1.9062, 4.334],
[2.57, 1.3331, 5.5573],
[2.9178, 0.2816, 8.2595],
[3.0222, -3.2737, 18.6333],
[3.2233, 0.8766, 6.09],
[3.5033, 1.324, 4.648],
[4.4567, 1.7683, 3.0913],
[5.3878, 0.8747, 7.0738],
[6.1956, 0.3393, 9.9586],
[8.7911, 0.2504, 10.5095],
[10.5322, 0.1577, 11.3246],
[13.8389, 0.1047, 11.8827],
[23.01, 0.0579, 12.5301],
[29.4811, 0.0285, 13.2057],
[48.0456, 0.0147, 13.612],
[54.06, 0.0016, 14.2446]
]
}
},
"defaultPushOutVolume": 7
},
"t200": {
"uiMaxFlowRate": 802.5,
"defaultAspirateFlowRate": {
"default": 716,
"valuesByApiLevel": { "2.14": 716 }
},
"defaultDispenseFlowRate": {
"default": 716,
"valuesByApiLevel": { "2.14": 716 }
},
"defaultBlowOutFlowRate": {
"default": 716,
"valuesByApiLevel": { "2.14": 716 }
},
"defaultFlowAcceleration": 24000.0,
"defaultTipLength": 58.35,
"defaultReturnTipHeight": 0.71,
"aspirate": {
"default": {
"1": [
[1.5742, 3.2596, 1.8233],
[2.5158, 2.2718, 3.3782],
[4.47, 1.1953, 6.0865],
[5.4908, 0.5062, 9.1669],
[6.6658, 0.3243, 10.1658],
[9.6683, 0.2016, 10.9838],
[11.6442, 0.1543, 11.4405],
[19.8692, 0.0794, 12.3132],
[33.4958, 0.0375, 13.1444],
[51.9508, 0.0191, 13.7624],
[92.6067, 0.0074, 14.3699],
[152.3575, 0.0029, 14.7822],
[179.5925, 0.0013, 15.027],
[211.5867, 0.0009, 15.1088]
]
}
},
"dispense": {
"default": {
"1": [
[1.5742, 3.2596, 1.8233],
[2.5158, 2.2718, 3.3782],
[4.47, 1.1953, 6.0865],
[5.4908, 0.5062, 9.1669],
[6.6658, 0.3243, 10.1658],
[9.6683, 0.2016, 10.9838],
[11.6442, 0.1543, 11.4405],
[19.8692, 0.0794, 12.3132],
[33.4958, 0.0375, 13.1444],
[51.9508, 0.0191, 13.7624],
[92.6067, 0.0074, 14.3699],
[152.3575, 0.0029, 14.7822],
[179.5925, 0.0013, 15.027],
[211.5867, 0.0009, 15.1088]
]
}
},
"defaultPushOutVolume": 5
},
"t1000": {
"uiMaxFlowRate": 727.3,
"defaultAspirateFlowRate": {
"default": 716,
"valuesByApiLevel": { "2.14": 716 }
},
"defaultDispenseFlowRate": {
"default": 716,
"valuesByApiLevel": { "2.14": 716 }
},
"defaultBlowOutFlowRate": {
"default": 716,
"valuesByApiLevel": { "2.14": 716 }
},
"defaultFlowAcceleration": 24000.0,
"defaultTipLength": 95.6,
"defaultReturnTipHeight": 0.82,
"aspirate": {
"default": {
"1": [
[2.33, 2.388148, 3.699878],
[2.75, -1.230691, 12.131772],
[4.82, 0.868196, 6.359833],
[9.77, 0.322207, 8.991498],
[12.08, 0.156051, 10.614846],
[15.08, 0.147745, 10.715186],
[51.21, 0.03759, 12.376313],
[92.59, 0.010829, 13.746781],
[112.39, 0.005015, 14.285091],
[243.33, 0.00274, 14.540746],
[356.08, 0.000877, 14.994001],
[430.6, 0.000594, 15.094722],
[628.32, 0.000279, 15.230539],
[1000.28, 0.000106, 15.339007],
[1105.26, 0.000122, 15.323864]
]
}
},
"dispense": {
"default": {
"1": [
[2.33, 2.388148, 3.699878],
[2.75, -1.230691, 12.131772],
[4.82, 0.868196, 6.359833],
[9.77, 0.322207, 8.991498],
[12.08, 0.156051, 10.614846],
[15.08, 0.147745, 10.715186],
[51.21, 0.03759, 12.376313],
[92.59, 0.010829, 13.746781],
[112.39, 0.005015, 14.285091],
[243.33, 0.00274, 14.540746],
[356.08, 0.000877, 14.994001],
[430.6, 0.000594, 15.094722],
[628.32, 0.000279, 15.230539],
[1000.28, 0.000106, 15.339007],
[1105.26, 0.000122, 15.323864]
]
}
},
"defaultPushOutVolume": 20
}
},
"defaultTipOverlapDictionary": {
"default": 10.5,
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5,
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5,
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5,
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
},
"maxVolume": 1000,
"minVolume": 5,
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_1000ul/1",
"opentrons/opentrons_flex_96_tiprack_200ul/1",
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
4 changes: 2 additions & 2 deletions shared-data/python/opentrons_shared_data/pipette/types.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
# Needed for Int Comparison. Keeping it next to
# the Literal type for ease of readability
PipetteModelMajorVersion = [1, 2, 3]
PipetteModelMinorVersion = [0, 1, 2, 3, 4, 5, 6]
PipetteModelMinorVersion = [0, 1, 2, 3, 4, 5, 6, 7]

# TODO Literals are only good for writing down
# exact values. Is there a better typing mechanism
# so we don't need to keep track of versions in two
# different places?
PipetteModelMajorVersionType = Literal[1, 2, 3]
PipetteModelMinorVersionType = Literal[0, 1, 2, 3, 4, 5, 6]
PipetteModelMinorVersionType = Literal[0, 1, 2, 3, 4, 5, 6, 7]


class LiquidClasses(enum.Enum):
Expand Down

0 comments on commit 38f6bd1

Please sign in to comment.