Skip to content

Commit

Permalink
fix(shared-data): Update low-volume accuracy functions and bottom plu…
Browse files Browse the repository at this point in the history 
…nger position (#13571)

* low-volume bottom plunger position is 61.5

* adds 8ch low-volume functions

* adds 1ch P50 low-volume function

* update python side test for changed values

---------

Co-authored-by: Seth Foster <[email protected]>
  • Loading branch information
@andySigler @sfoster1
andySigler and sfoster1 committed Sep 15, 2023
1 parent 11aeabb commit e121d3c
Show file tree
Hide file tree
Showing 17 changed files with 314 additions and 405 deletions.
2 changes: 1 addition & 1 deletion api/tests/opentrons/hardware_control/test_instruments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ async def test_configure_ot3(ot3_api_obj):
await hw_api.set_liquid_class(mount, "lowVolumeDefault")
await hw_api.prepare_for_aspirate(mount)
pos = await hw_api.current_position(mount)
assert pos[Axis.B] == pytest.approx(57.0)
assert pos[Axis.B] == pytest.approx(61.5)
assert hw_api._pipette_handler.get_pipette(OT3Mount.LEFT).push_out_volume == 7

await hw_api.set_liquid_class(mount, "default")
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.5,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 92.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.5,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 92.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.0,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 91.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.0,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 91.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.5,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 90.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.5,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 90.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.0,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 90.5
}
Expand Down
2 changes: 1 addition & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"lowVolumeDefault": {
"top": 0.0,
"bottom": 57.0,
"bottom": 61.5,
"blowout": 76.5,
"drop": 90.5
}
Expand Down
51 changes: 23 additions & 28 deletions shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,29 @@
"aspirate": {
"default": {
"1": [
[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]
[0.185, 0.6659, 0.0221],
[0.56, 0.5508, 0.0434],
[0.925, 0.3038, 0.1817],
[1.315, 0.1646, 0.3105],
[1.765, 0.0864, 0.4134],
[2.345, 0.0622, 0.456],
[2.59, 0.0593, 0.4627],
[2.82, -0.0052, 0.6298],
[2.97, -0.0412, 0.7315],
[3.09, -0.0194, 0.6665],
[3.335, 0.0099, 0.5762],
[3.675, 0.0539, 0.4294],
[3.905, 0.0558, 0.4226],
[4.525, 0.0488, 0.4497],
[5.2, 0.0167, 0.5951],
[6.595, 0.007, 0.6455],
[8.395, 0.0067, 0.6471],
[10.65, 0.0044, 0.6664],
[17.0, 0.0023, 0.6897],
[21.395, 0.0011, 0.7094],
[26.935, 0.0009, 0.7143],
[33.87, 0.0005, 0.7229],
[45.795, 0.0003, 0.7308]
]
}
},
Expand Down
102 changes: 46 additions & 56 deletions shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,68 +20,58 @@
"aspirate": {
"default": {
"1": [
[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]
[0.185, 0.6659, 0.0221],
[0.56, 0.5508, 0.0434],
[0.925, 0.3038, 0.1817],
[1.315, 0.1646, 0.3105],
[1.765, 0.0864, 0.4134],
[2.345, 0.0622, 0.456],
[2.59, 0.0593, 0.4627],
[2.82, -0.0052, 0.6298],
[2.97, -0.0412, 0.7315],
[3.09, -0.0194, 0.6665],
[3.335, 0.0099, 0.5762],
[3.675, 0.0539, 0.4294],
[3.905, 0.0558, 0.4226],
[4.525, 0.0488, 0.4497],
[5.2, 0.0167, 0.5951],
[6.595, 0.007, 0.6455],
[8.395, 0.0067, 0.6471],
[10.65, 0.0044, 0.6664],
[17.0, 0.0023, 0.6897],
[21.395, 0.0011, 0.7094],
[26.935, 0.0009, 0.7143],
[33.87, 0.0005, 0.7229],
[45.795, 0.0003, 0.7308]
]
}
},
"dispense": {
"default": {
"1": [
[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]
[0.185, 0.6659, 0.0221],
[0.56, 0.5508, 0.0434],
[0.925, 0.3038, 0.1817],
[1.315, 0.1646, 0.3105],
[1.765, 0.0864, 0.4134],
[2.345, 0.0622, 0.456],
[2.59, 0.0593, 0.4627],
[2.82, -0.0052, 0.6298],
[2.97, -0.0412, 0.7315],
[3.09, -0.0194, 0.6665],
[3.335, 0.0099, 0.5762],
[3.675, 0.0539, 0.4294],
[3.905, 0.0558, 0.4226],
[4.525, 0.0488, 0.4497],
[5.2, 0.0167, 0.5951],
[6.595, 0.007, 0.6455],
[8.395, 0.0067, 0.6471],
[10.65, 0.0044, 0.6664],
[17.0, 0.0023, 0.6897],
[21.395, 0.0011, 0.7094],
[26.935, 0.0009, 0.7143],
[33.87, 0.0005, 0.7229],
[45.795, 0.0003, 0.7308]
]
}
},
Expand Down
102 changes: 46 additions & 56 deletions shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,68 +20,58 @@
"aspirate": {
"default": {
"1": [
[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]
[0.185, 0.6659, 0.0221],
[0.56, 0.5508, 0.0434],
[0.925, 0.3038, 0.1817],
[1.315, 0.1646, 0.3105],
[1.765, 0.0864, 0.4134],
[2.345, 0.0622, 0.456],
[2.59, 0.0593, 0.4627],
[2.82, -0.0052, 0.6298],
[2.97, -0.0412, 0.7315],
[3.09, -0.0194, 0.6665],
[3.335, 0.0099, 0.5762],
[3.675, 0.0539, 0.4294],
[3.905, 0.0558, 0.4226],
[4.525, 0.0488, 0.4497],
[5.2, 0.0167, 0.5951],
[6.595, 0.007, 0.6455],
[8.395, 0.0067, 0.6471],
[10.65, 0.0044, 0.6664],
[17.0, 0.0023, 0.6897],
[21.395, 0.0011, 0.7094],
[26.935, 0.0009, 0.7143],
[33.87, 0.0005, 0.7229],
[45.795, 0.0003, 0.7308]
]
}
},
"dispense": {
"default": {
"1": [
[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]
[0.185, 0.6659, 0.0221],
[0.56, 0.5508, 0.0434],
[0.925, 0.3038, 0.1817],
[1.315, 0.1646, 0.3105],
[1.765, 0.0864, 0.4134],
[2.345, 0.0622, 0.456],
[2.59, 0.0593, 0.4627],
[2.82, -0.0052, 0.6298],
[2.97, -0.0412, 0.7315],
[3.09, -0.0194, 0.6665],
[3.335, 0.0099, 0.5762],
[3.675, 0.0539, 0.4294],
[3.905, 0.0558, 0.4226],
[4.525, 0.0488, 0.4497],
[5.2, 0.0167, 0.5951],
[6.595, 0.007, 0.6455],
[8.395, 0.0067, 0.6471],
[10.65, 0.0044, 0.6664],
[17.0, 0.0023, 0.6897],
[21.395, 0.0011, 0.7094],
[26.935, 0.0009, 0.7143],
[33.87, 0.0005, 0.7229],
[45.795, 0.0003, 0.7308]
]
}
},
Expand Down
Loading

0 comments on commit e121d3c

Please sign in to comment.