refactor(protocol-designer, step-generation): emit dropTipInPlace & m… (

#14203) emit dropTipInPlace after moveToAddressableAreaForDropTip commands in step-generation
Opentrons · Dec 14, 2023 · 6474aa2 · 6474aa2
1 parent d5ee4fc
commit 6474aa2
Show file tree

Hide file tree

Showing 12 changed files with 212 additions and 28 deletions.
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json
@@ -2782,6 +2782,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "814036fd-ea55-40d0-932b-d13f6113a77f",
+      "params": { "pipetteId": "0b3f2210-75c7-11ea-b42f-4b64e50f43e5" }
+    },
     {
       "commandType": "waitForResume",
       "key": "00cedccd-f5dc-4b12-9142-979758ba0dd9",
@@ -2905,7 +2910,11 @@
         "alternateDropLocation": true
       }
     },
-
+    {
+      "commandType": "dropTipInPlace",
+      "key": "c55edd6b-b323-4d72-81d3-39e08ec71a88",
+      "params": { "pipetteId": "0b3f2210-75c7-11ea-b42f-4b64e50f43e5" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "d83c457e-4183-4bac-a9cc-f58ece48e808",
@@ -3023,6 +3032,11 @@
         "offset": { "x": 0, "y": 0, "z": 0 },
         "alternateDropLocation": true
       }
+    },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "3bd0eb5c-3115-4953-aad4-a530dfb962fb",
+      "params": { "pipetteId": "0b3f2210-75c7-11ea-b42f-4b64e50f43e5" }
     }
   ],
   "commandAnnotationSchemaId": "opentronsCommandAnnotationSchemaV1",

diff --git a/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json
@@ -2742,6 +2742,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "e9745ff2-9404-432f-acb7-0f8400f37821",
+      "params": { "pipetteId": "0b3f2210-75c7-11ea-b42f-4b64e50f43e5" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "9969785e-f71d-4344-9241-c1b2d63845fa",
@@ -2785,6 +2790,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "1cf684b0-27e7-48c6-bb66-09ba0acf0630",
+      "params": { "pipetteId": "0b3f2210-75c7-11ea-b42f-4b64e50f43e5" }
+    },
     {
       "commandType": "temperatureModule/waitForTemperature",
       "key": "dcaef387-aa66-44b8-9a89-7708303388fb",

diff --git a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json
@@ -4009,6 +4009,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "ac00f670-852b-4426-97dc-871b44ba66a1",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "57a9e3bc-16e5-4dbf-840f-ef209cf856e1",
@@ -4052,6 +4057,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "2090ef62-ea92-4b94-bd06-db2b728be791",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "ec449df4-f566-463b-a456-888539754602",
@@ -4095,6 +4105,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "bb648909-b03d-4968-8c70-2805f62e25ea",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "30b832e2-d26d-4a67-8a2f-e016fed5bf5f",
@@ -4138,6 +4153,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "976eb63e-6088-4557-8db5-03e7eea31c1e",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "a8386c31-d0a7-45f2-aa3a-93ac440bb893",
@@ -4181,6 +4201,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "f5dd6139-a8ed-4581-bf1b-0be264a64d7d",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "f6d713e8-89ff-4d3e-aaab-fbe2989dd179",
@@ -4224,6 +4249,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "89b50486-6526-4583-bf14-0e69b1c9e734",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "96f89a25-617d-4bea-a1da-8fedf0cbf8f5",
@@ -4267,6 +4297,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "44e645f1-3e34-41d8-beb8-3f372040417f",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "faac2fd6-a6c2-4476-855f-050e6de30f50",
@@ -4310,6 +4345,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "8e019e03-08fb-4ffa-95f8-2b5772ead81f",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "7e002dcf-65f4-46b0-8809-d6f0316596c6",
@@ -4353,6 +4393,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "c934ec98-5a28-40ec-88cb-3b1860d8bac7",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "bd57a694-9816-47fb-b4aa-c80d2c3a0b2c",
@@ -4396,6 +4441,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "95585fea-74b8-4d30-bd98-2019c1f024e9",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "df9446b5-d7d2-4bb1-b64b-2cc5a544de96",
@@ -4439,6 +4489,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "479a02e3-e2f5-4c45-96f7-e8517fc17bd4",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "57d8e8c3-64ba-416d-bbed-eb7675ddde76",
@@ -4482,6 +4537,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "2f509f24-3b12-4fee-ad61-9f509021a38f",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "b9ecfc6b-e9f3-44ef-81be-b4d8136fcad6",
@@ -4525,6 +4585,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "d90df5ec-8ec5-4d07-84eb-3b223096ad96",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "8779a116-4dd8-4e75-bb64-971be73ce999",
@@ -4568,6 +4633,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "825d8d92-b475-4ad1-bab3-59bce3790ad2",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "f5812c27-3bf2-49d6-bcf2-e1d84cd31615",
@@ -4611,6 +4681,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "a2d3c0d6-eb9c-49e1-b956-714799ad22c4",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "fc43bd31-0414-4eaa-b5c2-f19569955525",
@@ -4654,6 +4729,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "4317a410-eceb-4130-b499-f6e717887fee",
+      "params": { "pipetteId": "2e7c6344-58ab-465c-b542-489883cb63fe" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "789d33d5-9931-4e3d-b128-8edb6a77c669",
@@ -4729,6 +4809,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "b7a75837-05f9-4fd5-ae46-d36c67717daf",
+      "params": { "pipetteId": "6d1e53c3-2db3-451b-ad60-3fe13781a193" }
+    },
     {
       "commandType": "moveLabware",
       "key": "291ca892-3619-4784-8a32-b8c379399ead",

diff --git a/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json b/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json
@@ -3650,6 +3650,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "0164aa78-bccf-4a2f-99b7-cdfe57f40010",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "4eaeeb54-5696-4266-b6e0-0d1ea4e26871",
@@ -3850,6 +3855,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "0e5e034f-293c-4261-af84-2a1df0c4a8fc",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "38fea220-e6a3-40fb-9f3f-38db5116b8cf",
@@ -4050,6 +4060,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "df138c35-ce81-4ecb-a034-0363e2ecaa06",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "c75fef6e-72d6-4736-ad4c-7c327996dab3",
@@ -4250,6 +4265,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "3b9ba522-a0a1-4313-b5e4-4b8177042416",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "b941a590-dae3-4cdc-b296-001459a944aa",
@@ -4450,6 +4470,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "56cab34a-a9e5-4226-b443-74d0ee8e0aa6",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "cee54c07-b439-40e2-ac71-79792b48945d",
@@ -4650,6 +4675,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "abd37ed7-c6d8-46ac-93c1-0f6b8b0bbe7f",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "6aeb689a-ffe8-4953-80d7-9319746e3b6f",
@@ -4850,6 +4880,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "abd37ed7-c6d8-46ac-93c1-0f6b8b0bbe7f",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "b7f37a99-be1d-4da9-bce2-d2b686240fab",
@@ -5050,6 +5085,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "09827fd5-e988-45a6-874c-95a35eec10e6",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "c9689672-a40e-4138-82d7-27e6ff4e480c",
@@ -5250,6 +5290,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "322a1d13-dde1-4d05-8562-f152bbf78f27",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "pickUpTip",
       "key": "d976581b-71a5-460f-b2e0-799777d6ea94",
@@ -5362,6 +5407,11 @@
         "alternateDropLocation": true
       }
     },
+    {
+      "commandType": "dropTipInPlace",
+      "key": "b4edbf18-d092-4668-b18a-99e13e7c7ce2",
+      "params": { "pipetteId": "c6f45030-92a5-11e9-ac62-1b173f839d9e" }
+    },
     {
       "commandType": "waitForDuration",
       "key": "6afbcb5c-9da8-4028-9413-2d93d48f7eb8",