Commit ad89a9cf authored by Georg Auzinger's avatar Georg Auzinger
Browse files

fixed some bugs related to removal of GLIB FW registers from Definition.h

parent fab71e1b
......@@ -45,7 +45,7 @@ std::string BeBoardFWInterface::getBoardType()
{
std::string cBoardTypeString;
uhal::ValWord<uint32_t> cBoardType = ReadReg( BOARD_TYPE );
uhal::ValWord<uint32_t> cBoardType = ReadReg( "board_id" );
char cChar = ( ( cBoardType & cMask4 ) >> 24 );
cBoardTypeString.push_back( cChar );
......@@ -65,11 +65,11 @@ std::string BeBoardFWInterface::getBoardType()
void BeBoardFWInterface::getBoardInfo()
{
std::cout << "FMC1 present : " << ReadReg( FMC1_PRESENT ) << std::endl;
std::cout << "FMC2 present : " << ReadReg( FMC2_PRESENT ) << std::endl;
std::cout << "FW version : " << ReadReg( FW_VERSION_MAJOR ) << "." << ReadReg( FW_VERSION_MINOR ) << "." << ReadReg( FW_VERSION_BUILD ) << std::endl;
std::cout << "FMC1 present : " << ReadReg( "status.fmc1_present" ) << std::endl;
std::cout << "FMC2 present : " << ReadReg( "status.fmc2_present" ) << std::endl;
std::cout << "FW version : " << ReadReg( "firm_id.firmware_major" ) << "." << ReadReg( "firm_id.firmware_minor" ) << "." << ReadReg( "firm_id.firmware_build" ) << std::endl;
uhal::ValWord<uint32_t> cBoardType = ReadReg( BOARD_TYPE );
uhal::ValWord<uint32_t> cBoardType = ReadReg( "board_id" );
std::cout << "BoardType : ";
......@@ -85,9 +85,9 @@ void BeBoardFWInterface::getBoardInfo()
cChar = ( cBoardType & cMask1 );
std::cout << cChar << std::endl;
std::cout << "FMC User Board ID : " << ReadReg( FMC_USER_BOARD_ID ) << std::endl;
std::cout << "FMC User System ID : " << ReadReg( FMC_USER_SYS_ID ) << std::endl;
std::cout << "FMC User Version : " << ReadReg( FMC_USER_VERSION ) << std::endl;
std::cout << "FMC User Board ID : " << ReadReg( "user_wb_ttc_fmc_regs.user_board_id" ) << std::endl;
std::cout << "FMC User System ID : " << ReadReg( "user_wb_ttc_fmc_regs.user_sys_id" ) << std::endl;
std::cout << "FMC User Version : " << ReadReg( "user_wb_ttc_fmc_regs.user_version" ) << std::endl;
}
......@@ -104,7 +104,7 @@ void BeBoardFWInterface::EncodeReg( const CbcRegItem& pRegItem, uint8_t pCbcId,
void BeBoardFWInterface::EncodeReg( const CbcRegItem& pRegItem, uint8_t pFeId, uint8_t pCbcId, std::vector<uint32_t>& pVecReq )
{
// (pCbcId & 7) restarts CbcIDs from 0 for FE 1 (if CbcID > 7)
pVecReq.push_back( pFeId >> 3 ) << 21 | pCbcId << 17 | pRegItem.fPage << 16 | pRegItem.fAddress << 8 | pRegItem.fValue );
pVecReq.push_back( pFeId << 21 | pCbcId << 17 | pRegItem.fPage << 16 | pRegItem.fAddress << 8 | pRegItem.fValue );
}
void BeBoardFWInterface::DecodeReg( CbcRegItem& pRegItem, uint8_t pCbcId, uint32_t pWord )
......
This diff is collapsed.
......@@ -248,6 +248,12 @@ std::vector<uint32_t> CtaFWInterface::ReadBlockRegValue( const std::string& pReg
return valBlock.value();
}
bool CtaFWInterface::WriteBlockReg( const std::string& pRegNode, const std::vector< uint32_t >& pValues )
{
bool cWriteCorr = RegManager::WriteBlockReg( pRegNode, pValues );
return cWriteCorr;
}
void CtaFWInterface::SelectDaqSRAM( uint32_t pNthAcq )
{
fStrSram = ( ( pNthAcq % 2 + 1 ) == 1 ? "sram1" : "sram2" );
......
......@@ -130,7 +130,7 @@ void PedeNoise::measureNoise()
// if we want to run with test pulses, we'll have to enable commissioning mode and enable the TP for each test group
if ( fTestPulse )
{
BeBoardRegWriter cBeBoardWriter( fBeBoardInterface, RQ, 1 );
BeBoardRegWriter cBeBoardWriter( fBeBoardInterface, "COMMISSIONNING_MODE_RQ", 1 );
this->accept( cBeBoardWriter );
cBeBoardWriter.setRegister( "COMMISSIONNING_MODE_CBC_TEST_PULSE_VALID", 1 );
this->accept( cBeBoardWriter );
......
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