-
Notifications
You must be signed in to change notification settings - Fork 179
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(robot-server,app): extend pipette offset cal to include tip length cal if needed #6641
Merged
Merged
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
5ad3818
add new states and transitions to accomodate tlc at beginning of pip …
b-cooper 942abc4
initialize deck
b-cooper d01dcb1
move to reference point in shared utils
b-cooper 51516a1
raise if wrong branch attempted
b-cooper e9d43e0
create flag unment req method
b-cooper 022985a
update save offset func internals
b-cooper acd2dfa
iron out merge conflicts
b-cooper 45b36be
make move to reference point shared command
b-cooper eeba86d
wire up extended pip offset flow with branching in app
b-cooper 383818e
feat(robot-server,app): extend pipette offset cal to include tip leng…
b-cooper 8607c78
a bit of clean up
b-cooper 344dc59
remove log
b-cooper d91f8c1
start splitting state machines into the two cases
sfoster1 75bcbf7
Fixup: Tests, add generic state enum and decide which flow to use on …
Laura-Danielle d288172
Fixup: Tavern test failure
Laura-Danielle 809cdaf
Fixup: make dataclass and have a load tip length flag
Laura-Danielle f460c93
Fixup: Add app side of calibration
Laura-Danielle 820efea
Temporary Commit For QA
Laura-Danielle 30d099d
Fixup: logic for has tip length calibration
Laura-Danielle ac73dfd
Remove unnecessary logs
Laura-Danielle 3c792ae
Fixup: JS mock
Laura-Danielle 9f2a39d
Actually fix fixture
Laura-Danielle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,197 +1,10 @@ | ||
| @import '@opentrons/components'; | ||
|
|
||
| .success_status_icon { | ||
| width: 2.5rem; | ||
| margin-right: 0.75rem; | ||
| color: var(--c-success); | ||
| } | ||
|
|
||
| .intro_header { | ||
| @apply --font-header-dark; | ||
|
|
||
| margin-bottom: 1rem; | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| .intro_content { | ||
| @apply --font-body-2-dark; | ||
|
|
||
| margin-bottom: 1.5rem; | ||
| } | ||
|
|
||
| .alert_modal_padding { | ||
| padding: 4rem 1rem; | ||
| } | ||
|
|
||
| .terminal_modal_contents, | ||
| .modal_contents { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: flex-start; | ||
| max-width: 48rem; | ||
| min-height: 14rem; | ||
| padding: 1rem; | ||
| } | ||
|
|
||
| .terminal_modal_contents { | ||
| padding: 1rem 1.5rem; | ||
| } | ||
|
|
||
| .complete_summary { | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| width: 100%; | ||
| margin: 2rem 0; | ||
| } | ||
|
|
||
| .continue_button { | ||
| margin: 1.5rem 5rem 1rem; | ||
| } | ||
|
|
||
| .block_image { | ||
| max-height: 20rem; | ||
| max-width: 16rem; | ||
| } | ||
|
|
||
| .required_tiprack { | ||
| width: 50%; | ||
| border: 1px solid var('--c-med-gray'); | ||
| padding: 0 1rem; | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .required_tiprack:not(:last-child) { | ||
| margin-right: 0.625rem; | ||
| } | ||
|
|
||
| .tiprack_image_container { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| padding: 1rem 0; | ||
| height: 70%; | ||
| } | ||
|
|
||
| .tiprack_image { | ||
| width: 100%; | ||
| max-height: 100%; | ||
| } | ||
|
|
||
| .tiprack_display_name { | ||
| font-size: var('--fs-body-2'); | ||
| } | ||
|
|
||
| /* | ||
| TODO: BC 2020-04-01 consider abstracting this to a shared place | ||
| these styles were mostly copped from PD's VIEW MEASUREMENTs button | ||
| ideally these would both use the same component | ||
| */ | ||
| .tiprack_measurements_link { | ||
| padding: 1rem 0.5rem; | ||
| flex: 0.6; | ||
| text-transform: uppercase; | ||
| text-align: center; | ||
| cursor: pointer; | ||
| text-decoration: none; | ||
| color: inherit; | ||
| font-size: var('--fs-body-2'); | ||
|
|
||
| &:hover { | ||
| background-color: var(--c-bg-hover); | ||
| } | ||
| } | ||
|
|
||
| .tipracks_note_header { | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| /* end copped styles */ | ||
|
|
||
| .prompt { | ||
| flex: none; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .prompt_text { | ||
| @apply --font-header-light; | ||
|
|
||
| font-weight: normal; | ||
| margin: 0.5rem 0; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .prompt_button { | ||
| display: block; | ||
| width: auto; | ||
| margin: 0.5rem 0 1rem 0; | ||
| padding-left: 3rem; | ||
| padding-right: 3rem; | ||
| } | ||
|
|
||
| .page_content_dark { | ||
| display: flex; | ||
| padding: 1rem; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| background-color: transparent; | ||
| height: 100%; | ||
| } | ||
|
|
||
| .deck_map_wrapper { | ||
| flex: 1 1 0; | ||
| align-self: stretch; | ||
| display: flex; | ||
| background-color: var(--c-bg-light); | ||
| border-radius: 6px; | ||
| } | ||
|
|
||
| .deck_map { | ||
| flex: 1; | ||
| } | ||
|
|
||
| .labware_ui_wrapper { | ||
| height: 100%; | ||
| width: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: flex-end; | ||
| } | ||
|
|
||
| .display_name { | ||
| @apply --truncate; | ||
|
|
||
| font-weight: var(--fw-semibold); | ||
| color: var(--c-font-light); | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| .command_button { | ||
| margin: 0 5rem; | ||
| } | ||
|
|
||
| .pick_up_tip_confirmation_button { | ||
| margin-top: 1rem; | ||
| width: 80%; | ||
| } | ||
|
|
||
| .step_check_video_wrapper { | ||
| margin-left: 1rem; | ||
| } | ||
|
|
||
| .step_check_video { | ||
| max-width: 100%; | ||
| max-height: 15rem; | ||
| } | ||
|
|
||
| .loading_spinner { | ||
| width: 7.5rem; | ||
| margin-bottom: 3rem; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we add an intermediate complete state we can get rid of the bool