Commit 87fef323 authored by Kevin Connor Nash's avatar Kevin Connor Nash
Browse files

Merge branch 'Dev_Merge_lpGBT_2S_PS' of...

Merge branch 'Dev_Merge_lpGBT_2S_PS' of https://gitlab.cern.ch/sseifeln/Ph2_ACF into tentativeMergeWithSarah
parents 2d569094 e5d734ef
Pipeline #2686495 failed with stages
in 41 seconds
......@@ -31,10 +31,10 @@ bool D19clpGBTInterface::ConfigureChip(Ph2_HwDescription::Chip* pChip, bool pVer
CPBconfig cCPBconfig;
cCPBconfig.fEnable = fUseCPB;
cCPBconfig.fI2CFrequency = 3;
cCPBconfig.fWait_us = 10;
cCPBconfig.fReTry = 1;
cCPBconfig.fVerbose = 1;
cCPBconfig.fMaxAttempts = 100;
cCPBconfig.fWait_us = 10; // TO-DO - make configurable from xml
cCPBconfig.fReTry = 1; // TO-DO - make configurable from xml
cCPBconfig.fVerbose = 0; // TO-DO - make configurable from xml
cCPBconfig.fMaxAttempts = 100; // TO-DO - make configurable from xml
fBoardFW->ConfigureCPB(cCPBconfig);
// Configure High Speed Link Tx Rx Polarity
// do this before doing anything else
......
......@@ -32,7 +32,7 @@ bool lpGBTInterface::WriteChipReg(Chip* pChip, const std::string& pDacName, uint
LOG(ERROR) << "LpGBT read-write registers end at 0x13C ... impossible to write to address " << BOLDYELLOW << cAddress << RESET;
return false;
}
bool cSuccess = false;
bool cSuccess = fBoardFW->WriteOptoLinkRegister(pChip, cAddress, pDacValue, pVerifLoop);
if(pChip->isOptical()) { cSuccess = fBoardFW->WriteOptoLinkRegister(pChip, cAddress, pDacValue, pVerifLoop); }
// TO-DO .. figure out what to do if piGBT is used
else
......
......@@ -88,7 +88,7 @@ if(NOT DEFINED ENV{OTSDAQ_CMSOUTERTRACKER_DIR})
endif()
endif()
set(LIBS ${LIBS} Ph2_Description Ph2_Interface Ph2_Utils Ph2_System Ph2_MonitorUtils)
set(LIBS ${LIBS} Ph2_Description Ph2_Interface Ph2_Utils Ph2_System)
if(NoDataShipping)
set(LIBS ${LIBS} Ph2_DQMUtils Ph2_MonitorDQM)
endif()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment