From e4e99413cf661cfbe9d76a3ee3b5becb41a13dda Mon Sep 17 00:00:00 2001 From: caila-marashaj Date: Thu, 24 Aug 2023 11:32:42 -0400 Subject: [PATCH] removev api changes --- api/src/opentrons/hardware_control/ot3api.py | 14 ++----------- .../2/general/eight_channel/p10/1_0.json | 17 +++------------ .../2/general/eight_channel/p10/1_3.json | 17 +++------------ .../2/general/eight_channel/p10/1_4.json | 17 +++------------ .../2/general/eight_channel/p10/1_5.json | 18 +++------------- .../2/general/eight_channel/p10/1_6.json | 18 +++------------- .../2/general/eight_channel/p1000/1_0.json | 19 +++-------------- .../2/general/eight_channel/p1000/3_0.json | 19 +++-------------- .../2/general/eight_channel/p1000/3_3.json | 19 +++-------------- .../2/general/eight_channel/p1000/3_4.json | 19 +++-------------- .../2/general/eight_channel/p1000/3_5.json | 19 +++-------------- .../2/general/eight_channel/p20/2_0.json | 17 +++------------ .../2/general/eight_channel/p20/2_1.json | 17 +++------------ .../2/general/eight_channel/p300/1_0.json | 17 +++------------ .../2/general/eight_channel/p300/1_3.json | 17 +++------------ .../2/general/eight_channel/p300/1_4.json | 17 +++------------ .../2/general/eight_channel/p300/1_5.json | 18 +++------------- .../2/general/eight_channel/p300/2_0.json | 21 ++++--------------- .../2/general/eight_channel/p300/2_1.json | 21 ++++--------------- .../2/general/eight_channel/p50/1_0.json | 17 +++------------ .../2/general/eight_channel/p50/1_3.json | 17 +++------------ .../2/general/eight_channel/p50/1_4.json | 17 +++------------ .../2/general/eight_channel/p50/1_5.json | 18 +++------------- .../2/general/eight_channel/p50/3_0.json | 19 +++-------------- .../2/general/eight_channel/p50/3_3.json | 19 +++-------------- .../2/general/eight_channel/p50/3_4.json | 19 +++-------------- .../2/general/eight_channel/p50/3_5.json | 19 +++-------------- .../general/ninety_six_channel/p1000/1_0.json | 2 +- .../general/ninety_six_channel/p1000/3_0.json | 2 +- .../general/ninety_six_channel/p1000/3_3.json | 2 +- .../general/ninety_six_channel/p1000/3_4.json | 3 ++- .../general/ninety_six_channel/p1000/3_5.json | 3 ++- .../2/general/single_channel/p10/1_0.json | 6 ++---- .../2/general/single_channel/p10/1_3.json | 6 ++---- .../2/general/single_channel/p10/1_4.json | 6 ++---- .../2/general/single_channel/p10/1_5.json | 6 ++---- .../2/general/single_channel/p1000/1_0.json | 7 ++----- .../2/general/single_channel/p1000/1_3.json | 7 ++----- .../2/general/single_channel/p1000/1_4.json | 7 ++----- .../2/general/single_channel/p1000/1_5.json | 7 ++----- .../2/general/single_channel/p1000/2_0.json | 10 +++------ .../2/general/single_channel/p1000/2_1.json | 10 +++------ .../2/general/single_channel/p1000/2_2.json | 10 +++------ .../2/general/single_channel/p1000/3_0.json | 8 ++----- .../2/general/single_channel/p1000/3_3.json | 8 ++----- .../2/general/single_channel/p1000/3_4.json | 8 ++----- .../2/general/single_channel/p1000/3_5.json | 8 ++----- .../2/general/single_channel/p20/2_0.json | 6 ++---- .../2/general/single_channel/p20/2_1.json | 6 ++---- .../2/general/single_channel/p20/2_2.json | 6 ++---- .../2/general/single_channel/p300/1_0.json | 6 ++---- .../2/general/single_channel/p300/1_3.json | 6 ++---- .../2/general/single_channel/p300/1_4.json | 6 ++---- .../2/general/single_channel/p300/1_5.json | 6 ++---- .../2/general/single_channel/p300/2_0.json | 6 ++---- .../2/general/single_channel/p300/2_1.json | 6 ++---- .../2/general/single_channel/p50/1_0.json | 6 ++---- .../2/general/single_channel/p50/1_3.json | 6 ++---- .../2/general/single_channel/p50/1_4.json | 6 ++---- .../2/general/single_channel/p50/1_5.json | 6 ++---- .../2/general/single_channel/p50/3_0.json | 8 ++----- .../2/general/single_channel/p50/3_3.json | 8 ++----- .../2/general/single_channel/p50/3_4.json | 8 ++----- .../2/general/single_channel/p50/3_5.json | 8 ++----- .../pipette/pipette_definition.py | 3 ++- .../scripts/update_configuration_files.py | 13 ++++++------ 66 files changed, 164 insertions(+), 574 deletions(-) diff --git a/api/src/opentrons/hardware_control/ot3api.py b/api/src/opentrons/hardware_control/ot3api.py index 075fe52bc81..99ab5b6192d 100644 --- a/api/src/opentrons/hardware_control/ot3api.py +++ b/api/src/opentrons/hardware_control/ot3api.py @@ -799,23 +799,13 @@ async def home_gripper_jaw(self) -> None: except GripperNotAttachedError: pass - async def home_plunger(self, mount: Union[top_types.Mount, OT3Mount], unstick: bool = False) -> None: + async def home_plunger(self, mount: Union[top_types.Mount, OT3Mount]) -> None: """ Home the plunger motor for a mount, and then return it to the 'bottom' position. """ - checked_mount = OT3Mount.from_mount(mount) - - if unstick: - instr = self._pipette_handler.hardware_instruments[checked_mount] - unstick_current = instr.plunger_motor_current.homing - - await self._backend.set_active_current( - { - Axis.of_main_tool_actuator(checked_mount): unstick_current - } - ) + checked_mount = OT3Mount.from_mount(mount) await self.home([Axis.of_main_tool_actuator(checked_mount)]) instr = self._pipette_handler.hardware_instruments[checked_mount] if instr: diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json index abb6215ea6f..ea7410d6991 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json index f93ac9568a4..b3e74d91cfe 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json index 00e8644ebbf..a57efc08c74 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json index 8fd58ccf908..8fd12be560e 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json @@ -35,24 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake", - "doubleDropTip" - ] -} \ No newline at end of file + "quirks": ["dropTipShake", "doubleDropTip"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json index 8fd58ccf908..8fd12be560e 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json @@ -35,24 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake", - "doubleDropTip" - ] -} \ No newline at end of file + "quirks": ["dropTipShake", "doubleDropTip"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json index d7f9e044601..71b533e99c5 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -45,16 +41,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -62,4 +49,4 @@ "shaftULperMM": 63.617, "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json index f741438d5a3..191a121af36 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -45,16 +41,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -62,4 +49,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json index f741438d5a3..191a121af36 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -45,16 +41,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -62,4 +49,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json index cc02ad25599..45a38198705 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -45,16 +41,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -62,4 +49,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json index cc02ad25599..45a38198705 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -45,16 +41,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -62,4 +49,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json index 23b83bdee52..15c6126dc43 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, - "backCompatNames": [ - "p10_multi" - ], + "backCompatNames": ["p10_multi"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json index 23b83bdee52..15c6126dc43 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 1.0, "shaftULperMM": 0.785, - "backCompatNames": [ - "p10_multi" - ], + "backCompatNames": ["p10_multi"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json index 7d4a2613d54..533e9b787fd 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 5.0, "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json index 29567019938..54eed0ab20a 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 5.0, "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json index 29567019938..54eed0ab20a 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 5.0, "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json index a2b026b2ae7..98aa45f1d99 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json @@ -35,24 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 5.0, "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake", - "doubleDropTip" - ] -} \ No newline at end of file + "quirks": ["dropTipShake", "doubleDropTip"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json index bd0e4d34af9..91dd3c9e185 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json @@ -35,25 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 3.5, "shaftULperMM": 9.621, - "backCompatNames": [ - "p300_multi" - ], + "backCompatNames": ["p300_multi"], "backlashDistance": 0.0, - "quirks": [ - "needsUnstick" - ] -} \ No newline at end of file + "quirks": ["needsUnstick"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json index bd0e4d34af9..91dd3c9e185 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json @@ -35,25 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 3.5, "shaftULperMM": 9.621, - "backCompatNames": [ - "p300_multi" - ], + "backCompatNames": ["p300_multi"], "backlashDistance": 0.0, - "quirks": [ - "needsUnstick" - ] -} \ No newline at end of file + "quirks": ["needsUnstick"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json index 9f17ca0f05a..52f607e0862 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 2.0, "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json index cff7d83cbd4..0e5633f381a 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 2.0, "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json index 1d28e6f0c3b..6517339b6bd 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json @@ -35,23 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 2.0, "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json index c4f5105337d..52d618422cd 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json @@ -35,24 +35,12 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "channels": 8, "shaftDiameter": 2.0, "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "doubleDropTip", - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["doubleDropTip", "dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json index e7321cebe05..44602235715 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -51,16 +47,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -68,4 +55,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json index e7321cebe05..44602235715 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -51,16 +47,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -68,4 +55,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json index d2749784161..bb64aeb9053 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -51,16 +47,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -68,4 +55,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json index d2749784161..bb64aeb9053 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 2 }, @@ -51,16 +47,7 @@ }, "partialTipConfigurations": { "partialTipSupported": true, - "availableConfigurations": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 - ] + "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8] }, "backCompatNames": [], "channels": 8, @@ -68,4 +55,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json index b222820de27..02a3e87b14c 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json @@ -11,7 +11,7 @@ "distance": 19.0 }, "dropTipConfigurations": { "current": 1.5, "speed": 5.5, "distance": 26.5 }, - "plungerMotorConfigurations": { "idle": 0.3, "run": 2.0 }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 0.0 }, "plungerPositionsConfigurations": { "default": { "top": 0, diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json index 3edaca0c481..f457e4aea62 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json @@ -11,7 +11,7 @@ "distance": 19.0 }, "dropTipConfigurations": { "current": 1.5, "speed": 5.5, "distance": 26.5 }, - "plungerMotorConfigurations": { "idle": 0.3, "run": 2.0 }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 0.0 }, "plungerPositionsConfigurations": { "default": { "top": 0, diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json index 3edaca0c481..f457e4aea62 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json @@ -11,7 +11,7 @@ "distance": 19.0 }, "dropTipConfigurations": { "current": 1.5, "speed": 5.5, "distance": 26.5 }, - "plungerMotorConfigurations": { "idle": 0.3, "run": 2.0 }, + "plungerMotorConfigurations": { "idle": 0.3, "run": 2.0, "homing": 0.0 }, "plungerPositionsConfigurations": { "default": { "top": 0, diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json index 7a8a792b0e4..5081e0edcea 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json @@ -17,7 +17,8 @@ }, "plungerMotorConfigurations": { "idle": 0.3, - "run": 0.8 + "run": 0.8, + "homing": 0.0 }, "plungerPositionsConfigurations": { "default": { diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json index 7a8a792b0e4..5081e0edcea 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json @@ -17,7 +17,8 @@ }, "plungerMotorConfigurations": { "idle": 0.3, - "run": 0.8 + "run": 0.8, + "homing": 0.0 }, "plungerPositionsConfigurations": { "default": { diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json index 9a369c91b6a..b07ec3ded8d 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json @@ -42,7 +42,5 @@ "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json index 868a7169cdd..7697d325412 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json @@ -42,7 +42,5 @@ "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json index ba1f48a78ec..b69f454bf69 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json @@ -42,7 +42,5 @@ "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json index ba1f48a78ec..b69f454bf69 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json @@ -42,7 +42,5 @@ "shaftULperMM": 0.785, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json index deae1008bc3..0bc3b51b3a8 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json @@ -42,8 +42,5 @@ "shaftULperMM": 63.617, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake", - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake", "dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json index aefccfd2fde..eed32d4caca 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json @@ -42,8 +42,5 @@ "shaftULperMM": 63.617, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake", - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake", "dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json index aefccfd2fde..eed32d4caca 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json @@ -42,8 +42,5 @@ "shaftULperMM": 63.617, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake", - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake", "dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json index fe12cb8c99b..617ce43d126 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json @@ -42,8 +42,5 @@ "shaftULperMM": 63.617, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake", - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake", "dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json index d98d35f91d5..fe3005a0f89 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json @@ -40,11 +40,7 @@ "channels": 1, "shaftDiameter": 6.0, "shaftULperMM": 28.274, - "backCompatNames": [ - "p1000_single" - ], + "backCompatNames": ["p1000_single"], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json index e8ea98527c1..4835fa9dc73 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json @@ -40,11 +40,7 @@ "channels": 1, "shaftDiameter": 6.0, "shaftULperMM": 28.274, - "backCompatNames": [ - "p1000_single" - ], + "backCompatNames": ["p1000_single"], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json index e8ea98527c1..4835fa9dc73 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json @@ -40,11 +40,7 @@ "channels": 1, "shaftDiameter": 6.0, "shaftULperMM": 28.274, - "backCompatNames": [ - "p1000_single" - ], + "backCompatNames": ["p1000_single"], "backlashDistance": 0.0, - "quirks": [ - "pickupTipShake" - ] -} \ No newline at end of file + "quirks": ["pickupTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json index a7504c0f234..4fe8b95326a 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -52,4 +48,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json index a7504c0f234..4fe8b95326a 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -52,4 +48,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json index df77c34b86f..9aefd660520 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -52,4 +48,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json index ef25fe32c5c..6632e473096 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json @@ -28,11 +28,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -52,4 +48,4 @@ "shaftULperMM": 15.904, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json index 2bc5a5474a9..a1095e968d1 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json @@ -40,9 +40,7 @@ "channels": 1, "shaftDiameter": 1.0, "shaftULperMM": 0.785, - "backCompatNames": [ - "p10_single" - ], + "backCompatNames": ["p10_single"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json index 9e33de1353c..257d50fa6a2 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json @@ -40,9 +40,7 @@ "channels": 1, "shaftDiameter": 1.0, "shaftULperMM": 0.785, - "backCompatNames": [ - "p10_single" - ], + "backCompatNames": ["p10_single"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json index 9e33de1353c..257d50fa6a2 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json @@ -40,9 +40,7 @@ "channels": 1, "shaftDiameter": 1.0, "shaftULperMM": 0.785, - "backCompatNames": [ - "p10_single" - ], + "backCompatNames": ["p10_single"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json index bf53c6fbbbe..f70df10ef21 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json @@ -42,7 +42,5 @@ "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json index dce3231f712..1f56ad142a7 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json @@ -42,7 +42,5 @@ "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json index 4e9f11758c8..b77a976ed23 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json @@ -42,7 +42,5 @@ "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json index 4e9f11758c8..b77a976ed23 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json @@ -42,7 +42,5 @@ "shaftULperMM": 19.635, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json index f1fee52dc9f..64c8ba8a327 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json @@ -40,9 +40,7 @@ "channels": 1, "shaftDiameter": 3.5, "shaftULperMM": 9.621, - "backCompatNames": [ - "p300_single" - ], + "backCompatNames": ["p300_single"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json index 77e185fdc53..34e9c025e03 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json @@ -40,9 +40,7 @@ "channels": 1, "shaftDiameter": 3.5, "shaftULperMM": 9.621, - "backCompatNames": [ - "p300_single" - ], + "backCompatNames": ["p300_single"], "backlashDistance": 0.0, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json index 306c471d04b..15fb095b1ce 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json @@ -42,7 +42,5 @@ "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json index c82f35ee5a3..1bdc5d994b8 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json @@ -42,7 +42,5 @@ "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json index 0dbe185b2d9..7d6083e338e 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json @@ -42,7 +42,5 @@ "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json index 193e7d8f7b0..1342422fa43 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json @@ -44,7 +44,5 @@ "shaftULperMM": 3.142, "backCompatNames": [], "backlashDistance": 0.0, - "quirks": [ - "dropTipShake" - ] -} \ No newline at end of file + "quirks": ["dropTipShake"] +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json index da973a754cd..0667b77ae1c 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -58,4 +54,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json index da973a754cd..0667b77ae1c 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -58,4 +54,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json index 16b0dad8a92..ffac357c88e 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -58,4 +54,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json index f20fd3346dd..0ae266ccd78 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json @@ -34,11 +34,7 @@ } }, "availableSensors": { - "sensors": [ - "pressure", - "capacitive", - "environment" - ], + "sensors": ["pressure", "capacitive", "environment"], "pressure": { "count": 1 }, @@ -58,4 +54,4 @@ "shaftULperMM": 0.785, "backlashDistance": 0.1, "quirks": [] -} \ No newline at end of file +} diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py index c76cefa06a8..1ac942a3f2b 100644 --- a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py +++ b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py @@ -119,7 +119,8 @@ class MotorConfigurations(BaseModel): ..., description="The plunger motor current to use during active states." ) homing: float = Field( - ..., description="The plunger motor current for homing to overcome static friction." + ..., + description="The plunger motor current for homing to overcome static friction.", ) diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py b/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py index e5e50aef64b..7d43adc41d2 100644 --- a/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py +++ b/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py @@ -144,13 +144,12 @@ def update( Recursively update the given dictionary to ensure no data is lost when updating. """ next_key = next(iter_of_configs, None) - # if next_key and isinstance(dict_to_update[next_key], dict): - # dict_to_update[next_key] = update( - # dict_to_update.get(next_key, {}), iter_of_configs, value_to_update - # ) - # elif next_key: - # breakpoint() - dict_to_update[next_key]['homing'] = value_to_update + if next_key and isinstance(dict_to_update[next_key], dict): + dict_to_update[next_key] = update( + dict_to_update.get(next_key, {}), iter_of_configs, value_to_update + ) + elif next_key: + dict_to_update[next_key] = value_to_update return dict_to_update