From f5c9077e6bdfcf7edd469ad7629324b10ca48de0 Mon Sep 17 00:00:00 2001 From: Christopher O'Grady Date: Thu, 4 Jan 2024 17:25:35 -0800 Subject: [PATCH 1/3] two changes to support rogue6 --- firmware/python/cameralink_gateway/_ClinkDevRoot.py | 4 ++++ software/scripts/devGui.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/firmware/python/cameralink_gateway/_ClinkDevRoot.py b/firmware/python/cameralink_gateway/_ClinkDevRoot.py index 6ff63c6..a4a91c9 100644 --- a/firmware/python/cameralink_gateway/_ClinkDevRoot.py +++ b/firmware/python/cameralink_gateway/_ClinkDevRoot.py @@ -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 diff --git a/software/scripts/devGui.py b/software/scripts/devGui.py index 1e3172f..b946b87 100755 --- a/software/scripts/devGui.py +++ b/software/scripts/devGui.py @@ -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, ) From 79e5efdb725e481e8b42f3bc1c23f6bc3d79eadc Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Thu, 4 Jan 2024 18:20:42 -0800 Subject: [PATCH 2/3] Update setup_env_slac.sh --- software/setup_env_slac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/setup_env_slac.sh b/software/setup_env_slac.sh index eece82b..1209587 100644 --- a/software/setup_env_slac.sh +++ b/software/setup_env_slac.sh @@ -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 From 6149a5d1d0d7f33c134d0f07e3c58da8cebe2cff Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Thu, 4 Jan 2024 18:21:12 -0800 Subject: [PATCH 3/3] Update _ClinkDevRoot.py --- firmware/python/cameralink_gateway/_ClinkDevRoot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/python/cameralink_gateway/_ClinkDevRoot.py b/firmware/python/cameralink_gateway/_ClinkDevRoot.py index a4a91c9..70d8ad8 100644 --- a/firmware/python/cameralink_gateway/_ClinkDevRoot.py +++ b/firmware/python/cameralink_gateway/_ClinkDevRoot.py @@ -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):