Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(api): Flag pipette as not ready to aspirate after pushing out air #13728

Merged
merged 7 commits into from
Oct 18, 2023

Conversation

andySigler
Copy link
Contributor

Overview

Set ready_to_aspirate = False if a push-out volume is used during dispense. The plunger would then be below the bottom position, and so would not be ready to aspirate.

Test Plan

Changelog

Review requests

Risk assessment

@andySigler andySigler requested a review from sfoster1 October 5, 2023 19:15
@andySigler andySigler requested a review from a team as a code owner October 5, 2023 19:15
@codecov
Copy link

codecov bot commented Oct 5, 2023

Codecov Report

Merging #13728 (feae789) into edge (cd064e6) will decrease coverage by 0.06%.
Report is 21 commits behind head on edge.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #13728      +/-   ##
==========================================
- Coverage   70.95%   70.90%   -0.06%     
==========================================
  Files        2451     1604     -847     
  Lines       68863    53275   -15588     
  Branches     8207     3634    -4573     
==========================================
- Hits        48861    37773   -11088     
+ Misses      18069    14916    -3153     
+ Partials     1933      586    -1347     
Flag Coverage Δ
g-code-testing 96.44% <ø> (ø)
hardware-testing ∅ <ø> (∅)
notify-server 89.13% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
api/src/opentrons/hardware_control/ot3api.py 79.47% <ø> (ø)

... and 847 files with indirect coverage changes

Copy link
Member

@sfoster1 sfoster1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also we should add a test

@@ -1842,6 +1842,8 @@ async def dispense(
raise
else:
dispense_spec.instr.remove_current_volume(dispense_spec.volume)
if push_out or dispense_spec.instr.push_out_volume:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably better for this to just be this since it's what actually controls things

Suggested change
if push_out or dispense_spec.instr.push_out_volume:
if dispense_spec.instr.push_out_volume:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if caller sets push_out=0 then the pipette is still ready-to-aspirate, so we need to either check this argument or we could specify what push-out volume was used within the dispense_spec and check that instead

@andySigler andySigler changed the title fix(hardware-testing): Flag pipette as not ready to aspirate after pushing out air fix(api): Flag pipette as not ready to aspirate after pushing out air Oct 6, 2023
Copy link
Member

@sfoster1 sfoster1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@sfoster1 sfoster1 merged commit e5dd5af into edge Oct 18, 2023
26 checks passed
@sfoster1 sfoster1 deleted the fix-api-not-ready-to-aspirate-after-push-out branch October 18, 2023 13:53
y3rsh added a commit that referenced this pull request Oct 25, 2023
* edge: (77 commits)
  fix(app): update move gantry text in change pipette flow (#13712)
  fix(app): fix CI after release merge back (#13816)
  chore(hardware): add opentrons hardware package to ot 2 build (#13770)
  feat(protocol-designer): correct step count in create file wizard (#13807)
  feat(protocol-designer): error handling in create file wizard (#13804)
  fix(app): invalidate OT2 calibration queries when calibration flows complete (#13809)
  always jog (#13806)
  chore(app): point updates at dns not s3 (#13798)
  docs(api): updated Flex default flow rates (#13796)
  fix(api): Flag pipette as not ready to aspirate after pushing out air (#13728)
  fix(api, hardware): allow OT3Controller to disable tip motors (#13805)
  more blank trials; longer scale stabilize wait; submerge 2.5mm (#13788)
  fix(app): unload adapters after checking position of labware on adapter on heater shaker module (#13803)
  feat(app): wire up location conflict modal for ODD (#13797)
  feat(app): add Deck configuration page component (#13784)
  fix(robot-server): add default to robot serial (#13802)
  feat(protocol-designer, components): prep work for deck config in PD (#13775)
  feat(app, protocol-designer): plug in waste chute asset (#13800)
  fix(app): do not check mag block in calibration status (#13799)
  feat(protocol-designer): edit additional items staging area support (#13752)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants