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

refactor(hardware control): start liquid probe 2mm higher, refactor z moves #15564

Merged
merged 9 commits into from
Jul 8, 2024

Conversation

caila-marashaj
Copy link
Contributor

@caila-marashaj caila-marashaj commented Jul 1, 2024

Overview

Quick refactor for liquid probe. This just breaks up the main function a little bit in ot3api to keep readability, and takes moves that aren't directly related to the liquid probing movement out of tool_sensors to keep that modular.

Changelog

  • take the z axis move up at the beginning of liquid probe out of tool_sensors, and move it to ot3api
  • instead of moving to liquid_settings.probe_start_position, move 2mm up from wherever the pipette is at the time of the call
  • move some of the motion calculation to an outside helper function

Copy link

codecov bot commented Jul 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.43%. Comparing base (5ce130b) to head (e9e247e).
Report is 112 commits behind head on edge.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##             edge   #15564       +/-   ##
===========================================
+ Coverage   60.43%   92.43%   +32.00%     
===========================================
  Files         154       77       -77     
  Lines       12119     1283    -10836     
===========================================
- Hits         7324     1186     -6138     
+ Misses       4795       97     -4698     
Flag Coverage Δ
g-code-testing 92.43% <ø> (?)
hardware ?
shared-data ?

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

see 231 files with indirect coverage changes

Copy link
Contributor

github-actions bot commented Jul 1, 2024

A PR has been opened to address analyses snapshot changes. Please review the changes here: #15565

@y3rsh
Copy link
Collaborator

y3rsh commented Jul 2, 2024

A PR has been opened to address analyses snapshot changes. Please review the changes here: #15565

FYI this change is in edge so if you merge in edge this test will pass 😊

@ryanthecoder ryanthecoder marked this pull request as ready for review July 5, 2024 19:16
@ryanthecoder ryanthecoder requested a review from a team as a code owner July 5, 2024 19:16
@ryanthecoder ryanthecoder force-pushed the EXEC-590-liquid-probe-z-moves branch from ff047f2 to 905249c Compare July 5, 2024 20:00
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.

Couple little things but looking good overall

if probe_settings.aspirate_while_sensing:
await self._move_to_plunger_bottom(checked_mount, rate=1.0)
await self._move_to_plunger_bottom(checked_mount, rate=p_prep_speed)
Copy link
Member

Choose a reason for hiding this comment

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

do we still need this switch to flip? would it actually work if we flipped it at this point?

Copy link
Contributor

Choose a reason for hiding this comment

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

Should still work, don't know if we want the ability to use it in the future or not

Copy link
Member

Choose a reason for hiding this comment

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

can we add a TODO to remove it at some point

@ryanthecoder ryanthecoder force-pushed the EXEC-590-liquid-probe-z-moves branch from dcf502a to 2aa36f0 Compare July 8, 2024 18:04
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, please make sure the eventual commit message has a more in-depth description that mentions the change to specifying moves by the plunger distance though

if probe_settings.aspirate_while_sensing:
await self._move_to_plunger_bottom(checked_mount, rate=1.0)
await self._move_to_plunger_bottom(checked_mount, rate=p_prep_speed)
Copy link
Member

Choose a reason for hiding this comment

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

can we add a TODO to remove it at some point

@caila-marashaj caila-marashaj merged commit 3479875 into edge Jul 8, 2024
22 checks passed
syao1226 pushed a commit that referenced this pull request Jul 10, 2024
… moves (#15564)

Refactors liquid_probe- z distances for each pass are now calculated using appropriate plunger distance for the given pipette model/tip combination
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.

None yet

4 participants