From ba96e9f63649eb9da2f4bca398882b7d870c28f0 Mon Sep 17 00:00:00 2001 From: Ryan howard Date: Thu, 1 Feb 2024 10:25:43 -0500 Subject: [PATCH] Revert "temp commit, will reverted (can be rebased away)" This reverts commit 17feea8629d8dea4c969f6177a3072da49af51e9. --- .../instruments/ot3/pipette.py | 7 +- .../protocol_api/core/engine/deck_conflict.py | 10 +- .../protocol_api/core/legacy/deck.py | 8 +- .../protocol_api/create_protocol_context.py | 6 +- .../deck/definitions/2/ot3_standard.json | 866 ------------------ .../single_channel/p50/default/3_5.json | 76 +- .../p50/lowVolumeDefault/3_5.json | 70 +- 7 files changed, 89 insertions(+), 954 deletions(-) delete mode 100644 shared-data/deck/definitions/2/ot3_standard.json diff --git a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py index 85787689304..2d36460ca69 100644 --- a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py +++ b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py @@ -427,11 +427,11 @@ def available_volume(self) -> float: def set_current_volume(self, new_volume: float) -> None: assert new_volume >= 0 - # assert new_volume <= self.working_volume + assert new_volume <= self.working_volume self._current_volume = new_volume def add_current_volume(self, volume_incr: float) -> None: - # assert self.ok_to_add_volume(volume_incr) + assert self.ok_to_add_volume(volume_incr) self._current_volume += volume_incr def remove_current_volume(self, volume_incr: float) -> None: @@ -439,8 +439,7 @@ def remove_current_volume(self, volume_incr: float) -> None: self._current_volume -= volume_incr def ok_to_add_volume(self, volume_incr: float) -> bool: - # return self.current_volume + volume_incr <= self.working_volume - return True + return self.current_volume + volume_incr <= self.working_volume def ok_to_push_out(self, push_out_dist_mm: float) -> bool: return push_out_dist_mm <= ( diff --git a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py index a89548afead..7ef2cfcbeac 100644 --- a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py +++ b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py @@ -223,12 +223,18 @@ def check_safe_for_tip_pickup_and_return( f" when picking up fewer than 96 tips." ) elif not is_partial_config and not is_96_ch_tiprack_adapter: - pass + raise UnsuitableTiprackForPipetteMotion( + f"{tiprack_name} must be on an Opentrons Flex 96 Tip Rack Adapter" + f" in order to pick up or return all 96 tips simultaneously." + ) elif ( not is_partial_config ): # tiprack is not on adapter and pipette is in full config - pass + raise UnsuitableTiprackForPipetteMotion( + f"{tiprack_name} must be on an Opentrons Flex 96 Tip Rack Adapter" + f" in order to pick up or return all 96 tips simultaneously." + ) def _check_deck_conflict_for_96_channel( diff --git a/api/src/opentrons/protocol_api/core/legacy/deck.py b/api/src/opentrons/protocol_api/core/legacy/deck.py index 1b21cac2516..ea4068934bd 100644 --- a/api/src/opentrons/protocol_api/core/legacy/deck.py +++ b/api/src/opentrons/protocol_api/core/legacy/deck.py @@ -48,11 +48,11 @@ def load_name(self) -> str: class Deck(UserDict): # type: ignore[type-arg] data: Dict[int, Optional[DeckItem]] - def __init__( - self, deck_type: str, version: int = DEFAULT_LEGACY_DECK_DEFINITION_VERSION - ) -> None: + def __init__(self, deck_type: str) -> None: super().__init__() - self._definition = load_deck(name=deck_type, version=version) + self._definition = load_deck( + name=deck_type, version=DEFAULT_LEGACY_DECK_DEFINITION_VERSION + ) self._positions = {} for slot in self._definition["locations"]["orderedSlots"]: self.data[int(slot["id"])] = None diff --git a/api/src/opentrons/protocol_api/create_protocol_context.py b/api/src/opentrons/protocol_api/create_protocol_context.py index 7d5047cc4bd..5a64e70cf99 100644 --- a/api/src/opentrons/protocol_api/create_protocol_context.py +++ b/api/src/opentrons/protocol_api/create_protocol_context.py @@ -22,7 +22,6 @@ from .core.common import ProtocolCore as AbstractProtocolCore from .core.legacy.deck import Deck as LegacyDeck -from opentrons_shared_data.deck import DEFAULT_DECK_DEFINITION_VERSION from .core.legacy.legacy_protocol_core import LegacyProtocolCore from .core.legacy.labware_offset_provider import ( AbstractLabwareOffsetProvider, @@ -53,7 +52,6 @@ def create_protocol_context( extra_labware: Optional[Dict[str, LabwareDefinition]] = None, bundled_labware: Optional[Dict[str, LabwareDefinition]] = None, bundled_data: Optional[Dict[str, bytes]] = None, - deck_version: int = DEFAULT_DECK_DEFINITION_VERSION, ) -> ProtocolContext: """Create a ProtocolContext for use in a Python protocol. @@ -123,7 +121,7 @@ def create_protocol_context( # TODO(mc, 2022-8-22): remove `disable_fast_protocol_upload` elif use_simulating_core and not feature_flags.disable_fast_protocol_upload(): - legacy_deck = LegacyDeck(deck_type=deck_type, version=deck_version) + legacy_deck = LegacyDeck(deck_type=deck_type) core = LegacyProtocolCoreSimulator( sync_hardware=sync_hardware, labware_offset_provider=labware_offset_provider, @@ -135,7 +133,7 @@ def create_protocol_context( ) else: - legacy_deck = LegacyDeck(deck_type=deck_type, version=deck_version) + legacy_deck = LegacyDeck(deck_type=deck_type) core = LegacyProtocolCore( sync_hardware=sync_hardware, labware_offset_provider=labware_offset_provider, diff --git a/shared-data/deck/definitions/2/ot3_standard.json b/shared-data/deck/definitions/2/ot3_standard.json deleted file mode 100644 index 8ad4397cba3..00000000000 --- a/shared-data/deck/definitions/2/ot3_standard.json +++ /dev/null @@ -1,866 +0,0 @@ -{ - "otId": "ot3_standard", - "schemaVersion": 3, - "cornerOffsetFromOrigin": [-204.31, -76.59, 0], - "dimensions": [854.995, 581.74, 0], - "metadata": { - "displayName": "OT-3 Standard Deck", - "tags": ["ot3", "12 slots", "standard"] - }, - "robot": { - "model": "OT-3 Standard" - }, - "locations": { - "orderedSlots": [ - { - "id": "1", - "position": [0.0, 0.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot D1", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "2", - "position": [164.0, 0.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot D2", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "3", - "position": [328.0, 0.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot D3", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "4", - "position": [0.0, 107, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot C1", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "5", - "position": [164.0, 107, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot C2", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "6", - "position": [328.0, 107, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot C3", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "7", - "position": [0.0, 214.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot B1", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "thermocyclerModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "8", - "position": [164.0, 214.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot B2", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "9", - "position": [328.0, 214.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot B3", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "10", - "position": [0.0, 321.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot A1", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "11", - "position": [164.0, 321.0, 0.0], - "matingSurfaceUnitVector": [-1, 1, -1], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot A2", - "compatibleModuleTypes": [ - "magneticModuleType", - "temperatureModuleType", - "heaterShakerModuleType" - ] - }, - { - "id": "12", - "position": [328.0, 321.0, 0.0], - "boundingBox": { - "xDimension": 128.0, - "yDimension": 86.0, - "zDimension": 0 - }, - "displayName": "Slot A3", - "compatibleModuleTypes": [] - } - ], - "calibrationPoints": [], - "fixtures": [ - { - "id": "fixedTrash", - "slot": "12", - "labware": "opentrons_1_trash_3200ml_fixed", - "displayName": "Fixed Trash" - } - ] - }, - "layers": [ - { - "name": "style", - "type": "element", - "value": "", - "attributes": { - "type": "text/css" - }, - "children": [ - { - "name": "", - "type": "text", - "value": "\n.st0{fill:#CCCCCC;}\n.st1{fill:none;stroke:#16212D;stroke-width:3.2047;stroke-opacity:0.7;}\n.st2{fill:none;stroke:#16212D;stroke-width:3.156;stroke-opacity:0.7;}\n", - "attributes": {}, - "children": [] - } - ] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_A1_EXPANSION", - "class": "st0", - "d": "M-97.8,496.6h239c2.3,0,4.2-1.9,4.2-4.2v-70c0-2.3-1.9-4.2-4.2-4.2h-239c-2.3,0-4.2,1.9-4.2,4.2v70\nC-102,494.7-100.1,496.6-97.8,496.6z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_A1", - "class": "st0", - "d": "M-97.7,417.1h238.8c2.4,0,4.3-1.9,4.3-4.3v-97.4c0-2.4-1.9-4.3-4.3-4.3H-97.7c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC-102,415.1-100.1,417.1-97.7,417.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_A2", - "class": "st0", - "d": "M150.8,417.1h154.3c2.4,0,4.3-1.9,4.3-4.3v-97.4c0-2.4-1.9-4.3-4.3-4.3H150.8c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC146.5,415.1,148.4,417.1,150.8,417.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_A3", - "class": "st0", - "d": "M314.8,417.1h238.9c2.4,0,4.3-1.9,4.3-4.3v-97.4c0-2.4-1.9-4.3-4.3-4.3H314.8c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC310.5,415.1,312.4,417.1,314.8,417.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_B1", - "class": "st0", - "d": "M-97.7,310h238.8c2.4,0,4.3-1.9,4.3-4.3v-97.2c0-2.4-1.9-4.3-4.3-4.3H-97.7c-2.4,0-4.3,1.9-4.3,4.3v97.2\nC-102,308.1-100.1,310-97.7,310z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_B2", - "class": "st0", - "d": "M150.8,310h154.3c2.4,0,4.3-1.9,4.3-4.3v-97.2c0-2.4-1.9-4.3-4.3-4.3H150.8c-2.4,0-4.3,1.9-4.3,4.3v97.2\nC146.5,308.1,148.4,310,150.8,310z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_B3", - "class": "st0", - "d": "M314.8,310h238.9c2.4,0,4.3-1.9,4.3-4.3v-97.2c0-2.4-1.9-4.3-4.3-4.3H314.8c-2.4,0-4.3,1.9-4.3,4.3v97.2\nC310.5,308.1,312.4,310,314.8,310z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_C1", - "class": "st0", - "d": "M-97.7,203.1h238.8c2.4,0,4.3-1.9,4.3-4.3v-97.4c0-2.4-1.9-4.3-4.3-4.3H-97.7c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC-102,201.2-100.1,203.1-97.7,203.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_C2", - "class": "st0", - "d": "M150.8,203.1h154.3c2.4,0,4.3-1.9,4.3-4.3v-97.4c0-2.4-1.9-4.3-4.3-4.3H150.8c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC146.5,201.2,148.4,203.1,150.8,203.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_C3", - "class": "st0", - "d": "M314.8,203.1h238.9c2.4,0,4.3-1.9,4.3-4.3v-97.4c0-2.4-1.9-4.3-4.3-4.3H314.8c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC310.5,201.2,312.4,203.1,314.8,203.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_D1", - "class": "st0", - "d": "M-97.7,96.1h238.8c2.4,0,4.3-1.9,4.3-4.3V-5.6c0-2.4-1.9-4.3-4.3-4.3H-97.7c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC-102,94.2-100.1,96.1-97.7,96.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_D2", - "class": "st0", - "d": "M150.8,96.1h154.3c2.4,0,4.3-1.9,4.3-4.3V-5.6c0-2.4-1.9-4.3-4.3-4.3H150.8c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC146.5,94.2,148.4,96.1,150.8,96.1z" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_BASE_D3", - "class": "st0", - "d": "M314.8,96.1h238.9c2.4,0,4.3-1.9,4.3-4.3V-5.6c0-2.4-1.9-4.3-4.3-4.3H314.8c-2.4,0-4.3,1.9-4.3,4.3v97.4\nC310.5,94.2,312.4,96.1,314.8,96.1z" - }, - "children": [] - }, - { - "name": "g", - "type": "element", - "value": "", - "attributes": { - "id": "SLOT_CLIPS" - }, - "children": [ - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M-1.9,398.9V409H8.9" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M-1.9,329.8v-10.5H8.7" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,398.9V409h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,329.8v-10.7h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M162.1,398.9V409h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M162.1,329.8v-10.5h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,398.9V409h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,329.8v-10.7h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M326,398.9V409h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M326,329.8v-10.5h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,398.9V409H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,329.8v-10.7H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M-1.9,291.9V302H8.9" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M-1.9,222.8v-10.5H8.7" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,291.9V302h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,222.8v-10.7h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M162.1,291.9V302h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M162.1,222.8v-10.5h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,291.9V302h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,222.8v-10.7h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M326,291.9V302h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M326,222.8v-10.5h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,291.9V302H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,222.8v-10.7H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M-1.9,185v10.1H8.9" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M-1.9,115.8v-10.5H8.7" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,185v10.1h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,115.8v-10.7h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M162.1,185v10.1h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M162.1,115.8v-10.5h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,185v10.1h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,115.8v-10.7h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M326,185v10.1h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M326,115.8v-10.5h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,185v10.1H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,115.8v-10.7H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M-1.9,77.9V88H8.9" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M-1.9,8.8V-1.7H8.7" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,77.9V88h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M129.9,8.8V-1.9h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M162.1,77.9V88h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M162.1,8.8V-1.7h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,77.9V88h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M293.9,8.8V-1.9h-10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M326,77.9V88h10.8" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st2", - "d": "M326,8.8V-1.7h10.6" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,77.9V88H447" - }, - "children": [] - }, - { - "name": "path", - "type": "element", - "value": "", - "attributes": { - "class": "st1", - "d": "M457.8,8.8V-1.9H447" - }, - "children": [] - } - ] - } - ] -} diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json index 5cd8acd6386..f89fb178b5f 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json @@ -20,50 +20,50 @@ "aspirate": { "default": { "1": [ - [0.3100,0.5910,0.0197], - [0.3900,0.2586,0.1227], - [0.8600,0.3697,0.0794], - [1.2900,0.2310,0.1987], - [1.9300,0.1144,0.3491], - [2.7000,0.0536,0.4664], - [2.9500,-0.1041,0.8923], - [3.2800,0.0216,0.5214], - [3.7600,0.0480,0.4349], - [4.3800,0.0830,0.3032], - [5.0800,0.0153,0.5996], - [5.9000,0.0136,0.6083], - [7.2900,0.0070,0.6474], - [9.0400,0.0059,0.6551], - [10.0800,0.0045,0.6682], - [13.7400,0.0029,0.6842], - [27.1500,0.0010,0.7104], - [50.4800,0.0002,0.7319], - [52.8900,-0.0006,0.7703] + [0.462, 0.5646, 0.0415], + [0.648, 0.3716, 0.1307], + [1.032, 0.2742, 0.1938], + [1.37, 0.1499, 0.3221], + [2.014, 0.1044, 0.3845], + [2.772, 0.0432, 0.5076], + [3.05, -0.0809, 0.8517], + [3.4, 0.0256, 0.5268], + [3.962, 0.0612, 0.4057], + [4.438, 0.0572, 0.4217], + [5.164, 0.018, 0.5955], + [5.966, 0.0095, 0.6393], + [7.38, 0.0075, 0.6514], + [9.128, 0.0049, 0.6705], + [10.16, 0.0033, 0.6854], + [13.812, 0.0024, 0.6948], + [27.204, 0.0008, 0.7165], + [50.614, 0.0002, 0.7328], + [53.046, -0.0005, 0.7676] ] } }, "dispense": { "default": { "1": [ - [0.3100,0.5910,0.0197], - [0.3900,0.2586,0.1227], - [0.8600,0.3697,0.0794], - [1.2900,0.2310,0.1987], - [1.9300,0.1144,0.3491], - [2.7000,0.0536,0.4664], - [2.9500,-0.1041,0.8923], - [3.2800,0.0216,0.5214], - [3.7600,0.0480,0.4349], - [4.3800,0.0830,0.3032], - [5.0800,0.0153,0.5996], - [5.9000,0.0136,0.6083], - [7.2900,0.0070,0.6474], - [9.0400,0.0059,0.6551], - [10.0800,0.0045,0.6682], - [13.7400,0.0029,0.6842], - [27.1500,0.0010,0.7104], - [50.4800,0.0002,0.7319], - [52.8900,-0.0006,0.7703] + [0.462, 0.5646, 0.0415], + [0.648, 0.3716, 0.1307], + [1.032, 0.2742, 0.1938], + [1.37, 0.1499, 0.3221], + [2.014, 0.1044, 0.3845], + [2.772, 0.0432, 0.5076], + [3.05, -0.0809, 0.8517], + [3.4, 0.0256, 0.5268], + [3.962, 0.0612, 0.4057], + [4.438, 0.0572, 0.4217], + [5.164, 0.018, 0.5955], + [5.966, 0.0095, 0.6393], + [7.38, 0.0075, 0.6514], + [9.128, 0.0049, 0.6705], + [10.16, 0.0033, 0.6854], + [13.812, 0.0024, 0.6948], + [27.204, 0.0008, 0.7165], + [50.614, 0.0002, 0.7328], + [53.046, -0.0005, 0.7676] ] } }, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json index 603a2cf8612..e925e4e401a 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json @@ -20,48 +20,46 @@ "aspirate": { "default": { "1": [ - [0.3000,0.4590,0.0586], - [0.4700,0.4300,0.0674], - [0.9000,0.3404,0.1095], - [1.2600,0.1925,0.2425], - [1.9500,0.1314,0.3195], - [2.7600,0.0604,0.4580], - [2.9500,-0.2085,1.2002], - [3.3300,0.0425,0.4597], - [3.8700,0.0592,0.4040], - [4.3100,0.0518,0.4327], - [5.0700,0.0264,0.5424], - [5.9300,0.0186,0.5818], - [7.3400,0.0078,0.6458], - [9.0800,0.0050,0.6664], - [10.0900,0.0022,0.6918], - [13.7400,0.0027,0.6868], - [27.1300,0.0009,0.7109], - [45.4300,-0.0038,0.8391] + [0.11, 0.207815, 0.040201], + [0.65, 0.43933, 0.014735], + [1.04, 0.256666, 0.133466], + [1.67, 0.147126, 0.247388], + [2.45, 0.078774, 0.361536], + [2.89, 0.042387, 0.450684], + [3.2, 0.014781, 0.530464], + [3.79, 0.071819, 0.347944], + [4.22, 0.051592, 0.424605], + [4.93, 0.021219, 0.552775], + [5.81, 0.023461, 0.541725], + [7.21, 0.008959, 0.625982], + [8.93, 0.005456, 0.651235], + [10.0, 0.007108, 0.636489], + [13.61, 0.002591, 0.681656], + [26.99, 0.001163, 0.701094], + [45.25, 0.000207, 0.726887] ] } }, "dispense": { "default": { "1": [ - [0.3000,0.4590,0.0586], - [0.4700,0.4300,0.0674], - [0.9000,0.3404,0.1095], - [1.2600,0.1925,0.2425], - [1.9500,0.1314,0.3195], - [2.7600,0.0604,0.4580], - [2.9500,-0.2085,1.2002], - [3.3300,0.0425,0.4597], - [3.8700,0.0592,0.4040], - [4.3100,0.0518,0.4327], - [5.0700,0.0264,0.5424], - [5.9300,0.0186,0.5818], - [7.3400,0.0078,0.6458], - [9.0800,0.0050,0.6664], - [10.0900,0.0022,0.6918], - [13.7400,0.0027,0.6868], - [27.1300,0.0009,0.7109], - [45.4300,-0.0038,0.8391] + [0.11, 0.207815, 0.040201], + [0.65, 0.43933, 0.014735], + [1.04, 0.256666, 0.133466], + [1.67, 0.147126, 0.247388], + [2.45, 0.078774, 0.361536], + [2.89, 0.042387, 0.450684], + [3.2, 0.014781, 0.530464], + [3.79, 0.071819, 0.347944], + [4.22, 0.051592, 0.424605], + [4.93, 0.021219, 0.552775], + [5.81, 0.023461, 0.541725], + [7.21, 0.008959, 0.625982], + [8.93, 0.005456, 0.651235], + [10.0, 0.007108, 0.636489], + [13.61, 0.002591, 0.681656], + [26.99, 0.001163, 0.701094], + [45.25, 0.000207, 0.726887] ] } },