-
Notifications
You must be signed in to change notification settings - Fork 178
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(shared-data): Add pipette definition for P50S v3.6 (#14863)
<!-- Thanks for taking the time to open a pull request! Please make sure you've read the "Opening Pull Requests" section of our Contributing Guide: https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests To ensure your code is reviewed quickly and thoroughly, please fill out the sections below to the best of your ability! --> # Overview Pipette definitions for P50S v3.6, which accounts for a small hardware modification which affects the accuracy function. NOTE: function in the PR is still copied over from the v3.5 model. Updated v3.6 function will be added in a followup PR after testing is complete. <!-- Use this section to describe your pull-request at a high level. If the PR addresses any open issues, please tag the issues here. --> # Test Plan <!-- Use this section to describe the steps that you took to test your Pull Request. If you did not perform any testing provide justification why. OT-3 Developers: You should default to testing on actual physical hardware. Once again, if you did not perform testing against hardware, justify why. Note: It can be helpful to write a test plan before doing development Example Test Plan (HTTP API Change) - Verified that new optional argument `dance-party` causes the robot to flash its lights, move the pipettes, then home. - Verified that when you omit the `dance-party` option the robot homes normally - Added protocol that uses `dance-party` argument to G-Code Testing Suite - Ran protocol that did not use `dance-party` argument and everything was successful - Added unit tests to validate that changes to pydantic model are correct --> # Changelog <!-- List out the changes to the code in this PR. Please try your best to categorize your changes and describe what has changed and why. Example changelog: - Fixed app crash when trying to calibrate an illegal pipette - Added state to API to track pipette usage - Updated API docs to mention only two pipettes are supported IMPORTANT: MAKE SURE ANY BREAKING CHANGES ARE PROPERLY COMMUNICATED --> # Review requests <!-- Describe any requests for your reviewers here. --> # Risk assessment <!-- Carefully go over your pull request and look at the other parts of the codebase it may affect. Look for the possibility, even if you think it's small, that your change may affect some other part of the system - for instance, changing return tip behavior in protocol may also change the behavior of labware calibration. Identify the other parts of the system your codebase may affect, so that in addition to your own review and testing, other people who may not have the system internalized as much as you can focus their attention and testing there. --> --------- Co-authored-by: pmoegenburg <[email protected]>
- Loading branch information
1 parent
7e818cc
commit 22adbad
Showing
5 changed files
with
420 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
shared-data/pipette/definitions/2/general/single_channel/p50/3_6.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| { | ||
| "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", | ||
| "displayName": "Flex 1-Channel 50 μL", | ||
| "model": "p50", | ||
| "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 | ||
| }, | ||
| "lowVolumeDefault": { | ||
| "top": 0.0, | ||
| "bottom": 61.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": 1.0, | ||
| "shaftULperMM": 0.785, | ||
| "backlashDistance": 0.1, | ||
| "quirks": [], | ||
| "plungerHomingConfigurations": { | ||
| "current": 1.0, | ||
| "speed": 30 | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
shared-data/pipette/definitions/2/geometry/single_channel/p50/3_6.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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/p50/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] | ||
| } | ||
| } |
85 changes: 85 additions & 0 deletions
85
shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| { | ||
| "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", | ||
| "supportedTips": { | ||
| "t50": { | ||
| "uiMaxFlowRate": 47, | ||
| "defaultAspirateFlowRate": { | ||
| "default": 35, | ||
| "valuesByApiLevel": { "2.14": 35 } | ||
| }, | ||
| "defaultDispenseFlowRate": { | ||
| "default": 57, | ||
| "valuesByApiLevel": { "2.14": 57 } | ||
| }, | ||
| "defaultBlowOutFlowRate": { | ||
| "default": 57, | ||
| "valuesByApiLevel": { "2.14": 57 } | ||
| }, | ||
| "defaultFlowAcceleration": 1200.0, | ||
| "defaultTipLength": 57.9, | ||
| "defaultReturnTipHeight": 0.71, | ||
| "aspirate": { | ||
| "default": { | ||
| "1": [ | ||
| [0.462, 0.5646, 0.0415], | ||
| [0.648, 0.3716, 0.1307], | ||
| [1.032, 0.2742, 0.1938], | ||
| [1.37, 0.1499, 0.3221], | ||
| [2.014, 0.1044, 0.3845], | ||
| [2.772, 0.0432, 0.5076], | ||
| [3.05, -0.0809, 0.8517], | ||
| [3.4, 0.0256, 0.5268], | ||
| [3.962, 0.0612, 0.4057], | ||
| [4.438, 0.0572, 0.4217], | ||
| [5.164, 0.018, 0.5955], | ||
| [5.966, 0.0095, 0.6393], | ||
| [7.38, 0.0075, 0.6514], | ||
| [9.128, 0.0049, 0.6705], | ||
| [10.16, 0.0033, 0.6854], | ||
| [13.812, 0.0024, 0.6948], | ||
| [27.204, 0.0008, 0.7165], | ||
| [50.614, 0.0002, 0.7328], | ||
| [53.046, -0.0005, 0.7676] | ||
| ] | ||
| } | ||
| }, | ||
| "dispense": { | ||
| "default": { | ||
| "1": [ | ||
| [0.462, 0.5646, 0.0415], | ||
| [0.648, 0.3716, 0.1307], | ||
| [1.032, 0.2742, 0.1938], | ||
| [1.37, 0.1499, 0.3221], | ||
| [2.014, 0.1044, 0.3845], | ||
| [2.772, 0.0432, 0.5076], | ||
| [3.05, -0.0809, 0.8517], | ||
| [3.4, 0.0256, 0.5268], | ||
| [3.962, 0.0612, 0.4057], | ||
| [4.438, 0.0572, 0.4217], | ||
| [5.164, 0.018, 0.5955], | ||
| [5.966, 0.0095, 0.6393], | ||
| [7.38, 0.0075, 0.6514], | ||
| [9.128, 0.0049, 0.6705], | ||
| [10.16, 0.0033, 0.6854], | ||
| [13.812, 0.0024, 0.6948], | ||
| [27.204, 0.0008, 0.7165], | ||
| [50.614, 0.0002, 0.7328], | ||
| [53.046, -0.0005, 0.7676] | ||
| ] | ||
| } | ||
| }, | ||
| "defaultPushOutVolume": 2 | ||
| } | ||
| }, | ||
| "defaultTipOverlapDictionary": { | ||
| "default": 10.5, | ||
| "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, | ||
| "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 | ||
| }, | ||
| "maxVolume": 50, | ||
| "minVolume": 5, | ||
| "defaultTipracks": [ | ||
| "opentrons/opentrons_flex_96_tiprack_50ul/1", | ||
| "opentrons/opentrons_flex_96_filtertiprack_50ul/1" | ||
| ] | ||
| } |
Oops, something went wrong.