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.

Sign up for GitHub

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

Support for rogue version 6 #40

Merged
merged 3 commits into from
Jan 5, 2024
Merged

Support for rogue version 6 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5c9077
two changes to support rogue6
chrisvam Jan 5, 2024
79e5efd
Update setup_env_slac.sh
ruck314 Jan 5, 2024
6149a5d
Update _ClinkDevRoot.py
ruck314 Jan 5, 2024
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
6 changes: 5 additions & 1 deletion firmware/python/cameralink_gateway/_ClinkDevRoot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import surf.protocols.clink as cl
import l2si_core as l2si

rogue.Version.minVersion('5.1.0')
rogue.Version.minVersion('6.1.1')
# rogue.Version.exactVersion('5.1.0')

class DummyBiDirStream(rogue.interfaces.stream.Master, rogue.interfaces.stream.Slave):
Expand Down Expand Up @@ -87,6 +87,10 @@ def __init__(self,
initRead = initRead,
**kwargs)

# added for rogue6
self.zmqServer = pr.interfaces.ZmqServer(root=self, addr='*', port=0)
self.addInterface(self.zmqServer)

# Unhide the RemoteVariableDump command
self.RemoteVariableDump.hidden = False

Expand Down
2 changes: 1 addition & 1 deletion software/scripts/devGui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def __call__( self , parser, namespace,values, option_string = None):
if (args.guiType == 'PyDM'):
import pyrogue.pydm
pyrogue.pydm.runPyDM(
root = root,
serverList = root.zmqServer.address,
sizeX = 800,
sizeY = 1000,
)
Expand Down
2 changes: 1 addition & 1 deletion software/setup_env_slac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ source /afs/slac.stanford.edu/g/reseng/vol31/anaconda/anaconda3/etc/profile.d/co
##################################
# Activate Rogue conda Environment
##################################
conda activate rogue_v5.18.4
conda activate rogue_v6.1.1