single channel definition updates

Opentrons · May 20, 2024 · 45d2899 · 45d2899
1 parent 350ebd0
commit 45d2899
Show file tree

Hide file tree

Showing 34 changed files with 385 additions and 238 deletions.
diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json
@@ -3,18 +3,30 @@
   "displayName": "P10 Single-Channel GEN1",
   "model": "p10",
   "displayCategory": "GEN1",
+  "validNozzleMaps": {
+    "maps": {
+      "A1": ["A1"]
+    }
+  },
   "pickUpTipConfigurations": {
     "pressFit": {
-      "speedByTipCount": {
-        "1": 30.0
-      },
       "presses": 3,
       "increment": 1.0,
-      "distanceByTipCount": {
-        "1": 10.0
-      },
-      "currentByTipCount": {
-        "1": 0.1
+      "configurationsByNozzleMap": {
+        "A1": {
+          "default": {
+            "speed": 30.0,
+            "distance": 10.0,
+            "current": 0.1,
+            "tipOverlaps": {
+              "default": 3.29,
+              "opentrons/opentrons_96_tiprack_10ul/1": 3.29,
+              "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29,
+              "opentrons/geb_96_tiprack_10ul/1": 6.2,
+              "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0
+            }
+          }
+        }
       }
     }
   },

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json
@@ -3,18 +3,30 @@
   "displayName": "P10 Single-Channel GEN1",
   "model": "p10",
   "displayCategory": "GEN1",
+  "validNozzleMaps": {
+    "maps": {
+      "A1": ["A1"]
+    }
+  },
   "pickUpTipConfigurations": {
     "pressFit": {
-      "speedByTipCount": {
-        "1": 30.0
-      },
       "presses": 3,
       "increment": 1.0,
-      "distanceByTipCount": {
-        "1": 10.0
-      },
-      "currentByTipCount": {
-        "1": 0.1
+      "configurationsByNozzleMap": {
+        "A1": {
+          "default": {
+            "speed": 30.0,
+            "distance": 10.0,
+            "current": 0.1,
+            "tipOverlaps": {
+              "default": 3.29,
+              "opentrons/opentrons_96_tiprack_10ul/1": 3.29,
+              "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29,
+              "opentrons/geb_96_tiprack_10ul/1": 6.2,
+              "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0
+            }
+          }
+        }
       }
     }
   },

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json
@@ -3,18 +3,30 @@
   "displayName": "P10 Single-Channel GEN1",
   "model": "p10",
   "displayCategory": "GEN1",
+  "validNozzleMaps": {
+    "maps": {
+      "A1": ["A1"]
+    }
+  },
   "pickUpTipConfigurations": {
     "pressFit": {
-      "speedByTipCount": {
-        "1": 30.0
-      },
       "presses": 3,
       "increment": 1.0,
-      "distanceByTipCount": {
-        "1": 10.0
-      },
-      "currentByTipCount": {
-        "1": 0.1
+      "configurationsByNozzleMap": {
+        "A1": {
+          "default": {
+            "speed": 30.0,
+            "distance": 10.0,
+            "current": 0.1,
+            "tipOverlaps": {
+              "default": 3.29,
+              "opentrons/opentrons_96_tiprack_10ul/1": 3.29,
+              "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29,
+              "opentrons/geb_96_tiprack_10ul/1": 6.2,
+              "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0
+            }
+          }
+        }
       }
     }
   },

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json
@@ -3,18 +3,30 @@
   "displayName": "P10 Single-Channel GEN1",
   "model": "p10",
   "displayCategory": "GEN1",
+  "validNozzleMaps": {
+    "maps": {
+      "A1": ["A1"]
+    }
+  },
   "pickUpTipConfigurations": {
     "pressFit": {
-      "speedByTipCount": {
-        "1": 30.0
-      },
       "presses": 3,
       "increment": 1.0,
-      "distanceByTipCount": {
-        "1": 10.0
-      },
-      "currentByTipCount": {
-        "1": 0.1
+      "configurationsByNozzleMap": {
+        "A1": {
+          "default": {
+            "speed": 30.0,
+            "distance": 10.0,
+            "current": 0.1,
+            "tipOverlaps": {
+              "default": 3.29,
+              "opentrons/opentrons_96_tiprack_10ul/1": 3.29,
+              "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29,
+              "opentrons/geb_96_tiprack_10ul/1": 6.2,
+              "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0
+            }
+          }
+        }
       }
     }
   },

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json
@@ -18,13 +18,13 @@
             "speed": 30.0,
             "distance": 15.0,
             "current": 0.1,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 30.0,
-            "distance": 15.0,
-            "current": 0.1,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 7.95,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 7.95,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95,
+              "opentrons/geb_96_tiprack_1000ul/1": 11.2,
+              "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json
@@ -18,13 +18,13 @@
             "speed": 30.0,
             "distance": 15.0,
             "current": 0.1,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 30.0,
-            "distance": 15.0,
-            "current": 0.1,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 7.95,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 7.95,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95,
+              "opentrons/geb_96_tiprack_1000ul/1": 11.2,
+              "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json
@@ -18,13 +18,13 @@
             "speed": 30.0,
             "distance": 15.0,
             "current": 0.1,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 30.0,
-            "distance": 15.0,
-            "current": 0.1,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 7.95,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 7.95,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95,
+              "opentrons/geb_96_tiprack_1000ul/1": 11.2,
+              "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json
@@ -18,13 +18,13 @@
             "speed": 30.0,
             "distance": 15.0,
             "current": 0.15,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 30.0,
-            "distance": 15.0,
-            "current": 0.15,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 7.95,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 7.95,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95,
+              "opentrons/geb_96_tiprack_1000ul/1": 11.2,
+              "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json
@@ -18,13 +18,12 @@
             "speed": 10.0,
             "distance": 17.0,
             "current": 0.17,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 10.0,
-            "distance": 17.0,
-            "current": 0.17,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 9.7,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 11.5,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5,
+              "opentrons/geb_96_tiprack_1000ul/1": 9.5
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json
@@ -18,13 +18,12 @@
             "speed": 10.0,
             "distance": 17.0,
             "current": 0.17,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 10.0,
-            "distance": 17.0,
-            "current": 0.17,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 9.7,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 11.5,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5,
+              "opentrons/geb_96_tiprack_1000ul/1": 9.5
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json
@@ -18,13 +18,12 @@
             "speed": 10.0,
             "distance": 17.0,
             "current": 0.17,
-            "tipOverlap": 7.47
-          },
-          "t200": {
-            "speed": 10.0,
-            "distance": 17.0,
-            "current": 0.17,
-            "tipOverlap": 6.1
+            "tipOverlaps": {
+              "default": 9.7,
+              "opentrons/opentrons_96_tiprack_1000ul/1": 11.5,
+              "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5,
+              "opentrons/geb_96_tiprack_1000ul/1": 9.5
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json
@@ -18,13 +18,15 @@
             "speed": 5.0,
             "distance": 13.0,
             "current": 0.15,
-            "tipOverlap": 10.5
-          },
-          "t50": {
-            "speed": 5.0,
-            "distance": 13.0,
-            "current": 0.15,
-            "tipOverlap": 10.05
+            "tipOverlaps": {
+              "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
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json
@@ -18,13 +18,15 @@
             "speed": 5.0,
             "distance": 13.0,
             "current": 0.15,
-            "tipOverlap": 10.5
-          },
-          "t50": {
-            "speed": 5.0,
-            "distance": 13.0,
-            "current": 0.15,
-            "tipOverlap": 10.05
+            "tipOverlaps": {
+              "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
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json
@@ -18,13 +18,15 @@
             "speed": 10.0,
             "distance": 13.0,
             "current": 0.2,
-            "tipOverlap": 10.5
-          },
-          "t50": {
-            "speed": 10.0,
-            "distance": 13.0,
-            "current": 0.2,
-            "tipOverlap": 10.05
+            "tipOverlaps": {
+              "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
+            }
           }
         }
       }

diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json
@@ -18,13 +18,15 @@
             "speed": 10.0,
             "distance": 13.0,
             "current": 0.2,
-            "tipOverlap": 10.5
-          },
-          "t50": {
-            "speed": 10.0,
-            "distance": 13.0,
-            "current": 0.2,
-            "tipOverlap": 10.05
+            "tipOverlaps": {
+              "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
+            }
           }
         }
       }