This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
Dodal 601 convert smargon to ophyd async #1469
Merged
Conversation
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
4 tasks
d-perl
approved these changes
Jul 3, 2024
setup.cfg
Outdated
| @@ -46,7 +46,7 @@ install_requires = | |||
| ophyd-async >= 0.3a5 | |||
| bluesky >= 1.13.0a3 | |||
| blueapi >= 0.4.3-rc1 | |||
| dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@a9a116d289abc9e67ce8db08f978ff502705b464 | |||
| dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@097b332f4a8ef3f1952110331e3ba97a0717bf0c | |||
There was a problem hiding this comment.
can clear this if you merge the dodal change first
Comment on lines
+18
to
+25
| yield from bps.mv( | ||
| smargon.x, | ||
| position[0], | ||
| smargon.y, | ||
| position[1], | ||
| smargon.z, | ||
| position[2], | ||
| ) |
There was a problem hiding this comment.
Suggested change
| yield from bps.mv( | |
| smargon.x, | |
| position[0], | |
| smargon.y, | |
| position[1], | |
| smargon.z, | |
| position[2], | |
| ) | |
| yield from bps.mv( | |
| *(smargon.x, position[0]), | |
| *(smargon.y, position[1]), | |
| *(smargon.z, position[2]), | |
| ) |
rtuck99
force-pushed
the
dodal_601_convert_smargon_to_ophyd_async
branch
from
fd2c964 to
c47bf42
Compare
olliesilvester
pushed a commit
to olliesilvester/mx-bluesky
that referenced
this pull request
Aug 23, 2024
…#1469) * (DiamondLightSource/dodalDiamondLightSource/hyperion#601) Fix broken unit tests as a result of dodal changes * Bump dodal commit hash
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes DiamondLightSource/dodal#601
Link to dodal PR (if required): DiamondLightSource/dodal#656
(remember to update
setup.cfgwith the dodal commit tag if you need it for tests to pass!)To test: