Skip to content

Commit 6572703

Browse files
give 96ch the same homing current as run
1 parent 586e986 commit 6572703

File tree

8 files changed

+21
-6
lines changed

8 files changed

+21
-6
lines changed

api/src/opentrons/hardware_control/ot3api.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,16 @@ async def _retrieve_home_position() -> Tuple[
13131313
await self._backend.home([axis], self.gantry_load)
13141314
else:
13151315
# both stepper and encoder positions are invalid, must home
1316+
if axis in Axis.pipette_axes():
1317+
# if we're homing a pipette for the first time, should do it
1318+
# at the homing current
1319+
mount = Axis.to_ot3_mount(axis)
1320+
instr = self._pipette_handler.hardware_instruments[mount]
1321+
1322+
if instr is not None:
1323+
await self._backend.set_active_current(
1324+
{axis: instr.plunger_motor_current.homing}
1325+
)
13161326
await self._backend.home([axis], self.gantry_load)
13171327

13181328
async def _home(self, axes: Sequence[Axis]) -> None:

shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"distance": 19.0
1212
},
1313
"dropTipConfigurations": { "current": 1.5, "speed": 5.5, "distance": 26.5 },
14-
"plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 0.0 },
14+
"plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 2.0 },
1515
"plungerPositionsConfigurations": {
1616
"default": {
1717
"top": 0,

shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"distance": 19.0
1212
},
1313
"dropTipConfigurations": { "current": 1.5, "speed": 5.5, "distance": 26.5 },
14-
"plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 0.0 },
14+
"plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 2.0 },
1515
"plungerPositionsConfigurations": {
1616
"default": {
1717
"top": 0,

shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"distance": 19.0
1212
},
1313
"dropTipConfigurations": { "current": 1.5, "speed": 5.5, "distance": 26.5 },
14-
"plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 0.0 },
14+
"plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 2.0 },
1515
"plungerPositionsConfigurations": {
1616
"default": {
1717
"top": 0,

shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"plungerMotorConfigurations": {
1919
"idle": 0.3,
2020
"run": 0.8,
21-
"homing": 0.0
21+
"homing": 0.8
2222
},
2323
"plungerPositionsConfigurations": {
2424
"default": {

shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"plungerMotorConfigurations": {
1919
"idle": 0.3,
2020
"run": 0.8,
21-
"homing": 0.0
21+
"homing": 0.8
2222
},
2323
"plungerPositionsConfigurations": {
2424
"default": {

shared-data/python/opentrons_shared_data/pipette/dev_types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ class PipetteModelSpec(TypedDict, total=False):
155155
pickUpPresses: PipetteCustomizableConfigElementInt
156156
pickUpSpeed: PipetteCustomizableConfigElementFloat
157157
plungerCurrent: PipetteCustomizableConfigElementFloat
158+
plungerHomingCurrent: float
158159
dropTipCurrent: PipetteCustomizableConfigElementFloat
159160
dropTipSpeed: PipetteCustomizableConfigElementFloat
160161
modelOffset: List[float]

shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ def _build_motor_configurations(
9797
if model_configurations:
9898
run = model_configurations["plungerCurrent"]["value"]
9999
idle = model_configurations.get("idleCurrent", run)
100+
homing = model_configurations.get("plungerHomingCurrent", run)
100101
else:
101102
print("Handling default plunger motor currents\n")
102103
idle = float(
@@ -105,7 +106,10 @@ def _build_motor_configurations(
105106
run = float(
106107
input("Please provide the default run current of the plunger motor\n")
107108
)
108-
return MotorConfigurations(idle=idle, run=run)
109+
homing = float(
110+
input("Please provide the default homing current of the plunger motor\n")
111+
)
112+
return MotorConfigurations(idle=idle, run=run, homing=homing)
109113

110114

111115
def _build_partial_tip_configurations(channels: int) -> PartialTipDefinition:

0 commit comments

Comments
 (0)