removing cameralink_gateway/_Application.py and using lcls2-pgp-fw-li…

…b/_Application.py instead
slaclab · Nov 17, 2023 · fb5211f · fb5211f
1 parent f776b63
commit fb5211f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 64 deletions.
diff --git a/firmware/python/cameralink_gateway/_Application.py b/firmware/python/cameralink_gateway/_Application.py
diff --git a/firmware/python/cameralink_gateway/_ClinkPcieFpga.py b/firmware/python/cameralink_gateway/_ClinkPcieFpga.py
@@ -11,7 +11,6 @@
 import pyrogue as pr
 
 import axipcie                 as pcie
-import cameralink_gateway      as clDev
 import lcls2_pgp_fw_lib.shared as shared
 
 class ClinkPcieFpga(pr.Device):
@@ -33,7 +32,7 @@ def __init__(self,
         ))
 
         # Application layer
-        self.add(clDev.Application(
+        self.add(shared.ApplicationLaneConfigDict(
             offset     = 0x00C0_0000,
             laneConfig = laneConfig,
             expand     = True,

diff --git a/firmware/python/cameralink_gateway/__init__.py b/firmware/python/cameralink_gateway/__init__.py
@@ -11,6 +11,5 @@
 import os
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 
-from cameralink_gateway._Application   import *
 from cameralink_gateway._ClinkPcieFpga import *
 from cameralink_gateway._ClinkDevRoot  import *
diff --git a/firmware/submodules/lcls2-pgp-fw-lib b/firmware/submodules/lcls2-pgp-fw-lib
diff --git a/software/setup_env_slac.sh b/software/setup_env_slac.sh
@@ -6,5 +6,4 @@ source /afs/slac.stanford.edu/g/reseng/vol31/anaconda/anaconda3/etc/profile.d/co
 ##################################
 # Activate Rogue conda Environment
 ##################################
-conda activate rogue_v5.10.0
-#conda activate rogue_v5.18.4
+conda activate rogue_v5.18.4