From e26e5b290d04bfb16e9eb7e22850136ae28cc60e Mon Sep 17 00:00:00 2001 From: Jethary Date: Tue, 26 Mar 2024 11:56:57 -0400 Subject: [PATCH] Revert "refactor getPipetteV2Specs to return latest version" This reverts commit 738bf77eb85290b850b7c0d9d8cbfb6fd858203e. --- .../protocol/8/doItAllV7MigratedToV8.json | 320 +++++++++--------- .../fixtures/protocol/8/doItAllV8.json | 178 +++++----- shared-data/js/__tests__/pipettes.test.ts | 4 +- shared-data/js/pipettes.ts | 71 +--- 4 files changed, 262 insertions(+), 311 deletions(-) diff --git a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json index 5a4a6b25f4a..48f284c85af 100644 --- a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json +++ b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json @@ -6,7 +6,7 @@ "author": "", "description": "", "created": 1689346890165, - "lastModified": 1711321112413, + "lastModified": 1711047167434, "category": null, "subcategory": null, "tags": [] @@ -15,7 +15,7 @@ "name": "opentrons/protocol-designer", "version": "8.0.2", "data": { - "_internalAppBuildDate": "Sun, 24 Mar 2024 22:58:15 GMT", + "_internalAppBuildDate": "Thu, 21 Mar 2024 18:51:59 GMT", "defaultValues": { "aspirate_mmFromBottom": 1, "dispense_mmFromBottom": 0.5, @@ -3747,7 +3747,7 @@ "commandSchemaId": "opentronsCommandSchemaV8", "commands": [ { - "key": "bb222a6b-9361-4c94-9310-8437c588ce0e", + "key": "6e489e69-6adb-4874-ad9f-4da035825829", "commandType": "loadPipette", "params": { "pipetteName": "p1000_single_flex", @@ -3756,7 +3756,7 @@ } }, { - "key": "d7d74979-4aa3-4692-bd83-dbfdb4d03134", + "key": "7536b20c-1416-4e5a-9e0a-2ac13f805fcd", "commandType": "loadPipette", "params": { "pipetteName": "p50_multi_flex", @@ -3765,7 +3765,7 @@ } }, { - "key": "307ddbde-9c2f-4d22-9539-80cd6da5db9f", + "key": "67136a9e-c10f-40ce-80de-920e33d78d44", "commandType": "loadModule", "params": { "model": "magneticBlockV1", @@ -3774,7 +3774,7 @@ } }, { - "key": "5533583c-547d-4a82-afee-b210f2edcbe3", + "key": "469e8246-7e19-4654-acdd-7c29a79ce67b", "commandType": "loadModule", "params": { "model": "heaterShakerModuleV1", @@ -3783,7 +3783,7 @@ } }, { - "key": "f3b1ba04-bed4-4da9-b49b-ae7c9c1d7900", + "key": "29533de7-bd35-458c-9f60-6b9be67bd64b", "commandType": "loadModule", "params": { "model": "temperatureModuleV2", @@ -3792,7 +3792,7 @@ } }, { - "key": "798d223d-1b2b-476e-a918-d8ded8623b9d", + "key": "85e3ebf2-4d2f-49e2-8335-cf8c69d58372", "commandType": "loadModule", "params": { "model": "thermocyclerModuleV2", @@ -3801,7 +3801,7 @@ } }, { - "key": "58893e91-f58c-4cb4-987a-26535ef31949", + "key": "d05c0cc2-d6c2-4fd3-9918-33f7d07bd2fd", "commandType": "loadLabware", "params": { "displayName": "Opentrons 96 Flat Bottom Heater-Shaker Adapter", @@ -3815,7 +3815,7 @@ } }, { - "key": "e0e486a3-7c25-47ce-8059-5e9c8cb3d017", + "key": "7b515b7c-9d35-4d4e-a19c-1a73de8fdc65", "commandType": "loadLabware", "params": { "displayName": "Opentrons Flex 96 Filter Tip Rack 50 µL", @@ -3827,7 +3827,7 @@ } }, { - "key": "8f78c96f-5b05-4181-976c-e0811ebd90ed", + "key": "583e9796-64e7-411e-b3e4-ce3c5f18a39a", "commandType": "loadLabware", "params": { "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt", @@ -3841,7 +3841,7 @@ } }, { - "key": "6cfbf641-5bf0-4293-ac0d-db0fd5d8114d", + "key": "bb089d2b-b8f8-4306-b0b8-e5d38d81aba6", "commandType": "loadLabware", "params": { "displayName": "Opentrons 24 Well Aluminum Block with NEST 1.5 mL Snapcap", @@ -3855,7 +3855,7 @@ } }, { - "key": "61eeba29-18ca-4bab-9268-fb7f000d3d6d", + "key": "aa80f4db-d94f-407c-9ea1-6df86119d200", "commandType": "loadLabware", "params": { "displayName": "NEST 96 Well Plate 200 µL Flat", @@ -3870,7 +3870,7 @@ }, { "commandType": "loadLiquid", - "key": "9ab300a4-addd-4864-8b7c-a69f3fdd250f", + "key": "52dfe64f-29b5-4d3e-838d-aecf6c0df8e0", "params": { "liquidId": "1", "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", @@ -3879,7 +3879,7 @@ }, { "commandType": "loadLiquid", - "key": "a5dff8e6-c9cd-4fb2-9e50-bff4d1440834", + "key": "68e4b018-1e5b-48d4-b858-93b3154e63a5", "params": { "liquidId": "0", "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", @@ -3897,7 +3897,7 @@ }, { "commandType": "temperatureModule/setTargetTemperature", - "key": "5290eab6-8b1c-4bba-a198-4b60cb1f4833", + "key": "18dcba87-324d-4483-a9be-e561c9b47bf0", "params": { "moduleId": "ef44ad7f-0fd9-46d6-8bc0-c70785644cc8:temperatureModuleType", "celsius": 4 @@ -3905,7 +3905,7 @@ }, { "commandType": "heaterShaker/waitForTemperature", - "key": "ca0d9d80-054c-40b8-8c1c-617cf83b4b8a", + "key": "84ae2f28-38f6-4314-9d34-3ff9af5a875c", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType", "celsius": 4 @@ -3913,14 +3913,14 @@ }, { "commandType": "thermocycler/closeLid", - "key": "f52be494-9282-4f8a-915d-c50de3a2c3fa", + "key": "0ec55f7b-4f82-46ad-a450-aac71d8ca198", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType" } }, { "commandType": "thermocycler/setTargetLidTemperature", - "key": "0d067880-000a-422a-b9b4-e495108c3474", + "key": "883d4fba-7b4c-410d-aeff-79ce4c3d106e", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType", "celsius": 40 @@ -3928,14 +3928,14 @@ }, { "commandType": "thermocycler/waitForLidTemperature", - "key": "610f35f0-b26c-4b25-a13d-a0dd3e6796ba", + "key": "8da2d0c4-c9b2-4acb-8230-6b68f33b92b7", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType" } }, { "commandType": "thermocycler/runProfile", - "key": "c3b955d5-d7ad-4664-a3bf-13d38e773111", + "key": "6df23192-439c-429c-89ab-c932751096f0", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType", "profile": [ @@ -3947,28 +3947,28 @@ }, { "commandType": "thermocycler/deactivateBlock", - "key": "720f9f66-acdb-4f83-8b63-5356a4c56f63", + "key": "c99151db-add8-41e4-9e5b-0516198f06b4", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType" } }, { "commandType": "thermocycler/deactivateLid", - "key": "5676763f-b1c4-4855-9508-aaf723c2a5fa", + "key": "2cf60177-6b03-4706-a2fb-7a211eb974e1", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType" } }, { "commandType": "thermocycler/openLid", - "key": "8193fcc5-07b3-449e-8d4c-ea27f11cbc30", + "key": "968e4a04-1cda-4730-a26d-810c0af827ad", "params": { "moduleId": "627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType" } }, { "commandType": "pickUpTip", - "key": "9c3af9b4-12a7-441e-b963-ea0deefe8a98", + "key": "39f9b118-55f7-4b32-b28a-689255ecf69a", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -3977,31 +3977,31 @@ }, { "commandType": "aspirate", - "key": "9c628509-7568-45f6-a09c-6a77bf3640ae", + "key": "cbd4de4c-8de3-407e-aace-9d0993c48214", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "fdcc1692-f41a-4ebe-a243-cc17b616e13a", + "key": "df9dcd8b-54a2-4ea3-9014-8d1e5a8769c7", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "7ec58dce-967f-4859-a85c-de9af3a92961", + "key": "41586872-d7ba-47a4-b545-aca0f924e1e5", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4011,12 +4011,12 @@ }, { "commandType": "dropTipInPlace", - "key": "76bc8353-f30f-44e3-acc8-e9c389504382", + "key": "1a253e2c-f44c-414b-929e-fb071233caa5", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "2ba4be0c-393a-4394-b0ae-0d0f3b5a6796", + "key": "903f0cbd-36fc-46ad-9629-af0e713a2551", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4025,31 +4025,31 @@ }, { "commandType": "aspirate", - "key": "f615dfc1-9b33-476f-98f0-f414fd8eb996", + "key": "15e1819f-a75f-4a99-b248-ef9c44f742bb", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "1c9a8c07-0c5d-451d-8e79-83804dbdb940", + "key": "1746f838-436c-4524-99ca-79a89807e7c6", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "8418b990-f11e-4134-a0f3-f7fd793419af", + "key": "139ac8eb-77bc-4dd5-8358-5cd3352b2841", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4059,12 +4059,12 @@ }, { "commandType": "dropTipInPlace", - "key": "5b36e629-954e-4919-9c00-5ac660070b5f", + "key": "7d3f53de-e3e9-4cce-aca3-a1c84ec8e4f5", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "a6a83935-65d7-4c82-a29c-8506c66bfe94", + "key": "519b1444-568a-49af-87cc-d251a28d5c74", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4073,31 +4073,31 @@ }, { "commandType": "aspirate", - "key": "76e73d2c-9b26-4cef-b017-e16eee7677c3", + "key": "eef96aa3-ed34-4a6c-a121-9bb1556016aa", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "0fc02938-a4a3-458c-bdd0-7e64d3c52c5a", + "key": "ee44942b-3da5-43c1-ad0b-17fc2ea46b68", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "B1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "f8c5ca80-9652-421b-b9a9-1249933271e9", + "key": "1cad272e-a562-4abe-975a-209d5b29f6b8", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4107,12 +4107,12 @@ }, { "commandType": "dropTipInPlace", - "key": "cc24567a-baed-4e72-93d9-e0ce6f500695", + "key": "b25eeb63-22a3-4a45-9a34-2588f6e28034", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "a0ad7946-f144-4422-8360-9581ce798352", + "key": "3b4257ba-7e37-4dc7-8630-628695a993b0", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4121,31 +4121,31 @@ }, { "commandType": "aspirate", - "key": "6efcf3e6-331a-4c26-8c8e-34408beaed6d", + "key": "9ee178b8-6918-477a-ac4a-3b94b3257ded", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "bcb2dafc-bbd6-4d8e-8873-166de013dfa0", + "key": "5b1fa15c-d50a-465e-99d6-d3c5631ba18b", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "B1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "0698cdfe-1a75-422d-b8c6-7b799e5714a1", + "key": "8ca34094-5af4-4c19-bbc9-e6a95ebe7dc7", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4155,12 +4155,12 @@ }, { "commandType": "dropTipInPlace", - "key": "4b10ceb1-d84e-4241-9726-c20a3525a9db", + "key": "ed570c7c-bec9-4320-92c6-c5dc4e8ea039", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "c02b83fe-f161-4672-b900-78a8e419242d", + "key": "24af8dc9-1d39-4ead-9fb7-c106cf81c4ca", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4169,31 +4169,31 @@ }, { "commandType": "aspirate", - "key": "754d644e-19ba-4a44-8130-78bd522e249a", + "key": "3fb7136f-156c-4ef2-ba9c-4010cbee7c45", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "92db5fa0-e539-4a50-8b37-dd6a430c2cb3", + "key": "70415053-47db-400e-a765-59930e782fba", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "C1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "181a0307-0301-4252-9b99-37304061427e", + "key": "6bc262a7-6619-4c1d-90ab-694881833ef2", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4203,12 +4203,12 @@ }, { "commandType": "dropTipInPlace", - "key": "497e2b7f-1bb1-4631-874b-b6a8d08d385f", + "key": "61c26a5d-05d6-490b-9881-2505f334e148", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "186b2e32-6aac-4b27-8dea-ebeba097b9fe", + "key": "e7db6545-1f4f-40bd-a440-08afc48c8a6d", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4217,31 +4217,31 @@ }, { "commandType": "aspirate", - "key": "0553bb59-476e-4787-838e-25f0e665ba11", + "key": "a6a1af44-5a04-4fdf-aecb-afec57d49809", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "69f7920e-feba-43f4-b77f-2d225986fa16", + "key": "fa36f3c3-8a96-4643-adc3-1c856446c432", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "C1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "ec012e5f-41b8-4985-b990-acc29fb23b55", + "key": "a3b84d03-7b16-4c8b-ab04-5e80d53c5008", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4251,12 +4251,12 @@ }, { "commandType": "dropTipInPlace", - "key": "17e661c3-a8c2-4628-a3cb-36b754a0b690", + "key": "b3b763fc-d538-4b1c-9a72-8a1c85238e55", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "1938edc6-b7de-4705-9e66-a72e076230f4", + "key": "aeb3764a-c819-4151-acb9-77d07399b13d", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4265,31 +4265,31 @@ }, { "commandType": "aspirate", - "key": "bd8eca6f-cfff-4ac7-8824-a7d6fb521130", + "key": "9b15d50e-e1a3-4966-8584-5e32da3afa4c", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "cebe0f0a-ba85-4582-9977-0c7ffec63be5", + "key": "ada5949a-0085-4f09-b65e-db092a2ddab6", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "D1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "043cf45a-e93f-43a5-a0cf-3d70bacdc5a9", + "key": "fbfd8391-eb1e-416f-97b0-4ea4e631b8b5", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4299,12 +4299,12 @@ }, { "commandType": "dropTipInPlace", - "key": "440e0e7c-aee1-45f1-b182-c7ace0234f11", + "key": "edc2c62c-4f1e-4b9d-958c-1f9d4594759b", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "b912b026-e329-42a0-851a-9aba946c7cc8", + "key": "e9f79e00-bc1f-4f92-9299-401a7d85d78b", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4313,31 +4313,31 @@ }, { "commandType": "aspirate", - "key": "06e274ce-0106-421c-8b4c-281b46331f76", + "key": "f361f6e5-a558-48dd-b808-383d48305944", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "3d23b612-ac62-4f60-9a86-60c027079fb5", + "key": "ad9f20e5-c018-4241-8ee4-0b94bd4b4b13", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "D1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "4172d89c-a98e-4205-a534-e5884e32ac7f", + "key": "c41c44f9-7969-4b9d-966f-7133927d1746", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4347,12 +4347,12 @@ }, { "commandType": "dropTipInPlace", - "key": "d3354254-983f-461e-b24b-50815c360107", + "key": "e2deb31d-b531-46a0-95b9-894c6143b51e", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "00325ed5-1039-4872-92a4-a9fa5e4d4781", + "key": "ad15920f-80f3-4b31-8c69-7a9753760ac5", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4361,31 +4361,31 @@ }, { "commandType": "aspirate", - "key": "7d4f016b-ede4-43c7-8573-16339a9b114b", + "key": "ee11c611-bd0f-4039-b631-738aceae4b8b", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "318b0a50-c807-461b-8487-660cf6a4ba77", + "key": "dace1ad5-22a3-4731-8a0e-54378e936e41", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "E1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "9a57b813-d661-46e6-bdc3-82a3360e59a8", + "key": "c0075e01-b1d6-41fc-a482-541eba3dd9ce", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4395,12 +4395,12 @@ }, { "commandType": "dropTipInPlace", - "key": "83d9c18e-4775-4726-b26a-45d9a3f27d85", + "key": "287153c4-baee-46c6-81e0-db0cd90a8d7b", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "fbf61603-8618-4bf9-82e0-baf935e6e40d", + "key": "e956cb88-1387-4014-aea0-06237c9ea125", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4409,31 +4409,31 @@ }, { "commandType": "aspirate", - "key": "e9bfcacf-0236-4f5e-8b30-d6e360503b22", + "key": "3d870b55-af49-42b0-b877-7a3777fea82d", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "58c8b67b-7e09-4630-8e78-fb1dea7b5756", + "key": "8d06248a-65a5-4372-a666-70ec956df1d4", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "E1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "e37a6c75-f5c6-4da6-911e-1d88b3ec5e1e", + "key": "3304feb9-69e8-4e70-a3b6-308706f06d0c", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4443,12 +4443,12 @@ }, { "commandType": "dropTipInPlace", - "key": "11da6e67-d459-427f-9fa9-7f38945e45e4", + "key": "2f73eac1-8a7a-4bb2-b634-3c938bb6a541", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "93b9c494-6914-4a7b-b24c-f6dd0c1c3d5f", + "key": "b08587bf-ac3a-4322-baa4-2d54ab4c74d8", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4457,31 +4457,31 @@ }, { "commandType": "aspirate", - "key": "5ec4cf30-8c51-49fd-bd17-5f62e8c220e4", + "key": "627b7b39-4646-42e5-8a6b-ab85c073631a", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "1f167f4b-1b68-49c5-afe9-659e3bf522fd", + "key": "f96068bb-8730-46d2-9649-e77060a67d96", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "F1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "9623e000-9bea-4389-a25e-ad5bd53921ec", + "key": "717da31c-723f-4761-8a9e-c46e3a0d95d9", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4491,12 +4491,12 @@ }, { "commandType": "dropTipInPlace", - "key": "a4c53872-c774-4560-8743-38b438156da4", + "key": "9b69289d-3b6c-4caa-ab71-eee65591d5d7", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "fceb7e1c-069b-4d5e-9a1f-5e80db85cd7d", + "key": "61f66087-286a-4309-8f56-e95e1d3450db", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4505,31 +4505,31 @@ }, { "commandType": "aspirate", - "key": "38167428-a7dd-4361-ad1a-0b33c565a083", + "key": "fcd20bdc-8cd3-4dc4-88ff-572317dfeafa", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "4df56032-fcd9-41ea-81e8-a685e2b0a702", + "key": "cc4e76bc-f89a-45e5-8200-1bfd3ba3c950", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "F1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "da5cc497-d86e-410b-83f1-a6b7f2713857", + "key": "f98a9dd9-6368-45ad-bf34-374ebd304017", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4539,12 +4539,12 @@ }, { "commandType": "dropTipInPlace", - "key": "ed44d479-e3bf-419f-bd71-b0125ebbb5dc", + "key": "28f596a5-d900-4335-82d1-c69c2a4f3476", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "431c308f-c5df-41cc-bbb1-31305aa128de", + "key": "cf3e0222-4b78-4c11-8f7c-853edb173ef0", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4553,31 +4553,31 @@ }, { "commandType": "aspirate", - "key": "550ef8bf-44d8-4c64-9b0a-2a6126e0237e", + "key": "87bf3bc3-d986-4d4e-9303-531db931ecf2", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "f77f5e68-a7ed-4dbe-b4da-e10804d444b7", + "key": "7d4a2f34-efc4-4c69-ac95-12e90da24846", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "G1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "99ae2a4b-a16e-44c8-9ae9-77851239787a", + "key": "c26ac9f4-f86a-410b-9524-3a107df76154", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4587,12 +4587,12 @@ }, { "commandType": "dropTipInPlace", - "key": "442b1523-0719-482e-8932-101ae06a2746", + "key": "cc9ad177-40b1-4063-904f-bdcd5f534ba3", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "3556441f-698d-43da-a4a6-851ea0c2be56", + "key": "6f27f601-b3a2-4d72-b1c7-d29fbef1e2fb", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4601,31 +4601,31 @@ }, { "commandType": "aspirate", - "key": "25c60ebb-9444-4fb0-a086-12affd30e88b", + "key": "0d614bd3-9723-467a-a8f4-6793875071a6", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "cc2b9290-c2e0-4893-98cf-f68d55454f8b", + "key": "321bc387-8de7-4456-99d2-f61e31f49ac4", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "G1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "ab521ddc-d7e4-4aab-82a1-ba17fdec0fb0", + "key": "23c76ed2-6751-4f8d-b061-02e54bae4b92", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4635,12 +4635,12 @@ }, { "commandType": "dropTipInPlace", - "key": "9f432687-3c35-4377-9df3-aac6e76e3736", + "key": "a33f1f9c-c1eb-42c5-b2d2-dc81d0c92207", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "93114022-098d-4467-a59e-08ba8e3c398c", + "key": "fa8827df-09aa-41df-b2af-794dafab3f36", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4649,31 +4649,31 @@ }, { "commandType": "aspirate", - "key": "eb9cac1f-67bf-42b8-b4dc-b809bb81820f", + "key": "222b1e4d-81fb-44c5-beff-d39ae967766c", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "1c504ea9-7c88-41dd-a04d-2f3f90015417", + "key": "d6644b59-fd5b-44cf-a5b4-da4bec2ffcd1", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "H1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "bf0156ef-8d70-426d-a24b-23d0c91ec7ab", + "key": "62a05dff-fd3d-47ec-a852-7ec365fdc60a", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4683,12 +4683,12 @@ }, { "commandType": "dropTipInPlace", - "key": "f69d0c75-546b-49b1-8086-7688c62ebb4d", + "key": "dcbbb300-64a6-4deb-9733-19b86574106a", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "37e21eba-d3bb-40c3-8b5b-65e4d3ab81d4", + "key": "882ee6ef-f2a3-4478-b88a-fd650c11cbc9", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4697,31 +4697,31 @@ }, { "commandType": "aspirate", - "key": "26adec84-4130-41a1-a3ce-923bb1e2b5fe", + "key": "4745b4e5-0fed-427b-961a-c1e346e5f591", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "dispense", - "key": "bd1f70e9-cbce-4846-8258-16f9d1991ac3", + "key": "916ce3bf-32a1-45e1-b704-32b75db4e572", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "volume": 50, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "H1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 478 + "flowRate": 6 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "cc2f54f0-735a-4c68-9cd9-fe4b723ae0e5", + "key": "62fc2bbb-ee9f-4769-9c6d-7eae1d56b7f3", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe", "addressableAreaName": "movableTrashA3", @@ -4731,12 +4731,12 @@ }, { "commandType": "dropTipInPlace", - "key": "1a43c3f3-6d49-44b2-ab17-4d504e18b856", + "key": "459eed51-26e1-4f67-946c-5f281d9ff5c4", "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" } }, { "commandType": "pickUpTip", - "key": "9624e1a0-dbe3-4d02-8cc8-fdfb328a1660", + "key": "a11d26ea-07d0-4fbe-95a8-3229bf3a7974", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "labwareId": "23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1", @@ -4745,7 +4745,7 @@ }, { "commandType": "configureForVolume", - "key": "4ddcdd41-24de-4898-a145-ee71a25afb4e", + "key": "8355523c-68f9-4d67-b7f0-c19b39a20d58", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "volume": 10 @@ -4753,55 +4753,55 @@ }, { "commandType": "aspirate", - "key": "be582ca8-8d6f-4ad3-b234-f7a6a1cbed05", + "key": "cb6f6fd9-ce96-4788-930a-bcb4fc73cab8", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "volume": 10, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 35 + "flowRate": 8 } }, { "commandType": "dispense", - "key": "d86c8f47-4902-4371-ae0c-1af1a75e2953", + "key": "d72adc76-8ece-47d3-86d2-5ccec5b507a4", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "volume": 10, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 57 + "flowRate": 8 } }, { "commandType": "aspirate", - "key": "f313a3a6-df1b-4d6b-a8d1-98c2c3d32130", + "key": "aefc83b0-fcba-4010-b71a-9b79e6134779", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "volume": 10, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 35 + "flowRate": 8 } }, { "commandType": "dispense", - "key": "1dcf7c6b-7561-4696-b70b-bd5c1b343dbd", + "key": "955873e5-8fcd-43d4-9f6c-3281922fc97d", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "volume": 10, "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 57 + "flowRate": 8 } }, { "commandType": "moveToAddressableAreaForDropTip", - "key": "6c4ae741-ae50-4c29-a2df-7266df5daf6c", + "key": "a237c669-fe56-434a-a5fc-225ba5403b28", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193", "addressableAreaName": "movableTrashA3", @@ -4811,12 +4811,12 @@ }, { "commandType": "dropTipInPlace", - "key": "34a62c06-eedb-4323-8dd6-20fca4f1085e", + "key": "87d1c5d5-c40e-480a-a0bf-4a8a63bae3cd", "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193" } }, { "commandType": "moveLabware", - "key": "2681596c-f15d-4781-b116-0079c8d1d748", + "key": "98e741c6-01c6-43d5-8d98-e3950b7dabda", "params": { "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "strategy": "usingGripper", @@ -4825,12 +4825,12 @@ }, { "commandType": "waitForDuration", - "key": "954b3a07-f6c6-43ef-9a97-4ec347d27a5c", + "key": "da873c66-a7e4-4810-b2d1-ab037e9156d1", "params": { "seconds": 60, "message": "" } }, { "commandType": "moveLabware", - "key": "367e2d8f-584e-478a-9e52-b8151673a593", + "key": "58ced158-ae4d-4275-814b-cf29bacda1c0", "params": { "labwareId": "fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2", "strategy": "usingGripper", @@ -4839,21 +4839,21 @@ }, { "commandType": "heaterShaker/closeLabwareLatch", - "key": "0134874e-ae18-416f-bb01-5d892cf8e837", + "key": "2706f0f9-5898-47e3-b53f-06df74598b4e", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType" } }, { "commandType": "heaterShaker/deactivateHeater", - "key": "c3c0412a-caba-4ae9-8f27-ed128b3d7ec4", + "key": "073eac12-998e-4075-bcb5-feb215d5f251", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType" } }, { "commandType": "heaterShaker/setAndWaitForShakeSpeed", - "key": "c23b0a43-fb16-4a9b-957c-b53fb2768029", + "key": "37fedb11-cfa0-494d-905f-e5539c2960e6", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType", "rpm": 500 @@ -4861,28 +4861,28 @@ }, { "commandType": "heaterShaker/deactivateHeater", - "key": "cdd9b86d-1cc9-4086-96f5-466720b7aa85", + "key": "6431c63c-608d-4f82-bc68-ade76b8c1cc2", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType" } }, { "commandType": "heaterShaker/deactivateShaker", - "key": "41432c4a-53ab-40f9-bcb4-6e0ba1f67e87", + "key": "a22834db-00b7-4f66-a681-9cc5dd17031e", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType" } }, { "commandType": "heaterShaker/openLabwareLatch", - "key": "77bdb842-57ae-49fe-ab36-9e6f8d1bc20d", + "key": "af548bbd-5620-405a-bda0-ac08ca06fbbd", "params": { "moduleId": "c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType" } }, { "commandType": "moveLabware", - "key": "9c1130c0-31a0-414d-b786-7ad20ce35167", + "key": "ffb00dfa-99db-4744-9bde-538d0aa7b1a7", "params": { "labwareId": "a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1", "strategy": "manualMoveWithPause", @@ -4891,14 +4891,14 @@ }, { "commandType": "temperatureModule/deactivate", - "key": "65074862-868a-48d7-afcb-a97756871c79", + "key": "8e0e035d-33a2-4995-a557-26c7951de915", "params": { "moduleId": "ef44ad7f-0fd9-46d6-8bc0-c70785644cc8:temperatureModuleType" } }, { "commandType": "moveLabware", - "key": "759a7609-b177-4669-9f54-0c3cd06c1b45", + "key": "36c8ae59-9d10-428a-b6fd-3e3b6b49ed09", "params": { "labwareId": "239ceac8-23ec-4900-810a-70aeef880273:opentrons/nest_96_wellplate_200ul_flat/2", "strategy": "manualMoveWithPause", diff --git a/protocol-designer/fixtures/protocol/8/doItAllV8.json b/protocol-designer/fixtures/protocol/8/doItAllV8.json index 256184ca675..9848033ccd0 100644 --- a/protocol-designer/fixtures/protocol/8/doItAllV8.json +++ b/protocol-designer/fixtures/protocol/8/doItAllV8.json @@ -6,16 +6,16 @@ "author": "", "description": "", "created": 1701659107408, - "lastModified": 1711321152535, + "lastModified": 1711047424926, "category": null, "subcategory": null, "tags": [] }, "designerApplication": { "name": "opentrons/protocol-designer", - "version": "8.0.2", + "version": "8.0.0", "data": { - "_internalAppBuildDate": "Sun, 24 Mar 2024 22:58:15 GMT", + "_internalAppBuildDate": "Thu, 21 Mar 2024 18:51:59 GMT", "defaultValues": { "aspirate_mmFromBottom": 1, "dispense_mmFromBottom": 0.5, @@ -3418,7 +3418,7 @@ "commandSchemaId": "opentronsCommandSchemaV8", "commands": [ { - "key": "9c3ed8b5-f406-4871-aeca-2d1d0ce4bfe5", + "key": "1809fd39-db28-4928-8773-31bc536fe765", "commandType": "loadPipette", "params": { "pipetteName": "p1000_single_flex", @@ -3427,7 +3427,7 @@ } }, { - "key": "5cd26f27-d933-4003-b033-6260a817b52c", + "key": "3a5f75b2-15c9-404f-9b87-f102beeb1a45", "commandType": "loadModule", "params": { "model": "heaterShakerModuleV1", @@ -3436,7 +3436,7 @@ } }, { - "key": "b6537b4d-e5a2-454a-8db3-e307ee07c0e3", + "key": "a13ba2f1-e557-4d2f-a304-87847ce68887", "commandType": "loadModule", "params": { "model": "thermocyclerModuleV2", @@ -3445,7 +3445,7 @@ } }, { - "key": "5dd0be2c-1f40-4d9a-94a2-bc754f762cc7", + "key": "e3f1abb9-b076-4b56-a593-0b4033462fea", "commandType": "loadLabware", "params": { "displayName": "Opentrons 96 PCR Heater-Shaker Adapter", @@ -3459,7 +3459,7 @@ } }, { - "key": "1cdd33c9-d9eb-4774-b43d-3c0661a2802d", + "key": "9d92792f-e5d1-4259-8e4b-da8ea83f28df", "commandType": "loadLabware", "params": { "displayName": "Opentrons Flex 96 Tip Rack 1000 µL", @@ -3471,7 +3471,7 @@ } }, { - "key": "7d986dc8-fbf0-4253-98dd-c75872bc7057", + "key": "d03df580-7915-4bba-9d34-e92039cfe24d", "commandType": "loadLabware", "params": { "displayName": "Opentrons Tough 96 Well Plate 200 µL PCR Full Skirt", @@ -3485,7 +3485,7 @@ } }, { - "key": "d37f3766-e93e-4fe7-9305-55b0e2a121c1", + "key": "d1e4cf27-a1db-48c4-b784-a21014bb234b", "commandType": "loadLabware", "params": { "displayName": "Axygen 1 Well Reservoir 90 mL", @@ -3498,7 +3498,7 @@ }, { "commandType": "loadLiquid", - "key": "4b25eb55-58e2-4f37-9e3a-50e00a683313", + "key": "64129bfd-92d7-4c70-9380-33785a6041ff", "params": { "liquidId": "1", "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", @@ -3516,7 +3516,7 @@ }, { "commandType": "loadLiquid", - "key": "bf61f236-3900-4690-ae2e-673327576cf4", + "key": "ac47f11d-0d9c-48d7-b45b-9ecb269a9a50", "params": { "liquidId": "0", "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", @@ -3525,14 +3525,14 @@ }, { "commandType": "thermocycler/openLid", - "key": "dfbdea37-5946-4d42-89a4-463012b34632", + "key": "bfa8af0c-4cb2-49d3-912b-b07e90a1f752", "params": { "moduleId": "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType" } }, { "commandType": "moveLabware", - "key": "8306d44f-471f-4fd7-af58-d64c2aa7e9f7", + "key": "a991e2d5-5be6-43b1-9a71-2f229aea392f", "params": { "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "strategy": "usingGripper", @@ -3541,7 +3541,7 @@ }, { "commandType": "pickUpTip", - "key": "857bf455-9955-4bce-a16a-cc4dbb6d4c9b", + "key": "55826f7b-111e-4768-a6d3-d0a4c4a5e20d", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3550,31 +3550,31 @@ }, { "commandType": "aspirate", - "key": "4a586a97-5ce9-4cc5-bf89-2f1f87bdde20", + "key": "bb5688fe-2909-4755-be74-1850d4d05735", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "bd25d986-4c3f-4a17-bd17-078c023cc001", + "key": "33f7aa0b-80e4-41f0-a841-d8aacb4c7f32", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "b7673c1c-f83c-4967-859e-83e0fb831357", + "key": "650a3b63-379d-4327-ae55-9752d04497ab", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3583,12 +3583,12 @@ }, { "commandType": "dropTipInPlace", - "key": "7290bca4-5b79-4b94-8592-9ea21290cd91", + "key": "40c51d0f-5a80-4355-91c1-aaaba7489f37", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "eb533006-f899-4bbe-8a20-5c9f5d5ba20d", + "key": "006d7584-e3ad-43a9-8fa1-0688f1d74304", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3597,31 +3597,31 @@ }, { "commandType": "aspirate", - "key": "c8c51d1b-374e-4dc5-a295-14cc8dd8da5e", + "key": "562c0ad9-1f97-4e74-af40-107e12019e41", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "339abae3-666e-48f6-8d8c-3087e073df2b", + "key": "cbd55dd4-a746-4bf5-bf43-73afd95ebff2", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "B1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "b8308284-849f-4581-ab7b-99d0db5a37ef", + "key": "1bac0a50-7a55-4abe-905c-547f006fd62c", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3630,12 +3630,12 @@ }, { "commandType": "dropTipInPlace", - "key": "458bc57f-1489-4dd5-8c7f-119a9ecbfd6a", + "key": "480d48a6-b825-406a-bc6c-b95b457a1eba", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "3ee08d06-c33d-4a16-88d8-ca2fad830121", + "key": "aed7d916-7957-4608-8678-895cd03f2bb8", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3644,31 +3644,31 @@ }, { "commandType": "aspirate", - "key": "532a6ac5-be15-4b16-b7c3-05cb866eb753", + "key": "6c2a45d8-449f-4d46-858d-01c349ec7481", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "a19f510b-977f-4580-9eec-dcc512e590a4", + "key": "2259e5af-9e35-45bc-b869-105e0d6bda3e", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "C1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "712493a8-bcae-48cd-9b94-385f652a6de5", + "key": "4422ed17-8cf6-47f4-b945-352f17a81fb0", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3677,12 +3677,12 @@ }, { "commandType": "dropTipInPlace", - "key": "e551d4ee-cd90-428c-89d0-3c6fb560b7f3", + "key": "33bf2ffd-b472-4d01-a063-e6d78cd10f6e", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "6a0d7de2-09e9-487f-a7aa-dc3f5dfaf957", + "key": "0b9fe44a-1d94-48ed-9d52-058fb8639425", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3691,31 +3691,31 @@ }, { "commandType": "aspirate", - "key": "48620e03-48fb-4ebe-87a0-e9ccb6117992", + "key": "d617d4ec-ae3c-4517-acea-7ff57af655ef", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "4c060513-1ec6-4d0e-995e-de093b64f447", + "key": "99bf9993-2553-4adc-9131-be9fe370b9df", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "D1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "a3cea5f4-155e-4b89-b21b-06802f1d82e0", + "key": "4f05b8d1-319d-40b5-a006-31a41ad5742f", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3724,12 +3724,12 @@ }, { "commandType": "dropTipInPlace", - "key": "353e7832-005f-4ce4-870d-f670c4eac274", + "key": "8faee0ed-2458-45d7-b09f-8021317417cd", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "74b0abe7-4ef1-4956-961b-02f02a7cb8b6", + "key": "bf3176ac-63db-4218-8042-d5683092a66d", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3738,31 +3738,31 @@ }, { "commandType": "aspirate", - "key": "ce9f5636-de37-4d99-b50d-a1aa89fe33a1", + "key": "fbea3f6f-0421-428a-bf21-6cda35b30407", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "8d3000af-9117-4bc8-937e-45102bbb2d7c", + "key": "fedd8c6f-777b-4913-afd9-63c919394a5c", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "E1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "f8848ed6-8ca7-46db-9109-fa0edc5b483e", + "key": "a1934186-6d8b-4fdf-b17a-8f9e93f63417", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3771,12 +3771,12 @@ }, { "commandType": "dropTipInPlace", - "key": "931b7773-1616-40c9-904d-aa8027883045", + "key": "4fb7ea89-471a-47c4-8af8-0a6bfdae1d74", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "3ea42af5-35c2-463c-b563-3fe0532c42c0", + "key": "f66afc4e-9476-4ca4-9cdc-a66257031413", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3785,31 +3785,31 @@ }, { "commandType": "aspirate", - "key": "d09c733e-cc3b-4ae6-a284-3a22bba573a4", + "key": "a629a9e7-e34f-4693-8479-3cb27d44d0b6", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "8c303e0e-c5e5-48b0-b261-2083f63126a4", + "key": "f831d4dd-c2c2-4429-9314-2fbef18546d6", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "F1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "d28b2400-8849-434a-b419-b14834295868", + "key": "e05ddba8-7f1b-45a6-a8d9-9de8b01146bc", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3818,12 +3818,12 @@ }, { "commandType": "dropTipInPlace", - "key": "60ffb55b-e200-4023-a0de-9c08ce2f4904", + "key": "059f01dc-eb9f-4cfd-92cf-0b67113e4c2d", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "47e6e805-5460-4eec-bd9e-54714e597def", + "key": "2d85f593-c882-45b2-89ec-f3bd9cd7c645", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3832,31 +3832,31 @@ }, { "commandType": "aspirate", - "key": "037da247-d390-4fc0-aba9-2a40251b0107", + "key": "860d1800-6f8d-46d6-a939-81569e9641fc", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "102275bb-d577-483b-8a0d-b1066d6d9e51", + "key": "1d9ef0b0-926e-446c-b0df-c57dfc97f34e", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "G1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "7eea2c58-4f22-4ea2-a80e-ff82cada8743", + "key": "c2954781-c45e-46ff-a8fa-36faea77630c", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3865,12 +3865,12 @@ }, { "commandType": "dropTipInPlace", - "key": "c8df1b4d-67c0-4561-be79-12fbf04c4298", + "key": "05db8e46-e6c4-4039-84ca-cf7a11042eb9", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "pickUpTip", - "key": "dce0677b-aea8-46bf-9053-4760fbc260e9", + "key": "2cbabc82-4412-4bc5-a7d2-12b74b39b641", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", @@ -3879,31 +3879,31 @@ }, { "commandType": "aspirate", - "key": "31bd892c-0ced-456f-9598-2a62f9aa5483", + "key": "9f9e94a0-4a33-441c-8864-e64f9a0fda07", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1", "wellName": "A1", "wellLocation": { "origin": "bottom", "offset": { "z": 1 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "dispense", - "key": "8e0a5330-2a16-464b-a0a2-b16335a34dd9", + "key": "d2144ca8-ca39-484a-a8a0-9c70e613be8a", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "volume": 100, "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "wellName": "H1", "wellLocation": { "origin": "bottom", "offset": { "z": 0.5 } }, - "flowRate": 716 + "flowRate": 160 } }, { "commandType": "moveToAddressableArea", - "key": "8b37fb42-d6d5-412f-81c9-336b18dd696b", + "key": "e8f7d982-7346-4e25-81b1-98e0412553d2", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc", "addressableAreaName": "1ChannelWasteChute", @@ -3912,19 +3912,19 @@ }, { "commandType": "dropTipInPlace", - "key": "c4cebdc4-e599-4bdd-8635-b57defbe111e", + "key": "880baa31-8fdb-4e11-9183-d90052fca1e2", "params": { "pipetteId": "9fcd50d9-92b2-45ac-acf1-e2cf773feffc" } }, { "commandType": "thermocycler/closeLid", - "key": "e5c3a0aa-231c-4ee0-96da-1ea95e6eff25", + "key": "e1c31c80-51e8-47db-be63-29d861843b56", "params": { "moduleId": "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType" } }, { "commandType": "thermocycler/setTargetBlockTemperature", - "key": "6c70ecd2-96ed-4b49-b74e-74fcbf1a6fe8", + "key": "ae59fc04-b753-482e-87f0-8680cdccb6c4", "params": { "moduleId": "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType", "celsius": 40 @@ -3932,47 +3932,47 @@ }, { "commandType": "thermocycler/waitForBlockTemperature", - "key": "7156c187-8e0b-488a-bc81-358f592ccf3f", + "key": "66261c91-97d7-4170-b2f6-462ad85b660e", "params": { "moduleId": "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType" } }, { "commandType": "waitForDuration", - "key": "a224e3cb-9a15-49c7-890e-64921ba206d3", + "key": "d09638c2-a49c-4b38-b22f-d581fb68feca", "params": { "seconds": 60, "message": "" } }, { "commandType": "thermocycler/openLid", - "key": "a58a4b92-06cf-4beb-a071-702498c64115", + "key": "b5017439-7aa1-483a-a475-3b03ce1a4505", "params": { "moduleId": "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType" } }, { "commandType": "thermocycler/deactivateBlock", - "key": "e5238393-969f-4028-91cb-efc601d20253", + "key": "b9e78735-3881-4493-82cb-4bd628bd288d", "params": { "moduleId": "fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType" } }, { "commandType": "heaterShaker/deactivateHeater", - "key": "6d34e9d2-f9e0-460f-98dc-aed8124acb14", + "key": "af91feaf-c12a-4059-abbf-91d33820a1c0", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "heaterShaker/openLabwareLatch", - "key": "77241798-50df-41d0-8f44-7a24d2f58674", + "key": "7a7352ad-9879-4b2e-bc48-540ac0b2ad3b", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "moveLabware", - "key": "18e94981-102e-4599-a487-9bb94659d5e3", + "key": "a2fe52a9-4acf-4599-afc3-5ed26bd579a8", "params": { "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "strategy": "usingGripper", @@ -3983,21 +3983,21 @@ }, { "commandType": "heaterShaker/closeLabwareLatch", - "key": "5b1760d4-bb50-4459-8cea-1977e7051dc5", + "key": "b057b4d6-57ae-4443-b798-2e6d9103c2e5", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "heaterShaker/deactivateHeater", - "key": "cc4a8fe2-6a0d-42a1-87e7-2147f426a981", + "key": "cb6fba71-dfd4-468b-a351-22279bfad1c1", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "heaterShaker/setAndWaitForShakeSpeed", - "key": "4be560b3-6860-4917-886c-d70674f940ec", + "key": "a8c7211e-11f9-41e2-b977-68b513a2db5d", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType", "rpm": 200 @@ -4005,40 +4005,40 @@ }, { "commandType": "waitForDuration", - "key": "c6ee8088-0f2e-48a8-a485-ca593eb2cbe1", + "key": "91be8718-5404-496e-957d-011a33f9cfe0", "params": { "seconds": 60 } }, { "commandType": "heaterShaker/deactivateShaker", - "key": "713dfd49-f87a-44dd-bfb7-8e669c76fb70", + "key": "11592571-7419-4880-b987-ace8edf90b8a", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "heaterShaker/deactivateHeater", - "key": "880c39f4-45b7-4b7e-95a5-7359c47d4208", + "key": "3da43478-0315-4c19-aaf2-087b174e1ecf", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "heaterShaker/deactivateHeater", - "key": "c53174f7-48d7-4c8a-afe4-d9ef49d75373", + "key": "7038cc9a-87e9-4554-a69d-3828d1cf9273", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "heaterShaker/openLabwareLatch", - "key": "9403eb81-c44f-4581-83c0-943e85b3a18a", + "key": "4a2c5d7f-31c0-40ff-ab77-b5eb167f4008", "params": { "moduleId": "23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType" } }, { "commandType": "moveLabware", - "key": "56d25a8d-edc1-48bb-b480-0b8901c070f8", + "key": "b2f3676b-da1a-411e-b106-fc761a5ce11b", "params": { "labwareId": "54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2", "strategy": "usingGripper", @@ -4047,7 +4047,7 @@ }, { "commandType": "moveLabware", - "key": "f01bb6fe-799f-4dbf-bf26-64bcf3dbee95", + "key": "f76dccda-5917-48cf-97eb-efd0ae2138f2", "params": { "labwareId": "f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1", "strategy": "usingGripper", diff --git a/shared-data/js/__tests__/pipettes.test.ts b/shared-data/js/__tests__/pipettes.test.ts index 857f429c9f0..0fe60334c3f 100644 --- a/shared-data/js/__tests__/pipettes.test.ts +++ b/shared-data/js/__tests__/pipettes.test.ts @@ -77,7 +77,7 @@ describe('pipette data accessors', () => { channels: 1, displayCategory: 'FLEX', displayName: 'Flex 1-Channel 1000 μL', - dropTipConfigurations: { plungerEject: { current: 1, speed: 15 } }, + dropTipConfigurations: { plungerEject: { current: 1, speed: 10 } }, liquids: { default: { $otSharedSchema: @@ -118,7 +118,7 @@ describe('pipette data accessors', () => { plungerHomingConfigurations: { current: 1, speed: 30 }, plungerMotorConfigurations: { idle: 0.3, run: 1 }, plungerPositionsConfigurations: { - default: { blowout: 76.5, bottom: 71.5, drop: 90.5, top: 0 }, + default: { blowout: 76.5, bottom: 71.5, drop: 90.5, top: 0.5 }, }, quirks: [], shaftDiameter: 4.5, diff --git a/shared-data/js/pipettes.ts b/shared-data/js/pipettes.ts index b540ca837a1..d918a2e6bc8 100644 --- a/shared-data/js/pipettes.ts +++ b/shared-data/js/pipettes.ts @@ -139,17 +139,17 @@ const getChannelsFromString = ( } } } -const getVersionFromGen = (gen: Gen): number | null => { +const getVersionFromGen = (gen: Gen): string | null => { switch (gen) { case 'gen1': { - return 1 + return '1_0' } case 'gen2': { - return 2 + return '2_0' } case 'gen3': case 'flex': { - return 3 + return '3_0' } default: { return null @@ -157,36 +157,6 @@ const getVersionFromGen = (gen: Gen): number | null => { } } -const getHighestVersion = ( - wholeVersion: string, - path: string, - pipetteModel: string, - channels: Channels | null, - majorVersion: number, - highestVersion: string -): string => { - const versionComponents = wholeVersion.split('_') - const majorPathVersion = parseInt(versionComponents[0]) - const minorPathVersion = parseInt(versionComponents[1]) - const highestVersionComponents = highestVersion.split('_') - const minorHighestVersion = parseInt(highestVersionComponents[1]) - - if (majorPathVersion === majorVersion) { - // Compare the version number with the current highest version - // and make sure the given model, channels, and major/minor versions - // are found in the path - if ( - minorPathVersion > minorHighestVersion && - path.includes(`${majorPathVersion}_${minorPathVersion}`) && - path.includes(pipetteModel) && - path.includes(channels ?? '') - ) { - highestVersion = `${majorPathVersion}_${minorPathVersion}` - } - } - return highestVersion -} - const V2_DEFINITION_TYPES = ['general', 'geometry'] /* takes in pipetteName such as 'p300_single' or 'p300_single_gen1' @@ -205,18 +175,12 @@ export const getPipetteSpecsV2 = ( const channels = getChannelsFromString(nameSplit[1] as PipChannelString) // ex: single -> single_channel const gen = getVersionFromGen(nameSplit[2] as Gen) - let version: string = '' - let majorVersion: number + let version: string // the first 2 conditions are to accommodate version from the pipetteName if (nameSplit.length === 2) { - // special-casing 96-channel - if (channels === 'ninety_six_channel') { - majorVersion = 3 - } else { - majorVersion = 1 - } + version = '1_0' } else if (gen != null) { - majorVersion = gen // ex: gen1 -> 1 + version = gen // ex: gen1 -> 1_0 // the 'else' is to accommodate the exact version if PipetteModel was added } else { const versionNumber = nameSplit[2].split('v')[1] @@ -226,25 +190,13 @@ export const getPipetteSpecsV2 = ( version = `${versionNumber}_0` // ex: 1 -> 1_0 } } - let highestVersion: string = '0_0' const generalGeometricMatchingJsons = Object.entries(generalGeometric).reduce( (genericGeometricModules: GeneralGeometricModules[], [path, module]) => { - const wholeVersion = path.split('/')[7] - highestVersion = getHighestVersion( - wholeVersion, - path, - pipetteModel, - channels, - majorVersion, - highestVersion - ) - V2_DEFINITION_TYPES.forEach(type => { if ( - `../pipette/definitions/2/${type}/${channels}/${pipetteModel}/${ - version === '' ? highestVersion : version - }.json` === path + `../pipette/definitions/2/${type}/${channels}/${pipetteModel}/${version}.json` === + path ) { genericGeometricModules.push(module.default) } @@ -267,9 +219,8 @@ export const getPipetteSpecsV2 = ( liquidTypes.push(type) } if ( - `../pipette/definitions/2/liquid/${channels}/${pipetteModel}/${type}/${ - version === '' ? highestVersion : version - }.json` === path + `../pipette/definitions/2/liquid/${channels}/${pipetteModel}/${type}/${version}.json` === + path ) { const index = liquidTypes.indexOf(type) const newKeyName = index !== -1 ? liquidTypes[index] : path