Merge branch 'edge' into EXEC-281-volume-tracking

Opentrons · Oct 18, 2024 · cb77025 · cb77025
2 parents 544d695 + b157bb4
commit cb77025
Show file tree

Hide file tree

Showing 147 changed files with 76,480 additions and 46,504 deletions.
diff --git a/...shot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json b/...shot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json
diff --git a/...napshot_test/test_analysis_snapshot[00574c503f][pl_BacteriaInoculation_Flex_6plates].json b/...napshot_test/test_analysis_snapshot[00574c503f][pl_BacteriaInoculation_Flex_6plates].json
diff --git a/...s_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json b/...s_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json
diff --git a/...snapshot_test/test_analysis_snapshot[01255c3f3b][pl_Flex_Protein_Digestion_Protocol].json b/...snapshot_test/test_analysis_snapshot[01255c3f3b][pl_Flex_Protein_Digestion_Protocol].json
@@ -6331,7 +6331,8 @@
             "y": 0.0,
             "z": -34.55
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6364,7 +6365,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6397,7 +6399,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6431,7 +6434,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6464,7 +6468,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6498,7 +6503,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6531,7 +6537,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6564,7 +6571,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6596,7 +6604,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -6628,7 +6637,8 @@
             "y": 0.0,
             "z": -1.0
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -7984,7 +7994,8 @@
             "y": 0.0,
             "z": -34.55
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8017,7 +8028,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8050,7 +8062,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8084,7 +8097,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8117,7 +8131,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8151,7 +8166,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8184,7 +8200,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8217,7 +8234,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8249,7 +8267,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -8281,7 +8300,8 @@
             "y": 0.0,
             "z": -1.0
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9637,7 +9657,8 @@
             "y": 0.0,
             "z": -34.55
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9670,7 +9691,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9703,7 +9725,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9737,7 +9760,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9770,7 +9794,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9804,7 +9829,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9837,7 +9863,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9870,7 +9897,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9902,7 +9930,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -9934,7 +9963,8 @@
             "y": 0.0,
             "z": -1.0
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11290,7 +11320,8 @@
             "y": 0.0,
             "z": -34.55
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11323,7 +11354,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11356,7 +11388,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11390,7 +11423,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11423,7 +11457,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11457,7 +11492,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11490,7 +11526,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11523,7 +11560,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11555,7 +11593,8 @@
             "y": 0.0,
             "z": -34.36
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },
@@ -11587,7 +11626,8 @@
             "y": 0.0,
             "z": -1.0
           },
-          "origin": "top"
+          "origin": "top",
+          "volumeOffset": 0.0
         },
         "wellName": "A1"
       },