Skip to content
Snippets Groups Projects

focus 2024-12

Merged Martin Christoph Hierholzer requested to merge mhier/focus-2024-12 into master
1 file
+ 21
7
Compare changes
  • Side-by-side
  • Inline
@@ -217,7 +217,7 @@ class boardSincav(boardSISBase):
global FIRMWARE_PROJECT_CONTROLLER
global CTRLBOARD_SLOT
FIRMWARE_TYPE_CONTROLLER = firmwareType
FIRMWARE_PROJECT_CONTROLLER = firmwareProject + "_" + firmwareType
FIRMWARE_PROJECT_CONTROLLER = firmwareProject + (("_" + firmwareType) if firmwareType else "")
CTRLBOARD_SLOT = ADCBOARD[self.index]["SLOT"]
def withBeamBasedFeedback(self):
@@ -231,7 +231,10 @@ class boardSincav(boardSISBase):
class boardDWC8VM1(boardSincav):
def __init__(self, slot, firmwareType, channelNames, firmwareProject="llrf_scav_sis8300l", skipController=False):
boardSincav.__init__(self, slot, firmwareType, channelNames, firmwareProject, skipController)
ADCBOARD[self.index]["RTM_TYPE"] = "DWC8VM1"
if firmwareProject != 'llrf_scav_sel_sis8300ku' :
ADCBOARD[self.index]["RTM_TYPE"] = "DWC8VM1"
else :
ADCBOARD[self.index]["RTM_TYPE"] = "RTM"
########################################################################################################################
Loading