diff --git a/api/src/opentrons/hardware_control/ot3api.py b/api/src/opentrons/hardware_control/ot3api.py index cab9acfa4ac..a3e08b53892 100644 --- a/api/src/opentrons/hardware_control/ot3api.py +++ b/api/src/opentrons/hardware_control/ot3api.py @@ -162,7 +162,7 @@ ) -TESTING_OVERSHOOT_MM = 0.04 # EDIT HERE (6/26) +TESTING_OVERSHOOT_MM = 0.00 # EDIT HERE (6/26) class OT3API( diff --git a/hardware-testing/hardware_testing/gravimetric/config.py b/hardware-testing/hardware_testing/gravimetric/config.py index af9ce565c69..f4a76eb7c2c 100644 --- a/hardware-testing/hardware_testing/gravimetric/config.py +++ b/hardware-testing/hardware_testing/gravimetric/config.py @@ -75,7 +75,7 @@ class PhotometricConfig(VolumetricConfig): LOW_VOLUME_UPPER_LIMIT_UL: Final = 2.0 -DELAY_AFTER_BACKLASH_96CH_LOW_VOLUMES = 3.0 # EDIT HERE (6/26) +DELAY_AFTER_BACKLASH_96CH_LOW_VOLUMES = 0.0 # EDIT HERE (6/26) TOUCH_TIP_SPEED = 30 diff --git a/hardware-testing/hardware_testing/gravimetric/liquid_class/defaults.py b/hardware-testing/hardware_testing/gravimetric/liquid_class/defaults.py index 4664cd54b80..a5e75171f29 100644 --- a/hardware-testing/hardware_testing/gravimetric/liquid_class/defaults.py +++ b/hardware-testing/hardware_testing/gravimetric/liquid_class/defaults.py @@ -14,7 +14,7 @@ _default_retract_mm = 5.0 _default_retract_discontinuity = 20 -_default_aspirate_delay_seconds = 3.0 # EDIT HERE (6/26) +_default_aspirate_delay_seconds = 0.0 # EDIT HERE (6/26) _default_dispense_delay_seconds = 0.5 _default_accel_p50_ul_sec_sec = 1200 diff --git a/shared-data/deck/definitions/2/ot3_standard.json b/shared-data/deck/definitions/2/ot3_standard.json new file mode 100644 index 00000000000..8ad4397cba3 --- /dev/null +++ b/shared-data/deck/definitions/2/ot3_standard.json @@ -0,0 +1,866 @@ +{ + "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": [] + } + ] + } + ] +}