Skip to content

Commit

Permalink
Merge branch 'edge' into AUTH-964-add_correction_volume_to_liquid_han…
Browse files Browse the repository at this point in the history
…dling_params
  • Loading branch information
sanni-t authored Jan 24, 2025
2 parents 3142b04 + 78b89ed commit 0dac94d
Show file tree
Hide file tree
Showing 99 changed files with 1,979 additions and 1,568 deletions.
106 changes: 53 additions & 53 deletions api/docs/v1/pipettes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ same behavior as before.
The P20 Single GEN2 is back-compatible with the P10 Single in this regard. If your protocol
specifies an ``instruments.P10_Single`` and your robot has an ``instruments.P20_Single_GEN2``
attached, you can run your protocol, and the robot will act as if the maximum volume of the P20
Single GEN2 is 10 μl.
Single GEN2 is 10 µl.

If you have a P50 Single specified in your protocol, there is no automatic backwards compatibility.
If you want to use a Gen2 Pipette, you must change your protocol to load either a P300 Single GEN2
(if you are using volumes between 20 and 50 μl) or a P20 Single GEN2 (if you are using volumes
below 20 μl).
(if you are using volumes between 20 and 50 µl) or a P20 Single GEN2 (if you are using volumes
below 20 µl).


Plunger Flow Rates
Expand Down Expand Up @@ -99,92 +99,92 @@ The given defaults for every pipette model is the following:
P10_Single
----------

- Aspirate Default: 5 μl/s
- Dispense Default: 10 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 1 μl
- Maximum Volume: 10 μl
- Aspirate Default: 5 µl/s
- Dispense Default: 10 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 1 µl
- Maximum Volume: 10 µl

P10_Multi
---------

- Aspirate Default: 5 μl/s
- Dispense Default: 10 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 1 μl
- Maximum Volume: 10 μl
- Aspirate Default: 5 µl/s
- Dispense Default: 10 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 1 µl
- Maximum Volume: 10 µl

P50_Single
----------

- Aspirate Default: 25 μl/s
- Dispense Default: 50 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 5 μl
- Maximum Volume: 50 μl
- Aspirate Default: 25 µl/s
- Dispense Default: 50 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 5 µl
- Maximum Volume: 50 µl

P50_Multi
---------

- Aspirate Default: 25 μl/s
- Dispense Default: 50 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 5 μl
- Maximum Volume: 50 μl
- Aspirate Default: 25 µl/s
- Dispense Default: 50 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 5 µl
- Maximum Volume: 50 µl

P300_Single
-----------

- Aspirate Default: 150 μl/s
- Dispense Default: 300 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 30 μl
- Maximum Volume: 300 μl
- Aspirate Default: 150 µl/s
- Dispense Default: 300 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 30 µl
- Maximum Volume: 300 µl

P300_Multi
----------

- Aspirate Default: 150 μl/s
- Dispense Default: 300 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 30 μl
- Maximum Volume: 300 μl
- Aspirate Default: 150 µl/s
- Dispense Default: 300 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 30 µl
- Maximum Volume: 300 µl

P1000_Single
------------

- Aspirate Default: 500 μl/s
- Dispense Default: 1000 μl/s
- Blow Out Default: 1000 μl/s
- Minimum Volume: 100 μl
- Maximum Volume: 1000 μl
- Aspirate Default: 500 µl/s
- Dispense Default: 1000 µl/s
- Blow Out Default: 1000 µl/s
- Minimum Volume: 100 µl
- Maximum Volume: 1000 µl

P20_Single_GEN2
---------------

- Aspirate Default: 3.78 μl/s
- Dispense Default: 3.78 μl/s
- Blow Out Default: 3.78 μl/s
- Minimum Volume: 1 μl
- Maximum Volume: 20 μl
- Aspirate Default: 3.78 µl/s
- Dispense Default: 3.78 µl/s
- Blow Out Default: 3.78 µl/s
- Minimum Volume: 1 µl
- Maximum Volume: 20 µl

P300_Single_GEN2
----------------

- Aspirate Default: 46.43 μl/s
- Dispense Default: 46.43 μl/s
- Blow Out Default: 46.43 μl/s
- Minimum Volume: 20 μl
- Maximum Volume: 300 μl
- Aspirate Default: 46.43 µl/s
- Dispense Default: 46.43 µl/s
- Blow Out Default: 46.43 µl/s
- Minimum Volume: 20 µl
- Maximum Volume: 300 µl

P1000_Single_GEN2
-----------------

- Aspirate Default: 137.35 μl/s
- Dispense Default: 137.35 μl/s
- Blow Out Default: 137.35 μl/s
- Minimum Volume: 100 μl
- Maximum Volume: 1000 μl
- Aspirate Default: 137.35 µl/s
- Dispense Default: 137.35 µl/s
- Blow Out Default: 137.35 µl/s
- Minimum Volume: 100 µl
- Maximum Volume: 1000 µl

Old Pipette Constructor
=======================
Expand Down
2 changes: 1 addition & 1 deletion api/docs/v2/complex_commands/parameters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ One reason to set ``new_tip="always"`` is to avoid cross-contamination between w

:py:meth:`~.InstrumentContext.transfer` will pick up a new tip before *every* aspirate when ``new_tip="always"``. This includes when :ref:`tip refilling <complex-tip-refilling>` requires multiple aspirations from a single source well.

:py:meth:`~.InstrumentContext.distribute` and :py:meth:`~.InstrumentContext.consolidate` only pick up one tip, even when ``new_tip="always"``. For example, this distribute command returns to the source well a second time, because the amount to be distributed (400 µL total plus disposal volume) exceeds the pipette capacity (300 μL)::
:py:meth:`~.InstrumentContext.distribute` and :py:meth:`~.InstrumentContext.consolidate` only pick up one tip, even when ``new_tip="always"``. For example, this distribute command returns to the source well a second time, because the amount to be distributed (400 µL total plus disposal volume) exceeds the pipette capacity (300 µL)::

pipette.distribute(
volume=200,
Expand Down
6 changes: 3 additions & 3 deletions api/docs/v2/modules/temperature_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ The Temperature Module supports these 96-well block and labware combinations for

* - 96-well block contents
- API Load Name
* - Bio-Rad well plate 200 μL
* - Bio-Rad well plate 200 µL
- ``opentrons_96_aluminumblock_biorad_wellplate_200uL``
* - Generic PCR strip 200 μL
* - Generic PCR strip 200 µL
- ``opentrons_96_aluminumblock_generic_pcr_strip_200uL``
* - NEST well plate 100 μL
* - NEST well plate 100 µL
- ``opentrons_96_aluminumblock_nest_wellplate_100uL``

This command loads the same physical adapter and labware as the example in the Standalone Adapters section above, but it is also compatible with earlier API versions::
Expand Down
2 changes: 1 addition & 1 deletion api/docs/v2/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Hardware and Labware

Before running a protocol, you’ll want to have the right kind of hardware and labware ready for your Flex or OT-2.

- **Flex users** should review Chapter 2: Installation and Relocation in the `instruction manual <https://insights.opentrons.com/hubfs/Products/Flex/Opentrons%20Flex%20Manual.pdf>`_. Specifically, see the pipette information in the "Instrument Installation and Calibration" section. You can use either a 1-channel or 8-channel pipette for this tutorial. Most Flex code examples will use a `Flex 1-Channel 1000 μL pipette <https://shop.opentrons.com/opentrons-flex-1-channel-pipette/>`_.
- **Flex users** should review Chapter 2: Installation and Relocation in the `instruction manual <https://insights.opentrons.com/hubfs/Products/Flex/Opentrons%20Flex%20Manual.pdf>`_. Specifically, see the pipette information in the "Instrument Installation and Calibration" section. You can use either a 1-channel or 8-channel pipette for this tutorial. Most Flex code examples will use a `Flex 1-Channel 1000 µL pipette <https://shop.opentrons.com/opentrons-flex-1-channel-pipette/>`_.

- **OT-2 users** should review the robot setup and pipette information on the `Get Started page <https://support.opentrons.com/s/ot2-get-started>`_. Specifically, see `attaching pipettes <https://support.opentrons.com/s/article/Get-started-Attach-pipettes>`_ and `initial calibration <https://support.opentrons.com/s/article/Get-started-Calibrate-the-deck>`_. You can use either a single-channel or 8-channel pipette for this tutorial. Most OT-2 code examples will use a `P300 Single-Channel GEN2 <https://shop.opentrons.com/single-channel-electronic-pipette-p20/>`_ pipette.

Expand Down
Loading

0 comments on commit 0dac94d

Please sign in to comment.