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

feat(app): allow p1000 gen2 to fallback to specced p1000 gen1 #4316

Merged
merged 4 commits into from
Oct 30, 2019

Conversation

b-cooper
Copy link
Contributor

@b-cooper b-cooper commented Oct 29, 2019

When a robot has an attached P1000 Single GEN2, the and the uploaded protocol has a P1000 Single GEN1 specified, the app should accept the newer actual pipette as an inexact match. This mirrors the case of P300 GEN2 -> P300 GEN1 and P20 GEN2 -> P10 GEN1.

re #3598

@b-cooper b-cooper added app Affects the `app` project ready for review labels Oct 29, 2019
@b-cooper b-cooper requested a review from mcous October 29, 2019 14:26
@codecov
Copy link

codecov bot commented Oct 29, 2019

Codecov Report

Merging #4316 into release_3.14.0 will decrease coverage by 18.28%.
The diff coverage is 0%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release_3.14.0    #4316       +/-   ##
===================================================
- Coverage           74.55%   56.27%   -18.29%     
===================================================
  Files                 120      890      +770     
  Lines               13763    24936    +11173     
===================================================
+ Hits                10261    14032     +3771     
- Misses               3502    10904     +7402
Impacted Files Coverage Δ
.../src/components/FileInfo/useInstrumentMountInfo.js 0% <0%> (ø)
opentrons/api/models.py 67.85% <0%> (-1.24%) ⬇️
opentrons/hardware_control/simulator.py 85.47% <0%> (-1.2%) ⬇️
opentrons/legacy_api/api.py 92% <0%> (-0.16%) ⬇️
opentrons/legacy_api/instruments/pipette.py 95.39% <0%> (-0.01%) ⬇️
opentrons/simulate.py 54.22% <0%> (ø) ⬆️
...omponents/DeckSetup/LabwareOverlays/LabwareName.js 0% <0%> (ø)
...library/src/labware-creator/components/Dropdown.js 0% <0%> (ø)
protocol-designer/src/analytics/actions.js 0% <0%> (ø)
labware-library/src/localization/en.js 100% <0%> (ø)
... and 767 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4802beb...ae24a3b. Read the comment docs.

@b-cooper b-cooper added the container Affects the robot's Docker container label Oct 30, 2019
@b-cooper
Copy link
Contributor Author

Holding until #4326 is merged

@b-cooper b-cooper added DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available and removed container Affects the robot's Docker container labels Oct 30, 2019
When a robot has an attached P1000 Single GEN2, the and the uploaded protocol has a P1000 Single
GEN1 attached, the app should accept the newer actual pipette as an inexact match. This mirrors the
case of P300 GEN2 -> P300 GEN1 and P20 GEN2 -> P10 GEN1.

re #3598
@b-cooper b-cooper added shared data Affects the `shared-data` project and removed DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available labels Oct 30, 2019
@b-cooper b-cooper force-pushed the app_p1000-gen-fallback branch from 6fdbad8 to 3c7c2bc Compare October 30, 2019 19:39
@b-cooper b-cooper requested a review from sfoster1 October 30, 2019 19:50
Copy link
Contributor

@mcous mcous left a comment

Choose a reason for hiding this comment

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

Code looks good. 👍 once tested

return false
}
function pipettesAreInexactMatch(
protocolInstrName,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this parameter untyped? It looks like it needs to know to accept string and void

@sfoster1 sfoster1 merged commit 0e33f65 into release_3.14.0 Oct 30, 2019
@sfoster1 sfoster1 deleted the app_p1000-gen-fallback branch October 30, 2019 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app Affects the `app` project shared data Affects the `shared-data` project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants