From d800dea53c3e243f83dd0bc889aa5a44d688a32b Mon Sep 17 00:00:00 2001 From: Carlos-fernandez Date: Tue, 4 Dec 2018 10:47:29 -0500 Subject: [PATCH 1/2] fix(api): new p10s function added to config file Due to inaccuracy of the old function, this new function was calculated based on testing several pipettes. The function has been tested on the scale and the robot. --- .../hardware_control/test_instruments.py | 2 +- shared-data/robot-data/pipetteModelSpecs.json | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py index 66480e71b82..15cb2aabb10 100644 --- a/api/tests/opentrons/hardware_control/test_instruments.py +++ b/api/tests/opentrons/hardware_control/test_instruments.py @@ -115,7 +115,7 @@ async def test_aspirate(dummy_instruments, loop): aspirate_ul = 3.0 aspirate_rate = 2 await hw_api.aspirate(types.Mount.LEFT, aspirate_ul, aspirate_rate) - new_plunger_pos = 5.660769 + new_plunger_pos = 6.05285 assert hw_api.current_position(types.Mount.LEFT)[Axis.B] == new_plunger_pos diff --git a/shared-data/robot-data/pipetteModelSpecs.json b/shared-data/robot-data/pipetteModelSpecs.json index be2bc413c40..b7745065c55 100644 --- a/shared-data/robot-data/pipetteModelSpecs.json +++ b/shared-data/robot-data/pipetteModelSpecs.json @@ -14,11 +14,11 @@ "dropTipCurrent": 0.5, "ulPerMm": { "aspirate": [ - [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] + [1.438649211, 0.01931415115, 0.691538317], + [1.836824579, 0.03868955123, 0.6636639129], + [2.960052684, 0.00470371018, 0.7260899411], + [4.487508789, 0.005175245625, 0.7246941713], + [10.59661421, 0.001470408978, 0.7413196584] ], "dispense": [ [12.5135, 0, 0.7945] @@ -42,11 +42,11 @@ "dropTipCurrent": 0.5, "ulPerMm": { "aspirate": [ - [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] + [1.438649211, 0.01931415115, 0.691538317], + [1.836824579, 0.03868955123, 0.6636639129], + [2.960052684, 0.00470371018, 0.7260899411], + [4.487508789, 0.005175245625, 0.7246941713], + [10.59661421, 0.001470408978, 0.7413196584] ], "dispense": [ [12.5135, 0, 0.7945] @@ -70,11 +70,11 @@ "dropTipCurrent": 0.5, "ulPerMm": { "aspirate": [ - [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] + [1.438649211, 0.01931415115, 0.691538317], + [1.836824579, 0.03868955123, 0.6636639129], + [2.960052684, 0.00470371018, 0.7260899411], + [4.487508789, 0.005175245625, 0.7246941713], + [10.59661421, 0.001470408978, 0.7413196584] ], "dispense": [ [12.5135, 0, 0.7945] From 20eb7ae9671c30d7fe01e832574f96c6584bb1b3 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Wed, 5 Dec 2018 11:01:57 -0500 Subject: [PATCH 2/2] fixup(api): trailing whitespace --- api/tests/opentrons/hardware_control/test_instruments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py index 15cb2aabb10..6746b674353 100644 --- a/api/tests/opentrons/hardware_control/test_instruments.py +++ b/api/tests/opentrons/hardware_control/test_instruments.py @@ -115,7 +115,7 @@ async def test_aspirate(dummy_instruments, loop): aspirate_ul = 3.0 aspirate_rate = 2 await hw_api.aspirate(types.Mount.LEFT, aspirate_ul, aspirate_rate) - new_plunger_pos = 6.05285 + new_plunger_pos = 6.05285 assert hw_api.current_position(types.Mount.LEFT)[Axis.B] == new_plunger_pos