From db7b5a452d218100065f407f40923da572941bd5 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Fri, 10 Feb 2023 11:47:31 -0500 Subject: [PATCH 01/13] Add script to automatically migrate pipettes --- .../pipette/build_json_script.py | 461 ++++++++++++++++++ .../pipette/pipette_definition.py | 11 + 2 files changed, 472 insertions(+) create mode 100644 shared-data/python/opentrons_shared_data/pipette/build_json_script.py diff --git a/shared-data/python/opentrons_shared_data/pipette/build_json_script.py b/shared-data/python/opentrons_shared_data/pipette/build_json_script.py new file mode 100644 index 00000000000..50138715c80 --- /dev/null +++ b/shared-data/python/opentrons_shared_data/pipette/build_json_script.py @@ -0,0 +1,461 @@ +import argparse +# import csv +from typing import Optional, Dict +from pathlib import Path +from pydantic import BaseModel + +from .. import get_shared_data_root +from . import name_config, model_config +from .pipette_definition import ( + PipetteGeometryDefinition, + PipetteLiquidPropertiesDefinition, + PipettePhysicalPropertiesDefinition, + TipHandlingConfigurations, + PlungerPositions, + PipetteTipType, + SupportedTipsDefinition, + MotorConfigurations, + PartialTipDefinition) + + +PIPETTE_DEFINITION_ROOT = get_shared_data_root() / "pipette" / "definitions" / "2" +GEOMETRY_ROOT = PIPETTE_DEFINITION_ROOT / "geometry" +GENERAL_ROOT = PIPETTE_DEFINITION_ROOT / "general" +LIQUID_ROOT = PIPETTE_DEFINITION_ROOT / "liquid" + + +## Name spec sample +# "p10_single": { +# "displayName": "P10 Single-Channel GEN1", +# "displayCategory": "GEN1", +# "minVolume": 1, +# "maxVolume": 10, +# "channels": 1, +# "defaultAspirateFlowRate": { +# "value": 5, +# "min": 0.001, +# "max": 50, +# "valuesByApiLevel": { "2.0": 5 } +# }, +# "defaultDispenseFlowRate": { +# "value": 10, +# "min": 0.001, +# "max": 50, +# "valuesByApiLevel": { "2.0": 10 } +# }, +# "defaultBlowOutFlowRate": { +# "value": 1000, +# "min": 5, +# "max": 1000, +# "valuesByApiLevel": { "2.0": 1000 } +# }, +# "smoothieConfigs": { +# "stepsPerMM": 768, +# "homePosition": 220, +# "travelDistance": 30 +# }, +# "defaultTipracks": [ +# "opentrons/opentrons_96_tiprack_10ul/1", +# "opentrons/opentrons_96_filtertiprack_10ul/1", +# "opentrons/geb_96_tiprack_10ul/1" +# ] + +## model spec sample + # "p1000_single_v1.3": { + # "name": "p1000_single", + # "top": { + # "value": 19.5, + # "min": 5, + # "max": 19.5, + # "units": "mm", + # "type": "float" + # }, + # "bottom": { + # "value": 2.5, + # "min": -2, + # "max": 19.0, + # "units": "mm", + # "type": "float" + # }, + # "blowout": { + # "value": 0.5, + # "min": -4, + # "max": 10, + # "units": "mm", + # "type": "float" + # }, + # "dropTip": { + # "value": -4, + # "min": -6, + # "max": 2, + # "units": "mm", + # "type": "float" + # }, + # "pickUpCurrent": { + # "value": 0.1, + # "min": 0.05, + # "max": 2.0, + # "units": "amps", + # "type": "float" + # }, + # "pickUpDistance": { + # "value": 15, + # "min": 1, + # "max": 30, + # "units": "mm", + # "type": "float" + # }, + # "pickUpIncrement": { + # "value": 1.0, + # "min": 0.0, + # "max": 10.0, + # "units": "mm", + # "type": "float" + # }, + # "pickUpPresses": { + # "value": 3, + # "min": 0, + # "max": 10, + # "units": "presses", + # "type": "int" + # }, + # "pickUpSpeed": { + # "value": 30, + # "min": 1, + # "max": 100, + # "units": "mm/s", + # "type": "float" + # }, + # "modelOffset": [0.0, 0.0, 20.0], + # "nozzleOffset": [0.0, 0.0, 45.0], + # "ulPerMm": [ + # { + # "aspirate": [ + # [148.9157, 0.0213, 56.3986], + # [210.8237, 0.0108, 57.9568], + # [241.2405, 0.0025, 59.717], + # [365.2719, 0.0046, 59.2043], + # [614.4871, 0.0023, 60.0431], + # [1000.0, 0.001, 60.8209] + # ], + # "dispense": [[1000, 0, 61.3275]] + # } + # ], + # "plungerCurrent": { + # "value": 0.5, + # "min": 0.1, + # "max": 0.5, + # "units": "amps", + # "type": "float" + # }, + # "dropTipCurrent": { + # "value": 0.7, + # "min": 0.1, + # "max": 0.8, + # "units": "amps", + # "type": "float" + # }, + # "dropTipSpeed": { + # "value": 5, + # "min": 0.001, + # "max": 30, + # "units": "mm/sec", + # "type": "float" + # }, + # "quirks": ["pickupTipShake", "dropTipShake"], + # "tipOverlap": { + # "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 + # }, + # "tipLength": { + # "value": 76.7, + # "units": "mm", + # "type": "float", + # "min": 0, + # "max": 100 + # } + # } + +def _build_geometry_model(path_to_3d: str, model_configurations: Optional[Dict] = None) -> PipetteGeometryDefinition: + if model_configurations: + nozzle_offset = model_configurations["nozzleOffset"] + else: + nozzle_offset = input("Please provide the nozzle offset") + return PipetteGeometryDefinition(nozzle_offset=nozzle_offset, path_to_3D=path_to_3d) + +def _build_tip_handling_configurations(tip_handling_type: str, model_configurations: Optional[Dict] = None) -> TipHandlingConfigurations: + presses = 0.0 + increment = 0.0 + distance = 0.0 + if tip_handling_type == "pickup" and model_configurations: + current = model_configurations["pickUpCurrent"]["value"] + speed = model_configurations["pickUpSpeed"]["value"] + presses = model_configurations["pickUpPresses"]["value"] + increment = model_configurations["pickUpIncrement"]["value"] + distance = model_configurations["pickUpDistance"]["value"] + elif tip_handling_type == "pickup": + print("Handling pick up tip configurations\n") + current = input("please provide the current") + speed = input("please provide the speed") + presses = input("please provide the number of presses for force pick up") + increment = input("please provide the increment to move the pipette down for force pickup") + distance = input("please provide the starting distance for pick up tip") + elif tip_handling_type == "drop" and model_configurations: + current = model_configurations["dropTipCurrent"]["value"] + speed = model_configurations["dropTipSpeed"]["value"] + elif tip_handling_type == "drop": + print("Handling drop tip configurations\n") + current = input("please provide the current") + speed = input("please provide the speed") + return TipHandlingConfigurations( + current=current, + speed=speed, + presses=presses, + increment=increment, + distance=distance) + +def _build_plunger_positions(model_configurations: Optional[Dict] = None) -> PlungerPositions: + if model_configurations: + top=model_configurations["top"]["value"] + bottom=model_configurations["bottom"]["value"] + blow_out=model_configurations["blowout"]["value"] + drop_tip=model_configurations["dropTip"]["value"] + else: + print("Handling plunger motor positions\n") + top=input("Please provide the top plunger position") + bottom=input("Please provide the bottom plunger position") + blow_out=input("Please provide the blow out plunger position") + drop_tip=input("Please provide the drop tip plunger position") + return PlungerPositions(top=top, bottom=bottom, blow_out=blow_out, drop_tip=drop_tip) + + +def _build_motor_configurations(model_configurations: Optional[Dict] = None) -> MotorConfigurations: + if model_configurations: + idle = model_configurations["idleCurrent"] + run = model_configurations["plungerCurrent"]["value"] + else: + print("Handling default plunger motor currents\n") + idle = input("Please provide the default idle current of the plunger motor") + run = input("Please provide the default run current of the plunger motor") + return MotorConfigurations(idle=idle, run=run) + +def _build_partial_tip_configurations(channels: int) -> PartialTipDefinition: + if channels == 8: + return PartialTipDefinition(partial_tip_supported=True, available_configurations=[1, 2, 3, 4, 5, 6, 7, 8]) + elif channels == 96: + return PartialTipDefinition(partial_tip_supported=True, available_configurations=[1, 8, 12, 96]) + else: + return PartialTipDefinition(partial_tip_supported=False) + +def _build_physical_model(pipette_type: str, model_configurations: Optional[Dict] = None, name_configurations: Optional[Dict] = None) -> PipettePhysicalPropertiesDefinition: + if model_configurations and name_configurations: + display_name = name_configurations["displayName"] + + display_category = name_configurations["displayCategory"] + available_sensors = [] + channels = name_configurations["channels"] + else: + print(f"Handling general pipette information for {pipette_type}\n") + display_name = input("please provide the product name of the pipette") + + display_category = input("please provide the model generation of the pipette") + available_sensors = input("Please provide a list of available sensors") + channels = input(f"Please provide the number of channels your {pipette_type} has") + pick_up_tip_configurations = _build_tip_handling_configurations("pickup") + drop_tip_configurations = _build_tip_handling_configurations("drop") + plunger_positions = _build_plunger_positions(model_configurations) + plunger_motor_configurations =_build_motor_configurations(model_configurations) + partial_tip_configurations=_build_partial_tip_configurations(int(channels)) + return PipettePhysicalPropertiesDefinition( + display_name=display_name, + pipette_type=pipette_type, + display_category=display_category, + pick_up_tip_configurations=pick_up_tip_configurations, + drop_tip_configurations=drop_tip_configurations, + plunger_motor_configurations=plunger_motor_configurations, + plunger_positions_configurations=plunger_positions, + available_sensors=available_sensors, + partial_tip_configurations=partial_tip_configurations, + channels=channels, + ) + +def _build_supported_tips(model_configurations: Optional[Dict] = None, name_configurations: Optional[Dict] = None) -> Dict[PipetteTipType, SupportedTipsDefinition]: + + if model_configurations and name_configurations: + ul_per_mm = model_configurations["ulPerMm"][0] + default_aspirate_flowrate = name_configurations["defaultAspirateFlowRate"]["value"] + default_dispense_flowrate = name_configurations["defaultDispenseFlowRate"]["value"] + default_blowout_flowrate = name_configurations["defaultBlowOutFlowRate"]["value"] + tip_length = model_configurations["tipLength"]["value"] + tip_overlap_dict = model_configurations["tipOverlap"] + default_return_tip = model_configurations.get("returnTipHeight", None) + + tip_volumes = set() + tip_overlap_tiprack_set = {} + for tiprack, overlap in tip_overlap_dict.items(): + split_value = tiprack.split("ul")[0].split("_") + if len(split_value) == 1: + continue + current_tip_volume = split_value[-1] + tip_volumes.add(int(current_tip_volume)) + if tip_overlap_tiprack_set.get(current_tip_volume, None): + tip_overlap_tiprack_set[int(current_tip_volume)][tiprack] = overlap + else: + tip_overlap_tiprack_set[int(current_tip_volume)] = {tiprack: overlap} + # breakpoint() + tips_dict = { + PipetteTipType[volume]: {SupportedTipsDefinition( + defaultAspirateFlowRate=default_aspirate_flowrate, + defaultDispenseFlowRate=default_dispense_flowrate, + defaultBlowOutFlowRate=default_blowout_flowrate, + defaultTipLength=tip_length, + defaultTipOverlap=tip_overlap_dict["default"], + aspirate={tiprack: ul_per_mm["aspirate"] for tiprack in tip_overlap_tiprack_set}, + dispense={tiprack: ul_per_mm["dispense"] for tiprack in tip_overlap_tiprack_set}, + defaultTipOverlapDictionary=tip_overlap_tiprack_set[volume], + defaultReturnTipHeight=default_return_tip) + } + for volume in tip_volumes + } + else: + print("Building tip specific pipetting functionality") + next_tip = True + + tips_dict = {} + while next_tip: + tip_volume = input("Please provide the next tip volume") + default_aspirate_flowrate = input("Please provide the default aspirate flowrate") + default_dispense_flowrate = input("Please provide the default dispense flowrate") + default_blowout_flowrate = input("Please provide the default blowout flowrate") + + tip_length = input("Please provide the default tip length for this tip size") + default_tip_overlap = input("Please provide the default tip overlap for this tip size") + tips_dict = { + PipetteTipType[tip_volume]: SupportedTipsDefinition( + defaultAspirateFlowRate=default_aspirate_flowrate, + default_dispense_flowrate=default_dispense_flowrate, + default_blowout_flowrate=default_blowout_flowrate, + defaultTipLength=tip_length, + defaultTipOverlap=default_tip_overlap, + aspirate={"default": [[]]}, + dispense={"default": [[]]}) + } + cont = input("Additional tips? Please enter y/n") + + next_tip = cont == "y" or cont == "yes" + print("Please review the aspirate and dispense functions once the pipette model is built.") + return tips_dict + +def _build_liquid_model(model_configurations: Optional[Dict] = None, name_configurations: Optional[Dict] = None, pipette_functions_path: Optional[Path] = None) -> PipetteLiquidPropertiesDefinition: + if model_configurations and name_configurations: + max_volume = name_configurations["maxVolume"] + min_volume = name_configurations["minVolume"] + default_tipracks = name_configurations["defaultTipracks"] + else: + max_volume = input("please provide the max volume of the pipette") + min_volume = input("please provide the min volume of the pipette") + supported_tips_dict = _build_supported_tips(model_configurations, name_configurations) + return PipetteLiquidPropertiesDefinition( + supported_tips=supported_tips_dict, + max_volume=max_volume, + min_volume=min_volume, + default_tipracks=default_tipracks) + +def save_to_file( + directorypath: Path, + file_name: str, + data: BaseModel, +) -> None: + """ + Function used to save data to a file + + :param filepath: path to save data at + :param data: data to save + :param encoder: if there is any specialized encoder needed. + The default encoder is the date time encoder. + """ + directorypath.mkdir(parents=True, exist_ok=True) + filepath = directorypath / f"{file_name}.json" + filepath.write_text(data.json(), encoding="utf-8") + + +def migrate_v1_to_v2() -> None: + print("MIGRATING!") + all_models = model_config()["config"] + config_models_ot2 = [k for k in all_models.keys() if "v3" not in k] + + quirks_list = {} + for model in config_models_ot2: + base_name, full_version = model.split("_v") + generation = "_gen2" if float(full_version) >= 2.0 else "" + name = f"{base_name}{generation}" + name_configurations = name_config()[name] + model_configurations = all_models[model] + + liquid_model = _build_liquid_model(model_configurations, name_configurations) + pipette_type = f"p{liquid_model.max_volume}" + physical_model = _build_physical_model(model_configurations, name_configurations, pipette_type) + + quirks_list[model] = model_configurations["quirks"] + split_version = full_version.split(".") + file_name = f"{split_version[0]}_{split_version[1] if len(split_version) > 1 else 0}.json" + current_pipette_path = physical_model.channels / liquid_model.max_volume + + path_to_3d = GEOMETRY_ROOT / current_pipette_path / "placeholder.gltf" + geometry_model = _build_geometry_model(path_to_3d, model_configurations) + + + save_to_file(GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model) + save_to_file(GENERAL_ROOT / current_pipette_path, file_name, physical_model) + save_to_file(LIQUID_ROOT / current_pipette_path, file_name, liquid_model) + + for key, items in quirks_list.items(): + print(f"Quirks list for {key}: {items}") + + +def build_new_pipette_model_v2() -> None: + """ + Build a brand new pipette model from user inputted data. + """ + geometry_model = _build_geometry_model() + liquid_model = _build_liquid_model() + pipette_type = f"p{liquid_model.max_volume}" + physical_model = _build_physical_model(pipette_type) + + major_version = input("please provide the major version of this pipette model") + minor_version = input("please provide the minor version of this pipette model") + + file_name = f"{major_version}_{minor_version}.json" + current_pipette_path = physical_model.channels / liquid_model.max_volume + save_to_file(GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model) + save_to_file(GENERAL_ROOT / current_pipette_path, file_name, physical_model) + save_to_file(LIQUID_ROOT / current_pipette_path, file_name, liquid_model) + + + +def main() -> None: + print("EXECUTING!") + parser = argparse.ArgumentParser( + description="96 channel tip handling testing script." + ) + parser.add_argument( + "--new_pipette_model", + type=bool, + help="If true, build a new pipette model from scratch", + default=False, + ) + + + args = parser.parse_args() + if args.new_pipette_model: + build_new_pipette_model_v2() + else: + migrate_v1_to_v2() + + +if __name__ == "__main__": + print("file got called?") + main() diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py index a7e21acbe7f..40a7a054955 100644 --- a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py +++ b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py @@ -20,8 +20,11 @@ class PipetteTipType(Enum): + t10 = 10 + t20 = 20 t50 = 50 t200 = 200 + t300 = 300 t1000 = 1000 @@ -44,7 +47,10 @@ def __str__(self) -> str: class PipetteModelType(Enum): + p10 = "p10" + p20 = "p20" p50 = "p50" + p300 = "p300" p1000 = "p1000" @@ -119,6 +125,11 @@ class SupportedTipsDefinition(BaseModel): dispense: Dict[str, List[Tuple[float, float, float]]] = Field( ..., description="The default pipetting functions list for dispensing." ) + tip_overlap_dictionary: Dict[str, float] = Field( + default={}, + description="The default tip overlap associated with this tip type.", + alias="defaultTipOverlapDictionary", + ) class MotorConfigurations(BaseModel): From 0aa8bc7b1e0869f1946e0a77507e1539c5d729b8 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Mon, 13 Feb 2023 14:49:04 -0500 Subject: [PATCH 02/13] modify the version of the ot3 models --- .../p1000/{1_0.json => 3_3.json} | 0 .../2/general/eight_channel/p50/3_3.json | 38 +++ .../p1000/{1_0.json => 3_3.json} | 0 .../2/general/single_channel/p1000/3_3.json | 37 +++ .../2/general/single_channel/p50/3_3.json | 37 +++ .../p1000/{1_0.json => 3_3.json} | 0 .../2/geometry/eight_channel/p50/3_3.json | 5 + .../p1000/{1_0.json => 3_3.json} | 0 .../2/geometry/single_channel/p1000/3_3.json | 5 + .../2/geometry/single_channel/p50/3_3.json | 5 + .../p1000/{1_0.json => 3_3.json} | 0 .../eight_channel/p50/{1_0.json => 3_3.json} | 0 .../p1000/{1_0.json => 3_3.json} | 0 .../2/liquid/single_channel/p1000/3_3.json | 308 ++++++++++++++++++ .../2/liquid/single_channel/p50/3_3.json | 80 +++++ 15 files changed, 515 insertions(+) rename shared-data/pipette/definitions/2/general/eight_channel/p1000/{1_0.json => 3_3.json} (100%) create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json rename shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/{1_0.json => 3_3.json} (100%) create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json rename shared-data/pipette/definitions/2/geometry/eight_channel/p1000/{1_0.json => 3_3.json} (100%) create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json rename shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/{1_0.json => 3_3.json} (100%) create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json rename shared-data/pipette/definitions/2/liquid/eight_channel/p1000/{1_0.json => 3_3.json} (100%) rename shared-data/pipette/definitions/2/liquid/eight_channel/p50/{1_0.json => 3_3.json} (100%) rename shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/{1_0.json => 3_3.json} (100%) create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/3_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p50/3_3.json diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json rename to shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json new file mode 100644 index 00000000000..50d177c5619 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json @@ -0,0 +1,38 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", + "displayName": "P50 Eight Channel GEN3", + "model": "p50", + "displayCategory": "GEN3", + "pickUpTipConfigurations": { + "current": 0.5, + "presses": 1, + "speed": 10, + "increment": 0.0, + "distance": 13.0 + }, + "dropTipConfigurations": { + "current": 1.0, + "speed": 10 + }, + "plungerMotorConfigurations": { + "idle": 0.3, + "run": 1.0 + }, + "plungerPositionsConfigurations": { + "top": 0.5, + "bottom": 71.5, + "blowout": 76.5, + "drop": 92.5 + }, + "availableSensors": { + "sensors": ["pressure", "capacitive", "environment"], + "pressure": { "count": 2 }, + "capacitive": { "count": 2 }, + "environment": { "count": 1 } + }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json rename to shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json 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 new file mode 100644 index 00000000000..07fcca44917 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json @@ -0,0 +1,37 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", + "displayName": "P1000 One Channel GEN3", + "model": "p1000", + "displayCategory": "GEN3", + "pickUpTipConfigurations": { + "current": 0.15, + "presses": 1, + "speed": 5, + "increment": 0.0, + "distance": 13.0 + }, + "dropTipConfigurations": { + "current": 1.0, + "speed": 10 + }, + "plungerMotorConfigurations": { + "idle": 0.3, + "run": 1.0 + }, + "plungerPositionsConfigurations": { + "top": 0.5, + "bottom": 71.5, + "blowout": 76.5, + "drop": 90.5 + }, + "availableSensors": { + "sensors": ["pressure", "capacitive", "environment"], + "pressure": { "count": 1 }, + "capacitive": { "count": 1 }, + "environment": { "count": 1 } + }, + "partialTipConfigurations": { + "partialTipSupported": false + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json new file mode 100644 index 00000000000..8011b23c6b3 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json @@ -0,0 +1,37 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", + "displayName": "P50 One Channel GEN3", + "model": "p50", + "displayCategory": "GEN3", + "pickUpTipConfigurations": { + "current": 0.15, + "presses": 1, + "speed": 5, + "increment": 0.0, + "distance": 13.0 + }, + "dropTipConfigurations": { + "current": 1.0, + "speed": 10 + }, + "plungerMotorConfigurations": { + "idle": 0.3, + "run": 1.0 + }, + "plungerPositionsConfigurations": { + "top": 0.5, + "bottom": 71.5, + "blowout": 76.5, + "drop": 90.5 + }, + "availableSensors": { + "sensors": ["pressure", "capacitive", "environment"], + "pressure": { "count": 1 }, + "capacitive": { "count": 1 }, + "environment": { "count": 1 } + }, + "partialTipConfigurations": { + "partialTipSupported": false + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p1000/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/geometry/eight_channel/p1000/1_0.json rename to shared-data/pipette/definitions/2/geometry/eight_channel/p1000/3_3.json diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json new file mode 100644 index 00000000000..8769a00ffc2 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json @@ -0,0 +1,5 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", + "pathTo3D": "pipette/definitions/2/eight_channel/p1000/placeholder.gltf", + "nozzleOffset": [-8.0, -16.0, -259.15] +} diff --git a/shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/1_0.json rename to shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/3_3.json diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json new file mode 100644 index 00000000000..3598874a13e --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json @@ -0,0 +1,5 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", + "pathTo3D": "pipette/definitions/2/single_channel/p1000/placeholder.gltf", + "nozzleOffset": [-8.0, -22.0, -259.15] +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json new file mode 100644 index 00000000000..c723f77f5bc --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json @@ -0,0 +1,5 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", + "pathTo3D": "pipette/definitions/2/single_channel/p50/placeholder.gltf", + "nozzleOffset": [-8.0, -22.0, -259.15] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/liquid/eight_channel/p1000/1_0.json rename to shared-data/pipette/definitions/2/liquid/eight_channel/p1000/3_3.json diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json rename to shared-data/pipette/definitions/2/liquid/eight_channel/p50/3_3.json diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/3_3.json similarity index 100% rename from shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/1_0.json rename to shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/3_3.json diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/3_3.json new file mode 100644 index 00000000000..74cbc028bc7 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/3_3.json @@ -0,0 +1,308 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", + "supportedTips": { + "t50": { + "defaultAspirateFlowRate": 6, + "defaultDispenseFlowRate": 6, + "defaultBlowOutFlowRate": 80, + "defaultTipLength": 57.9, + "defaultTipOverlap": 10.5, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "default": [ + [0.4148, -1705.1015, 20.5455], + [0.4476, -80.633, 47.2788], + [0.5512, -1.5936, 11.9026], + [0.6027, -18.9998, 21.4972], + [0.6503, -15.8781, 19.6156], + [0.7733, 3.0612, 7.2993], + [0.8391, -5.2227, 13.7056], + [0.9736, 3.0706, 6.7467], + [1.16, -0.374, 10.1005], + [1.3964, 1.3004, 8.1582], + [1.5815, -0.4837, 10.6494], + [1.8306, 1.1464, 8.0714], + [2.0345, 0.0132, 10.1459], + [2.6221, 0.5374, 9.0794], + [2.9655, -1.7582, 15.0986], + [3.5124, 0.2754, 9.0681], + [4.6591, 1.406, 5.097], + [5.367, 0.394, 9.8123], + [6.0839, 0.3365, 10.1205], + [6.8312, 0.3379, 10.1121], + [7.5676, 0.2611, 10.637], + [8.2397, 0.095, 11.8939], + [8.9776, 0.2015, 11.0165], + [10.413, 0.1332, 11.6294], + [11.8539, 0.1074, 11.8979], + [13.3655, 0.1286, 11.6464], + [14.8236, 0.0758, 12.3519], + [16.3203, 0.083, 12.2457], + [17.7915, 0.0581, 12.6515], + [19.2145, 0.0273, 13.1995], + [20.6718, 0.0388, 12.9792], + [22.1333, 0.0357, 13.044], + [25.0761, 0.0332, 13.0977], + [28.0339, 0.029, 13.2035], + [30.967, 0.0201, 13.4538], + [33.8727, 0.013, 13.6737], + [36.8273, 0.0172, 13.5324], + [39.7594, 0.0121, 13.7191], + [42.6721, 0.0083, 13.8687], + [45.5964, 0.0085, 13.8618], + [48.5297, 0.0084, 13.8668], + [51.4512, 0.0064, 13.9651] + ] + }, + "dispense": { + "default": [ + [0.4148, -1705.1015, 20.5455], + [0.4476, -80.633, 47.2788], + [0.5512, -1.5936, 11.9026], + [0.6027, -18.9998, 21.4972], + [0.6503, -15.8781, 19.6156], + [0.7733, 3.0612, 7.2993], + [0.8391, -5.2227, 13.7056], + [0.9736, 3.0706, 6.7467], + [1.16, -0.374, 10.1005], + [1.3964, 1.3004, 8.1582], + [1.5815, -0.4837, 10.6494], + [1.8306, 1.1464, 8.0714], + [2.0345, 0.0132, 10.1459], + [2.6221, 0.5374, 9.0794], + [2.9655, -1.7582, 15.0986], + [3.5124, 0.2754, 9.0681], + [4.6591, 1.406, 5.097], + [5.367, 0.394, 9.8123], + [6.0839, 0.3365, 10.1205], + [6.8312, 0.3379, 10.1121], + [7.5676, 0.2611, 10.637], + [8.2397, 0.095, 11.8939], + [8.9776, 0.2015, 11.0165], + [10.413, 0.1332, 11.6294], + [11.8539, 0.1074, 11.8979], + [13.3655, 0.1286, 11.6464], + [14.8236, 0.0758, 12.3519], + [16.3203, 0.083, 12.2457], + [17.7915, 0.0581, 12.6515], + [19.2145, 0.0273, 13.1995], + [20.6718, 0.0388, 12.9792], + [22.1333, 0.0357, 13.044], + [25.0761, 0.0332, 13.0977], + [28.0339, 0.029, 13.2035], + [30.967, 0.0201, 13.4538], + [33.8727, 0.013, 13.6737], + [36.8273, 0.0172, 13.5324], + [39.7594, 0.0121, 13.7191], + [42.6721, 0.0083, 13.8687], + [45.5964, 0.0085, 13.8618], + [48.5297, 0.0084, 13.8668], + [51.4512, 0.0064, 13.9651] + ] + } + }, + "t200": { + "defaultAspirateFlowRate": 80, + "defaultDispenseFlowRate": 80, + "defaultBlowOutFlowRate": 80, + "defaultTipLength": 58.35, + "defaultTipOverlap": 10.5, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "default": [ + [0.8314, -2.9322, 24.0741], + [0.8853, -30.0996, 48.7784], + [0.9778, -4.3627, 25.9941], + [0.975, 802.2301, -762.6744], + [1.1272, -4.6837, 24.0666], + [1.2747, -3.91, 23.1945], + [1.5656, -2.8032, 21.7836], + [1.6667, -7.2039, 28.6731], + [2.4403, -0.5147, 17.5244], + [3.0564, -1.6013, 20.1761], + [3.6444, -1.1974, 18.9418], + [4.1189, -1.7877, 21.0928], + [4.6467, -0.8591, 17.2684], + [5.2597, -0.207, 14.2379], + [5.8581, -0.2196, 14.3044], + [6.4772, -0.1025, 13.6183], + [7.8158, 0.0537, 12.6063], + [9.1664, 0.0507, 12.6302], + [10.5064, 0.0285, 12.8339], + [14.8361, 0.0818, 12.273], + [19.3933, 0.0801, 12.2991], + [23.9242, 0.0487, 12.9079], + [28.4922, 0.0379, 13.1666], + [36.145, 0.0277, 13.4572], + [43.7972, 0.0184, 13.7916], + [51.5125, 0.0154, 13.9248], + [59.2467, 0.0121, 14.0931], + [66.9428, 0.0084, 14.3151], + [74.6853, 0.0079, 14.3498], + [82.3722, 0.0052, 14.5512], + [90.1106, 0.0054, 14.5333], + [97.8369, 0.0043, 14.6288], + [105.6153, 0.0046, 14.5983], + [113.3686, 0.0036, 14.7076], + [121.1108, 0.003, 14.7785], + [136.61, 0.0026, 14.826], + [152.0708, 0.0018, 14.9298], + [167.6433, 0.0021, 14.8827], + [183.1011, 0.0012, 15.0438], + [198.5845, 0.0011, 15.0538], + [214.0264, 0.0008, 15.123] + ] + }, + "dispense": { + "default": [ + [0.8314, -2.9322, 24.0741], + [0.8853, -30.0996, 48.7784], + [0.9778, -4.3627, 25.9941], + [0.975, 802.2301, -762.6744], + [1.1272, -4.6837, 24.0666], + [1.2747, -3.91, 23.1945], + [1.5656, -2.8032, 21.7836], + [1.6667, -7.2039, 28.6731], + [2.4403, -0.5147, 17.5244], + [3.0564, -1.6013, 20.1761], + [3.6444, -1.1974, 18.9418], + [4.1189, -1.7877, 21.0928], + [4.6467, -0.8591, 17.2684], + [5.2597, -0.207, 14.2379], + [5.8581, -0.2196, 14.3044], + [6.4772, -0.1025, 13.6183], + [7.8158, 0.0537, 12.6063], + [9.1664, 0.0507, 12.6302], + [10.5064, 0.0285, 12.8339], + [14.8361, 0.0818, 12.273], + [19.3933, 0.0801, 12.2991], + [23.9242, 0.0487, 12.9079], + [28.4922, 0.0379, 13.1666], + [36.145, 0.0277, 13.4572], + [43.7972, 0.0184, 13.7916], + [51.5125, 0.0154, 13.9248], + [59.2467, 0.0121, 14.0931], + [66.9428, 0.0084, 14.3151], + [74.6853, 0.0079, 14.3498], + [82.3722, 0.0052, 14.5512], + [90.1106, 0.0054, 14.5333], + [97.8369, 0.0043, 14.6288], + [105.6153, 0.0046, 14.5983], + [113.3686, 0.0036, 14.7076], + [121.1108, 0.003, 14.7785], + [136.61, 0.0026, 14.826], + [152.0708, 0.0018, 14.9298], + [167.6433, 0.0021, 14.8827], + [183.1011, 0.0012, 15.0438], + [198.5845, 0.0011, 15.0538], + [214.0264, 0.0008, 15.123] + ] + } + }, + "t1000": { + "defaultAspirateFlowRate": 160, + "defaultDispenseFlowRate": 160, + "defaultBlowOutFlowRate": 80, + "defaultTipLength": 95.6, + "defaultTipOverlap": 10.5, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "default": [ + [0.7511, 3.9556, 6.455], + [1.3075, 2.1664, 5.8839], + [1.8737, 1.1513, 7.2111], + [3.177, 0.9374, 7.612], + [4.5368, 0.5531, 8.8328], + [7.3103, 0.3035, 9.9651], + [10.0825, 0.1513, 11.0781], + [12.9776, 0.1293, 11.2991], + [15.9173, 0.0976, 11.7115], + [18.8243, 0.0624, 12.2706], + [21.8529, 0.07, 12.1275], + [24.8068, 0.0418, 12.7442], + [27.7744, 0.0356, 12.8984], + [35.2873, 0.0303, 13.0454], + [42.7989, 0.0202, 13.4038], + [50.4562, 0.0196, 13.4293], + [58.1081, 0.0145, 13.6843], + [65.7267, 0.0104, 13.9252], + [73.2857, 0.0068, 14.1606], + [81.0016, 0.0091, 13.9883], + [88.6617, 0.0064, 14.2052], + [103.9829, 0.0051, 14.3271], + [119.4408, 0.0049, 14.3475], + [134.889, 0.0037, 14.485], + [150.273, 0.0026, 14.6402], + [181.2798, 0.0026, 14.6427], + [212.4724, 0.0022, 14.7002], + [243.577, 0.0015, 14.8558], + [274.7216, 0.0012, 14.9205], + [305.8132, 0.0009, 15.0118], + [368.0697, 0.0007, 15.0668], + [430.2513, 0.0005, 15.1594], + [492.3487, 0.0003, 15.2291], + [554.5713, 0.0003, 15.2367], + [616.6825, 0.0002, 15.2949], + [694.4168, 0.0002, 15.3027], + [772.0327, 0.0001, 15.3494], + [849.617, 0.0001, 15.3717], + [927.2556, 0.0001, 15.3745], + [1004.87, 0.0001, 15.3912], + [1051.4648, 0.0001, 15.391] + ] + }, + "dispense": { + "default": [ + [0.7511, 3.9556, 6.455], + [1.3075, 2.1664, 5.8839], + [1.8737, 1.1513, 7.2111], + [3.177, 0.9374, 7.612], + [4.5368, 0.5531, 8.8328], + [7.3103, 0.3035, 9.9651], + [10.0825, 0.1513, 11.0781], + [12.9776, 0.1293, 11.2991], + [15.9173, 0.0976, 11.7115], + [18.8243, 0.0624, 12.2706], + [21.8529, 0.07, 12.1275], + [24.8068, 0.0418, 12.7442], + [27.7744, 0.0356, 12.8984], + [35.2873, 0.0303, 13.0454], + [42.7989, 0.0202, 13.4038], + [50.4562, 0.0196, 13.4293], + [58.1081, 0.0145, 13.6843], + [65.7267, 0.0104, 13.9252], + [73.2857, 0.0068, 14.1606], + [81.0016, 0.0091, 13.9883], + [88.6617, 0.0064, 14.2052], + [103.9829, 0.0051, 14.3271], + [119.4408, 0.0049, 14.3475], + [134.889, 0.0037, 14.485], + [150.273, 0.0026, 14.6402], + [181.2798, 0.0026, 14.6427], + [212.4724, 0.0022, 14.7002], + [243.577, 0.0015, 14.8558], + [274.7216, 0.0012, 14.9205], + [305.8132, 0.0009, 15.0118], + [368.0697, 0.0007, 15.0668], + [430.2513, 0.0005, 15.1594], + [492.3487, 0.0003, 15.2291], + [554.5713, 0.0003, 15.2367], + [616.6825, 0.0002, 15.2949], + [694.4168, 0.0002, 15.3027], + [772.0327, 0.0001, 15.3494], + [849.617, 0.0001, 15.3717], + [927.2556, 0.0001, 15.3745], + [1004.87, 0.0001, 15.3912], + [1051.4648, 0.0001, 15.391] + ] + } + } + }, + "maxVolume": 1000, + "minVolume": 1, + "defaultTipracks": [ + "opentrons/opentrons_ot3_96_tiprack_1000ul/1", + "opentrons/opentrons_ot3_96_tiprack_200ul/1", + "opentrons/opentrons_ot3_96_tiprack_50ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/3_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/3_3.json new file mode 100644 index 00000000000..92e6be23beb --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/3_3.json @@ -0,0 +1,80 @@ +{ + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", + "supportedTips": { + "t50": { + "defaultAspirateFlowRate": 8, + "defaultDispenseFlowRate": 8, + "defaultBlowOutFlowRate": 4, + "defaultTipLength": 57.9, + "defaultTipOverlap": 10.5, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "default": [ + [0.6464, 0.4817, 0.0427], + [1.0889, 0.2539, 0.1591], + [1.5136, 0.1624, 0.2587], + [1.9108, 0.1042, 0.3467], + [2.2941, 0.0719, 0.4085], + [2.9978, 0.037, 0.4886], + [3.7731, 0.0378, 0.4863], + [4.7575, 0.0516, 0.4342], + [5.5024, 0.011, 0.6275], + [6.2686, 0.0114, 0.6253], + [7.005, 0.0054, 0.6625], + [8.5207, 0.0063, 0.6563], + [10.0034, 0.003, 0.6844], + [11.5075, 0.0031, 0.6833], + [13.0327, 0.0032, 0.6829], + [14.5356, 0.0018, 0.7003], + [17.5447, 0.0014, 0.7063], + [20.5576, 0.0011, 0.7126], + [23.5624, 0.0007, 0.7197], + [26.5785, 0.0007, 0.721], + [29.593, 0.0005, 0.7248], + [32.6109, 0.0004, 0.7268], + [35.6384, 0.0004, 0.727], + [38.6439, 0.0002, 0.7343], + [41.6815, 0.0004, 0.7284], + [44.6895, 0.0002, 0.7372], + [47.6926, 0.0001, 0.7393], + [51.4567, 0.0001, 0.7382] + ] + }, + "dispense": { + "default": [ + [0.6464, 0.4817, 0.0427], + [1.0889, 0.2539, 0.1591], + [1.5136, 0.1624, 0.2587], + [1.9108, 0.1042, 0.3467], + [2.2941, 0.0719, 0.4085], + [2.9978, 0.037, 0.4886], + [3.7731, 0.0378, 0.4863], + [4.7575, 0.0516, 0.4342], + [5.5024, 0.011, 0.6275], + [6.2686, 0.0114, 0.6253], + [7.005, 0.0054, 0.6625], + [8.5207, 0.0063, 0.6563], + [10.0034, 0.003, 0.6844], + [11.5075, 0.0031, 0.6833], + [13.0327, 0.0032, 0.6829], + [14.5356, 0.0018, 0.7003], + [17.5447, 0.0014, 0.7063], + [20.5576, 0.0011, 0.7126], + [23.5624, 0.0007, 0.7197], + [26.5785, 0.0007, 0.721], + [29.593, 0.0005, 0.7248], + [32.6109, 0.0004, 0.7268], + [35.6384, 0.0004, 0.727], + [38.6439, 0.0002, 0.7343], + [41.6815, 0.0004, 0.7284], + [44.6895, 0.0002, 0.7372], + [47.6926, 0.0001, 0.7393], + [51.4567, 0.0001, 0.7382] + ] + } + } + }, + "maxVolume": 50, + "minVolume": 0.5, + "defaultTipracks": ["opentrons/opentrons_ot3_96_tiprack_50ul/1"] +} From 7baac0c6760abb1a83377f16fa7c59de8c7f1f0d Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Mon, 13 Feb 2023 14:55:48 -0500 Subject: [PATCH 03/13] add gen1 and gen2 schemas --- .../2/general/eight_channel/p10/1_0.json | 32 ++ .../2/general/eight_channel/p10/1_3.json | 32 ++ .../2/general/eight_channel/p10/1_4.json | 32 ++ .../2/general/eight_channel/p10/1_5.json | 32 ++ .../2/general/eight_channel/p10/1_6.json | 32 ++ .../2/general/eight_channel/p20/2_0.json | 32 ++ .../2/general/eight_channel/p20/2_1.json | 32 ++ .../2/general/eight_channel/p300/1_0.json | 32 ++ .../2/general/eight_channel/p300/1_3.json | 32 ++ .../2/general/eight_channel/p300/1_4.json | 32 ++ .../2/general/eight_channel/p300/1_5.json | 32 ++ .../2/general/eight_channel/p300/2_0.json | 32 ++ .../2/general/eight_channel/p300/2_1.json | 32 ++ .../2/general/eight_channel/p50/1_0.json | 42 +- .../2/general/eight_channel/p50/1_3.json | 32 ++ .../2/general/eight_channel/p50/1_4.json | 32 ++ .../2/general/eight_channel/p50/1_5.json | 32 ++ .../2/general/single_channel/p10/1_0.json | 32 ++ .../2/general/single_channel/p10/1_3.json | 32 ++ .../2/general/single_channel/p10/1_4.json | 32 ++ .../2/general/single_channel/p10/1_5.json | 32 ++ .../2/general/single_channel/p1000/1_0.json | 45 +- .../2/general/single_channel/p1000/1_3.json | 32 ++ .../2/general/single_channel/p1000/1_4.json | 32 ++ .../2/general/single_channel/p1000/1_5.json | 32 ++ .../2/general/single_channel/p1000/2_0.json | 32 ++ .../2/general/single_channel/p1000/2_1.json | 32 ++ .../2/general/single_channel/p1000/2_2.json | 32 ++ .../2/general/single_channel/p20/2_0.json | 32 ++ .../2/general/single_channel/p20/2_1.json | 32 ++ .../2/general/single_channel/p20/2_2.json | 32 ++ .../2/general/single_channel/p300/1_0.json | 32 ++ .../2/general/single_channel/p300/1_3.json | 32 ++ .../2/general/single_channel/p300/1_4.json | 32 ++ .../2/general/single_channel/p300/1_5.json | 32 ++ .../2/general/single_channel/p300/2_0.json | 32 ++ .../2/general/single_channel/p300/2_1.json | 32 ++ .../2/general/single_channel/p50/1_0.json | 45 +- .../2/general/single_channel/p50/1_3.json | 32 ++ .../2/general/single_channel/p50/1_4.json | 32 ++ .../2/general/single_channel/p50/1_5.json | 32 ++ .../2/geometry/eight_channel/p10/1_0.json | 4 + .../2/geometry/eight_channel/p10/1_3.json | 4 + .../2/geometry/eight_channel/p10/1_4.json | 4 + .../2/geometry/eight_channel/p10/1_5.json | 4 + .../2/geometry/eight_channel/p10/1_6.json | 4 + .../eight_channel/p10/placeholder.gltf | 0 .../2/geometry/eight_channel/p20/2_0.json | 4 + .../2/geometry/eight_channel/p20/2_1.json | 4 + .../eight_channel/p20/placeholder.gltf | 0 .../2/geometry/eight_channel/p300/1_0.json | 4 + .../2/geometry/eight_channel/p300/1_3.json | 4 + .../2/geometry/eight_channel/p300/1_4.json | 4 + .../2/geometry/eight_channel/p300/1_5.json | 4 + .../2/geometry/eight_channel/p300/2_0.json | 4 + .../2/geometry/eight_channel/p300/2_1.json | 4 + .../2/geometry/eight_channel/p50/1_0.json | 5 +- .../2/geometry/eight_channel/p50/1_3.json | 4 + .../2/geometry/eight_channel/p50/1_4.json | 4 + .../2/geometry/eight_channel/p50/1_5.json | 4 + .../2/geometry/single_channel/p10/1_0.json | 4 + .../2/geometry/single_channel/p10/1_3.json | 4 + .../2/geometry/single_channel/p10/1_4.json | 4 + .../2/geometry/single_channel/p10/1_5.json | 4 + .../single_channel/p10/placeholder.gltf | 0 .../2/geometry/single_channel/p1000/1_0.json | 5 +- .../2/geometry/single_channel/p1000/1_3.json | 4 + .../2/geometry/single_channel/p1000/1_4.json | 4 + .../2/geometry/single_channel/p1000/1_5.json | 4 + .../2/geometry/single_channel/p1000/2_0.json | 4 + .../2/geometry/single_channel/p1000/2_1.json | 4 + .../2/geometry/single_channel/p1000/2_2.json | 4 + .../2/geometry/single_channel/p20/2_0.json | 4 + .../2/geometry/single_channel/p20/2_1.json | 4 + .../2/geometry/single_channel/p20/2_2.json | 4 + .../single_channel/p20/placeholder.gltf | 0 .../2/geometry/single_channel/p300/1_0.json | 4 + .../2/geometry/single_channel/p300/1_3.json | 4 + .../2/geometry/single_channel/p300/1_4.json | 4 + .../2/geometry/single_channel/p300/1_5.json | 4 + .../2/geometry/single_channel/p300/2_0.json | 4 + .../2/geometry/single_channel/p300/2_1.json | 4 + .../single_channel/p300/placeholder.gltf | 0 .../2/geometry/single_channel/p50/1_0.json | 5 +- .../2/geometry/single_channel/p50/1_3.json | 4 + .../2/geometry/single_channel/p50/1_4.json | 4 + .../2/geometry/single_channel/p50/1_5.json | 4 + .../2/liquid/eight_channel/p10/1_0.json | 63 +++ .../2/liquid/eight_channel/p10/1_3.json | 63 +++ .../2/liquid/eight_channel/p10/1_4.json | 63 +++ .../2/liquid/eight_channel/p10/1_5.json | 67 +++ .../2/liquid/eight_channel/p10/1_6.json | 99 +++++ .../2/liquid/eight_channel/p20/2_0.json | 407 ++++++++++++++++++ .../2/liquid/eight_channel/p20/2_1.json | 407 ++++++++++++++++++ .../2/liquid/eight_channel/p300/1_0.json | 62 +++ .../2/liquid/eight_channel/p300/1_3.json | 62 +++ .../2/liquid/eight_channel/p300/1_4.json | 62 +++ .../2/liquid/eight_channel/p300/1_5.json | 62 +++ .../2/liquid/eight_channel/p300/2_0.json | 164 +++++++ .../2/liquid/eight_channel/p300/2_1.json | 164 +++++++ .../2/liquid/eight_channel/p50/1_0.json | 58 +++ .../2/liquid/eight_channel/p50/1_3.json | 58 +++ .../2/liquid/eight_channel/p50/1_4.json | 58 +++ .../2/liquid/eight_channel/p50/1_5.json | 67 +++ .../2/liquid/single_channel/p10/1_0.json | 61 +++ .../2/liquid/single_channel/p10/1_3.json | 61 +++ .../2/liquid/single_channel/p10/1_4.json | 61 +++ .../2/liquid/single_channel/p10/1_5.json | 61 +++ .../2/liquid/single_channel/p1000/1_0.json | 347 +++------------ .../2/liquid/single_channel/p1000/1_3.json | 69 +++ .../2/liquid/single_channel/p1000/1_4.json | 69 +++ .../2/liquid/single_channel/p1000/1_5.json | 69 +++ .../2/liquid/single_channel/p1000/2_0.json | 214 +++++++++ .../2/liquid/single_channel/p1000/2_1.json | 220 ++++++++++ .../2/liquid/single_channel/p1000/2_2.json | 220 ++++++++++ .../2/liquid/single_channel/p20/2_0.json | 407 ++++++++++++++++++ .../2/liquid/single_channel/p20/2_1.json | 346 +++++++++++++++ .../2/liquid/single_channel/p20/2_2.json | 346 +++++++++++++++ .../2/liquid/single_channel/p300/1_0.json | 71 +++ .../2/liquid/single_channel/p300/1_3.json | 71 +++ .../2/liquid/single_channel/p300/1_4.json | 71 +++ .../2/liquid/single_channel/p300/1_5.json | 74 ++++ .../2/liquid/single_channel/p300/2_0.json | 164 +++++++ .../2/liquid/single_channel/p300/2_1.json | 164 +++++++ .../2/liquid/single_channel/p50/1_0.json | 114 ++--- .../2/liquid/single_channel/p50/1_3.json | 58 +++ .../2/liquid/single_channel/p50/1_4.json | 58 +++ .../2/liquid/single_channel/p50/1_5.json | 70 +++ 128 files changed, 6523 insertions(+), 444 deletions(-) create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json create mode 100644 shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json create mode 100644 shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json create mode 100644 shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json new file mode 100644 index 00000000000..79fc6b24952 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 8-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.4, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": -1.0, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json new file mode 100644 index 00000000000..ccc3e503a18 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 8-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.4, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 0.5, + "blowout": -2.5, + "drop": -5.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json new file mode 100644 index 00000000000..6391465a206 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 8-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.4, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": -1.0, + "drop": -4.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json new file mode 100644 index 00000000000..96a21fc4ec9 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 8-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.55, + "speed": 30.0, + "presses": 3, + "increment": 3.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": -1.0, + "drop": -4.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json new file mode 100644 index 00000000000..96a21fc4ec9 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 8-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.55, + "speed": 30.0, + "presses": 3, + "increment": 3.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": -1.0, + "drop": -4.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json new file mode 100644 index 00000000000..02d87b46d56 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P20 8-Channel GEN2", + "model": "p20", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 11.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 15.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -8.5, + "blowout": -13.0, + "drop": -31.6 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json new file mode 100644 index 00000000000..02d87b46d56 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json @@ -0,0 +1,32 @@ +{ + "displayName": "P20 8-Channel GEN2", + "model": "p20", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 11.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 15.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -8.5, + "blowout": -13.0, + "drop": -31.6 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json new file mode 100644 index 00000000000..0b7e5d9db77 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 8-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 3.5, + "blowout": 3.0, + "drop": -2.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json new file mode 100644 index 00000000000..e2c188be3b0 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 8-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 3.5, + "blowout": 1.5, + "drop": -3.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json new file mode 100644 index 00000000000..e2c188be3b0 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 8-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 3.5, + "blowout": 1.5, + "drop": -3.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json new file mode 100644 index 00000000000..1555cb823bf --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 8-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.9, + "speed": 30.0, + "presses": 3, + "increment": 3.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 3.5, + "blowout": 1.5, + "drop": -3.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json new file mode 100644 index 00000000000..967111198aa --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 8-Channel GEN2", + "model": "p300", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.8, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 11.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.5, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -14.5, + "blowout": -19.0, + "drop": -33.4 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json new file mode 100644 index 00000000000..967111198aa --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 8-Channel GEN2", + "model": "p300", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.8, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 11.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.5, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -14.5, + "blowout": -19.0, + "drop": -33.4 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json index 50d177c5619..6ce50d3c19a 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json @@ -1,35 +1,29 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", - "displayName": "P50 Eight Channel GEN3", + "displayName": "P50 8-Channel GEN1", "model": "p50", - "displayCategory": "GEN3", + "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.5, - "presses": 1, - "speed": 10, - "increment": 0.0, - "distance": 13.0 + "current": 0.6, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 }, "dropTipConfigurations": { - "current": 1.0, - "speed": 10 - }, - "plungerMotorConfigurations": { - "idle": 0.3, - "run": 1.0 + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, "plungerPositionsConfigurations": { - "top": 0.5, - "bottom": 71.5, - "blowout": 76.5, - "drop": 92.5 - }, - "availableSensors": { - "sensors": ["pressure", "capacitive", "environment"], - "pressure": { "count": 2 }, - "capacitive": { "count": 2 }, - "environment": { "count": 1 } + "top": 19.5, + "bottom": 2.5, + "blowout": 2.0, + "drop": -3.5 }, + "availableSensors": { "sensors": [] }, "partialTipConfigurations": { "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json new file mode 100644 index 00000000000..c5103514904 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P50 8-Channel GEN1", + "model": "p50", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": 0.5, + "drop": -5.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json new file mode 100644 index 00000000000..15bf1fb4d8f --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P50 8-Channel GEN1", + "model": "p50", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.6, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": 0.5, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json new file mode 100644 index 00000000000..2c669b7821d --- /dev/null +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P50 8-Channel GEN1", + "model": "p50", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.8, + "speed": 30.0, + "presses": 3, + "increment": 3.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": 0.5, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": true, + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] + }, + "channels": 8 +} 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 new file mode 100644 index 00000000000..dcbb6408792 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 Single-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": -1.0, + "drop": -4.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..d59d0997f1f --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 Single-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 0.5, + "blowout": -2.5, + "drop": -6.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..b0613e6bece --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 Single-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.5, + "blowout": -0.5, + "drop": -5.2 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..b0613e6bece --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P10 Single-Channel GEN1", + "model": "p10", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.5, + "blowout": -0.5, + "drop": -5.2 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 index 07fcca44917..a4ab0384ed5 100644 --- 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 @@ -1,37 +1,32 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", - "displayName": "P1000 One Channel GEN3", + "displayName": "P1000 Single-Channel GEN1", "model": "p1000", - "displayCategory": "GEN3", + "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.15, - "presses": 1, - "speed": 5, - "increment": 0.0, - "distance": 13.0 + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 15.0 }, "dropTipConfigurations": { - "current": 1.0, - "speed": 10 - }, - "plungerMotorConfigurations": { - "idle": 0.3, - "run": 1.0 + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, "plungerPositionsConfigurations": { - "top": 0.5, - "bottom": 71.5, - "blowout": 76.5, - "drop": 90.5 - }, - "availableSensors": { - "sensors": ["pressure", "capacitive", "environment"], - "pressure": { "count": 1 }, - "capacitive": { "count": 1 }, - "environment": { "count": 1 } + "top": 19.5, + "bottom": 3.0, + "blowout": 1.0, + "drop": -2.2 }, + "availableSensors": { "sensors": [] }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "availableConfigurations": null }, "channels": 1 } 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 new file mode 100644 index 00000000000..dfaa27d186c --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P1000 Single-Channel GEN1", + "model": "p1000", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 15.0 + }, + "dropTipConfigurations": { + "current": 0.7, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.5, + "blowout": 0.5, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..dfaa27d186c --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P1000 Single-Channel GEN1", + "model": "p1000", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 15.0 + }, + "dropTipConfigurations": { + "current": 0.7, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.5, + "blowout": 0.5, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..5949929c694 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P1000 Single-Channel GEN1", + "model": "p1000", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.15, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 15.0 + }, + "dropTipConfigurations": { + "current": 0.7, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.5, + "blowout": 0.5, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..605b876191c --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P1000 Single-Channel GEN2", + "model": "p1000", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.17, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 17.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 1.0, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -18.5, + "blowout": -23.0, + "drop": -37.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..8fe2afe2702 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json @@ -0,0 +1,32 @@ +{ + "displayName": "P1000 Single-Channel GEN2", + "model": "p1000", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.17, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 17.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -18.5, + "blowout": -23.0, + "drop": -37.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} 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 new file mode 100644 index 00000000000..8fe2afe2702 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json @@ -0,0 +1,32 @@ +{ + "displayName": "P1000 Single-Channel GEN2", + "model": "p1000", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.17, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 17.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -18.5, + "blowout": -23.0, + "drop": -37.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json new file mode 100644 index 00000000000..37b551d782e --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P20 Single-Channel GEN2", + "model": "p20", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 14.0 + }, + "dropTipConfigurations": { + "current": 1.0, + "speed": 15.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 1.0, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -8.5, + "blowout": -13.0, + "drop": -27.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json new file mode 100644 index 00000000000..b284f904093 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json @@ -0,0 +1,32 @@ +{ + "displayName": "P20 Single-Channel GEN2", + "model": "p20", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 14.0 + }, + "dropTipConfigurations": { + "current": 1.0, + "speed": 15.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -8.5, + "blowout": -13.0, + "drop": -27.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json new file mode 100644 index 00000000000..b284f904093 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json @@ -0,0 +1,32 @@ +{ + "displayName": "P20 Single-Channel GEN2", + "model": "p20", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 14.0 + }, + "dropTipConfigurations": { + "current": 1.0, + "speed": 15.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -8.5, + "blowout": -13.0, + "drop": -27.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json new file mode 100644 index 00000000000..42bd6c8bd76 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 Single-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 1.5, + "blowout": 0.0, + "drop": -4.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json new file mode 100644 index 00000000000..a6849d962d7 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 Single-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 1.5, + "blowout": -1.5, + "drop": -5.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json new file mode 100644 index 00000000000..9aee9fe27ef --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 Single-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 3.0, + "blowout": 0.0, + "drop": -4.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json new file mode 100644 index 00000000000..9aee9fe27ef --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 Single-Channel GEN1", + "model": "p300", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 3.0, + "blowout": 0.0, + "drop": -4.5 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json new file mode 100644 index 00000000000..41eec6ff117 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 Single-Channel GEN2", + "model": "p300", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.125, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 17.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 1.0, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -14.5, + "blowout": -19.0, + "drop": -37.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json new file mode 100644 index 00000000000..af1fb33d5ed --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json @@ -0,0 +1,32 @@ +{ + "displayName": "P300 Single-Channel GEN2", + "model": "p300", + "displayCategory": "GEN2", + "pickUpTipConfigurations": { + "current": 0.125, + "speed": 10.0, + "presses": 1, + "increment": 0.0, + "distance": 17.0 + }, + "dropTipConfigurations": { + "current": 1.25, + "speed": 7.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": -14.5, + "blowout": -19.0, + "drop": -37.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json index 8011b23c6b3..e06c5426135 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json @@ -1,37 +1,32 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", - "displayName": "P50 One Channel GEN3", + "displayName": "P50 Single-Channel GEN1", "model": "p50", - "displayCategory": "GEN3", + "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.15, - "presses": 1, - "speed": 5, - "increment": 0.0, - "distance": 13.0 + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 }, "dropTipConfigurations": { - "current": 1.0, - "speed": 10 - }, - "plungerMotorConfigurations": { - "idle": 0.3, - "run": 1.0 + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, "plungerPositionsConfigurations": { - "top": 0.5, - "bottom": 71.5, - "blowout": 76.5, - "drop": 90.5 - }, - "availableSensors": { - "sensors": ["pressure", "capacitive", "environment"], - "pressure": { "count": 1 }, - "capacitive": { "count": 1 }, - "environment": { "count": 1 } + "top": 19.5, + "bottom": 2.01, + "blowout": 2.0, + "drop": -4.5 }, + "availableSensors": { "sensors": [] }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "availableConfigurations": null }, "channels": 1 } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json new file mode 100644 index 00000000000..62be4314a55 --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json @@ -0,0 +1,32 @@ +{ + "displayName": "P50 Single-Channel GEN1", + "model": "p50", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": 0.5, + "drop": -6.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json new file mode 100644 index 00000000000..1ba41109fbf --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json @@ -0,0 +1,32 @@ +{ + "displayName": "P50 Single-Channel GEN1", + "model": "p50", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": 0.5, + "drop": -5.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json new file mode 100644 index 00000000000..1ba41109fbf --- /dev/null +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json @@ -0,0 +1,32 @@ +{ + "displayName": "P50 Single-Channel GEN1", + "model": "p50", + "displayCategory": "GEN1", + "pickUpTipConfigurations": { + "current": 0.1, + "speed": 30.0, + "presses": 3, + "increment": 1.0, + "distance": 10.0 + }, + "dropTipConfigurations": { + "current": 0.5, + "speed": 5.0, + "presses": 0, + "increment": 0.0, + "distance": 0.0 + }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 0.3 }, + "plungerPositionsConfigurations": { + "top": 19.5, + "bottom": 2.0, + "blowout": 0.5, + "drop": -5.0 + }, + "availableSensors": { "sensors": [] }, + "partialTipConfigurations": { + "partialTipSupported": false, + "availableConfigurations": null + }, + "channels": 1 +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json new file mode 100644 index 00000000000..a84c17deef6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json new file mode 100644 index 00000000000..a84c17deef6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json new file mode 100644 index 00000000000..a84c17deef6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json new file mode 100644 index 00000000000..a84c17deef6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json new file mode 100644 index 00000000000..a84c17deef6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json new file mode 100644 index 00000000000..f8f86ac6598 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 19.4], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json new file mode 100644 index 00000000000..f8f86ac6598 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 19.4], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json new file mode 100644 index 00000000000..478988796f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json new file mode 100644 index 00000000000..478988796f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json new file mode 100644 index 00000000000..478988796f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json new file mode 100644 index 00000000000..478988796f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json new file mode 100644 index 00000000000..3f91202b575 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 35.52], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json new file mode 100644 index 00000000000..3f91202b575 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 35.52], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json index 8769a00ffc2..41ce64ef068 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json @@ -1,5 +1,4 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/eight_channel/p1000/placeholder.gltf", - "nozzleOffset": [-8.0, -16.0, -259.15] + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json new file mode 100644 index 00000000000..41ce64ef068 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json new file mode 100644 index 00000000000..41ce64ef068 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json new file mode 100644 index 00000000000..41ce64ef068 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 31.5, 0.8], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json new file mode 100644 index 00000000000..4a17b98e8f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 12.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json new file mode 100644 index 00000000000..4a17b98e8f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 12.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json new file mode 100644 index 00000000000..4a17b98e8f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 12.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json new file mode 100644 index 00000000000..4a17b98e8f6 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 12.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json index 3598874a13e..a30b458d4ce 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json @@ -1,5 +1,4 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/single_channel/p1000/placeholder.gltf", - "nozzleOffset": [-8.0, -22.0, -259.15] + "nozzleOffset": [0.0, 0.0, 45.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json new file mode 100644 index 00000000000..a30b458d4ce --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 45.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json new file mode 100644 index 00000000000..a30b458d4ce --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 45.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json new file mode 100644 index 00000000000..a30b458d4ce --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 45.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json new file mode 100644 index 00000000000..76b95026313 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 50.14], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json new file mode 100644 index 00000000000..76b95026313 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 50.14], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json new file mode 100644 index 00000000000..76b95026313 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 50.14], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json new file mode 100644 index 00000000000..5b81f07c196 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 10.45], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json new file mode 100644 index 00000000000..5b81f07c196 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 10.45], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json new file mode 100644 index 00000000000..5b81f07c196 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 10.45], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json new file mode 100644 index 00000000000..022fd0a8590 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json new file mode 100644 index 00000000000..022fd0a8590 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json new file mode 100644 index 00000000000..022fd0a8590 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json new file mode 100644 index 00000000000..022fd0a8590 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json new file mode 100644 index 00000000000..59a3ef4029e --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 29.45], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json new file mode 100644 index 00000000000..59a3ef4029e --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 29.45], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json index c723f77f5bc..3fbd15cb3b3 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json @@ -1,5 +1,4 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/single_channel/p50/placeholder.gltf", - "nozzleOffset": [-8.0, -22.0, -259.15] + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json new file mode 100644 index 00000000000..3fbd15cb3b3 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json new file mode 100644 index 00000000000..3fbd15cb3b3 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json new file mode 100644 index 00000000000..3fbd15cb3b3 --- /dev/null +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json @@ -0,0 +1,4 @@ +{ + "nozzleOffset": [0.0, 0.0, 25.0], + "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json new file mode 100644 index 00000000000..34e47dd5717 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json @@ -0,0 +1,63 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.74444519, 0.0, 0.8058688085] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json new file mode 100644 index 00000000000..34e47dd5717 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json @@ -0,0 +1,63 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.74444519, 0.0, 0.8058688085] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json new file mode 100644 index 00000000000..34e47dd5717 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json @@ -0,0 +1,63 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.74444519, 0.0, 0.8058688085] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json new file mode 100644 index 00000000000..59c3d145c6f --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json @@ -0,0 +1,67 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.774444444, -0.1917910448, 1.2026], + [2.151481481, -0.0706286837, 1.0125], + [2.898518519, -0.04343083788, 0.954], + [6.373333333, -0.00905990194, 0.8544], + [11.00259259, -0.002325900358, 0.8115] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.774444444, -0.1917910448, 1.2026], + [2.151481481, -0.0706286837, 1.0125], + [2.898518519, -0.04343083788, 0.954], + [6.373333333, -0.00905990194, 0.8544], + [11.00259259, -0.002325900358, 0.8115] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.774444444, -0.1917910448, 1.2026], + [2.151481481, -0.0706286837, 1.0125], + [2.898518519, -0.04343083788, 0.954], + [6.373333333, -0.00905990194, 0.8544], + [11.00259259, -0.002325900358, 0.8115] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.774444444, -0.1917910448, 1.2026], + [2.151481481, -0.0706286837, 1.0125], + [2.898518519, -0.04343083788, 0.954], + [6.373333333, -0.00905990194, 0.8544], + [11.00259259, -0.002325900358, 0.8115] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.74444519, 0.0, 0.8058688085] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json new file mode 100644 index 00000000000..df14e06fbb2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json @@ -0,0 +1,99 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.8649, 0.0374, 0.8484], + [1.2416, -0.0987, 0.9503], + [1.6053, -0.069, 0.9134], + [1.9851, -0.0226, 0.839], + [2.3481, -0.0313, 0.8561], + [2.7207, -0.0143, 0.8164], + [3.0702, -0.028, 0.8536], + [4.5998, -0.0006, 0.7694], + [6.1063, -0.0022, 0.7769], + [7.6504, 0.0011, 0.7564], + [9.1863, 0.0003, 0.7626], + [10.7574, 0.0018, 0.7488], + [12.2984, -0.4986, 6.1321] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.8649, 0.0374, 0.8484], + [1.2416, -0.0987, 0.9503], + [1.6053, -0.069, 0.9134], + [1.9851, -0.0226, 0.839], + [2.3481, -0.0313, 0.8561], + [2.7207, -0.0143, 0.8164], + [3.0702, -0.028, 0.8536], + [4.5998, -0.0006, 0.7694], + [6.1063, -0.0022, 0.7769], + [7.6504, 0.0011, 0.7564], + [9.1863, 0.0003, 0.7626], + [10.7574, 0.0018, 0.7488], + [12.2984, -0.4986, 6.1321] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.8649, 0.0374, 0.8484], + [1.2416, -0.0987, 0.9503], + [1.6053, -0.069, 0.9134], + [1.9851, -0.0226, 0.839], + [2.3481, -0.0313, 0.8561], + [2.7207, -0.0143, 0.8164], + [3.0702, -0.028, 0.8536], + [4.5998, -0.0006, 0.7694], + [6.1063, -0.0022, 0.7769], + [7.6504, 0.0011, 0.7564], + [9.1863, 0.0003, 0.7626], + [10.7574, 0.0018, 0.7488], + [12.2984, -0.4986, 6.1321] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.8649, 0.0374, 0.8484], + [1.2416, -0.0987, 0.9503], + [1.6053, -0.069, 0.9134], + [1.9851, -0.0226, 0.839], + [2.3481, -0.0313, 0.8561], + [2.7207, -0.0143, 0.8164], + [3.0702, -0.028, 0.8536], + [4.5998, -0.0006, 0.7694], + [6.1063, -0.0022, 0.7769], + [7.6504, 0.0011, 0.7564], + [9.1863, 0.0003, 0.7626], + [10.7574, 0.0018, 0.7488], + [12.2984, -0.4986, 6.1321] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [12.74444519, 0.0, 0.8058688085] + ], + "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.74444519, 0.0, 0.8058688085] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json new file mode 100644 index 00000000000..54a17c91faf --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json @@ -0,0 +1,407 @@ +{ + "supportedTips": { + "t20": { + "defaultAspirateFlowRate": 7.6, + "defaultDispenseFlowRate": 7.6, + "defaultBlowOutFlowRate": 7.6, + "defaultTipLength": 31.1, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/opentrons_96_filtertiprack_20ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/opentrons_96_filtertiprack_20ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_20ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_20ul/1": 8.25 + } + }, + "t10": { + "defaultAspirateFlowRate": 7.6, + "defaultDispenseFlowRate": 7.6, + "defaultBlowOutFlowRate": 7.6, + "defaultTipLength": 31.1, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3 + } + } + }, + "maxVolume": 20, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_20ul/1", + "opentrons/opentrons_96_filtertiprack_20ul/1", + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json new file mode 100644 index 00000000000..b65e0e8f11f --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json @@ -0,0 +1,407 @@ +{ + "supportedTips": { + "t20": { + "defaultAspirateFlowRate": 7.6, + "defaultDispenseFlowRate": 7.6, + "defaultBlowOutFlowRate": 7.6, + "defaultTipLength": 31.1, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/opentrons_96_filtertiprack_20ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/opentrons_96_filtertiprack_20ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_20ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_20ul/1": 8.25 + } + }, + "t10": { + "defaultAspirateFlowRate": 7.6, + "defaultDispenseFlowRate": 7.6, + "defaultBlowOutFlowRate": 7.6, + "defaultTipLength": 31.1, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3 + } + } + }, + "maxVolume": 20, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_20ul/1", + "opentrons/opentrons_96_filtertiprack_20ul/1", + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json new file mode 100644 index 00000000000..3d270cbb4b2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json @@ -0,0 +1,62 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json new file mode 100644 index 00000000000..3d270cbb4b2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json @@ -0,0 +1,62 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json new file mode 100644 index 00000000000..3d270cbb4b2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json @@ -0,0 +1,62 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json new file mode 100644 index 00000000000..3d270cbb4b2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json @@ -0,0 +1,62 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [309.2612689, 0.0, 19.29389273] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json new file mode 100644 index 00000000000..9c033f761e4 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json @@ -0,0 +1,164 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 94.0, + "defaultDispenseFlowRate": 94.0, + "defaultBlowOutFlowRate": 94.0, + "defaultTipLength": 51.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": 0.4, + "aspirate": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] + ] + }, + "dispense": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_filtertiprack_200ul/1": 8.2 + } + }, + "t300": { + "defaultAspirateFlowRate": 94.0, + "defaultDispenseFlowRate": 94.0, + "defaultBlowOutFlowRate": 94.0, + "defaultTipLength": 51.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": 0.4, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 8.2 + } + } + }, + "maxVolume": 300, + "minVolume": 20.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json new file mode 100644 index 00000000000..72210d74f8b --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json @@ -0,0 +1,164 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 94.0, + "defaultDispenseFlowRate": 94.0, + "defaultBlowOutFlowRate": 94.0, + "defaultTipLength": 51.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": 0.4, + "aspirate": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] + ] + }, + "dispense": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_filtertiprack_200ul/1": 8.2 + } + }, + "t300": { + "defaultAspirateFlowRate": 94.0, + "defaultDispenseFlowRate": 94.0, + "defaultBlowOutFlowRate": 94.0, + "defaultTipLength": 51.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": 0.4, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 8.2 + } + } + }, + "maxVolume": 300, + "minVolume": 20.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json new file mode 100644 index 00000000000..332755d69a7 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json @@ -0,0 +1,58 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 3.06368702] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json new file mode 100644 index 00000000000..332755d69a7 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json @@ -0,0 +1,58 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 3.06368702] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json new file mode 100644 index 00000000000..332755d69a7 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json @@ -0,0 +1,58 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 3.06368702] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json new file mode 100644 index 00000000000..2e40e8a5fb2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json @@ -0,0 +1,67 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [6.190392157, -0.01092438778, 3.1628], + [7.639705882, -0.02712575255, 3.2631], + [10.69666667, 0.0001007939816, 3.0551], + [24.49343137, 0.0003978066956, 3.0519], + [50.0, -1.501363238e-5, 3.062] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [6.190392157, -0.01092438778, 3.1628], + [7.639705882, -0.02712575255, 3.2631], + [10.69666667, 0.0001007939816, 3.0551], + [24.49343137, 0.0003978066956, 3.0519], + [50.0, -1.501363238e-5, 3.062] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 3.06368702] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [6.190392157, -0.01092438778, 3.1628], + [7.639705882, -0.02712575255, 3.2631], + [10.69666667, 0.0001007939816, 3.0551], + [24.49343137, 0.0003978066956, 3.0519], + [50.0, -1.501363238e-5, 3.062] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json new file mode 100644 index 00000000000..339afe5dbd2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json @@ -0,0 +1,61 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json new file mode 100644 index 00000000000..339afe5dbd2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json @@ -0,0 +1,61 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json new file mode 100644 index 00000000000..339afe5dbd2 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json @@ -0,0 +1,61 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json new file mode 100644 index 00000000000..56eb0cf95a1 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json @@ -0,0 +1,61 @@ +{ + "supportedTips": { + "t10": { + "defaultAspirateFlowRate": 5.0, + "defaultDispenseFlowRate": 10.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 33.0, + "defaultTipOverlap": 3.29, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [1.553425807, -0.03427618068, 0.83], + [1.934976526, -0.007134812859, 0.7878], + [2.689843897, -0.007238069768, 0.788], + [6.161165493, 0.0004663523509, 0.7673], + [10.7963169, 0.0002200157553, 0.7688] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [1.553425807, -0.03427618068, 0.83], + [1.934976526, -0.007134812859, 0.7878], + [2.689843897, -0.007238069768, 0.788], + [6.161165493, 0.0004663523509, 0.7673], + [10.7963169, 0.0002200157553, 0.7688] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [1.553425807, -0.03427618068, 0.83], + [1.934976526, -0.007134812859, 0.7878], + [2.689843897, -0.007238069768, 0.788], + [6.161165493, 0.0004663523509, 0.7673], + [10.7963169, 0.0002200157553, 0.7688] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [1.553425807, -0.03427618068, 0.83], + [1.934976526, -0.007134812859, 0.7878], + [2.689843897, -0.007238069768, 0.788], + [6.161165493, 0.0004663523509, 0.7673], + [10.7963169, 0.0002200157553, 0.7688] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 10, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json index 74cbc028bc7..59188cd2958 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json @@ -1,308 +1,69 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { - "t50": { - "defaultAspirateFlowRate": 6, - "defaultDispenseFlowRate": 6, - "defaultBlowOutFlowRate": 80, - "defaultTipLength": 57.9, - "defaultTipOverlap": 10.5, - "defaultReturnTipHeight": 0.83, - "aspirate": { - "default": [ - [0.4148, -1705.1015, 20.5455], - [0.4476, -80.633, 47.2788], - [0.5512, -1.5936, 11.9026], - [0.6027, -18.9998, 21.4972], - [0.6503, -15.8781, 19.6156], - [0.7733, 3.0612, 7.2993], - [0.8391, -5.2227, 13.7056], - [0.9736, 3.0706, 6.7467], - [1.16, -0.374, 10.1005], - [1.3964, 1.3004, 8.1582], - [1.5815, -0.4837, 10.6494], - [1.8306, 1.1464, 8.0714], - [2.0345, 0.0132, 10.1459], - [2.6221, 0.5374, 9.0794], - [2.9655, -1.7582, 15.0986], - [3.5124, 0.2754, 9.0681], - [4.6591, 1.406, 5.097], - [5.367, 0.394, 9.8123], - [6.0839, 0.3365, 10.1205], - [6.8312, 0.3379, 10.1121], - [7.5676, 0.2611, 10.637], - [8.2397, 0.095, 11.8939], - [8.9776, 0.2015, 11.0165], - [10.413, 0.1332, 11.6294], - [11.8539, 0.1074, 11.8979], - [13.3655, 0.1286, 11.6464], - [14.8236, 0.0758, 12.3519], - [16.3203, 0.083, 12.2457], - [17.7915, 0.0581, 12.6515], - [19.2145, 0.0273, 13.1995], - [20.6718, 0.0388, 12.9792], - [22.1333, 0.0357, 13.044], - [25.0761, 0.0332, 13.0977], - [28.0339, 0.029, 13.2035], - [30.967, 0.0201, 13.4538], - [33.8727, 0.013, 13.6737], - [36.8273, 0.0172, 13.5324], - [39.7594, 0.0121, 13.7191], - [42.6721, 0.0083, 13.8687], - [45.5964, 0.0085, 13.8618], - [48.5297, 0.0084, 13.8668], - [51.4512, 0.0064, 13.9651] - ] - }, - "dispense": { - "default": [ - [0.4148, -1705.1015, 20.5455], - [0.4476, -80.633, 47.2788], - [0.5512, -1.5936, 11.9026], - [0.6027, -18.9998, 21.4972], - [0.6503, -15.8781, 19.6156], - [0.7733, 3.0612, 7.2993], - [0.8391, -5.2227, 13.7056], - [0.9736, 3.0706, 6.7467], - [1.16, -0.374, 10.1005], - [1.3964, 1.3004, 8.1582], - [1.5815, -0.4837, 10.6494], - [1.8306, 1.1464, 8.0714], - [2.0345, 0.0132, 10.1459], - [2.6221, 0.5374, 9.0794], - [2.9655, -1.7582, 15.0986], - [3.5124, 0.2754, 9.0681], - [4.6591, 1.406, 5.097], - [5.367, 0.394, 9.8123], - [6.0839, 0.3365, 10.1205], - [6.8312, 0.3379, 10.1121], - [7.5676, 0.2611, 10.637], - [8.2397, 0.095, 11.8939], - [8.9776, 0.2015, 11.0165], - [10.413, 0.1332, 11.6294], - [11.8539, 0.1074, 11.8979], - [13.3655, 0.1286, 11.6464], - [14.8236, 0.0758, 12.3519], - [16.3203, 0.083, 12.2457], - [17.7915, 0.0581, 12.6515], - [19.2145, 0.0273, 13.1995], - [20.6718, 0.0388, 12.9792], - [22.1333, 0.0357, 13.044], - [25.0761, 0.0332, 13.0977], - [28.0339, 0.029, 13.2035], - [30.967, 0.0201, 13.4538], - [33.8727, 0.013, 13.6737], - [36.8273, 0.0172, 13.5324], - [39.7594, 0.0121, 13.7191], - [42.6721, 0.0083, 13.8687], - [45.5964, 0.0085, 13.8618], - [48.5297, 0.0084, 13.8668], - [51.4512, 0.0064, 13.9651] - ] - } - }, - "t200": { - "defaultAspirateFlowRate": 80, - "defaultDispenseFlowRate": 80, - "defaultBlowOutFlowRate": 80, - "defaultTipLength": 58.35, - "defaultTipOverlap": 10.5, - "defaultReturnTipHeight": 0.83, - "aspirate": { - "default": [ - [0.8314, -2.9322, 24.0741], - [0.8853, -30.0996, 48.7784], - [0.9778, -4.3627, 25.9941], - [0.975, 802.2301, -762.6744], - [1.1272, -4.6837, 24.0666], - [1.2747, -3.91, 23.1945], - [1.5656, -2.8032, 21.7836], - [1.6667, -7.2039, 28.6731], - [2.4403, -0.5147, 17.5244], - [3.0564, -1.6013, 20.1761], - [3.6444, -1.1974, 18.9418], - [4.1189, -1.7877, 21.0928], - [4.6467, -0.8591, 17.2684], - [5.2597, -0.207, 14.2379], - [5.8581, -0.2196, 14.3044], - [6.4772, -0.1025, 13.6183], - [7.8158, 0.0537, 12.6063], - [9.1664, 0.0507, 12.6302], - [10.5064, 0.0285, 12.8339], - [14.8361, 0.0818, 12.273], - [19.3933, 0.0801, 12.2991], - [23.9242, 0.0487, 12.9079], - [28.4922, 0.0379, 13.1666], - [36.145, 0.0277, 13.4572], - [43.7972, 0.0184, 13.7916], - [51.5125, 0.0154, 13.9248], - [59.2467, 0.0121, 14.0931], - [66.9428, 0.0084, 14.3151], - [74.6853, 0.0079, 14.3498], - [82.3722, 0.0052, 14.5512], - [90.1106, 0.0054, 14.5333], - [97.8369, 0.0043, 14.6288], - [105.6153, 0.0046, 14.5983], - [113.3686, 0.0036, 14.7076], - [121.1108, 0.003, 14.7785], - [136.61, 0.0026, 14.826], - [152.0708, 0.0018, 14.9298], - [167.6433, 0.0021, 14.8827], - [183.1011, 0.0012, 15.0438], - [198.5845, 0.0011, 15.0538], - [214.0264, 0.0008, 15.123] - ] - }, - "dispense": { - "default": [ - [0.8314, -2.9322, 24.0741], - [0.8853, -30.0996, 48.7784], - [0.9778, -4.3627, 25.9941], - [0.975, 802.2301, -762.6744], - [1.1272, -4.6837, 24.0666], - [1.2747, -3.91, 23.1945], - [1.5656, -2.8032, 21.7836], - [1.6667, -7.2039, 28.6731], - [2.4403, -0.5147, 17.5244], - [3.0564, -1.6013, 20.1761], - [3.6444, -1.1974, 18.9418], - [4.1189, -1.7877, 21.0928], - [4.6467, -0.8591, 17.2684], - [5.2597, -0.207, 14.2379], - [5.8581, -0.2196, 14.3044], - [6.4772, -0.1025, 13.6183], - [7.8158, 0.0537, 12.6063], - [9.1664, 0.0507, 12.6302], - [10.5064, 0.0285, 12.8339], - [14.8361, 0.0818, 12.273], - [19.3933, 0.0801, 12.2991], - [23.9242, 0.0487, 12.9079], - [28.4922, 0.0379, 13.1666], - [36.145, 0.0277, 13.4572], - [43.7972, 0.0184, 13.7916], - [51.5125, 0.0154, 13.9248], - [59.2467, 0.0121, 14.0931], - [66.9428, 0.0084, 14.3151], - [74.6853, 0.0079, 14.3498], - [82.3722, 0.0052, 14.5512], - [90.1106, 0.0054, 14.5333], - [97.8369, 0.0043, 14.6288], - [105.6153, 0.0046, 14.5983], - [113.3686, 0.0036, 14.7076], - [121.1108, 0.003, 14.7785], - [136.61, 0.0026, 14.826], - [152.0708, 0.0018, 14.9298], - [167.6433, 0.0021, 14.8827], - [183.1011, 0.0012, 15.0438], - [198.5845, 0.0011, 15.0538], - [214.0264, 0.0008, 15.123] - ] - } - }, "t1000": { - "defaultAspirateFlowRate": 160, - "defaultDispenseFlowRate": 160, - "defaultBlowOutFlowRate": 80, - "defaultTipLength": 95.6, - "defaultTipOverlap": 10.5, - "defaultReturnTipHeight": 0.83, + "defaultAspirateFlowRate": 500.0, + "defaultDispenseFlowRate": 1000.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 76.7, + "defaultTipOverlap": 7.95, + "defaultReturnTipHeight": null, "aspirate": { - "default": [ - [0.7511, 3.9556, 6.455], - [1.3075, 2.1664, 5.8839], - [1.8737, 1.1513, 7.2111], - [3.177, 0.9374, 7.612], - [4.5368, 0.5531, 8.8328], - [7.3103, 0.3035, 9.9651], - [10.0825, 0.1513, 11.0781], - [12.9776, 0.1293, 11.2991], - [15.9173, 0.0976, 11.7115], - [18.8243, 0.0624, 12.2706], - [21.8529, 0.07, 12.1275], - [24.8068, 0.0418, 12.7442], - [27.7744, 0.0356, 12.8984], - [35.2873, 0.0303, 13.0454], - [42.7989, 0.0202, 13.4038], - [50.4562, 0.0196, 13.4293], - [58.1081, 0.0145, 13.6843], - [65.7267, 0.0104, 13.9252], - [73.2857, 0.0068, 14.1606], - [81.0016, 0.0091, 13.9883], - [88.6617, 0.0064, 14.2052], - [103.9829, 0.0051, 14.3271], - [119.4408, 0.0049, 14.3475], - [134.889, 0.0037, 14.485], - [150.273, 0.0026, 14.6402], - [181.2798, 0.0026, 14.6427], - [212.4724, 0.0022, 14.7002], - [243.577, 0.0015, 14.8558], - [274.7216, 0.0012, 14.9205], - [305.8132, 0.0009, 15.0118], - [368.0697, 0.0007, 15.0668], - [430.2513, 0.0005, 15.1594], - [492.3487, 0.0003, 15.2291], - [554.5713, 0.0003, 15.2367], - [616.6825, 0.0002, 15.2949], - [694.4168, 0.0002, 15.3027], - [772.0327, 0.0001, 15.3494], - [849.617, 0.0001, 15.3717], - [927.2556, 0.0001, 15.3745], - [1004.87, 0.0001, 15.3912], - [1051.4648, 0.0001, 15.391] + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] ] }, "dispense": { - "default": [ - [0.7511, 3.9556, 6.455], - [1.3075, 2.1664, 5.8839], - [1.8737, 1.1513, 7.2111], - [3.177, 0.9374, 7.612], - [4.5368, 0.5531, 8.8328], - [7.3103, 0.3035, 9.9651], - [10.0825, 0.1513, 11.0781], - [12.9776, 0.1293, 11.2991], - [15.9173, 0.0976, 11.7115], - [18.8243, 0.0624, 12.2706], - [21.8529, 0.07, 12.1275], - [24.8068, 0.0418, 12.7442], - [27.7744, 0.0356, 12.8984], - [35.2873, 0.0303, 13.0454], - [42.7989, 0.0202, 13.4038], - [50.4562, 0.0196, 13.4293], - [58.1081, 0.0145, 13.6843], - [65.7267, 0.0104, 13.9252], - [73.2857, 0.0068, 14.1606], - [81.0016, 0.0091, 13.9883], - [88.6617, 0.0064, 14.2052], - [103.9829, 0.0051, 14.3271], - [119.4408, 0.0049, 14.3475], - [134.889, 0.0037, 14.485], - [150.273, 0.0026, 14.6402], - [181.2798, 0.0026, 14.6427], - [212.4724, 0.0022, 14.7002], - [243.577, 0.0015, 14.8558], - [274.7216, 0.0012, 14.9205], - [305.8132, 0.0009, 15.0118], - [368.0697, 0.0007, 15.0668], - [430.2513, 0.0005, 15.1594], - [492.3487, 0.0003, 15.2291], - [554.5713, 0.0003, 15.2367], - [616.6825, 0.0002, 15.2949], - [694.4168, 0.0002, 15.3027], - [772.0327, 0.0001, 15.3494], - [849.617, 0.0001, 15.3717], - [927.2556, 0.0001, 15.3745], - [1004.87, 0.0001, 15.3912], - [1051.4648, 0.0001, 15.391] + "opentrons/opentrons_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [1000.0, 0.0, 61.3275] + ], + "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [1000.0, 0.0, 61.3275] ] + }, + "defaultTipOverlapDictionary": { + "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 } } }, "maxVolume": 1000, - "minVolume": 1, + "minVolume": 100.0, "defaultTipracks": [ - "opentrons/opentrons_ot3_96_tiprack_1000ul/1", - "opentrons/opentrons_ot3_96_tiprack_200ul/1", - "opentrons/opentrons_ot3_96_tiprack_50ul/1" + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" ] } diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json new file mode 100644 index 00000000000..59188cd2958 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json @@ -0,0 +1,69 @@ +{ + "supportedTips": { + "t1000": { + "defaultAspirateFlowRate": 500.0, + "defaultDispenseFlowRate": 1000.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 76.7, + "defaultTipOverlap": 7.95, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [1000.0, 0.0, 61.3275] + ], + "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [1000.0, 0.0, 61.3275] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 1000, + "minVolume": 100.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json new file mode 100644 index 00000000000..59188cd2958 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json @@ -0,0 +1,69 @@ +{ + "supportedTips": { + "t1000": { + "defaultAspirateFlowRate": 500.0, + "defaultDispenseFlowRate": 1000.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 76.7, + "defaultTipOverlap": 7.95, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [1000.0, 0.0, 61.3275] + ], + "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [1000.0, 0.0, 61.3275] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 1000, + "minVolume": 100.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json new file mode 100644 index 00000000000..59188cd2958 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json @@ -0,0 +1,69 @@ +{ + "supportedTips": { + "t1000": { + "defaultAspirateFlowRate": 500.0, + "defaultDispenseFlowRate": 1000.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 76.7, + "defaultTipOverlap": 7.95, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [1000.0, 0.0, 61.3275] + ], + "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ + [1000.0, 0.0, 61.3275] + ] + }, + "defaultTipOverlapDictionary": { + "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 + } + } + }, + "maxVolume": 1000, + "minVolume": 100.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json new file mode 100644 index 00000000000..77356ad07ec --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json @@ -0,0 +1,214 @@ +{ + "supportedTips": { + "t1000": { + "defaultAspirateFlowRate": 137.35, + "defaultDispenseFlowRate": 137.35, + "defaultBlowOutFlowRate": 137.35, + "defaultTipLength": 78.3, + "defaultTipOverlap": 9.7, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_1000ul/1": 11.5, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5, + "opentrons/geb_96_tiprack_1000ul/1": 9.5 + } + } + }, + "maxVolume": 1000, + "minVolume": 100.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json new file mode 100644 index 00000000000..28601a51a25 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json @@ -0,0 +1,220 @@ +{ + "supportedTips": { + "t1000": { + "defaultAspirateFlowRate": 137.35, + "defaultDispenseFlowRate": 137.35, + "defaultBlowOutFlowRate": 137.35, + "defaultTipLength": 78.3, + "defaultTipOverlap": 9.7, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_1000ul/1": 11.5, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5, + "opentrons/geb_96_tiprack_1000ul/1": 9.5 + } + } + }, + "maxVolume": 1000, + "minVolume": 100.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json new file mode 100644 index 00000000000..da560250afe --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json @@ -0,0 +1,220 @@ +{ + "supportedTips": { + "t1000": { + "defaultAspirateFlowRate": 137.35, + "defaultDispenseFlowRate": 137.35, + "defaultBlowOutFlowRate": 137.35, + "defaultTipLength": 78.3, + "defaultTipOverlap": 9.7, + "defaultReturnTipHeight": 0.83, + "aspirate": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_1000ul/1": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] + ], + "opentrons/opentrons_96_filtertiprack_1000ul/1": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] + ], + "opentrons/geb_96_tiprack_1000ul/1": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_1000ul/1": 11.5, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5, + "opentrons/geb_96_tiprack_1000ul/1": 9.5 + } + } + }, + "maxVolume": 1000, + "minVolume": 100.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_1000ul/1", + "opentrons/opentrons_96_filtertiprack_1000ul/1", + "opentrons/geb_96_tiprack_1000ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json new file mode 100644 index 00000000000..da1676a7c9e --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json @@ -0,0 +1,407 @@ +{ + "supportedTips": { + "t20": { + "defaultAspirateFlowRate": 3.78, + "defaultDispenseFlowRate": 3.78, + "defaultBlowOutFlowRate": 3.78, + "defaultTipLength": 31.15, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/opentrons_96_filtertiprack_20ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/opentrons_96_filtertiprack_20ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_20ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_20ul/1": 8.25 + } + }, + "t10": { + "defaultAspirateFlowRate": 3.78, + "defaultDispenseFlowRate": 3.78, + "defaultBlowOutFlowRate": 3.78, + "defaultTipLength": 31.15, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3 + } + } + }, + "maxVolume": 20, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_20ul/1", + "opentrons/opentrons_96_filtertiprack_20ul/1", + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json new file mode 100644 index 00000000000..41d394d93ca --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json @@ -0,0 +1,346 @@ +{ + "supportedTips": { + "t20": { + "defaultAspirateFlowRate": 3.78, + "defaultDispenseFlowRate": 3.78, + "defaultBlowOutFlowRate": 3.78, + "defaultTipLength": 31.15, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_20ul/1": 8.25 + } + }, + "t10": { + "defaultAspirateFlowRate": 3.78, + "defaultDispenseFlowRate": 3.78, + "defaultBlowOutFlowRate": 3.78, + "defaultTipLength": 31.15, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3 + } + } + }, + "maxVolume": 20, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_20ul/1", + "opentrons/opentrons_96_filtertiprack_20ul/1", + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json new file mode 100644 index 00000000000..c5829f6c2cc --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json @@ -0,0 +1,346 @@ +{ + "supportedTips": { + "t20": { + "defaultAspirateFlowRate": 3.78, + "defaultDispenseFlowRate": 3.78, + "defaultBlowOutFlowRate": 3.78, + "defaultTipLength": 31.15, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_20ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_20ul/1": 8.25 + } + }, + "t10": { + "defaultAspirateFlowRate": 3.78, + "defaultDispenseFlowRate": 3.78, + "defaultBlowOutFlowRate": 3.78, + "defaultTipLength": 31.15, + "defaultTipOverlap": 8.25, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_10ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ], + "opentrons/opentrons_96_filtertiprack_10ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ], + "opentrons/geb_96_tiprack_10ul/1": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3 + } + } + }, + "maxVolume": 20, + "minVolume": 1.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_20ul/1", + "opentrons/opentrons_96_filtertiprack_20ul/1", + "opentrons/opentrons_96_tiprack_10ul/1", + "opentrons/opentrons_96_filtertiprack_10ul/1", + "opentrons/geb_96_tiprack_10ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json new file mode 100644 index 00000000000..1ea4518716c --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json @@ -0,0 +1,71 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json new file mode 100644 index 00000000000..1ea4518716c --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json @@ -0,0 +1,71 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json new file mode 100644 index 00000000000..1ea4518716c --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json @@ -0,0 +1,71 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json new file mode 100644 index 00000000000..c5878b53518 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json @@ -0,0 +1,74 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [35.11266179, 0.03721315938, 16.2497], + [44.37338506, 0.02084320206, 16.8245], + [63.12001468, 0.01519931266, 17.0749], + [148.3020792, 0.005910516464, 17.6612], + [224.5387262, 0.00227975152, 18.1997], + [301.049323, 0.001359578667, 18.4063] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [35.11266179, 0.03721315938, 16.2497], + [44.37338506, 0.02084320206, 16.8245], + [63.12001468, 0.01519931266, 17.0749], + [148.3020792, 0.005910516464, 17.6612], + [224.5387262, 0.00227975152, 18.1997], + [301.049323, 0.001359578667, 18.4063] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 150.0, + "defaultDispenseFlowRate": 300.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [35.11266179, 0.03721315938, 16.2497], + [44.37338506, 0.02084320206, 16.8245], + [63.12001468, 0.01519931266, 17.0749], + [148.3020792, 0.005910516464, 17.6612], + [224.5387262, 0.00227975152, 18.1997], + [301.049323, 0.001359578667, 18.4063] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [302.3895337, 0.0, 18.83156277] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 300, + "minVolume": 30.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json new file mode 100644 index 00000000000..375b3fb8324 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json @@ -0,0 +1,164 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 46.43, + "defaultDispenseFlowRate": 46.43, + "defaultBlowOutFlowRate": 46.43, + "defaultTipLength": 49.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] + ] + }, + "dispense": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_filtertiprack_200ul/1": 8.2 + } + }, + "t300": { + "defaultAspirateFlowRate": 46.43, + "defaultDispenseFlowRate": 46.43, + "defaultBlowOutFlowRate": 46.43, + "defaultTipLength": 49.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 8.2 + } + } + }, + "maxVolume": 300, + "minVolume": 20.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json new file mode 100644 index 00000000000..fdebc12bbb7 --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json @@ -0,0 +1,164 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 46.43, + "defaultDispenseFlowRate": 46.43, + "defaultBlowOutFlowRate": 46.43, + "defaultTipLength": 49.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] + ] + }, + "dispense": { + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_filtertiprack_200ul/1": 8.2 + } + }, + "t300": { + "defaultAspirateFlowRate": 46.43, + "defaultDispenseFlowRate": 46.43, + "defaultBlowOutFlowRate": 46.43, + "defaultTipLength": 49.0, + "defaultTipOverlap": 8.2, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 8.2 + } + } + }, + "maxVolume": 300, + "minVolume": 20.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json index 92e6be23beb..04ebd25d48b 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json @@ -1,80 +1,58 @@ { - "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { - "t50": { - "defaultAspirateFlowRate": 8, - "defaultDispenseFlowRate": 8, - "defaultBlowOutFlowRate": 4, - "defaultTipLength": 57.9, - "defaultTipOverlap": 10.5, - "defaultReturnTipHeight": 0.83, + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, "aspirate": { - "default": [ - [0.6464, 0.4817, 0.0427], - [1.0889, 0.2539, 0.1591], - [1.5136, 0.1624, 0.2587], - [1.9108, 0.1042, 0.3467], - [2.2941, 0.0719, 0.4085], - [2.9978, 0.037, 0.4886], - [3.7731, 0.0378, 0.4863], - [4.7575, 0.0516, 0.4342], - [5.5024, 0.011, 0.6275], - [6.2686, 0.0114, 0.6253], - [7.005, 0.0054, 0.6625], - [8.5207, 0.0063, 0.6563], - [10.0034, 0.003, 0.6844], - [11.5075, 0.0031, 0.6833], - [13.0327, 0.0032, 0.6829], - [14.5356, 0.0018, 0.7003], - [17.5447, 0.0014, 0.7063], - [20.5576, 0.0011, 0.7126], - [23.5624, 0.0007, 0.7197], - [26.5785, 0.0007, 0.721], - [29.593, 0.0005, 0.7248], - [32.6109, 0.0004, 0.7268], - [35.6384, 0.0004, 0.727], - [38.6439, 0.0002, 0.7343], - [41.6815, 0.0004, 0.7284], - [44.6895, 0.0002, 0.7372], - [47.6926, 0.0001, 0.7393], - [51.4567, 0.0001, 0.7382] + "opentrons/tipone_96_tiprack_200ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "dispense": { - "default": [ - [0.6464, 0.4817, 0.0427], - [1.0889, 0.2539, 0.1591], - [1.5136, 0.1624, 0.2587], - [1.9108, 0.1042, 0.3467], - [2.2941, 0.0719, 0.4085], - [2.9978, 0.037, 0.4886], - [3.7731, 0.0378, 0.4863], - [4.7575, 0.0516, 0.4342], - [5.5024, 0.011, 0.6275], - [6.2686, 0.0114, 0.6253], - [7.005, 0.0054, 0.6625], - [8.5207, 0.0063, 0.6563], - [10.0034, 0.003, 0.6844], - [11.5075, 0.0031, 0.6833], - [13.0327, 0.0032, 0.6829], - [14.5356, 0.0018, 0.7003], - [17.5447, 0.0014, 0.7063], - [20.5576, 0.0011, 0.7126], - [23.5624, 0.0007, 0.7197], - [26.5785, 0.0007, 0.721], - [29.593, 0.0005, 0.7248], - [32.6109, 0.0004, 0.7268], - [35.6384, 0.0004, 0.727], - [38.6439, 0.0002, 0.7343], - [41.6815, 0.0004, 0.7284], - [44.6895, 0.0002, 0.7372], - [47.6926, 0.0001, 0.7393], - [51.4567, 0.0001, 0.7382] + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 2.931601299] ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 } } }, "maxVolume": 50, - "minVolume": 0.5, - "defaultTipracks": ["opentrons/opentrons_ot3_96_tiprack_50ul/1"] + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] } diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json new file mode 100644 index 00000000000..04ebd25d48b --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json @@ -0,0 +1,58 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 2.931601299] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json new file mode 100644 index 00000000000..04ebd25d48b --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json @@ -0,0 +1,58 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 2.931601299] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json new file mode 100644 index 00000000000..8120cc4304c --- /dev/null +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json @@ -0,0 +1,70 @@ +{ + "supportedTips": { + "t200": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/tipone_96_tiprack_200ul/1": [ + [5.762111167, 0.02912395377, 2.7132], + [7.208999967, 0.001758534127, 2.8709], + [10.18300033, 0.008684827443, 2.821], + [35.954444, 0.003367098915, 2.8751], + [42.075889, 0.001505686352, 2.9421], + [50.0, 0.001091358226, 2.9595] + ], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [5.762111167, 0.02912395377, 2.7132], + [7.208999967, 0.001758534127, 2.8709], + [10.18300033, 0.008684827443, 2.821], + [35.954444, 0.003367098915, 2.8751], + [42.075889, 0.001505686352, 2.9421], + [50.0, 0.001091358226, 2.9595] + ] + }, + "dispense": { + "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], + "opentrons/opentrons_96_filtertiprack_200ul/1": [ + [50.0, 0.0, 2.931601299] + ] + }, + "defaultTipOverlapDictionary": { + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } + }, + "t300": { + "defaultAspirateFlowRate": 25.0, + "defaultDispenseFlowRate": 50.0, + "defaultBlowOutFlowRate": 1000.0, + "defaultTipLength": 51.7, + "defaultTipOverlap": 7.47, + "defaultReturnTipHeight": null, + "aspirate": { + "opentrons/opentrons_96_tiprack_300ul/1": [ + [5.762111167, 0.02912395377, 2.7132], + [7.208999967, 0.001758534127, 2.8709], + [10.18300033, 0.008684827443, 2.821], + [35.954444, 0.003367098915, 2.8751], + [42.075889, 0.001505686352, 2.9421], + [50.0, 0.001091358226, 2.9595] + ] + }, + "dispense": { + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + }, + "defaultTipOverlapDictionary": { + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } + } + }, + "maxVolume": 50, + "minVolume": 5.0, + "defaultTipracks": [ + "opentrons/opentrons_96_tiprack_300ul/1", + "opentrons/opentrons_96_filtertiprack_200ul/1" + ] +} From 9ee548aad5ab416722a047e56b12d5c2266b4eb1 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Mon, 13 Feb 2023 23:01:34 -0500 Subject: [PATCH 04/13] Add script and make definition modifications for older pipette configs --- .../pipette/build_json_script.py | 717 ++++++++++-------- .../pipette/load_data.py | 11 +- .../pipette/pipette_definition.py | 15 +- .../python/tests/pipette/test_load_data.py | 26 +- 4 files changed, 424 insertions(+), 345 deletions(-) diff --git a/shared-data/python/opentrons_shared_data/pipette/build_json_script.py b/shared-data/python/opentrons_shared_data/pipette/build_json_script.py index 50138715c80..13c5d435073 100644 --- a/shared-data/python/opentrons_shared_data/pipette/build_json_script.py +++ b/shared-data/python/opentrons_shared_data/pipette/build_json_script.py @@ -1,6 +1,8 @@ import argparse -# import csv -from typing import Optional, Dict +import csv +import json +from ast import literal_eval +from typing import Optional, Dict, Union, Any, cast from pathlib import Path from pydantic import BaseModel @@ -15,7 +17,11 @@ PipetteTipType, SupportedTipsDefinition, MotorConfigurations, - PartialTipDefinition) + PartialTipDefinition, + AvailableSensorDefinition, +) + +from .dev_types import PipetteModelSpec, PipetteNameSpec, PipetteName PIPETTE_DEFINITION_ROOT = get_shared_data_root() / "pipette" / "definitions" / "2" @@ -24,420 +30,407 @@ LIQUID_ROOT = PIPETTE_DEFINITION_ROOT / "liquid" -## Name spec sample -# "p10_single": { -# "displayName": "P10 Single-Channel GEN1", -# "displayCategory": "GEN1", -# "minVolume": 1, -# "maxVolume": 10, -# "channels": 1, -# "defaultAspirateFlowRate": { -# "value": 5, -# "min": 0.001, -# "max": 50, -# "valuesByApiLevel": { "2.0": 5 } -# }, -# "defaultDispenseFlowRate": { -# "value": 10, -# "min": 0.001, -# "max": 50, -# "valuesByApiLevel": { "2.0": 10 } -# }, -# "defaultBlowOutFlowRate": { -# "value": 1000, -# "min": 5, -# "max": 1000, -# "valuesByApiLevel": { "2.0": 1000 } -# }, -# "smoothieConfigs": { -# "stepsPerMM": 768, -# "homePosition": 220, -# "travelDistance": 30 -# }, -# "defaultTipracks": [ -# "opentrons/opentrons_96_tiprack_10ul/1", -# "opentrons/opentrons_96_filtertiprack_10ul/1", -# "opentrons/geb_96_tiprack_10ul/1" -# ] - -## model spec sample - # "p1000_single_v1.3": { - # "name": "p1000_single", - # "top": { - # "value": 19.5, - # "min": 5, - # "max": 19.5, - # "units": "mm", - # "type": "float" - # }, - # "bottom": { - # "value": 2.5, - # "min": -2, - # "max": 19.0, - # "units": "mm", - # "type": "float" - # }, - # "blowout": { - # "value": 0.5, - # "min": -4, - # "max": 10, - # "units": "mm", - # "type": "float" - # }, - # "dropTip": { - # "value": -4, - # "min": -6, - # "max": 2, - # "units": "mm", - # "type": "float" - # }, - # "pickUpCurrent": { - # "value": 0.1, - # "min": 0.05, - # "max": 2.0, - # "units": "amps", - # "type": "float" - # }, - # "pickUpDistance": { - # "value": 15, - # "min": 1, - # "max": 30, - # "units": "mm", - # "type": "float" - # }, - # "pickUpIncrement": { - # "value": 1.0, - # "min": 0.0, - # "max": 10.0, - # "units": "mm", - # "type": "float" - # }, - # "pickUpPresses": { - # "value": 3, - # "min": 0, - # "max": 10, - # "units": "presses", - # "type": "int" - # }, - # "pickUpSpeed": { - # "value": 30, - # "min": 1, - # "max": 100, - # "units": "mm/s", - # "type": "float" - # }, - # "modelOffset": [0.0, 0.0, 20.0], - # "nozzleOffset": [0.0, 0.0, 45.0], - # "ulPerMm": [ - # { - # "aspirate": [ - # [148.9157, 0.0213, 56.3986], - # [210.8237, 0.0108, 57.9568], - # [241.2405, 0.0025, 59.717], - # [365.2719, 0.0046, 59.2043], - # [614.4871, 0.0023, 60.0431], - # [1000.0, 0.001, 60.8209] - # ], - # "dispense": [[1000, 0, 61.3275]] - # } - # ], - # "plungerCurrent": { - # "value": 0.5, - # "min": 0.1, - # "max": 0.5, - # "units": "amps", - # "type": "float" - # }, - # "dropTipCurrent": { - # "value": 0.7, - # "min": 0.1, - # "max": 0.8, - # "units": "amps", - # "type": "float" - # }, - # "dropTipSpeed": { - # "value": 5, - # "min": 0.001, - # "max": 30, - # "units": "mm/sec", - # "type": "float" - # }, - # "quirks": ["pickupTipShake", "dropTipShake"], - # "tipOverlap": { - # "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 - # }, - # "tipLength": { - # "value": 76.7, - # "units": "mm", - # "type": "float", - # "min": 0, - # "max": 100 - # } - # } - -def _build_geometry_model(path_to_3d: str, model_configurations: Optional[Dict] = None) -> PipetteGeometryDefinition: - if model_configurations: - nozzle_offset = model_configurations["nozzleOffset"] - else: - nozzle_offset = input("Please provide the nozzle offset") - return PipetteGeometryDefinition(nozzle_offset=nozzle_offset, path_to_3D=path_to_3d) +def _migrate_liquid_model_v1( + model_configurations: PipetteModelSpec, name_configurations: PipetteNameSpec +) -> PipetteLiquidPropertiesDefinition: + return build_liquid_model_v2( + { + "maxVolume": name_configurations["maxVolume"], + "minVolume": name_configurations["minVolume"], + "defaultTipracks": name_configurations["defaultTipracks"], + }, + _migrate_supported_tips(model_configurations, name_configurations), + ) + + +def _migrate_physical_model_v1( + pipette_type: str, + model_configurations: PipetteModelSpec, + name_configurations: PipetteNameSpec, +) -> PipettePhysicalPropertiesDefinition: + channels = name_configurations["channels"] + pick_up_tip_configurations = _build_tip_handling_configurations( + "pickup", model_configurations + ) + drop_tip_configurations = _build_tip_handling_configurations( + "drop", model_configurations + ) + plunger_positions = _build_plunger_positions(model_configurations) + plunger_motor_configurations = _build_motor_configurations(model_configurations) + partial_tip_configurations = _build_partial_tip_configurations(int(channels)) + return build_physical_model_v2( + { + "displayName": name_configurations["displayName"], + "model": pipette_type, + "displayCategory": name_configurations["displayCategory"], + "pickUpTipConfigurations": pick_up_tip_configurations, + "dropTipConfigurations": drop_tip_configurations, + "plungerMotorConfigurations": plunger_motor_configurations, + "plungerPositionsConfigurations": plunger_positions, + "partialTipConfigurations": partial_tip_configurations, + "channels": channels, + } + ) -def _build_tip_handling_configurations(tip_handling_type: str, model_configurations: Optional[Dict] = None) -> TipHandlingConfigurations: - presses = 0.0 - increment = 0.0 + +def _migrate_geometry_model_v1( + path_to_3d: str, model_configurations: PipetteModelSpec +) -> PipetteGeometryDefinition: + + return build_geometry_model_v2( + {"nozzleOffset": model_configurations["nozzleOffset"], "pathTo3D": path_to_3d} + ) + + +def _build_tip_handling_configurations( + tip_handling_type: str, model_configurations: Optional[PipetteModelSpec] = None +) -> TipHandlingConfigurations: + presses = 0 + increment = 0 distance = 0.0 if tip_handling_type == "pickup" and model_configurations: current = model_configurations["pickUpCurrent"]["value"] speed = model_configurations["pickUpSpeed"]["value"] presses = model_configurations["pickUpPresses"]["value"] - increment = model_configurations["pickUpIncrement"]["value"] + increment = int(model_configurations["pickUpIncrement"]["value"]) distance = model_configurations["pickUpDistance"]["value"] elif tip_handling_type == "pickup": print("Handling pick up tip configurations\n") - current = input("please provide the current") - speed = input("please provide the speed") - presses = input("please provide the number of presses for force pick up") - increment = input("please provide the increment to move the pipette down for force pickup") - distance = input("please provide the starting distance for pick up tip") + current = float(input("please provide the current\n")) + speed = float(input("please provide the speed\n")) + presses = int(input("please provide the number of presses for force pick up\n")) + increment = int( + input( + "please provide the increment to move the pipette down for force pickup\n" + ) + ) + distance = float( + input("please provide the starting distance for pick up tip\n") + ) elif tip_handling_type == "drop" and model_configurations: current = model_configurations["dropTipCurrent"]["value"] speed = model_configurations["dropTipSpeed"]["value"] elif tip_handling_type == "drop": print("Handling drop tip configurations\n") - current = input("please provide the current") - speed = input("please provide the speed") + current = float(input("please provide the current\n")) + speed = float(input("please provide the speed\n")) return TipHandlingConfigurations( current=current, speed=speed, presses=presses, increment=increment, - distance=distance) + distance=distance, + ) + -def _build_plunger_positions(model_configurations: Optional[Dict] = None) -> PlungerPositions: +def _build_plunger_positions( + model_configurations: Optional[PipetteModelSpec] = None, +) -> PlungerPositions: if model_configurations: - top=model_configurations["top"]["value"] - bottom=model_configurations["bottom"]["value"] - blow_out=model_configurations["blowout"]["value"] - drop_tip=model_configurations["dropTip"]["value"] + top = model_configurations["top"]["value"] + bottom = model_configurations["bottom"]["value"] + blow_out = model_configurations["blowout"]["value"] + drop_tip = model_configurations["dropTip"]["value"] else: print("Handling plunger motor positions\n") - top=input("Please provide the top plunger position") - bottom=input("Please provide the bottom plunger position") - blow_out=input("Please provide the blow out plunger position") - drop_tip=input("Please provide the drop tip plunger position") - return PlungerPositions(top=top, bottom=bottom, blow_out=blow_out, drop_tip=drop_tip) + top = float(input("Please provide the top plunger position\n")) + bottom = float(input("Please provide the bottom plunger position\n")) + blow_out = float(input("Please provide the blow out plunger position\n")) + drop_tip = float(input("Please provide the drop tip plunger position\n")) + return PlungerPositions(top=top, bottom=bottom, blowout=blow_out, drop=drop_tip) -def _build_motor_configurations(model_configurations: Optional[Dict] = None) -> MotorConfigurations: +def _build_motor_configurations( + model_configurations: Optional[PipetteModelSpec] = None, +) -> MotorConfigurations: if model_configurations: - idle = model_configurations["idleCurrent"] run = model_configurations["plungerCurrent"]["value"] + idle = model_configurations.get("idleCurrent", run) else: print("Handling default plunger motor currents\n") - idle = input("Please provide the default idle current of the plunger motor") - run = input("Please provide the default run current of the plunger motor") + idle = float( + input("Please provide the default idle current of the plunger motor\n") + ) + run = float( + input("Please provide the default run current of the plunger motor\n") + ) return MotorConfigurations(idle=idle, run=run) + def _build_partial_tip_configurations(channels: int) -> PartialTipDefinition: if channels == 8: - return PartialTipDefinition(partial_tip_supported=True, available_configurations=[1, 2, 3, 4, 5, 6, 7, 8]) + return PartialTipDefinition( + partialTipSupported=True, availableConfigurations=[1, 2, 3, 4, 5, 6, 7, 8] + ) elif channels == 96: - return PartialTipDefinition(partial_tip_supported=True, available_configurations=[1, 8, 12, 96]) + return PartialTipDefinition( + partialTipSupported=True, availableConfigurations=[1, 8, 12, 96] + ) else: - return PartialTipDefinition(partial_tip_supported=False) + return PartialTipDefinition(partialTipSupported=False) + + +def build_geometry_model_v2( + input_dictionary: Dict[str, Any] +) -> PipetteGeometryDefinition: + return PipetteGeometryDefinition.parse_obj(input_dictionary) + + +def build_liquid_model_v2( + input_dictionary: Dict[str, Any], + supported_tip_configurations: Dict[str, SupportedTipsDefinition], +) -> PipetteLiquidPropertiesDefinition: + if input_dictionary: + if input_dictionary.get("partialTipConfigurations"): + return PipetteLiquidPropertiesDefinition.parse_obj( + {**input_dictionary, "supportedTips": supported_tip_configurations} + ) + else: + return PipetteLiquidPropertiesDefinition.parse_obj( + { + **input_dictionary, + "partialTipConfigurations": _build_partial_tip_configurations( + input_dictionary["channels"] + ), + "supportedTips": supported_tip_configurations, + } + ) + max_volume = int(input("please provide the max volume of the pipette\n")) + min_volume = float(input("please provide the min volume of the pipette\n")) + default_tipracks = input( + "please input the load names of default tipracks separated by commas\n" + ) + list_default_tipracks = default_tipracks.split(",") + return PipetteLiquidPropertiesDefinition.parse_obj( + { + "supportedTips": supported_tip_configurations, + "maxVolume": max_volume, + "minVolume": min_volume, + "defaultTipracks": list_default_tipracks, + } + ) -def _build_physical_model(pipette_type: str, model_configurations: Optional[Dict] = None, name_configurations: Optional[Dict] = None) -> PipettePhysicalPropertiesDefinition: - if model_configurations and name_configurations: - display_name = name_configurations["displayName"] - display_category = name_configurations["displayCategory"] - available_sensors = [] - channels = name_configurations["channels"] - else: - print(f"Handling general pipette information for {pipette_type}\n") - display_name = input("please provide the product name of the pipette") +def build_physical_model_v2( + input_dictionary: Optional[Dict[str, Any]], pipette_type: Optional[str] = None +) -> PipettePhysicalPropertiesDefinition: + if input_dictionary: + available_sensors = AvailableSensorDefinition( + sensors=input_dictionary.pop("availableSensors", []) + ) + return PipettePhysicalPropertiesDefinition.parse_obj( + {**input_dictionary, "availableSensors": available_sensors} + ) + print(f"Handling general pipette information for {pipette_type}\n") + display_name = input("please provide the product name of the pipette\n") - display_category = input("please provide the model generation of the pipette") - available_sensors = input("Please provide a list of available sensors") - channels = input(f"Please provide the number of channels your {pipette_type} has") + display_category = input("please provide the model generation of the pipette\n") + input_available_sensors = input( + "Please provide a list of available sensors, separated by comma\n" + ) + channels = input(f"Please provide the number of channels your {pipette_type} has\n") pick_up_tip_configurations = _build_tip_handling_configurations("pickup") drop_tip_configurations = _build_tip_handling_configurations("drop") - plunger_positions = _build_plunger_positions(model_configurations) - plunger_motor_configurations =_build_motor_configurations(model_configurations) - partial_tip_configurations=_build_partial_tip_configurations(int(channels)) - return PipettePhysicalPropertiesDefinition( - display_name=display_name, - pipette_type=pipette_type, - display_category=display_category, - pick_up_tip_configurations=pick_up_tip_configurations, - drop_tip_configurations=drop_tip_configurations, - plunger_motor_configurations=plunger_motor_configurations, - plunger_positions_configurations=plunger_positions, - available_sensors=available_sensors, - partial_tip_configurations=partial_tip_configurations, - channels=channels, - ) - -def _build_supported_tips(model_configurations: Optional[Dict] = None, name_configurations: Optional[Dict] = None) -> Dict[PipetteTipType, SupportedTipsDefinition]: - - if model_configurations and name_configurations: - ul_per_mm = model_configurations["ulPerMm"][0] - default_aspirate_flowrate = name_configurations["defaultAspirateFlowRate"]["value"] - default_dispense_flowrate = name_configurations["defaultDispenseFlowRate"]["value"] - default_blowout_flowrate = name_configurations["defaultBlowOutFlowRate"]["value"] - tip_length = model_configurations["tipLength"]["value"] - tip_overlap_dict = model_configurations["tipOverlap"] - default_return_tip = model_configurations.get("returnTipHeight", None) - - tip_volumes = set() - tip_overlap_tiprack_set = {} - for tiprack, overlap in tip_overlap_dict.items(): - split_value = tiprack.split("ul")[0].split("_") - if len(split_value) == 1: - continue - current_tip_volume = split_value[-1] - tip_volumes.add(int(current_tip_volume)) - if tip_overlap_tiprack_set.get(current_tip_volume, None): - tip_overlap_tiprack_set[int(current_tip_volume)][tiprack] = overlap - else: - tip_overlap_tiprack_set[int(current_tip_volume)] = {tiprack: overlap} - # breakpoint() - tips_dict = { - PipetteTipType[volume]: {SupportedTipsDefinition( - defaultAspirateFlowRate=default_aspirate_flowrate, - defaultDispenseFlowRate=default_dispense_flowrate, - defaultBlowOutFlowRate=default_blowout_flowrate, - defaultTipLength=tip_length, - defaultTipOverlap=tip_overlap_dict["default"], - aspirate={tiprack: ul_per_mm["aspirate"] for tiprack in tip_overlap_tiprack_set}, - dispense={tiprack: ul_per_mm["dispense"] for tiprack in tip_overlap_tiprack_set}, - defaultTipOverlapDictionary=tip_overlap_tiprack_set[volume], - defaultReturnTipHeight=default_return_tip) - } - for volume in tip_volumes + plunger_positions = _build_plunger_positions() + plunger_motor_configurations = _build_motor_configurations() + partial_tip_configurations = _build_partial_tip_configurations(int(channels)) + + return PipettePhysicalPropertiesDefinition.parse_obj( + { + "displayName": display_name, + "model": pipette_type, + "displayCategory": display_category, + "pickUpTipConfigurations": pick_up_tip_configurations, + "dropTipConfigurations": drop_tip_configurations, + "plungerMotorConfigurations": plunger_motor_configurations, + "plungerPositionsConfigurations": plunger_positions, + "availableSensors": AvailableSensorDefinition( + sensors=input_available_sensors.split(",") + ), + "partialTipConfigurations": partial_tip_configurations, + "channels": channels, } - else: - print("Building tip specific pipetting functionality") - next_tip = True + ) - tips_dict = {} - while next_tip: - tip_volume = input("Please provide the next tip volume") - default_aspirate_flowrate = input("Please provide the default aspirate flowrate") - default_dispense_flowrate = input("Please provide the default dispense flowrate") - default_blowout_flowrate = input("Please provide the default blowout flowrate") - - tip_length = input("Please provide the default tip length for this tip size") - default_tip_overlap = input("Please provide the default tip overlap for this tip size") - tips_dict = { - PipetteTipType[tip_volume]: SupportedTipsDefinition( - defaultAspirateFlowRate=default_aspirate_flowrate, - default_dispense_flowrate=default_dispense_flowrate, - default_blowout_flowrate=default_blowout_flowrate, - defaultTipLength=tip_length, - defaultTipOverlap=default_tip_overlap, - aspirate={"default": [[]]}, - dispense={"default": [[]]}) + +def _migrate_supported_tips( + model_configurations: PipetteModelSpec, name_configurations: PipetteNameSpec +) -> Dict[str, SupportedTipsDefinition]: + + ul_per_mm = model_configurations["ulPerMm"][0] + + tip_overlap_dict = model_configurations["tipOverlap"] + + tip_volumes = set() + tip_overlap_tiprack_set: Dict[str, Any] = {} + for tiprack, overlap in tip_overlap_dict.items(): + split_value = tiprack.split("ul")[0].split("_") + if len(split_value) == 1: + continue + current_tip_volume = split_value[-1] + tip_volumes.add(current_tip_volume) + if tip_overlap_tiprack_set.get(current_tip_volume, None): + tip_overlap_tiprack_set[current_tip_volume][tiprack] = overlap + else: + tip_overlap_tiprack_set[current_tip_volume] = {tiprack: overlap} + return { + PipetteTipType(int(volume)).name: build_supported_tips( + { + "aspirate": { + tiprack: ul_per_mm["aspirate"] + for tiprack in tip_overlap_tiprack_set[volume] + }, + "dispense": { + tiprack: ul_per_mm["dispense"] + for tiprack in tip_overlap_tiprack_set[volume] + }, + "defaultReturnTipHeight": model_configurations.get( + "returnTipHeight", None + ), + "defaultAspirateFlowRate": name_configurations[ + "defaultAspirateFlowRate" + ]["value"], + "defaultBlowOurFlowRate": name_configurations[ + "defaultDispenseFlowRate" + ]["value"], + "defaultDispenseFlowRate": name_configurations[ + "defaultDispenseFlowRate" + ]["value"], + "defaultTipLength": model_configurations["tipLength"]["value"], + "defaultTipOverlap": tip_overlap_dict["default"], + "defaultTipOverlapDictionary": tip_overlap_tiprack_set[volume], } - cont = input("Additional tips? Please enter y/n") + ) + for volume in tip_volumes + } + + +def build_supported_tips(input_dictionary: Dict[str, Any]) -> SupportedTipsDefinition: + return SupportedTipsDefinition.parse_obj(input_dictionary) - next_tip = cont == "y" or cont == "yes" - print("Please review the aspirate and dispense functions once the pipette model is built.") - return tips_dict - -def _build_liquid_model(model_configurations: Optional[Dict] = None, name_configurations: Optional[Dict] = None, pipette_functions_path: Optional[Path] = None) -> PipetteLiquidPropertiesDefinition: - if model_configurations and name_configurations: - max_volume = name_configurations["maxVolume"] - min_volume = name_configurations["minVolume"] - default_tipracks = name_configurations["defaultTipracks"] - else: - max_volume = input("please provide the max volume of the pipette") - min_volume = input("please provide the min volume of the pipette") - supported_tips_dict = _build_supported_tips(model_configurations, name_configurations) - return PipetteLiquidPropertiesDefinition( - supported_tips=supported_tips_dict, - max_volume=max_volume, - min_volume=min_volume, - default_tipracks=default_tipracks) def save_to_file( directorypath: Path, file_name: str, - data: BaseModel, + data: Union[BaseModel, Dict[str, Any]], ) -> None: """ Function used to save data to a file - - :param filepath: path to save data at - :param data: data to save - :param encoder: if there is any specialized encoder needed. - The default encoder is the date time encoder. """ + directorypath.mkdir(parents=True, exist_ok=True) filepath = directorypath / f"{file_name}.json" - filepath.write_text(data.json(), encoding="utf-8") + if isinstance(data, BaseModel): + filepath.write_text(data.json(by_alias=True), encoding="utf-8") + else: + filepath.write_text(json.dumps(data), encoding="utf-8") def migrate_v1_to_v2() -> None: - print("MIGRATING!") + """ + Migrate pipette config data from v1 to v2 schema version. + """ all_models = model_config()["config"] - config_models_ot2 = [k for k in all_models.keys() if "v3" not in k] + config_models_ot2 = [ + k for k in all_models.keys() if "v3" not in k and "v4" not in k + ] quirks_list = {} for model in config_models_ot2: base_name, full_version = model.split("_v") generation = "_gen2" if float(full_version) >= 2.0 else "" - name = f"{base_name}{generation}" + name = cast(PipetteName, f"{base_name}{generation}") + name_configurations = name_config()[name] model_configurations = all_models[model] - liquid_model = _build_liquid_model(model_configurations, name_configurations) + liquid_model = _migrate_liquid_model_v1( + model_configurations, name_configurations + ) pipette_type = f"p{liquid_model.max_volume}" - physical_model = _build_physical_model(model_configurations, name_configurations, pipette_type) + physical_model = _migrate_physical_model_v1( + pipette_type, model_configurations, name_configurations + ) quirks_list[model] = model_configurations["quirks"] split_version = full_version.split(".") - file_name = f"{split_version[0]}_{split_version[1] if len(split_version) > 1 else 0}.json" - current_pipette_path = physical_model.channels / liquid_model.max_volume + file_name = ( + f"{split_version[0]}_{split_version[1] if len(split_version) > 1 else 0}" + ) + current_pipette_path = Path(physical_model.channels.name.lower()) / pipette_type path_to_3d = GEOMETRY_ROOT / current_pipette_path / "placeholder.gltf" - geometry_model = _build_geometry_model(path_to_3d, model_configurations) + geometry_model = _migrate_geometry_model_v1( + str(path_to_3d), model_configurations + ) + # workaround to better serialize nested dicts in pydantic + dict_liquid_model = liquid_model.dict(by_alias=True) + dict_liquid_model["supportedTips"] = { + k.name: v for k, v in dict_liquid_model["supportedTips"].items() + } save_to_file(GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model) save_to_file(GENERAL_ROOT / current_pipette_path, file_name, physical_model) - save_to_file(LIQUID_ROOT / current_pipette_path, file_name, liquid_model) + save_to_file(LIQUID_ROOT / current_pipette_path, file_name, dict_liquid_model) for key, items in quirks_list.items(): print(f"Quirks list for {key}: {items}") -def build_new_pipette_model_v2() -> None: +def build_new_pipette_model_v2( + pipette_functions_dict: Dict[str, Any], pipette_model_csv: str +) -> None: """ Build a brand new pipette model from user inputted data. """ - geometry_model = _build_geometry_model() - liquid_model = _build_liquid_model() + top_level_pipette_model = {} + with open(pipette_model_csv, "r") as f: + reader = csv.reader(f) + current_key = None + for row in reader: + if row[0]: + current_key = row[0] + top_level_pipette_model[current_key] = {row[1]: literal_eval(row[2])} + elif current_key: + top_level_pipette_model[current_key][row[1]] = literal_eval(row[2]) + else: + continue + geometry_model = build_geometry_model_v2(top_level_pipette_model["geometry"]) + liquid_model = build_liquid_model_v2( + top_level_pipette_model["liquid"], pipette_functions_dict + ) pipette_type = f"p{liquid_model.max_volume}" - physical_model = _build_physical_model(pipette_type) + physical_model = build_physical_model_v2( + { + **top_level_pipette_model["general"], + "plungerMotorConfigurations": top_level_pipette_model[ + "plungerMotorConfigurations" + ], + "plungerPositionsConfigurations": top_level_pipette_model[ + "plungerPositionsConfigurations" + ], + "pickUpTipConfigurations": top_level_pipette_model[ + "pickUpTipConfigurations" + ], + "dropTipConfigurations": top_level_pipette_model["dropTipConfigurations"], + }, + pipette_type, + ) + + major_version = input("please provide the major version of this pipette model\n") + minor_version = input("please provide the minor version of this pipette model\n") - major_version = input("please provide the major version of this pipette model") - minor_version = input("please provide the minor version of this pipette model") + file_name = f"{major_version}_{minor_version}" + current_pipette_path = Path(physical_model.channels.name.lower()) / pipette_type - file_name = f"{major_version}_{minor_version}.json" - current_pipette_path = physical_model.channels / liquid_model.max_volume save_to_file(GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model) save_to_file(GENERAL_ROOT / current_pipette_path, file_name, physical_model) save_to_file(LIQUID_ROOT / current_pipette_path, file_name, liquid_model) - def main() -> None: - print("EXECUTING!") + """Entry point.""" parser = argparse.ArgumentParser( description="96 channel tip handling testing script." ) @@ -447,15 +440,85 @@ def main() -> None: help="If true, build a new pipette model from scratch", default=False, ) - + parser.add_argument( + "--path_to_pipette_model", + type=str, + help="the csv filled with data to build a pipette model", + default=None, + ) args = parser.parse_args() if args.new_pipette_model: - build_new_pipette_model_v2() + using_csv = "" if args.path_to_pipette_model else "out" + print(f"Building new pipette function with{using_csv} using csv") + + next_tip = True + pipette_functions_dict: Dict[str, Any] = {} + while next_tip: + print("Preparing pipetting function table from csv\n") + tip_volume = input("Please provide the next tip volume\n") + tiprack = input( + "Please provide the tiprack/tip type associated with this data\n" + ) + path_to_data = input("Please provide the data path to the csv\n") + csv_dict = pipette_functions_dict.get(f"t{tip_volume}", {}) + with open(path_to_data, "r") as f: + reader = csv.reader(f) + pipetting_key = None + for row in reader: + current_key_exists = csv_dict.get(row[0]) + if row[0] == "aspirate" or row[0] == "dispense": + pipetting_key = row[0] + if current_key_exists: + csv_dict[pipetting_key][f"{tiprack}"].append( + [float(row[1]), float(row[2]), float(row[3])] + ) + else: + csv_dict[pipetting_key] = { + f"{tiprack}": [ + [float(row[1]), float(row[2]), float(row[3])] + ] + } + elif pipetting_key and not row[0]: + csv_dict[pipetting_key][f"{tiprack}"].append( + [float(row[1]), float(row[2]), float(row[3])] + ) + else: + pipetting_key = None + if current_key_exists: + continue + csv_dict[row[0]] = row[1] + pipette_functions_dict[f"t{tip_volume}"] = csv_dict + cont = input("Additional tips? Please enter y/n") + + next_tip = cont == "y" or cont == "yes" + converted_pipette_functions_dict = { + k: build_supported_tips(d) for k, d in pipette_functions_dict.items() + } + + print( + "Please review the aspirate and dispense functions once the pipette model is built.\n" + ) + build_new_pipette_model_v2( + converted_pipette_functions_dict, args.path_to_pipette_model + ) else: + print("Migrating schema v1 files...") migrate_v1_to_v2() if __name__ == "__main__": - print("file got called?") + """ + A script to automate building a pipette configuration definition. + + This script can either perform migrations from a v1 -> v2 schema format + or build a brand new script from scratch. + + When building a new pipette configuration model, you will either need + to provide CSVs or use command line inputs. + + If you choose CSVs you will need one CSV for the general pipette configuration + data (such as pipette model or number of channels) and one for every tip + type that this pipette model can support. + """ main() diff --git a/shared-data/python/opentrons_shared_data/pipette/load_data.py b/shared-data/python/opentrons_shared_data/pipette/load_data.py index 5082f0440bd..b76542e2596 100644 --- a/shared-data/python/opentrons_shared_data/pipette/load_data.py +++ b/shared-data/python/opentrons_shared_data/pipette/load_data.py @@ -76,14 +76,9 @@ def load_definition( ): raise KeyError("Pipette version not found.") - updated_version = version - if updated_version.as_tuple != (1, 0): - # TODO (lc 12-5-2022) Temporary measure until we have full version support - # in the new configurations. Should be removed ASAP. - updated_version = PipetteVersionType(1, 0) - geometry_dict = _geometry(channels, max_volume, updated_version) - physical_dict = _physical(channels, max_volume, updated_version) - liquid_dict = _liquid(channels, max_volume, updated_version) + geometry_dict = _geometry(channels, max_volume, version) + physical_dict = _physical(channels, max_volume, version) + liquid_dict = _liquid(channels, max_volume, version) return PipetteConfigurations.parse_obj( {**geometry_dict, **physical_dict, **liquid_dict, "version": version} diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py index 40a7a054955..d7c3cdc28ac 100644 --- a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py +++ b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py @@ -1,5 +1,5 @@ from typing_extensions import Literal -from typing import List, Dict, Tuple, cast +from typing import List, Dict, Tuple, cast, Optional from pydantic import BaseModel, Field, validator from enum import Enum from dataclasses import dataclass @@ -9,14 +9,14 @@ PipetteModelMajorVersion = [1, 2, 3] -PipetteModelMinorVersion = [0, 1, 2, 3] +PipetteModelMinorVersion = [0, 1, 2, 3, 4, 5] # TODO Literals are only good for writing down # exact values. Is there a better typing mechanism # so we don't need to keep track of versions in two # different places? PipetteModelMajorVersionType = Literal[1, 2, 3] -PipetteModelMinorVersionType = Literal[0, 1, 2, 3] +PipetteModelMinorVersionType = Literal[0, 1, 2, 3, 4, 5] class PipetteTipType(Enum): @@ -114,7 +114,7 @@ class SupportedTipsDefinition(BaseModel): description="The default tip overlap associated with this tip type.", alias="defaultTipOverlap", ) - default_return_tip_height: float = Field( + default_return_tip_height: Optional[float] = Field( ..., description="The height to return a tip to its tiprack.", alias="defaultReturnTipHeight", @@ -250,6 +250,13 @@ def convert_display_category(cls, v: str) -> PipetteGenerationType: return PipetteGenerationType.GEN1 return PipetteGenerationType(v) + class Config: + json_encoders = { + PipetteChannelType: lambda v: v.value, + PipetteModelType: lambda v: v.value, + PipetteGenerationType: lambda v: v.value, + } + class PipetteGeometryDefinition(BaseModel): """The geometry properties definition of a pipette.""" diff --git a/shared-data/python/tests/pipette/test_load_data.py b/shared-data/python/tests/pipette/test_load_data.py index 4514584894b..a067637c0e9 100644 --- a/shared-data/python/tests/pipette/test_load_data.py +++ b/shared-data/python/tests/pipette/test_load_data.py @@ -8,17 +8,31 @@ def test_load_pipette_definition() -> None: - pipette_config = load_data.load_definition( + pipette_config_one = load_data.load_definition( PipetteModelType.p50, PipetteChannelType.SINGLE_CHANNEL, - PipetteVersionType(major=1, minor=0), + PipetteVersionType(major=3, minor=3), ) - assert pipette_config.channels.as_int == 1 - assert pipette_config.pipette_type.value == "p50" - assert pipette_config.nozzle_offset == [-8.0, -22.0, -259.15] + assert pipette_config_one.channels.as_int == 1 + assert pipette_config_one.pipette_type.value == "p50" + assert pipette_config_one.nozzle_offset == [-8.0, -22.0, -259.15] assert ( - pipette_config.supported_tips[PipetteTipType.t50].default_aspirate_flowrate + pipette_config_one.supported_tips[PipetteTipType.t50].default_aspirate_flowrate == 8.0 ) + + pipette_config_two = load_data.load_definition( + PipetteModelType.p50, + PipetteChannelType.SINGLE_CHANNEL, + PipetteVersionType(major=1, minor=0), + ) + + assert pipette_config_two.channels.as_int == 1 + assert pipette_config_two.pipette_type.value == "p50" + assert pipette_config_two.nozzle_offset == [0.0, 0.0, 25.0] + assert ( + pipette_config_two.supported_tips[PipetteTipType.t200].default_aspirate_flowrate + == 25.0 + ) From 6140245a313f1e9f918eb18e4d271e08e998f8f7 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 10:44:48 -0500 Subject: [PATCH 05/13] add scripts subdirectory, modify build script --- .../pipette/scripts/__init__.py | 0 .../pipette/{ => scripts}/build_json_script.py | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 shared-data/python/opentrons_shared_data/pipette/scripts/__init__.py rename shared-data/python/opentrons_shared_data/pipette/{ => scripts}/build_json_script.py (97%) diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/__init__.py b/shared-data/python/opentrons_shared_data/pipette/scripts/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/python/opentrons_shared_data/pipette/build_json_script.py b/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py similarity index 97% rename from shared-data/python/opentrons_shared_data/pipette/build_json_script.py rename to shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py index 13c5d435073..4c5b5f6275e 100644 --- a/shared-data/python/opentrons_shared_data/pipette/build_json_script.py +++ b/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py @@ -6,9 +6,9 @@ from pathlib import Path from pydantic import BaseModel -from .. import get_shared_data_root -from . import name_config, model_config -from .pipette_definition import ( +from ... import get_shared_data_root +from .. import name_config, model_config +from ..pipette_definition import ( PipetteGeometryDefinition, PipetteLiquidPropertiesDefinition, PipettePhysicalPropertiesDefinition, @@ -21,13 +21,13 @@ AvailableSensorDefinition, ) -from .dev_types import PipetteModelSpec, PipetteNameSpec, PipetteName +from ..dev_types import PipetteModelSpec, PipetteNameSpec, PipetteName -PIPETTE_DEFINITION_ROOT = get_shared_data_root() / "pipette" / "definitions" / "2" -GEOMETRY_ROOT = PIPETTE_DEFINITION_ROOT / "geometry" -GENERAL_ROOT = PIPETTE_DEFINITION_ROOT / "general" -LIQUID_ROOT = PIPETTE_DEFINITION_ROOT / "liquid" +PIPETTE_DEFINITION_ROOT = Path("pipette") / "definitions" / "2" +GEOMETRY_ROOT = get_shared_data_root() / PIPETTE_DEFINITION_ROOT / "geometry" +GENERAL_ROOT = get_shared_data_root() / PIPETTE_DEFINITION_ROOT / "general" +LIQUID_ROOT = get_shared_data_root() / PIPETTE_DEFINITION_ROOT / "liquid" def _migrate_liquid_model_v1( @@ -359,7 +359,7 @@ def migrate_v1_to_v2() -> None: ) current_pipette_path = Path(physical_model.channels.name.lower()) / pipette_type - path_to_3d = GEOMETRY_ROOT / current_pipette_path / "placeholder.gltf" + path_to_3d = PIPETTE_DEFINITION_ROOT / current_pipette_path / "placeholder.gltf" geometry_model = _migrate_geometry_model_v1( str(path_to_3d), model_configurations ) From 114790f785683b4759e33fc7a389d187ffa5dcee Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 10:45:47 -0500 Subject: [PATCH 06/13] sanitize path for gltf models --- .../pipette/definitions/2/geometry/eight_channel/p10/1_0.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p10/1_3.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p10/1_4.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p10/1_5.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p10/1_6.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p20/2_0.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p20/2_1.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p300/1_0.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p300/1_3.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p300/1_4.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p300/1_5.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p300/2_0.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p300/2_1.json | 2 +- .../definitions/2/geometry/eight_channel/p300/placeholder.gltf | 0 .../pipette/definitions/2/geometry/eight_channel/p50/1_0.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p50/1_3.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p50/1_4.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p50/1_5.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p10/1_0.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p10/1_3.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p10/1_4.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p10/1_5.json | 2 +- .../definitions/2/geometry/single_channel/p1000/1_0.json | 2 +- .../definitions/2/geometry/single_channel/p1000/1_3.json | 2 +- .../definitions/2/geometry/single_channel/p1000/1_4.json | 2 +- .../definitions/2/geometry/single_channel/p1000/1_5.json | 2 +- .../definitions/2/geometry/single_channel/p1000/2_0.json | 2 +- .../definitions/2/geometry/single_channel/p1000/2_1.json | 2 +- .../definitions/2/geometry/single_channel/p1000/2_2.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p20/2_0.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p20/2_1.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p20/2_2.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p300/1_0.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p300/1_3.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p300/1_4.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p300/1_5.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p300/2_0.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p300/2_1.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p50/1_0.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p50/1_3.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p50/1_4.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p50/1_5.json | 2 +- 42 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json index a84c17deef6..d2005c48134 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json index a84c17deef6..d2005c48134 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json index a84c17deef6..d2005c48134 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json index a84c17deef6..d2005c48134 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json index a84c17deef6..d2005c48134 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json index f8f86ac6598..855977006d1 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 19.4], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json index f8f86ac6598..855977006d1 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 19.4], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json index 478988796f6..e1c5f12b002 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json index 478988796f6..e1c5f12b002 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json index 478988796f6..e1c5f12b002 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json index 478988796f6..e1c5f12b002 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json index 3f91202b575..0b83e709452 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 35.52], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json index 3f91202b575..0b83e709452 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 35.52], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json index 41ce64ef068..df8bf98746f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json index 41ce64ef068..df8bf98746f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json index 41ce64ef068..df8bf98746f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json index 41ce64ef068..df8bf98746f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 31.5, 0.8], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json index 4a17b98e8f6..c9eab4ef4a9 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 12.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json index 4a17b98e8f6..c9eab4ef4a9 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 12.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json index 4a17b98e8f6..c9eab4ef4a9 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 12.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json index 4a17b98e8f6..c9eab4ef4a9 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 12.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json index a30b458d4ce..40a811576b5 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 45.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json index a30b458d4ce..40a811576b5 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 45.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json index a30b458d4ce..40a811576b5 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 45.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json index a30b458d4ce..40a811576b5 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 45.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json index 76b95026313..ce87f5f1beb 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 50.14], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json index 76b95026313..ce87f5f1beb 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 50.14], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json index 76b95026313..ce87f5f1beb 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 50.14], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json index 5b81f07c196..90abe92da86 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 10.45], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json index 5b81f07c196..90abe92da86 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 10.45], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json index 5b81f07c196..90abe92da86 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 10.45], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json index 022fd0a8590..27059a76808 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json index 022fd0a8590..27059a76808 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json index 022fd0a8590..27059a76808 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json index 022fd0a8590..27059a76808 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json index 59a3ef4029e..3739ffe237b 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 29.45], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json index 59a3ef4029e..3739ffe237b 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 29.45], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json index 3fbd15cb3b3..0a00c8fdf0d 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json index 3fbd15cb3b3..0a00c8fdf0d 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json index 3fbd15cb3b3..0a00c8fdf0d 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json index 3fbd15cb3b3..0a00c8fdf0d 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json @@ -1,4 +1,4 @@ { "nozzleOffset": [0.0, 0.0, 25.0], - "pathTo3D": "/Users/lauracox/Desktop/Work/opentrons/shared-data/pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } From 5774fdbb3d59bd1f985675d48b65da45ee0ba698 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 10:46:55 -0500 Subject: [PATCH 07/13] make gltf files binary --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index c44cace90c6..3ba1a647169 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,4 +3,5 @@ # These files are binary and line endings should be left untouched *.hex binary *.bat binary +*.gltf binary api/pypi-readme.rst text eol=lf From 2694616b467c8d71c91a332b892b3aeefdae27f2 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 12:38:18 -0500 Subject: [PATCH 08/13] Add schema relative paths --- .../2/general/eight_channel/p10/1_0.json | 1 + .../2/general/eight_channel/p10/1_3.json | 1 + .../2/general/eight_channel/p10/1_4.json | 1 + .../2/general/eight_channel/p10/1_5.json | 1 + .../2/general/eight_channel/p10/1_6.json | 1 + .../2/general/eight_channel/p20/2_0.json | 1 + .../2/general/eight_channel/p20/2_1.json | 1 + .../2/general/eight_channel/p300/1_0.json | 1 + .../2/general/eight_channel/p300/1_3.json | 1 + .../2/general/eight_channel/p300/1_4.json | 1 + .../2/general/eight_channel/p300/1_5.json | 1 + .../2/general/eight_channel/p300/2_0.json | 1 + .../2/general/eight_channel/p300/2_1.json | 1 + .../2/general/eight_channel/p50/1_0.json | 1 + .../2/general/eight_channel/p50/1_3.json | 1 + .../2/general/eight_channel/p50/1_4.json | 1 + .../2/general/eight_channel/p50/1_5.json | 1 + .../2/general/single_channel/p10/1_0.json | 1 + .../2/general/single_channel/p10/1_3.json | 1 + .../2/general/single_channel/p10/1_4.json | 1 + .../2/general/single_channel/p10/1_5.json | 1 + .../2/general/single_channel/p1000/1_0.json | 1 + .../2/general/single_channel/p1000/1_3.json | 1 + .../2/general/single_channel/p1000/1_4.json | 1 + .../2/general/single_channel/p1000/1_5.json | 1 + .../2/general/single_channel/p1000/2_0.json | 1 + .../2/general/single_channel/p1000/2_1.json | 1 + .../2/general/single_channel/p1000/2_2.json | 1 + .../2/general/single_channel/p20/2_0.json | 1 + .../2/general/single_channel/p20/2_1.json | 1 + .../2/general/single_channel/p20/2_2.json | 1 + .../2/general/single_channel/p300/1_0.json | 1 + .../2/general/single_channel/p300/1_3.json | 1 + .../2/general/single_channel/p300/1_4.json | 1 + .../2/general/single_channel/p300/1_5.json | 1 + .../2/general/single_channel/p300/2_0.json | 1 + .../2/general/single_channel/p300/2_1.json | 1 + .../2/general/single_channel/p50/1_0.json | 1 + .../2/general/single_channel/p50/1_3.json | 1 + .../2/general/single_channel/p50/1_4.json | 1 + .../2/general/single_channel/p50/1_5.json | 1 + .../2/geometry/eight_channel/p10/1_0.json | 1 + .../2/geometry/eight_channel/p10/1_3.json | 1 + .../2/geometry/eight_channel/p10/1_4.json | 1 + .../2/geometry/eight_channel/p10/1_5.json | 1 + .../2/geometry/eight_channel/p10/1_6.json | 1 + .../2/geometry/eight_channel/p20/2_0.json | 1 + .../2/geometry/eight_channel/p20/2_1.json | 1 + .../2/geometry/eight_channel/p300/1_0.json | 1 + .../2/geometry/eight_channel/p300/1_3.json | 1 + .../2/geometry/eight_channel/p300/1_4.json | 1 + .../2/geometry/eight_channel/p300/1_5.json | 1 + .../2/geometry/eight_channel/p300/2_0.json | 1 + .../2/geometry/eight_channel/p300/2_1.json | 1 + .../2/geometry/eight_channel/p50/1_0.json | 1 + .../2/geometry/eight_channel/p50/1_3.json | 1 + .../2/geometry/eight_channel/p50/1_4.json | 1 + .../2/geometry/eight_channel/p50/1_5.json | 1 + .../2/geometry/single_channel/p10/1_0.json | 1 + .../2/geometry/single_channel/p10/1_3.json | 1 + .../2/geometry/single_channel/p10/1_4.json | 1 + .../2/geometry/single_channel/p10/1_5.json | 1 + .../2/geometry/single_channel/p1000/1_0.json | 1 + .../2/geometry/single_channel/p1000/1_3.json | 1 + .../2/geometry/single_channel/p1000/1_4.json | 1 + .../2/geometry/single_channel/p1000/1_5.json | 1 + .../2/geometry/single_channel/p1000/2_0.json | 1 + .../2/geometry/single_channel/p1000/2_1.json | 1 + .../2/geometry/single_channel/p1000/2_2.json | 1 + .../2/geometry/single_channel/p20/2_0.json | 1 + .../2/geometry/single_channel/p20/2_1.json | 1 + .../2/geometry/single_channel/p20/2_2.json | 1 + .../2/geometry/single_channel/p300/1_0.json | 1 + .../2/geometry/single_channel/p300/1_3.json | 1 + .../2/geometry/single_channel/p300/1_4.json | 1 + .../2/geometry/single_channel/p300/1_5.json | 1 + .../2/geometry/single_channel/p300/2_0.json | 1 + .../2/geometry/single_channel/p300/2_1.json | 1 + .../2/geometry/single_channel/p50/1_0.json | 1 + .../2/geometry/single_channel/p50/1_3.json | 1 + .../2/geometry/single_channel/p50/1_4.json | 1 + .../2/geometry/single_channel/p50/1_5.json | 1 + .../2/liquid/eight_channel/p10/1_0.json | 1 + .../2/liquid/eight_channel/p10/1_3.json | 1 + .../2/liquid/eight_channel/p10/1_4.json | 1 + .../2/liquid/eight_channel/p10/1_5.json | 1 + .../2/liquid/eight_channel/p10/1_6.json | 1 + .../2/liquid/eight_channel/p20/2_0.json | 1 + .../2/liquid/eight_channel/p20/2_1.json | 1 + .../2/liquid/eight_channel/p300/1_0.json | 1 + .../2/liquid/eight_channel/p300/1_3.json | 1 + .../2/liquid/eight_channel/p300/1_4.json | 1 + .../2/liquid/eight_channel/p300/1_5.json | 1 + .../2/liquid/eight_channel/p300/2_0.json | 1 + .../2/liquid/eight_channel/p300/2_1.json | 1 + .../2/liquid/eight_channel/p50/1_0.json | 1 + .../2/liquid/eight_channel/p50/1_3.json | 1 + .../2/liquid/eight_channel/p50/1_4.json | 1 + .../2/liquid/eight_channel/p50/1_5.json | 1 + .../2/liquid/single_channel/p10/1_0.json | 1 + .../2/liquid/single_channel/p10/1_3.json | 1 + .../2/liquid/single_channel/p10/1_4.json | 1 + .../2/liquid/single_channel/p10/1_5.json | 1 + .../2/liquid/single_channel/p1000/1_0.json | 1 + .../2/liquid/single_channel/p1000/1_3.json | 1 + .../2/liquid/single_channel/p1000/1_4.json | 1 + .../2/liquid/single_channel/p1000/1_5.json | 1 + .../2/liquid/single_channel/p1000/2_0.json | 1 + .../2/liquid/single_channel/p1000/2_1.json | 1 + .../2/liquid/single_channel/p1000/2_2.json | 1 + .../2/liquid/single_channel/p20/2_0.json | 1 + .../2/liquid/single_channel/p20/2_1.json | 1 + .../2/liquid/single_channel/p20/2_2.json | 1 + .../2/liquid/single_channel/p300/1_0.json | 1 + .../2/liquid/single_channel/p300/1_3.json | 1 + .../2/liquid/single_channel/p300/1_4.json | 1 + .../2/liquid/single_channel/p300/1_5.json | 1 + .../2/liquid/single_channel/p300/2_0.json | 1 + .../2/liquid/single_channel/p300/2_1.json | 1 + .../2/liquid/single_channel/p50/1_0.json | 1 + .../2/liquid/single_channel/p50/1_3.json | 1 + .../2/liquid/single_channel/p50/1_4.json | 1 + .../2/liquid/single_channel/p50/1_5.json | 1 + .../pipette/scripts/build_json_script.py | 43 ++++++++++++++++--- 124 files changed, 159 insertions(+), 7 deletions(-) diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json index 79fc6b24952..b7f649af3a4 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 8-Channel GEN1", "model": "p10", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json index ccc3e503a18..bab451bb083 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 8-Channel GEN1", "model": "p10", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json index 6391465a206..441941e6f5e 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 8-Channel GEN1", "model": "p10", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json index 96a21fc4ec9..b8ec57d78f1 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 8-Channel GEN1", "model": "p10", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json index 96a21fc4ec9..b8ec57d78f1 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 8-Channel GEN1", "model": "p10", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json index 02d87b46d56..9721be3f6d6 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P20 8-Channel GEN2", "model": "p20", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json index 02d87b46d56..9721be3f6d6 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P20 8-Channel GEN2", "model": "p20", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json index 0b7e5d9db77..f336ef58676 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 8-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json index e2c188be3b0..923af228231 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 8-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json index e2c188be3b0..923af228231 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 8-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json index 1555cb823bf..81d4ebb7a2a 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 8-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json index 967111198aa..fd4ae7071bc 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 8-Channel GEN2", "model": "p300", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json index 967111198aa..fd4ae7071bc 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 8-Channel GEN2", "model": "p300", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json index 6ce50d3c19a..9e5d62a0069 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 8-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json index c5103514904..2b9aa7f7a9b 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 8-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json index 15bf1fb4d8f..b20c569e589 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 8-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json index 2c669b7821d..ba69dc44c71 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 8-Channel GEN1", "model": "p50", "displayCategory": "GEN1", 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 index dcbb6408792..2abdfc148c6 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", 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 index d59d0997f1f..e5c6be1e18f 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", 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 index b0613e6bece..7892b8c0e61 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", 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 index b0613e6bece..7892b8c0e61 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", 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 index a4ab0384ed5..ce95d262eba 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN1", "model": "p1000", "displayCategory": "GEN1", 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 index dfaa27d186c..4396b8dd8e6 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN1", "model": "p1000", "displayCategory": "GEN1", 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 index dfaa27d186c..4396b8dd8e6 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN1", "model": "p1000", "displayCategory": "GEN1", 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 index 5949929c694..e7b01a3385e 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN1", "model": "p1000", "displayCategory": "GEN1", 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 index 605b876191c..001db688c61 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN2", "model": "p1000", "displayCategory": "GEN2", 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 index 8fe2afe2702..62ffdfeaa52 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN2", "model": "p1000", "displayCategory": "GEN2", 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 index 8fe2afe2702..62ffdfeaa52 100644 --- 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 @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P1000 Single-Channel GEN2", "model": "p1000", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json index 37b551d782e..317c71331ba 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P20 Single-Channel GEN2", "model": "p20", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json index b284f904093..5246629858a 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P20 Single-Channel GEN2", "model": "p20", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json index b284f904093..5246629858a 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P20 Single-Channel GEN2", "model": "p20", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json index 42bd6c8bd76..57166633426 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 Single-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json index a6849d962d7..1df5547e3f0 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 Single-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json index 9aee9fe27ef..f4caa3248dc 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 Single-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json index 9aee9fe27ef..f4caa3248dc 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 Single-Channel GEN1", "model": "p300", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json index 41eec6ff117..a356173dbf6 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 Single-Channel GEN2", "model": "p300", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json index af1fb33d5ed..c00e1970f83 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P300 Single-Channel GEN2", "model": "p300", "displayCategory": "GEN2", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json index e06c5426135..d4b706ed9c8 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 Single-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json index 62be4314a55..acc8955499c 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 Single-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json index 1ba41109fbf..6b2e8d4a94d 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 Single-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json index 1ba41109fbf..6b2e8d4a94d 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", "displayName": "P50 Single-Channel GEN1", "model": "p50", "displayCategory": "GEN1", diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json index d2005c48134..1e50a6c78d4 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json index d2005c48134..1e50a6c78d4 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json index d2005c48134..1e50a6c78d4 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json index d2005c48134..1e50a6c78d4 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json index d2005c48134..1e50a6c78d4 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json index 855977006d1..8c6a9c2009f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 19.4], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json index 855977006d1..8c6a9c2009f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 19.4], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json index e1c5f12b002..9994be37777 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json index e1c5f12b002..9994be37777 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json index e1c5f12b002..9994be37777 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json index e1c5f12b002..9994be37777 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json index 0b83e709452..2db582cf46f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 35.52], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json index 0b83e709452..2db582cf46f 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 35.52], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json index df8bf98746f..ed8db28f1c0 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json index df8bf98746f..ed8db28f1c0 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json index df8bf98746f..ed8db28f1c0 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json index df8bf98746f..ed8db28f1c0 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 31.5, 0.8], "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json index c9eab4ef4a9..1f23d6f6d0f 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 12.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json index c9eab4ef4a9..1f23d6f6d0f 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 12.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json index c9eab4ef4a9..1f23d6f6d0f 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 12.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json index c9eab4ef4a9..1f23d6f6d0f 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 12.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p10/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json index 40a811576b5..254376bef2a 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 45.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json index 40a811576b5..254376bef2a 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 45.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json index 40a811576b5..254376bef2a 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 45.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json index 40a811576b5..254376bef2a 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 45.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json index ce87f5f1beb..61aaf848c4b 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 50.14], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json index ce87f5f1beb..61aaf848c4b 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 50.14], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json index ce87f5f1beb..61aaf848c4b 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 50.14], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json index 90abe92da86..d8b228d29fb 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 10.45], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json index 90abe92da86..d8b228d29fb 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 10.45], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json index 90abe92da86..d8b228d29fb 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 10.45], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p20/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json index 27059a76808..331c20e01f3 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json index 27059a76808..331c20e01f3 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json index 27059a76808..331c20e01f3 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json index 27059a76808..331c20e01f3 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json index 3739ffe237b..5642ac68062 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 29.45], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json index 3739ffe237b..5642ac68062 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 29.45], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p300/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json index 0a00c8fdf0d..b9416880425 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json index 0a00c8fdf0d..b9416880425 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json index 0a00c8fdf0d..b9416880425 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json index 0a00c8fdf0d..b9416880425 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", "nozzleOffset": [0.0, 0.0, 25.0], "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf" } diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json index 34e47dd5717..82f5c64d6f0 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json index 34e47dd5717..82f5c64d6f0 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json index 34e47dd5717..82f5c64d6f0 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json index 59c3d145c6f..271552bfaeb 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json index df14e06fbb2..15ff0ddc71e 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json index 54a17c91faf..91c84085062 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t20": { "defaultAspirateFlowRate": 7.6, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json index b65e0e8f11f..1b91888d43a 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t20": { "defaultAspirateFlowRate": 7.6, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json index 3d270cbb4b2..e6b542667a6 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json index 3d270cbb4b2..e6b542667a6 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json index 3d270cbb4b2..e6b542667a6 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json index 3d270cbb4b2..e6b542667a6 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json index 9c033f761e4..5e37d63038e 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 94.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json index 72210d74f8b..fa364296f1b 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 94.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json index 332755d69a7..65bf7ce5c74 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json index 332755d69a7..65bf7ce5c74 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json index 332755d69a7..65bf7ce5c74 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json index 2e40e8a5fb2..6b8079d6b62 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json index 339afe5dbd2..84a284db702 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json index 339afe5dbd2..84a284db702 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json index 339afe5dbd2..84a284db702 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json index 56eb0cf95a1..7ac6d1b1c48 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t10": { "defaultAspirateFlowRate": 5.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json index 59188cd2958..0f311c32ba9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 500.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json index 59188cd2958..0f311c32ba9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 500.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json index 59188cd2958..0f311c32ba9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 500.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json index 59188cd2958..0f311c32ba9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 500.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json index 77356ad07ec..b473cb8a15e 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 137.35, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json index 28601a51a25..2202d01ea87 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 137.35, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json index da560250afe..2b14308c1f2 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t1000": { "defaultAspirateFlowRate": 137.35, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json index da1676a7c9e..856653cc03f 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t20": { "defaultAspirateFlowRate": 3.78, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json index 41d394d93ca..74ada9074b4 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t20": { "defaultAspirateFlowRate": 3.78, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json index c5829f6c2cc..e1ac403ed3b 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t20": { "defaultAspirateFlowRate": 3.78, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json index 1ea4518716c..71a93d69f41 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json index 1ea4518716c..71a93d69f41 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json index 1ea4518716c..71a93d69f41 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json index c5878b53518..e6304eefd7b 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 150.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json index 375b3fb8324..a6d62856c24 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 46.43, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json index fdebc12bbb7..9c3f676b9a2 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 46.43, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json index 04ebd25d48b..a0a4f5619e9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json index 04ebd25d48b..a0a4f5619e9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json index 04ebd25d48b..a0a4f5619e9 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json index 8120cc4304c..a826ee3803b 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json @@ -1,4 +1,5 @@ { + "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { "t200": { "defaultAspirateFlowRate": 25.0, diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py b/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py index 4c5b5f6275e..44f54cc5edb 100644 --- a/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py +++ b/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py @@ -29,6 +29,10 @@ GENERAL_ROOT = get_shared_data_root() / PIPETTE_DEFINITION_ROOT / "general" LIQUID_ROOT = get_shared_data_root() / PIPETTE_DEFINITION_ROOT / "liquid" +GENERAL_SCHEMA = "#/pipette/schemas/2/pipettePropertiesSchema.json" +LIQUID_SCHEMA = "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json" +GEOMETRY_SCHEMA = "#/pipette/schemas/2/pipetteGeometryPropertiesSchema.json" + def _migrate_liquid_model_v1( model_configurations: PipetteModelSpec, name_configurations: PipetteNameSpec @@ -313,6 +317,7 @@ def save_to_file( directorypath: Path, file_name: str, data: Union[BaseModel, Dict[str, Any]], + schema_path: str, ) -> None: """ Function used to save data to a file @@ -321,8 +326,11 @@ def save_to_file( directorypath.mkdir(parents=True, exist_ok=True) filepath = directorypath / f"{file_name}.json" if isinstance(data, BaseModel): - filepath.write_text(data.json(by_alias=True), encoding="utf-8") + dict_basemodel = data.dict(by_alias=True) + dict_basemodel["$otSharedSchema"] = schema_path + filepath.write_text(json.dumps(dict_basemodel), encoding="utf-8") else: + data["$otSharedSchema"] = schema_path filepath.write_text(json.dumps(data), encoding="utf-8") @@ -370,9 +378,24 @@ def migrate_v1_to_v2() -> None: k.name: v for k, v in dict_liquid_model["supportedTips"].items() } - save_to_file(GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model) - save_to_file(GENERAL_ROOT / current_pipette_path, file_name, physical_model) - save_to_file(LIQUID_ROOT / current_pipette_path, file_name, dict_liquid_model) + save_to_file( + GEOMETRY_ROOT / current_pipette_path, + file_name, + geometry_model, + GEOMETRY_SCHEMA, + ) + save_to_file( + GENERAL_ROOT / current_pipette_path, + file_name, + physical_model, + GENERAL_SCHEMA, + ) + save_to_file( + LIQUID_ROOT / current_pipette_path, + file_name, + dict_liquid_model, + LIQUID_SCHEMA, + ) for key, items in quirks_list.items(): print(f"Quirks list for {key}: {items}") @@ -424,9 +447,15 @@ def build_new_pipette_model_v2( file_name = f"{major_version}_{minor_version}" current_pipette_path = Path(physical_model.channels.name.lower()) / pipette_type - save_to_file(GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model) - save_to_file(GENERAL_ROOT / current_pipette_path, file_name, physical_model) - save_to_file(LIQUID_ROOT / current_pipette_path, file_name, liquid_model) + save_to_file( + GEOMETRY_ROOT / current_pipette_path, file_name, geometry_model, GEOMETRY_SCHEMA + ) + save_to_file( + GENERAL_ROOT / current_pipette_path, file_name, physical_model, GENERAL_SCHEMA + ) + save_to_file( + LIQUID_ROOT / current_pipette_path, file_name, liquid_model, LIQUID_SCHEMA + ) def main() -> None: From dac54a72a84d8f46530f78509242f05f66f22365 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 12:44:45 -0500 Subject: [PATCH 09/13] was using the wrong relative path... --- .../pipette/definitions/2/geometry/eight_channel/p1000/3_3.json | 2 +- .../pipette/definitions/2/geometry/eight_channel/p50/3_3.json | 2 +- .../definitions/2/geometry/ninety_six_channel/p1000/3_3.json | 2 +- .../definitions/2/geometry/single_channel/p1000/3_3.json | 2 +- .../pipette/definitions/2/geometry/single_channel/p50/3_3.json | 2 +- shared-data/pipette/schemas/2/pipetteGeometrySchema.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p1000/3_3.json index b0f29297cc0..acade0fa951 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p1000/3_3.json @@ -1,5 +1,5 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/eight_channel/p50/placeholder.gltf", + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf", "nozzleOffset": [-8.0, -16.0, -259.15] } diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json index 8769a00ffc2..c93774f0022 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel/p50/3_3.json @@ -1,5 +1,5 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/eight_channel/p1000/placeholder.gltf", + "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p1000/placeholder.gltf", "nozzleOffset": [-8.0, -16.0, -259.15] } diff --git a/shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/3_3.json index 090c7a22699..2a18fa5c1d6 100644 --- a/shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/3_3.json @@ -1,5 +1,5 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/ninety_six_channel/p1000/placeholder.gltf", + "pathTo3D": "pipette/definitions/2/geometry/ninety_six_channel/p1000/placeholder.gltf", "nozzleOffset": [-36.0, -25.5, -259.15] } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json index 3598874a13e..39731c8aedc 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p1000/3_3.json @@ -1,5 +1,5 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/single_channel/p1000/placeholder.gltf", + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p1000/placeholder.gltf", "nozzleOffset": [-8.0, -22.0, -259.15] } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json index c723f77f5bc..de6c4e07ac1 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_3.json @@ -1,5 +1,5 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/single_channel/p50/placeholder.gltf", + "pathTo3D": "pipette/definitions/2/geometry/single_channel/p50/placeholder.gltf", "nozzleOffset": [-8.0, -22.0, -259.15] } diff --git a/shared-data/pipette/schemas/2/pipetteGeometrySchema.json b/shared-data/pipette/schemas/2/pipetteGeometrySchema.json index c65d5e37f8d..35e9ebb16e8 100644 --- a/shared-data/pipette/schemas/2/pipetteGeometrySchema.json +++ b/shared-data/pipette/schemas/2/pipetteGeometrySchema.json @@ -21,7 +21,7 @@ "pathTo3D": { "description": "path to the gltf file representing the 3D pipette model", "type": "string", - "pattern": "^pipette/definitions/[2]/([a-z]*_[a-z]*)+/p[0-9]{2,4}/[a-z]*[.]gltf" + "pattern": "^pipette/definitions/[2]/geometry/([a-z]*_[a-z]*)+/p[0-9]{2,4}/[a-z]*[.]gltf" } } } From cc6471d865fc0d9ed4fcc624230241cfb178e81b Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 12:45:00 -0500 Subject: [PATCH 10/13] update test to check all schemas --- shared-data/js/__tests__/pipetteSchemaV2.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared-data/js/__tests__/pipetteSchemaV2.test.ts b/shared-data/js/__tests__/pipetteSchemaV2.test.ts index 25332eb7104..ae85233ab8c 100644 --- a/shared-data/js/__tests__/pipetteSchemaV2.test.ts +++ b/shared-data/js/__tests__/pipetteSchemaV2.test.ts @@ -46,7 +46,7 @@ describe('test schema against all liquid specs definitions', () => { }) it(`parent dir matches pipette model: ${liquidPath}`, () => { - expect(['p50', 'p1000']).toContain( + expect(['p10', 'p20', 'p50', 'p300', 'p1000']).toContain( path.basename(path.dirname(liquidPath)) ) }) @@ -73,7 +73,7 @@ describe('test schema against all geometry specs definitions', () => { }) it(`parent dir matches pipette model: ${geometryPath}`, () => { - expect(['p50', 'p1000']).toContain( + expect(['p10', 'p20', 'p50', 'p300', 'p1000']).toContain( path.basename(path.dirname(geometryPath)) ) }) @@ -105,7 +105,7 @@ describe('test schema against all general specs definitions', () => { }) it(`parent dir matches pipette model: ${generalPath}`, () => { - expect(['p50', 'p1000']).toContain( + expect(['p10', 'p20', 'p50', 'p300', 'p1000']).toContain( path.basename(path.dirname(generalPath)) ) }) From 584fea755c69c9d347c3bffa911319e3fdb6b221 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 16:56:49 -0500 Subject: [PATCH 11/13] Add a default value for aspirate and dispense functions --- .../2/liquid/eight_channel/p10/1_0.json | 9 +- .../2/liquid/eight_channel/p10/1_3.json | 9 ++ .../2/liquid/eight_channel/p10/1_4.json | 9 ++ .../2/liquid/eight_channel/p10/1_5.json | 10 ++ .../2/liquid/eight_channel/p10/1_6.json | 18 +++ .../2/liquid/eight_channel/p20/2_0.json | 30 +++++ .../2/liquid/eight_channel/p20/2_1.json | 120 +++++++++++++++++ .../2/liquid/eight_channel/p300/1_0.json | 7 + .../2/liquid/eight_channel/p300/1_3.json | 14 ++ .../2/liquid/eight_channel/p300/1_4.json | 14 ++ .../2/liquid/eight_channel/p300/1_5.json | 14 ++ .../2/liquid/eight_channel/p300/2_0.json | 93 +++++++++++++ .../2/liquid/eight_channel/p300/2_1.json | 124 ++++++++++++++++++ .../2/liquid/eight_channel/p50/1_0.json | 14 +- .../2/liquid/eight_channel/p50/1_3.json | 7 + .../2/liquid/eight_channel/p50/1_4.json | 12 +- .../2/liquid/eight_channel/p50/1_5.json | 20 ++- .../2/liquid/single_channel/p10/1_0.json | 10 +- .../2/liquid/single_channel/p10/1_3.json | 10 +- .../2/liquid/single_channel/p10/1_4.json | 7 + .../2/liquid/single_channel/p10/1_5.json | 10 +- .../2/liquid/single_channel/p1000/1_0.json | 11 ++ .../2/liquid/single_channel/p1000/1_3.json | 11 ++ .../2/liquid/single_channel/p1000/1_4.json | 11 ++ .../2/liquid/single_channel/p1000/1_5.json | 11 ++ .../2/liquid/single_channel/p1000/2_0.json | 62 +++++++++ .../2/liquid/single_channel/p1000/2_1.json | 64 +++++++++ .../2/liquid/single_channel/p1000/2_2.json | 64 +++++++++ .../2/liquid/single_channel/p20/2_0.json | 120 +++++++++++++++++ .../2/liquid/single_channel/p20/2_1.json | 120 +++++++++++++++++ .../2/liquid/single_channel/p20/2_2.json | 120 +++++++++++++++++ .../2/liquid/single_channel/p300/1_0.json | 20 +++ .../2/liquid/single_channel/p300/1_3.json | 20 +++ .../2/liquid/single_channel/p300/1_4.json | 20 +++ .../2/liquid/single_channel/p300/1_5.json | 22 ++++ .../2/liquid/single_channel/p300/2_0.json | 124 ++++++++++++++++++ .../2/liquid/single_channel/p300/2_1.json | 124 ++++++++++++++++++ .../2/liquid/single_channel/p50/1_0.json | 15 ++- .../2/liquid/single_channel/p50/1_3.json | 7 + .../2/liquid/single_channel/p50/1_4.json | 14 +- .../2/liquid/single_channel/p50/1_5.json | 22 +++- 41 files changed, 1532 insertions(+), 11 deletions(-) diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json index 82f5c64d6f0..da561f74506 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_0.json @@ -32,6 +32,12 @@ [2.497849452, -0.1888, 1.30410391], [5.649462387, -0.0081, 0.8528667891], [12.74444519, -0.0018, 0.8170558891] + ], + "default": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] ] }, "dispense": { @@ -44,7 +50,8 @@ "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] - ] + ], + "default": [[12.74444519, 0.0, 0.8058688085]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json index 82f5c64d6f0..a4830da147a 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json @@ -32,6 +32,12 @@ [2.497849452, -0.1888, 1.30410391], [5.649462387, -0.0081, 0.8528667891], [12.74444519, -0.0018, 0.8170558891] + ], + "default": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] ] }, "dispense": { @@ -44,6 +50,9 @@ "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] + ], + "default": [ + [12.74444519, 0.0, 0.8058688085] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json index 82f5c64d6f0..a4830da147a 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json @@ -32,6 +32,12 @@ [2.497849452, -0.1888, 1.30410391], [5.649462387, -0.0081, 0.8528667891], [12.74444519, -0.0018, 0.8170558891] + ], + "default": [ + [1.893415617, -1.1069, 3.042593193], + [2.497849452, -0.1888, 1.30410391], + [5.649462387, -0.0081, 0.8528667891], + [12.74444519, -0.0018, 0.8170558891] ] }, "dispense": { @@ -44,6 +50,9 @@ "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] + ], + "default": [ + [12.74444519, 0.0, 0.8058688085] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json index 271552bfaeb..c309f90f051 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json @@ -36,6 +36,13 @@ [2.898518519, -0.04343083788, 0.954], [6.373333333, -0.00905990194, 0.8544], [11.00259259, -0.002325900358, 0.8115] + ], + "default": [ + [1.774444444, -0.1917910448, 1.2026], + [2.151481481, -0.0706286837, 1.0125], + [2.898518519, -0.04343083788, 0.954], + [6.373333333, -0.00905990194, 0.8544], + [11.00259259, -0.002325900358, 0.8115] ] }, "dispense": { @@ -48,6 +55,9 @@ "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] + ], + "default": [ + [12.74444519, 0.0, 0.8058688085] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json index 15ff0ddc71e..bd7cfef820e 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json @@ -68,6 +68,21 @@ [9.1863, 0.0003, 0.7626], [10.7574, 0.0018, 0.7488], [12.2984, -0.4986, 6.1321] + ], + "default": [ + [0.8649, 0.0374, 0.8484], + [1.2416, -0.0987, 0.9503], + [1.6053, -0.069, 0.9134], + [1.9851, -0.0226, 0.839], + [2.3481, -0.0313, 0.8561], + [2.7207, -0.0143, 0.8164], + [3.0702, -0.028, 0.8536], + [4.5998, -0.0006, 0.7694], + [6.1063, -0.0022, 0.7769], + [7.6504, 0.0011, 0.7564], + [9.1863, 0.0003, 0.7626], + [10.7574, 0.0018, 0.7488], + [12.2984, -0.4986, 6.1321] ] }, "dispense": { @@ -80,6 +95,9 @@ "opentrons/geb_96_tiprack_10ul/1": [[12.74444519, 0.0, 0.8058688085]], "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] + ], + "default": [ + [12.74444519, 0.0, 0.8058688085] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json index 91c84085062..025e798a58b 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_0.json @@ -130,6 +130,36 @@ [18.0383, 0.0016, 0.722], [19.558, 0.0004, 0.744], [21.057, -0.0001, 0.7548] + ], + "default": [ + [0.9201, 0.0987, 0.6425], + [1.0713, 0.0817, 0.582], + [1.2327, 0.0946, 0.5683], + [1.3654, -0.016, 0.7046], + [1.5139, 0.0364, 0.633], + [1.6634, 0.0332, 0.6378], + [1.7955, -0.0191, 0.7249], + [1.951, 0.0399, 0.6189], + [2.103, 0.0277, 0.6427], + [2.4684, 0.0117, 0.6764], + [2.8469, 0.017, 0.6632], + [3.2284, 0.015, 0.6691], + [3.599, 0.0064, 0.6968], + [3.9789, 0.0096, 0.6854], + [4.3576, 0.0075, 0.6938], + [4.7241, 0.0014, 0.7201], + [5.0953, 0.003, 0.7124], + [5.8498, 0.0044, 0.7055], + [7.3776, 0.0043, 0.7062], + [8.8971, 0.0024, 0.72], + [10.3977, 0.0008, 0.7339], + [11.9333, 0.002, 0.7214], + [13.4322, 0.0003, 0.7427], + [14.946, 0.0007, 0.7368], + [16.4788, 0.0011, 0.7304], + [18.0383, 0.0016, 0.722], + [19.558, 0.0004, 0.744], + [21.057, -0.0001, 0.7548] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json index 1b91888d43a..3215e9ac2d7 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p20/2_1.json @@ -68,6 +68,36 @@ [17.9666, 0.0003, 0.7437], [19.5173, 0.0013, 0.7248], [21.0316, 0.0003, 0.7447] + ], + "default": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] ] }, "dispense": { @@ -130,6 +160,36 @@ [17.9666, 0.0003, 0.7437], [19.5173, 0.0013, 0.7248], [21.0316, 0.0003, 0.7447] + ], + "default": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] ] }, "defaultTipOverlapDictionary": { @@ -264,6 +324,36 @@ [17.9666, 0.0003, 0.7437], [19.5173, 0.0013, 0.7248], [21.0316, 0.0003, 0.7447] + ], + "default": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] ] }, "dispense": { @@ -386,6 +476,36 @@ [17.9666, 0.0003, 0.7437], [19.5173, 0.0013, 0.7248], [21.0316, 0.0003, 0.7447] + ], + "default": [ + [0.873, -0.0339, 0.6276], + [1.0274, 0.1203, 0.5185], + [1.1795, 0.0863, 0.5535], + [1.3179, 0.0267, 0.6238], + [1.4539, 0.0141, 0.6404], + [1.6193, 0.0836, 0.5394], + [1.7838, 0.0691, 0.5628], + [1.9164, -0.0124, 0.7082], + [2.0417, -0.0307, 0.7433], + [2.4182, 0.0274, 0.6245], + [2.8159, 0.0329, 0.6115], + [3.1854, 0.0105, 0.6743], + [3.5678, 0.0149, 0.6604], + [3.9434, 0.0091, 0.6811], + [4.3254, 0.0102, 0.6766], + [4.7002, 0.0059, 0.6955], + [5.0629, 0.0005, 0.7208], + [5.8469, 0.0097, 0.6743], + [7.3388, 0.002, 0.7191], + [8.877, 0.0038, 0.7059], + [10.4052, 0.0023, 0.7196], + [11.9158, 0.001, 0.7328], + [13.419, 0.0005, 0.7387], + [14.9352, 0.0008, 0.7344], + [16.4603, 0.0009, 0.7327], + [17.9666, 0.0003, 0.7437], + [19.5173, 0.0013, 0.7248], + [21.0316, 0.0003, 0.7447] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json index e6b542667a6..e886fbff272 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json @@ -16,6 +16,10 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { @@ -24,6 +28,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json index e6b542667a6..2bb15aa982e 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json @@ -16,6 +16,10 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { @@ -24,6 +28,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { @@ -42,11 +49,18 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json index e6b542667a6..2bb15aa982e 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json @@ -16,6 +16,10 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { @@ -24,6 +28,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { @@ -42,11 +49,18 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json index e6b542667a6..2bb15aa982e 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json @@ -16,6 +16,10 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { @@ -24,6 +28,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { @@ -42,11 +49,18 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [57.25698968, 0.017, 18.132], [309.2612689, 0.001, 19.03] + ], + "default": [ + [57.25698968, 0.017, 18.132], + [309.2612689, 0.001, 19.03] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [309.2612689, 0.0, 19.29389273] + ], + "default": [ + [309.2612689, 0.0, 19.29389273] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json index 5e37d63038e..9a747f0c5bf 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_0.json @@ -72,6 +72,37 @@ [277.5545, 0.0002, 9.1849], [296.3369, 0.0005, 9.123], [301.0236, 0.0004, 9.1508] + ], + "default": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] ] }, "defaultTipOverlapDictionary": { @@ -116,6 +147,37 @@ [277.5545, 0.0002, 9.1849], [296.3369, 0.0005, 9.123], [301.0236, 0.0004, 9.1508] + ], + "default": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] ] }, "dispense": { @@ -149,6 +211,37 @@ [277.5545, 0.0002, 9.1849], [296.3369, 0.0005, 9.123], [301.0236, 0.0004, 9.1508] + ], + "default": [ + [15.4931, 0.0268, 8.559], + [17.2964, 0.0227, 8.2555], + [26.4494, 0.0184, 8.3302], + [31.0328, 0.0109, 8.5278], + [35.6206, 0.0084, 8.6052], + [40.1967, 0.006, 8.6914], + [44.7911, 0.0056, 8.7084], + [54.0381, 0.0052, 8.7251], + [63.2183, 0.0027, 8.8601], + [72.5189, 0.0036, 8.8023], + [81.7883, 0.0025, 8.887], + [91.0614, 0.002, 8.924], + [100.335, 0.0016, 8.9566], + [109.6503, 0.0017, 8.9473], + [118.9447, 0.0013, 8.9951], + [128.2742, 0.0014, 8.9858], + [137.5514, 0.0008, 9.0566], + [146.9261, 0.0014, 8.9824], + [156.2103, 0.0006, 9.0886], + [165.6528, 0.0015, 8.9557], + [174.9731, 0.0007, 9.0932], + [184.3156, 0.0007, 9.0842], + [202.9883, 0.0006, 9.1076], + [221.64, 0.0004, 9.1369], + [240.2986, 0.0004, 9.1488], + [258.925, 0.0003, 9.1769], + [277.5545, 0.0002, 9.1849], + [296.3369, 0.0005, 9.123], + [301.0236, 0.0004, 9.1508] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json index fa364296f1b..d7d9c1422ec 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/2_1.json @@ -39,6 +39,37 @@ [277.8381, 0.0004, 9.1384], [296.7631, 0.0007, 9.0766], [301.4592, 0.0004, 9.1587] + ], + "default": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] ] }, "dispense": { @@ -72,6 +103,37 @@ [277.8381, 0.0004, 9.1384], [296.7631, 0.0007, 9.0766], [301.4592, 0.0004, 9.1587] + ], + "default": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] ] }, "defaultTipOverlapDictionary": { @@ -116,6 +178,37 @@ [277.8381, 0.0004, 9.1384], [296.7631, 0.0007, 9.0766], [301.4592, 0.0004, 9.1587] + ], + "default": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] ] }, "dispense": { @@ -149,6 +242,37 @@ [277.8381, 0.0004, 9.1384], [296.7631, 0.0007, 9.0766], [301.4592, 0.0004, 9.1587] + ], + "default": [ + [15.1131, 0.049, 8.3069], + [16.9572, 0.0447, 7.7203], + [26.1311, 0.0253, 8.0502], + [30.7644, 0.0172, 8.2622], + [35.4169, 0.0138, 8.364], + [39.9942, 0.0073, 8.5961], + [44.6186, 0.0078, 8.5751], + [53.8569, 0.0057, 8.6705], + [63.1219, 0.0045, 8.7363], + [72.3953, 0.0034, 8.7997], + [81.6392, 0.0023, 8.8802], + [90.9025, 0.0021, 8.9015], + [100.1819, 0.0019, 8.9218], + [109.4856, 0.0018, 8.9314], + [118.7745, 0.0014, 8.9741], + [128.135, 0.0017, 8.9334], + [137.43, 0.001, 9.0215], + [146.7356, 0.001, 9.0295], + [156.0722, 0.001, 9.0178], + [165.4444, 0.0011, 9.0036], + [174.7933, 0.0009, 9.0446], + [184.1725, 0.001, 9.0324], + [202.8867, 0.0007, 9.0758], + [221.595, 0.0006, 9.1028], + [240.3436, 0.0006, 9.1048], + [259.0833, 0.0005, 9.1287], + [277.8381, 0.0004, 9.1384], + [296.7631, 0.0007, 9.0766], + [301.4592, 0.0004, 9.1587] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json index 65bf7ce5c74..44a6d1aaa37 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json @@ -16,12 +16,19 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [12.29687531, -0.0049, 3.134703694], [50.0, -0.0002, 3.077116024] + ], + "default": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] + ], + "default": [ + [50.0, 0.0, 3.06368702] ] }, "defaultTipOverlapDictionary": { @@ -40,10 +47,15 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [12.29687531, -0.0049, 3.134703694], [50.0, -0.0002, 3.077116024] + ], + "default": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] ] }, "dispense": { - "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]], + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json index 65bf7ce5c74..5e893c97947 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json @@ -16,12 +16,19 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [12.29687531, -0.0049, 3.134703694], [50.0, -0.0002, 3.077116024] + ], + "default": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] + ], + "default": [ + [50.0, 0.0, 3.06368702] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json index 65bf7ce5c74..536e527299d 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json @@ -22,6 +22,9 @@ "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] + ], + "default": [ + [50.0, 0.0, 3.06368702] ] }, "defaultTipOverlapDictionary": { @@ -40,10 +43,15 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [12.29687531, -0.0049, 3.134703694], [50.0, -0.0002, 3.077116024] - ] + ], + "default": [ + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] }, "dispense": { - "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]], + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json index 6b8079d6b62..b1eca99289c 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json @@ -22,12 +22,22 @@ [10.69666667, 0.0001007939816, 3.0551], [24.49343137, 0.0003978066956, 3.0519], [50.0, -1.501363238e-5, 3.062] + ], + "default": [ + [6.190392157, -0.01092438778, 3.1628], + [7.639705882, -0.02712575255, 3.2631], + [10.69666667, 0.0001007939816, 3.0551], + [24.49343137, 0.0003978066956, 3.0519], + [50.0, -1.501363238e-5, 3.062] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 3.06368702]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] + ], + "default": [ + [50.0, 0.0, 3.06368702] ] }, "defaultTipOverlapDictionary": { @@ -49,10 +59,18 @@ [10.69666667, 0.0001007939816, 3.0551], [24.49343137, 0.0003978066956, 3.0519], [50.0, -1.501363238e-5, 3.062] + ], + "default": [ + [6.190392157, -0.01092438778, 3.1628], + [7.639705882, -0.02712575255, 3.2631], + [10.69666667, 0.0001007939816, 3.0551], + [24.49343137, 0.0003978066956, 3.0519], + [50.0, -1.501363238e-5, 3.062] ] }, "dispense": { - "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]] + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]], + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json index 84a284db702..99d7cefc88c 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json @@ -36,13 +36,21 @@ [3.2354, -0.0447, 0.9536], [3.9984, -0.012, 0.8477], [12.5135, -0.0021, 0.8079] + ], + "default": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] ] }, "dispense": { "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], - "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]], + "default": [[12.5135, 0.0, 0.7945]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json index 84a284db702..99d7cefc88c 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json @@ -36,13 +36,21 @@ [3.2354, -0.0447, 0.9536], [3.9984, -0.012, 0.8477], [12.5135, -0.0021, 0.8079] + ], + "default": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] ] }, "dispense": { "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], - "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]], + "default": [[12.5135, 0.0, 0.7945]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json index 84a284db702..bb3db4d1163 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_4.json @@ -36,6 +36,13 @@ [3.2354, -0.0447, 0.9536], [3.9984, -0.012, 0.8477], [12.5135, -0.0021, 0.8079] + ], + "default": [ + [1.8263, -0.0958, 1.088], + [2.5222, -0.104, 1.1031], + [3.2354, -0.0447, 0.9536], + [3.9984, -0.012, 0.8477], + [12.5135, -0.0021, 0.8079] ] }, "dispense": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json index 7ac6d1b1c48..70d47e42e46 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json @@ -36,13 +36,21 @@ [2.689843897, -0.007238069768, 0.788], [6.161165493, 0.0004663523509, 0.7673], [10.7963169, 0.0002200157553, 0.7688] + ], + "default": [ + [1.553425807, -0.03427618068, 0.83], + [1.934976526, -0.007134812859, 0.7878], + [2.689843897, -0.007238069768, 0.788], + [6.161165493, 0.0004663523509, 0.7673], + [10.7963169, 0.0002200157553, 0.7688] ] }, "dispense": { "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], - "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]] + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]], + "default": [[12.5135, 0.0, 0.7945]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json index 0f311c32ba9..49c656b1d85 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json @@ -40,6 +40,14 @@ [365.2719, 0.0046, 59.2043], [614.4871, 0.0023, 60.0431], [1000.0, 0.001, 60.8209] + ], + "default": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] ] }, "dispense": { @@ -50,6 +58,9 @@ "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] + ], + "default": [ + [1000.0, 0.0, 61.3275] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json index 0f311c32ba9..49c656b1d85 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json @@ -40,6 +40,14 @@ [365.2719, 0.0046, 59.2043], [614.4871, 0.0023, 60.0431], [1000.0, 0.001, 60.8209] + ], + "default": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] ] }, "dispense": { @@ -50,6 +58,9 @@ "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] + ], + "default": [ + [1000.0, 0.0, 61.3275] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json index 0f311c32ba9..49c656b1d85 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json @@ -40,6 +40,14 @@ [365.2719, 0.0046, 59.2043], [614.4871, 0.0023, 60.0431], [1000.0, 0.001, 60.8209] + ], + "default": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] ] }, "dispense": { @@ -50,6 +58,9 @@ "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] + ], + "default": [ + [1000.0, 0.0, 61.3275] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json index 0f311c32ba9..49c656b1d85 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json @@ -40,6 +40,14 @@ [365.2719, 0.0046, 59.2043], [614.4871, 0.0023, 60.0431], [1000.0, 0.001, 60.8209] + ], + "default": [ + [148.9157, 0.0213, 56.3986], + [210.8237, 0.0108, 57.9568], + [241.2405, 0.0025, 59.717], + [365.2719, 0.0046, 59.2043], + [614.4871, 0.0023, 60.0431], + [1000.0, 0.001, 60.8209] ] }, "dispense": { @@ -50,6 +58,9 @@ "opentrons/geb_96_tiprack_1000ul/1": [[1000.0, 0.0, 61.3275]], "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] + ], + "default": [ + [1000.0, 0.0, 61.3275] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json index b473cb8a15e..a4dfe58ee67 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_0.json @@ -101,6 +101,37 @@ [927.0, 0.0002205, 27.06], [981.8, 0.0001571, 27.12], [1010.0, 0.0003381, 26.94] + ], + "default": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] ] }, "dispense": { @@ -196,6 +227,37 @@ [927.0, 0.0002205, 27.06], [981.8, 0.0001571, 27.12], [1010.0, 0.0003381, 26.94] + ], + "default": [ + [83.6, 0.01502, 25.62], + [90.39, 0.0152, 24.45], + [104.1, 0.01386, 24.57], + [117.7, 0.00991, 24.98], + [131.3, 0.007542, 25.26], + [158.6, 0.006723, 25.37], + [186.1, 0.005602, 25.55], + [199.9, 0.005013, 25.66], + [213.6, 0.002767, 26.11], + [241.2, 0.003594, 25.93], + [268.6, 0.002371, 26.22], + [323.5, 0.001687, 26.41], + [378.3, 0.001273, 26.54], + [433.3, 0.001039, 26.63], + [460.8, 0.0007889, 26.74], + [488.1, 0.0004039, 26.92], + [515.5, 0.0005667, 26.84], + [542.9, 0.0005983, 26.82], + [570.4, 0.0006121, 26.81], + [597.7, 0.0002485, 27.02], + [625.4, 0.0008384, 26.67], + [652.5, -0.0001662, 27.3], + [707.4, 0.0003177, 26.98], + [762.4, 0.000383, 26.94], + [817.1, 0.0001665, 27.1], + [872.1, 0.000301, 26.99], + [927.0, 0.0002205, 27.06], + [981.8, 0.0001571, 27.12], + [1010.0, 0.0003381, 26.94] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json index 2202d01ea87..ff8fab66c3b 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_1.json @@ -104,6 +104,38 @@ [929.8528, 0.0001, 27.2124], [984.8253, 0.0001, 27.2484], [1012.2269, 0.0, 27.3121] + ], + "default": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] ] }, "dispense": { @@ -202,6 +234,38 @@ [929.8528, 0.0001, 27.2124], [984.8253, 0.0001, 27.2484], [1012.2269, 0.0, 27.3121] + ], + "default": [ + [83.6125, 0.0158, 25.6199], + [90.4833, 0.0183, 24.2002], + [104.1964, 0.0143, 24.5544], + [117.7531, 0.0087, 25.1402], + [131.3828, 0.008, 25.2238], + [158.8108, 0.007, 25.3573], + [186.1861, 0.0047, 25.717], + [199.8483, 0.0035, 25.938], + [213.7914, 0.0056, 25.5359], + [241.1658, 0.0026, 26.1594], + [268.9339, 0.0035, 25.9521], + [324.0678, 0.002, 26.3458], + [379.1867, 0.0014, 26.5405], + [406.6172, 0.0008, 26.7661], + [434.4039, 0.0015, 26.4869], + [461.8772, 0.0007, 26.8497], + [489.4708, 0.0009, 26.7746], + [516.9619, 0.0006, 26.9133], + [544.6047, 0.0008, 26.8025], + [572.0717, 0.0004, 27.0067], + [599.6383, 0.0005, 26.9348], + [627.2047, 0.0005, 26.963], + [654.7669, 0.0004, 26.9925], + [709.8303, 0.0003, 27.0535], + [764.8439, 0.0003, 27.1116], + [819.8756, 0.0002, 27.1306], + [874.8864, 0.0002, 27.165], + [929.8528, 0.0001, 27.2124], + [984.8253, 0.0001, 27.2484], + [1012.2269, 0.0, 27.3121] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json index 2b14308c1f2..e20af403bcd 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/2_2.json @@ -104,6 +104,38 @@ [931.3206, 0.0001, 27.2769], [986.4186, 0.0002, 27.2505], [1013.9597, 0.0001, 27.2644] + ], + "default": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] ] }, "dispense": { @@ -202,6 +234,38 @@ [931.3206, 0.0001, 27.2769], [986.4186, 0.0002, 27.2505], [1013.9597, 0.0001, 27.2644] + ], + "default": [ + [83.9281, 0.0176, 25.7039], + [90.6789, 0.0125, 24.7768], + [104.4067, 0.0141, 24.6307], + [118.1219, 0.0108, 24.9777], + [131.7286, 0.0071, 25.4124], + [159.2686, 0.0072, 25.3936], + [186.7464, 0.0049, 25.7722], + [200.4731, 0.0038, 25.9749], + [214.2558, 0.0038, 25.9699], + [241.8258, 0.0032, 26.1015], + [269.5028, 0.0029, 26.1641], + [324.6789, 0.0019, 26.4311], + [379.9153, 0.0015, 26.585], + [407.5544, 0.0012, 26.6765], + [435.225, 0.0011, 26.7098], + [462.8847, 0.001, 26.7775], + [490.4011, 0.0006, 26.9595], + [518.1417, 0.0009, 26.783], + [545.5994, 0.0003, 27.094], + [573.2856, 0.0007, 26.8988], + [600.8433, 0.0004, 27.0549], + [628.3706, 0.0003, 27.1059], + [655.9225, 0.0004, 27.1005], + [711.0492, 0.0003, 27.1166], + [766.1336, 0.0003, 27.169], + [821.3261, 0.0003, 27.1451], + [876.3753, 0.0002, 27.2404], + [931.3206, 0.0001, 27.2769], + [986.4186, 0.0002, 27.2505], + [1013.9597, 0.0001, 27.2644] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json index 856653cc03f..4f26b85f3eb 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_0.json @@ -68,6 +68,36 @@ [18.06, 0.0003974, 0.7452], [19.62, 0.001391, 0.7273], [21.14, 0.0003498, 0.7477] + ], + "default": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] ] }, "dispense": { @@ -130,6 +160,36 @@ [18.06, 0.0003974, 0.7452], [19.62, 0.001391, 0.7273], [21.14, 0.0003498, 0.7477] + ], + "default": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] ] }, "defaultTipOverlapDictionary": { @@ -264,6 +324,36 @@ [18.06, 0.0003974, 0.7452], [19.62, 0.001391, 0.7273], [21.14, 0.0003498, 0.7477] + ], + "default": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] ] }, "dispense": { @@ -386,6 +476,36 @@ [18.06, 0.0003974, 0.7452], [19.62, 0.001391, 0.7273], [21.14, 0.0003498, 0.7477] + ], + "default": [ + [0.8425, 0.0933, 0.5892], + [0.9934, 0.1264, 0.4953], + [1.17, 0.1658, 0.4562], + [1.299, -0.005354, 0.6565], + [1.435, 0.02079, 0.6225], + [1.603, 0.09178, 0.5206], + [1.745, 0.02307, 0.6306], + [1.916, 0.07824, 0.5345], + [2.051, -0.004942, 0.6939], + [2.417, 0.01873, 0.6454], + [2.801, 0.0253, 0.6295], + [3.163, 0.00714, 0.6804], + [3.539, 0.01305, 0.6617], + [3.949, 0.02487, 0.6198], + [4.32, 0.005296, 0.6971], + [4.692, 0.004936, 0.6987], + [5.084, 0.01144, 0.6682], + [5.791, -0.003501, 0.7441], + [7.344, 0.00678, 0.6846], + [8.857, 0.00243, 0.7165], + [10.42, 0.003968, 0.7029], + [11.94, 0.001477, 0.7289], + [13.47, 0.001089, 0.7335], + [15.01, 0.00147, 0.7284], + [16.54, 0.0008888, 0.7371], + [18.06, 0.0003974, 0.7452], + [19.62, 0.001391, 0.7273], + [21.14, 0.0003498, 0.7477] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json index 74ada9074b4..6a079d1954e 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_1.json @@ -38,6 +38,36 @@ [18.2255, 0.0005, 0.751], [19.7847, 0.001, 0.7412], [21.3395, 0.0008, 0.746] + ], + "default": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] ] }, "dispense": { @@ -70,6 +100,36 @@ [18.2255, 0.0005, 0.751], [19.7847, 0.001, 0.7412], [21.3395, 0.0008, 0.746] + ], + "default": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] ] }, "defaultTipOverlapDictionary": { @@ -203,6 +263,36 @@ [18.2255, 0.0005, 0.751], [19.7847, 0.001, 0.7412], [21.3395, 0.0008, 0.746] + ], + "default": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] ] }, "dispense": { @@ -325,6 +415,36 @@ [18.2255, 0.0005, 0.751], [19.7847, 0.001, 0.7412], [21.3395, 0.0008, 0.746] + ], + "default": [ + [0.9034, 0.147, 0.6223], + [1.0379, 0.0252, 0.6226], + [1.1913, 0.0856, 0.5599], + [1.3481, 0.078, 0.569], + [1.5008, 0.0533, 0.6023], + [1.6468, 0.0272, 0.6414], + [1.7939, 0.0259, 0.6435], + [1.9416, 0.0235, 0.6479], + [2.0951, 0.0321, 0.6311], + [2.4797, 0.0263, 0.6433], + [2.8632, 0.0191, 0.6611], + [3.2394, 0.0108, 0.6849], + [3.6157, 0.0087, 0.6918], + [3.9974, 0.0096, 0.6883], + [4.3741, 0.0059, 0.7033], + [4.7578, 0.0077, 0.6954], + [5.1419, 0.0067, 0.6999], + [5.9051, 0.0047, 0.7105], + [7.4406, 0.0039, 0.7154], + [8.9842, 0.003, 0.7218], + [10.5104, 0.0014, 0.7366], + [12.0673, 0.0022, 0.7274], + [13.6096, 0.0012, 0.7395], + [15.1334, 0.0004, 0.7509], + [16.6911, 0.0013, 0.7371], + [18.2255, 0.0005, 0.751], + [19.7847, 0.001, 0.7412], + [21.3395, 0.0008, 0.746] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json index e1ac403ed3b..05eca2a4a3d 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p20/2_2.json @@ -38,6 +38,36 @@ [18.221, 0.0007, 0.7466], [19.7746, 0.0009, 0.7434], [21.3288, 0.0008, 0.7455] + ], + "default": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] ] }, "dispense": { @@ -70,6 +100,36 @@ [18.221, 0.0007, 0.7466], [19.7746, 0.0009, 0.7434], [21.3288, 0.0008, 0.7455] + ], + "default": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] ] }, "defaultTipOverlapDictionary": { @@ -203,6 +263,36 @@ [18.221, 0.0007, 0.7466], [19.7746, 0.0009, 0.7434], [21.3288, 0.0008, 0.7455] + ], + "default": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] ] }, "dispense": { @@ -325,6 +415,36 @@ [18.221, 0.0007, 0.7466], [19.7746, 0.0009, 0.7434], [21.3288, 0.0008, 0.7455] + ], + "default": [ + [0.8679, 0.1607, 0.5953], + [1.0259, 0.1345, 0.5032], + [1.1863, 0.1113, 0.527], + [1.3419, 0.0766, 0.5682], + [1.4882, 0.0377, 0.6204], + [1.6413, 0.0482, 0.6047], + [1.7935, 0.039, 0.6199], + [1.9447, 0.0313, 0.6336], + [2.0929, 0.021, 0.6538], + [2.4644, 0.0174, 0.6612], + [2.8527, 0.0233, 0.6466], + [3.2241, 0.0089, 0.6878], + [3.6095, 0.0141, 0.671], + [3.9964, 0.0122, 0.6779], + [4.3696, 0.0044, 0.7088], + [4.7483, 0.0059, 0.7026], + [5.1447, 0.0112, 0.6772], + [5.9135, 0.0055, 0.7066], + [7.4416, 0.0033, 0.7199], + [8.9724, 0.0023, 0.7269], + [10.5091, 0.0019, 0.7305], + [12.0515, 0.0017, 0.7331], + [13.6004, 0.0015, 0.7349], + [15.142, 0.001, 0.7422], + [16.679, 0.0007, 0.7469], + [18.221, 0.0007, 0.7466], + [19.7746, 0.0009, 0.7434], + [21.3288, 0.0008, 0.7455] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json index 71a93d69f41..4e0e3a5aad7 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json @@ -22,6 +22,13 @@ [73.90077516, 0.008, 17.902], [111.8437953, 0.004, 18.153], [302.3895337, 0.001, 18.23] + ], + "default": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] ] }, "dispense": { @@ -30,6 +37,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { @@ -51,11 +61,21 @@ [73.90077516, 0.008, 17.902], [111.8437953, 0.004, 18.153], [302.3895337, 0.001, 18.23] + ], + "default": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json index 71a93d69f41..4e0e3a5aad7 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json @@ -22,6 +22,13 @@ [73.90077516, 0.008, 17.902], [111.8437953, 0.004, 18.153], [302.3895337, 0.001, 18.23] + ], + "default": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] ] }, "dispense": { @@ -30,6 +37,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { @@ -51,11 +61,21 @@ [73.90077516, 0.008, 17.902], [111.8437953, 0.004, 18.153], [302.3895337, 0.001, 18.23] + ], + "default": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json index 71a93d69f41..4e0e3a5aad7 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json @@ -22,6 +22,13 @@ [73.90077516, 0.008, 17.902], [111.8437953, 0.004, 18.153], [302.3895337, 0.001, 18.23] + ], + "default": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] ] }, "dispense": { @@ -30,6 +37,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { @@ -51,11 +61,21 @@ [73.90077516, 0.008, 17.902], [111.8437953, 0.004, 18.153], [302.3895337, 0.001, 18.23] + ], + "default": [ + [36.19844973, 0.043, 16.548], + [54.98518519, 0.012, 17.658], + [73.90077516, 0.008, 17.902], + [111.8437953, 0.004, 18.153], + [302.3895337, 0.001, 18.23] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json index e6304eefd7b..c5c9e00b55d 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json @@ -24,6 +24,14 @@ [148.3020792, 0.005910516464, 17.6612], [224.5387262, 0.00227975152, 18.1997], [301.049323, 0.001359578667, 18.4063] + ], + "default": [ + [35.11266179, 0.03721315938, 16.2497], + [44.37338506, 0.02084320206, 16.8245], + [63.12001468, 0.01519931266, 17.0749], + [148.3020792, 0.005910516464, 17.6612], + [224.5387262, 0.00227975152, 18.1997], + [301.049323, 0.001359578667, 18.4063] ] }, "dispense": { @@ -32,6 +40,9 @@ ], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { @@ -54,11 +65,22 @@ [148.3020792, 0.005910516464, 17.6612], [224.5387262, 0.00227975152, 18.1997], [301.049323, 0.001359578667, 18.4063] + ], + "default": [ + [35.11266179, 0.03721315938, 16.2497], + [44.37338506, 0.02084320206, 16.8245], + [63.12001468, 0.01519931266, 17.0749], + [148.3020792, 0.005910516464, 17.6612], + [224.5387262, 0.00227975152, 18.1997], + [301.049323, 0.001359578667, 18.4063] ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] + ], + "default": [ + [302.3895337, 0.0, 18.83156277] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json index a6d62856c24..f8836006224 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_0.json @@ -39,6 +39,37 @@ [277.0, 0.0002951, 9.15], [295.8, 0.0006016, 9.066], [305.2, 0.0005193, 9.091] + ], + "default": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] ] }, "dispense": { @@ -72,6 +103,37 @@ [277.0, 0.0002951, 9.15], [295.8, 0.0006016, 9.066], [305.2, 0.0005193, 9.091] + ], + "default": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] ] }, "defaultTipOverlapDictionary": { @@ -116,6 +178,37 @@ [277.0, 0.0002951, 9.15], [295.8, 0.0006016, 9.066], [305.2, 0.0005193, 9.091] + ], + "default": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] ] }, "dispense": { @@ -149,6 +242,37 @@ [277.0, 0.0002951, 9.15], [295.8, 0.0006016, 9.066], [305.2, 0.0005193, 9.091] + ], + "default": [ + [15.0, 0.03765, 8.267], + [16.85, 0.04986, 7.5856], + [25.87, 0.022, 8.056], + [30.38, 0.01239, 8.304], + [34.94, 0.0119, 8.312], + [39.55, 0.0118, 8.322], + [44.17, 0.009613, 8.409], + [53.34, 0.006137, 8.56], + [62.58, 0.005383, 8.603], + [71.88, 0.004954, 8.629], + [81.14, 0.003271, 8.75], + [90.51, 0.003783, 8.709], + [99.77, 0.002023, 8.868], + [109.1, 0.002414, 8.829], + [118.5, 0.002089, 8.865], + [127.7, 0.001333, 8.954], + [137.1, 0.00156, 8.925], + [146.4, 0.00137, 8.952], + [155.7, 0.0009013, 9.02], + [165.1, 0.001024, 9.001], + [174.4, 0.0007312, 9.049], + [183.7, 0.000922, 9.016], + [202.4, 0.0006839, 9.05948], + [221.0, 0.0006408, 9.068], + [239.7, 0.0005434, 9.09], + [258.4, 0.0004064, 9.123], + [277.0, 0.0002951, 9.15], + [295.8, 0.0006016, 9.066], + [305.2, 0.0005193, 9.091] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json index 9c3f676b9a2..e031e99f853 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/2_1.json @@ -39,6 +39,37 @@ [278.4011, 0.0002, 9.2108], [297.4147, 0.0007, 9.0725], [306.8498, 0.0005, 9.1596] + ], + "default": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] ] }, "dispense": { @@ -72,6 +103,37 @@ [278.4011, 0.0002, 9.2108], [297.4147, 0.0007, 9.0725], [306.8498, 0.0005, 9.1596] + ], + "default": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] ] }, "defaultTipOverlapDictionary": { @@ -116,6 +178,37 @@ [278.4011, 0.0002, 9.2108], [297.4147, 0.0007, 9.0725], [306.8498, 0.0005, 9.1596] + ], + "default": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] ] }, "dispense": { @@ -149,6 +242,37 @@ [278.4011, 0.0002, 9.2108], [297.4147, 0.0007, 9.0725], [306.8498, 0.0005, 9.1596] + ], + "default": [ + [14.7756, 0.0665, 8.0865], + [16.5924, 0.0482, 7.4964], + [25.7471, 0.0313, 7.7776], + [30.3716, 0.0206, 8.0522], + [35.0387, 0.0176, 8.1435], + [39.6218, 0.0099, 8.4143], + [44.2371, 0.0092, 8.4393], + [53.5373, 0.0081, 8.4885], + [62.8398, 0.0058, 8.6108], + [72.1873, 0.005, 8.6658], + [81.5098, 0.0036, 8.7661], + [90.8491, 0.003, 8.8099], + [100.1749, 0.0023, 8.8716], + [109.5784, 0.0026, 8.8434], + [118.9531, 0.002, 8.9129], + [128.3267, 0.0017, 8.9478], + [137.6582, 0.0012, 9.0146], + [147.0504, 0.0014, 8.9803], + [156.4156, 0.0011, 9.0295], + [165.7858, 0.001, 9.0439], + [175.1029, 0.0006, 9.1103], + [184.4962, 0.0009, 9.0506], + [203.316, 0.0009, 9.0599], + [222.0502, 0.0006, 9.1282], + [240.872, 0.0006, 9.108], + [259.7109, 0.0006, 9.1226], + [278.4011, 0.0002, 9.2108], + [297.4147, 0.0007, 9.0725], + [306.8498, 0.0005, 9.1596] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json index a0a4f5619e9..db1897913a2 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_0.json @@ -16,12 +16,20 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [11.79687499, -0.0098, 3.064988953], [50.0, -0.0004, 2.954068131] + ], + "default": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] + ], + "default": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "defaultTipOverlapDictionary": { @@ -40,10 +48,15 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [11.79687499, -0.0098, 3.064988953], [50.0, -0.0004, 2.954068131] + ], + "default": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "dispense": { - "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]], + "default": [[50.0, 0.0, 2.931601299]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json index a0a4f5619e9..1988308030f 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json @@ -16,12 +16,19 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [11.79687499, -0.0098, 3.064988953], [50.0, -0.0004, 2.954068131] + ], + "default": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] + ], + "default": [ + [50.0, 0.0, 2.931601299] ] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json index a0a4f5619e9..1b5646fbca8 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json @@ -16,12 +16,19 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [11.79687499, -0.0098, 3.064988953], [50.0, -0.0004, 2.954068131] + ], + "default": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] + ], + "default": [ + [50.0, 0.0, 2.931601299] ] }, "defaultTipOverlapDictionary": { @@ -40,10 +47,15 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [11.79687499, -0.0098, 3.064988953], [50.0, -0.0004, 2.954068131] + ], + "default": [ + [11.79687499, -0.0098, 3.064988953], + [50.0, -0.0004, 2.954068131] ] }, "dispense": { - "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]], + "default": [[50.0, 0.0, 2.931601299]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json index a826ee3803b..3e87e37ee7c 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json @@ -24,12 +24,23 @@ [35.954444, 0.003367098915, 2.8751], [42.075889, 0.001505686352, 2.9421], [50.0, 0.001091358226, 2.9595] + ], + "default": [ + [5.762111167, 0.02912395377, 2.7132], + [7.208999967, 0.001758534127, 2.8709], + [10.18300033, 0.008684827443, 2.821], + [35.954444, 0.003367098915, 2.8751], + [42.075889, 0.001505686352, 2.9421], + [50.0, 0.001091358226, 2.9595] ] }, "dispense": { "opentrons/tipone_96_tiprack_200ul/1": [[50.0, 0.0, 2.931601299]], "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] + ], + "default": [ + [50.0, 0.0, 2.931601299] ] }, "defaultTipOverlapDictionary": { @@ -52,10 +63,19 @@ [35.954444, 0.003367098915, 2.8751], [42.075889, 0.001505686352, 2.9421], [50.0, 0.001091358226, 2.9595] + ], + "default": [ + [5.762111167, 0.02912395377, 2.7132], + [7.208999967, 0.001758534127, 2.8709], + [10.18300033, 0.008684827443, 2.821], + [35.954444, 0.003367098915, 2.8751], + [42.075889, 0.001505686352, 2.9421], + [50.0, 0.001091358226, 2.9595] ] }, "dispense": { - "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]] + "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 2.931601299]], + "default": [[50.0, 0.0, 2.931601299]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 From df47c61e4b01313ff4ef7dd5985011a05c2ed4a2 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 16:57:10 -0500 Subject: [PATCH 12/13] fix up tests to use correct pipette version --- .../opentrons/config/test_ot3_pipette_config.py | 10 +++++++--- .../hardware_control/test_instruments.py | 6 +++--- .../opentrons/hardware_control/test_ot3_api.py | 16 ++++++++-------- .../hardware_control/test_ot3_transforms.py | 4 ++-- .../opentrons/hardware_control/test_pipette.py | 8 ++++---- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/api/tests/opentrons/config/test_ot3_pipette_config.py b/api/tests/opentrons/config/test_ot3_pipette_config.py index 0f02bb2cc31..2f64f4ad621 100644 --- a/api/tests/opentrons/config/test_ot3_pipette_config.py +++ b/api/tests/opentrons/config/test_ot3_pipette_config.py @@ -21,10 +21,14 @@ def test_multiple_tip_configurations() -> None: model_version = pc.PipetteModelVersionType( PipetteModelType.p1000, PipetteChannelType.EIGHT_CHANNEL, - PipetteVersionType(1, 0), + PipetteVersionType(3, 3), ) loaded_configuration = pc.load_ot3_pipette(model_version) - assert list(loaded_configuration.supported_tips.keys()) == list(PipetteTipType) + assert list(loaded_configuration.supported_tips.keys()) == [ + PipetteTipType.t50, + PipetteTipType.t200, + PipetteTipType.t1000, + ] assert isinstance( loaded_configuration.supported_tips[PipetteTipType.t50], SupportedTipsDefinition, @@ -33,7 +37,7 @@ def test_multiple_tip_configurations() -> None: @pytest.mark.parametrize( argnames=["model", "channels", "version"], - argvalues=[["p50", 8, (1, 0)], ["p1000", 96, (1, 0)], ["p50", 1, (1, 0)]], + argvalues=[["p50", 8, (3, 3)], ["p1000", 96, (3, 3)], ["p50", 1, (1, 0)]], ) def test_load_full_pipette_configurations( model: str, channels: int, version: Tuple[int, int] diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py index cc1d8ce1e82..c3d7e179ba3 100644 --- a/api/tests/opentrons/hardware_control/test_instruments.py +++ b/api/tests/opentrons/hardware_control/test_instruments.py @@ -45,7 +45,7 @@ def dummy_instruments(): def dummy_instruments_attached_ot3(): return { types.Mount.LEFT: { - "model": "p1000_single_v3.0", + "model": "p1000_single_v3.3", "id": "testy", "name": "p1000_single_gen3", }, @@ -673,12 +673,12 @@ async def test_blowout_flow_rate(sim_and_instr): async def test_reset_instruments(monkeypatch, sim_and_instr): instruments = { types.Mount.LEFT: { - "model": "p1000_single_v3.0", + "model": "p1000_single_v3.3", "id": "testy", "name": "p1000_single_gen3", }, types.Mount.RIGHT: { - "model": "p1000_single_v3.0", + "model": "p1000_single_v3.3", "id": "testy", "name": "p1000_single_gen3", }, diff --git a/api/tests/opentrons/hardware_control/test_ot3_api.py b/api/tests/opentrons/hardware_control/test_ot3_api.py index 26dbf187458..9aa3d12b427 100644 --- a/api/tests/opentrons/hardware_control/test_ot3_api.py +++ b/api/tests/opentrons/hardware_control/test_ot3_api.py @@ -162,8 +162,8 @@ async def mock_instrument_handlers( ( ( { - OT3Mount.RIGHT: {"channels": 8, "version": (1, 0), "model": "p50"}, - OT3Mount.LEFT: {"channels": 1, "version": (1, 0), "model": "p1000"}, + OT3Mount.RIGHT: {"channels": 8, "version": (3, 3), "model": "p50"}, + OT3Mount.LEFT: {"channels": 1, "version": (3, 3), "model": "p1000"}, }, GantryLoad.TWO_LOW_THROUGHPUT, ), @@ -173,34 +173,34 @@ async def mock_instrument_handlers( GantryLoad.GRIPPER, ), ( - {OT3Mount.LEFT: {"channels": 8, "version": (1, 0), "model": "p1000"}}, + {OT3Mount.LEFT: {"channels": 8, "version": (3, 3), "model": "p1000"}}, GantryLoad.LOW_THROUGHPUT, ), ( - {OT3Mount.RIGHT: {"channels": 8, "version": (1, 0), "model": "p1000"}}, + {OT3Mount.RIGHT: {"channels": 8, "version": (3, 3), "model": "p1000"}}, GantryLoad.LOW_THROUGHPUT, ), ( - {OT3Mount.LEFT: {"channels": 96, "model": "p1000", "version": (1, 0)}}, + {OT3Mount.LEFT: {"channels": 96, "model": "p1000", "version": (3, 3)}}, GantryLoad.HIGH_THROUGHPUT, ), ( { - OT3Mount.LEFT: {"channels": 1, "version": (1, 0), "model": "p1000"}, + OT3Mount.LEFT: {"channels": 1, "version": (3, 3), "model": "p1000"}, OT3Mount.GRIPPER: {"model": GripperModel.v1, "id": "g12345"}, }, GantryLoad.LOW_THROUGHPUT, ), ( { - OT3Mount.RIGHT: {"channels": 8, "version": (1, 0), "model": "p1000"}, + OT3Mount.RIGHT: {"channels": 8, "version": (3, 3), "model": "p1000"}, OT3Mount.GRIPPER: {"model": GripperModel.v1, "id": "g12345"}, }, GantryLoad.LOW_THROUGHPUT, ), ( { - OT3Mount.LEFT: {"channels": 96, "model": "p1000", "version": (1, 0)}, + OT3Mount.LEFT: {"channels": 96, "model": "p1000", "version": (3, 3)}, OT3Mount.GRIPPER: {"model": GripperModel.v1, "id": "g12345"}, }, GantryLoad.HIGH_THROUGHPUT, diff --git a/api/tests/opentrons/hardware_control/test_ot3_transforms.py b/api/tests/opentrons/hardware_control/test_ot3_transforms.py index 1a63a918698..1f26e21c580 100644 --- a/api/tests/opentrons/hardware_control/test_ot3_transforms.py +++ b/api/tests/opentrons/hardware_control/test_ot3_transforms.py @@ -7,7 +7,7 @@ @pytest.mark.parametrize( - "pipette_model", ["p1000_single_v3.0", "p1000_single_v3.1", "p50_multi_v3.1"] + "pipette_model", ["p1000_single_v3.3", "p1000_single_v3.3", "p50_multi_v3.3"] ) async def test_transforms_roundtrip(pipette_model): attached = { @@ -30,7 +30,7 @@ async def test_transforms_roundtrip(pipette_model): @pytest.mark.parametrize( - "pipette_model", ["p1000_single_v3.0", "p50_single_v3.1", "p1000_multi_v3.1"] + "pipette_model", ["p1000_single_v3.3", "p50_single_v3.3", "p1000_multi_v3.3"] ) async def test_transform_values(pipette_model): attached = { diff --git a/api/tests/opentrons/hardware_control/test_pipette.py b/api/tests/opentrons/hardware_control/test_pipette.py index 4ad6d7babc7..9ab4c0734f7 100644 --- a/api/tests/opentrons/hardware_control/test_pipette.py +++ b/api/tests/opentrons/hardware_control/test_pipette.py @@ -89,7 +89,7 @@ def test_tip_tracking( [lazy_fixture("hardware_pipette_ot2"), "p10_single_v1", Point(0, 0, 12.0)], [ lazy_fixture("hardware_pipette_ot3"), - ot3_pipette_config.convert_pipette_model("p1000_single_v1.0"), + ot3_pipette_config.convert_pipette_model("p1000_single_v3.3"), Point(-8.0, -22.0, -259.15), ], ], @@ -277,19 +277,19 @@ def test_flow_rate_setting( ], [ lazy_fixture("hardware_pipette_ot3"), - ot3_pipette_config.convert_pipette_model("p1000_single_v1.0"), + ot3_pipette_config.convert_pipette_model("p1000_single_v3.3"), Point(-8.0, -22.0, -259.15), Point(-8.0, -22.0, -259.15), ], [ lazy_fixture("hardware_pipette_ot3"), - ot3_pipette_config.convert_pipette_model("p1000_multi_v1.0"), + ot3_pipette_config.convert_pipette_model("p1000_multi_v3.3"), Point(-8.0, -47.5, -259.15), Point(-8.0, -79.0, -259.15), ], [ lazy_fixture("hardware_pipette_ot3"), - ot3_pipette_config.convert_pipette_model("p1000_96", "1.0"), + ot3_pipette_config.convert_pipette_model("p1000_96", "3.3"), Point(13.5, -46.5, -259.15), Point(-36.0, -88.5, -259.15), ], From 2f018799b53b24347b010a7c08d9a72e2add15d6 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Tue, 14 Feb 2023 17:13:20 -0500 Subject: [PATCH 13/13] js formatting --- .../definitions/2/liquid/eight_channel/p10/1_3.json | 4 +--- .../definitions/2/liquid/eight_channel/p10/1_4.json | 4 +--- .../definitions/2/liquid/eight_channel/p10/1_5.json | 4 +--- .../definitions/2/liquid/eight_channel/p10/1_6.json | 4 +--- .../definitions/2/liquid/eight_channel/p300/1_0.json | 4 +--- .../definitions/2/liquid/eight_channel/p300/1_3.json | 8 ++------ .../definitions/2/liquid/eight_channel/p300/1_4.json | 8 ++------ .../definitions/2/liquid/eight_channel/p300/1_5.json | 8 ++------ .../definitions/2/liquid/eight_channel/p50/1_0.json | 6 ++---- .../definitions/2/liquid/eight_channel/p50/1_3.json | 4 +--- .../definitions/2/liquid/eight_channel/p50/1_4.json | 10 ++++------ .../definitions/2/liquid/eight_channel/p50/1_5.json | 4 +--- .../definitions/2/liquid/single_channel/p10/1_0.json | 4 +++- .../definitions/2/liquid/single_channel/p10/1_3.json | 4 +++- .../definitions/2/liquid/single_channel/p10/1_5.json | 4 +++- .../definitions/2/liquid/single_channel/p1000/1_0.json | 4 +--- .../definitions/2/liquid/single_channel/p1000/1_3.json | 4 +--- .../definitions/2/liquid/single_channel/p1000/1_4.json | 4 +--- .../definitions/2/liquid/single_channel/p1000/1_5.json | 4 +--- .../definitions/2/liquid/single_channel/p300/1_0.json | 8 ++------ .../definitions/2/liquid/single_channel/p300/1_3.json | 8 ++------ .../definitions/2/liquid/single_channel/p300/1_4.json | 8 ++------ .../definitions/2/liquid/single_channel/p300/1_5.json | 8 ++------ .../definitions/2/liquid/single_channel/p50/1_3.json | 4 +--- .../definitions/2/liquid/single_channel/p50/1_4.json | 4 +--- .../definitions/2/liquid/single_channel/p50/1_5.json | 4 +--- 26 files changed, 43 insertions(+), 97 deletions(-) diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json index a4830da147a..da561f74506 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_3.json @@ -51,9 +51,7 @@ "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] ], - "default": [ - [12.74444519, 0.0, 0.8058688085] - ] + "default": [[12.74444519, 0.0, 0.8058688085]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json index a4830da147a..da561f74506 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_4.json @@ -51,9 +51,7 @@ "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] ], - "default": [ - [12.74444519, 0.0, 0.8058688085] - ] + "default": [[12.74444519, 0.0, 0.8058688085]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json index c309f90f051..a53b1e1706a 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_5.json @@ -56,9 +56,7 @@ "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] ], - "default": [ - [12.74444519, 0.0, 0.8058688085] - ] + "default": [[12.74444519, 0.0, 0.8058688085]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json index bd7cfef820e..76e8e7a3a74 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/1_6.json @@ -96,9 +96,7 @@ "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ [12.74444519, 0.0, 0.8058688085] ], - "default": [ - [12.74444519, 0.0, 0.8058688085] - ] + "default": [[12.74444519, 0.0, 0.8058688085]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_10ul/1": 3.29, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json index e886fbff272..aeca2b99f79 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_0.json @@ -29,9 +29,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json index 2bb15aa982e..03632855fe1 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_3.json @@ -29,9 +29,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -59,9 +57,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json index 2bb15aa982e..03632855fe1 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_4.json @@ -29,9 +29,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -59,9 +57,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json index 2bb15aa982e..03632855fe1 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p300/1_5.json @@ -29,9 +29,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -59,9 +57,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [309.2612689, 0.0, 19.29389273] ], - "default": [ - [309.2612689, 0.0, 19.29389273] - ] + "default": [[309.2612689, 0.0, 19.29389273]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json index 44a6d1aaa37..3294dd0164d 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_0.json @@ -27,9 +27,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] ], - "default": [ - [50.0, 0.0, 3.06368702] - ] + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -48,7 +46,7 @@ [12.29687531, -0.0049, 3.134703694], [50.0, -0.0002, 3.077116024] ], - "default": [ + "default": [ [12.29687531, -0.0049, 3.134703694], [50.0, -0.0002, 3.077116024] ] diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json index 5e893c97947..4811a3180eb 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_3.json @@ -27,9 +27,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] ], - "default": [ - [50.0, 0.0, 3.06368702] - ] + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json index 536e527299d..ba13da349c5 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_4.json @@ -23,9 +23,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] ], - "default": [ - [50.0, 0.0, 3.06368702] - ] + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -45,9 +43,9 @@ [50.0, -0.0002, 3.077116024] ], "default": [ - [12.29687531, -0.0049, 3.134703694], - [50.0, -0.0002, 3.077116024] - ] + [12.29687531, -0.0049, 3.134703694], + [50.0, -0.0002, 3.077116024] + ] }, "dispense": { "opentrons/opentrons_96_tiprack_300ul/1": [[50.0, 0.0, 3.06368702]], diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json index b1eca99289c..2a459450109 100644 --- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/1_5.json @@ -36,9 +36,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 3.06368702] ], - "default": [ - [50.0, 0.0, 3.06368702] - ] + "default": [[50.0, 0.0, 3.06368702]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json index 99d7cefc88c..92cfc940bca 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_0.json @@ -49,7 +49,9 @@ "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], - "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.5135, 0.0, 0.7945] + ], "default": [[12.5135, 0.0, 0.7945]] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json index 99d7cefc88c..92cfc940bca 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_3.json @@ -49,7 +49,9 @@ "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], - "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.5135, 0.0, 0.7945] + ], "default": [[12.5135, 0.0, 0.7945]] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json index 70d47e42e46..45552c83023 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p10/1_5.json @@ -49,7 +49,9 @@ "opentrons/opentrons_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/opentrons_96_filtertiprack_10ul/1": [[12.5135, 0.0, 0.7945]], "opentrons/geb_96_tiprack_10ul/1": [[12.5135, 0.0, 0.7945]], - "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [[12.5135, 0.0, 0.7945]], + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": [ + [12.5135, 0.0, 0.7945] + ], "default": [[12.5135, 0.0, 0.7945]] }, "defaultTipOverlapDictionary": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json index 49c656b1d85..488f914b3c1 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_0.json @@ -59,9 +59,7 @@ "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] ], - "default": [ - [1000.0, 0.0, 61.3275] - ] + "default": [[1000.0, 0.0, 61.3275]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json index 49c656b1d85..488f914b3c1 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_3.json @@ -59,9 +59,7 @@ "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] ], - "default": [ - [1000.0, 0.0, 61.3275] - ] + "default": [[1000.0, 0.0, 61.3275]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json index 49c656b1d85..488f914b3c1 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_4.json @@ -59,9 +59,7 @@ "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] ], - "default": [ - [1000.0, 0.0, 61.3275] - ] + "default": [[1000.0, 0.0, 61.3275]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json index 49c656b1d85..488f914b3c1 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/1_5.json @@ -59,9 +59,7 @@ "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": [ [1000.0, 0.0, 61.3275] ], - "default": [ - [1000.0, 0.0, 61.3275] - ] + "default": [[1000.0, 0.0, 61.3275]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json index 4e0e3a5aad7..16c472c3b59 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_0.json @@ -38,9 +38,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -74,9 +72,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json index 4e0e3a5aad7..16c472c3b59 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_3.json @@ -38,9 +38,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -74,9 +72,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json index 4e0e3a5aad7..16c472c3b59 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_4.json @@ -38,9 +38,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -74,9 +72,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json index c5c9e00b55d..6d92a11822f 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p300/1_5.json @@ -41,9 +41,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, @@ -79,9 +77,7 @@ "opentrons/opentrons_96_tiprack_300ul/1": [ [302.3895337, 0.0, 18.83156277] ], - "default": [ - [302.3895337, 0.0, 18.83156277] - ] + "default": [[302.3895337, 0.0, 18.83156277]] }, "defaultTipOverlapDictionary": { "opentrons/opentrons_96_tiprack_300ul/1": 7.47 diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json index 1988308030f..a0a82ba69ce 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_3.json @@ -27,9 +27,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] ], - "default": [ - [50.0, 0.0, 2.931601299] - ] + "default": [[50.0, 0.0, 2.931601299]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json index 1b5646fbca8..696c4d08e92 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_4.json @@ -27,9 +27,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] ], - "default": [ - [50.0, 0.0, 2.931601299] - ] + "default": [[50.0, 0.0, 2.931601299]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json index 3e87e37ee7c..b6305228c84 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/1_5.json @@ -39,9 +39,7 @@ "opentrons/opentrons_96_filtertiprack_200ul/1": [ [50.0, 0.0, 2.931601299] ], - "default": [ - [50.0, 0.0, 2.931601299] - ] + "default": [[50.0, 0.0, 2.931601299]] }, "defaultTipOverlapDictionary": { "opentrons/tipone_96_tiprack_200ul/1": 6.1,