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

SmarAct Encoded Tip Tilt Embedded Screens #1326

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
40c4caf
ENH: Add UserSet signals and add long_names
aberges-SLAC Feb 22, 2025
2e1df24
ENH: Add UI file for SmarActEncodedTipTilt class embedded screen
aberges-SLAC Mar 1, 2025
4c5d8d9
ENH: Add pyqt partner script to ui for embedded SmarActEncodedTipTilt
aberges-SLAC Mar 1, 2025
12698a1
MNT: Fix "tip" and "tilt" so that it is consistent with open-loop tip…
aberges-SLAC Mar 4, 2025
99e83fd
ENH: Add class and button for open-loop settings panels
aberges-SLAC Mar 4, 2025
69cf250
MNT: Add open-loop jog step sizes and fix some button text
aberges-SLAC Mar 4, 2025
8de41ea
ENH: Add jog_step_size to open-loop PV linkages
aberges-SLAC Mar 4, 2025
aa40c17
Merge branch 'pcdshub:master' into SmarActEncodedTipTilt
aberges-SLAC Mar 4, 2025
501f394
Merge branch 'SmarActEncodedTipTilt' of github.com:aberges-SLAC/pcdsd…
aberges-SLAC Mar 4, 2025
1484e67
DOC: add upcoming release notes
aberges-SLAC Mar 4, 2025
60061e1
Revert "ENH: Add UserSet signals and add long_names"
aberges-SLAC Mar 5, 2025
6e4c8e9
MNT: Remove vestigial annotation
aberges-SLAC Mar 6, 2025
11ffb73
MNT: nitpick some release notes
aberges-SLAC Mar 6, 2025
c1dd96e
ENH: Add signals for watching channel state flags
aberges-SLAC Mar 7, 2025
f29f29e
ENH: Make the calibration sequence wait on calibration signals
aberges-SLAC Mar 7, 2025
820294d
DOC: Update release notes
aberges-SLAC Mar 7, 2025
21257fd
MNT: Use only channel_state_raw for state flags
aberges-SLAC Mar 7, 2025
dbafd13
MNT: only use channel_state_raw for backwards compat
aberges-SLAC Mar 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions docs/source/upcoming_release_notes/1325-SmarActEncodedTipTilt.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
1325 SmarActEncodedTipTilt
#################

API Breaks
----------
- N/A

Library Features
----------------
- N/A

Device Features
---------------
- SmarActEncodedTipTilt: added embedded screens
- SmarActEncodedTipTilt: bundles open-loop and closed-loop motion
- SmarActEncodedTipTilt: wraps the home and calibrate sequence into single methods
- SmarActEncodedTipTilt: add channel_state_raw, calibrating, and referencing signals

New Devices
-----------
- N/A

Bugfixes
--------
- N/A

Maintenance
-----------
- N/A

Contributors
------------
- aberges-SLAC
3 changes: 3 additions & 0 deletions pcdsdevices/epics_motor.py
Original file line number Diff line number Diff line change
Expand Up @@ -1661,6 +1661,8 @@ class SmarAct(EpicsMotorInterface):
doc="Temperature at the channel's amplifier")
module_temp = Cpt(EpicsSignalRO, ':MODTEMP', kind='normal',
doc='Temperature of the MCS2 Module in the rack')
channel_state_raw = Cpt(EpicsSignalRO, ':STATE_RBV', kind='omitted',
doc='Channel state bitmask represented as raw int')

# These PVs will probably not be needed for most encoded motors, but can be
# useful
Expand Down Expand Up @@ -1700,6 +1702,7 @@ def __init__(self, *args, **kwargs):
self.dist_code_inv.long_name = 'Distance Code Inversion'
self.channel_temp.long_name = 'Channel Temp. (°C)'
self.module_temp.long_name = 'Module Temp. (°C)'
self.channel_state_raw.long_name = 'Channel State'


class SmarActEncodedTipTilt(Device):
Expand Down
Loading
Loading