rtang/SOLARIS_QT6_DAQ
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

bug fix for VX2730

Browse Source
This commit is contained in:
Ryan Tang 2024-07-27 15:36:30 -04:00
parent 4a5fd7a769
commit fc31f1a658
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ClassDigitizer2Gen.cpp
View File

@ -1208,12 +1208,20 @@ void Digitizer2Gen::ReadAllSettings(){
boardSettings[i].GetPara() == PHA::DIG::TempSensADC6.GetPara() boardSettings[i].GetPara() == PHA::DIG::TempSensADC6.GetPara()
) )
) continue; ) continue;
if( ModelName == "VX2730" &&
(boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() ||
boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara()
)
) continue;
ReadValue(boardSettings[i]); ReadValue(boardSettings[i]);
} }
if( ModelName == "VX2745") for(int i = 0; i < 4 ; i ++) ReadValue(VGASetting[i], i); if( ModelName == "VX2745") for(int i = 0; i < 4 ; i ++) ReadValue(VGASetting[i], i);
if( CupVer >= 2023091800 ) for( int idx = 0; idx < 16; idx++) ReadValue(InputDelay[idx], idx, false); if( ModelName != "VX2730"){
if( CupVer >= 2023091800 ) for( int idx = 0; idx < 16; idx++) ReadValue(InputDelay[idx], idx, false);
}
for( int index = 0; index < 4; index++){ for( int index = 0; index < 4; index++){
for( int i = 0; i < (int) LVDSSettings[index].size(); i++){ for( int i = 0; i < (int) LVDSSettings[index].size(); i++){

26
digiSettingsPanel.cpp
View File

@ -788,17 +788,19 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
} }
{//^====================== Group = InputDelay {//^====================== Group = InputDelay
bdGroup[iDigi] = new QWidget(this); if( digi[iDigi]->GetModelName() != "VX2730") {
bdTab->addTab(bdGroup[iDigi], "Input Delay"); bdGroup[iDigi] = new QWidget(this);
QGridLayout * groupLayout = new QGridLayout(bdGroup[iDigi]); bdTab->addTab(bdGroup[iDigi], "Input Delay");
groupLayout->setAlignment(Qt::AlignTop ); QGridLayout * groupLayout = new QGridLayout(bdGroup[iDigi]);
//LVDSLayout->setSpacing(2); groupLayout->setAlignment(Qt::AlignTop );
//LVDSLayout->setSpacing(2);
for(int k = 0; k < MaxNumberOfGroup; k ++){ for(int k = 0; k < MaxNumberOfGroup; k ++){
SetupSpinBox(spbInputDelay[iDigi][k], PHA::GROUP::InputDelay, k, false, "ch : " + QString::number(4*k) + " - " + QString::number(4*k+3) + " [ns] ", groupLayout, k/4, 2*(k%4)); SetupSpinBox(spbInputDelay[iDigi][k], PHA::GROUP::InputDelay, k, false, "ch : " + QString::number(4*k) + " - " + QString::number(4*k+3) + " [ns] ", groupLayout, k/4, 2*(k%4));
}
bdGroup[iDigi]->setEnabled(digi[iDigi]->GetCupVer() >= MIN_VERSION_GROUP);
} }
bdGroup[iDigi]->setEnabled(digi[iDigi]->GetCupVer() >= MIN_VERSION_GROUP);
} }
} }
@ -2619,7 +2621,7 @@ void DigiSettingsPanel::UpdatePanelFromMemory(bool onlyStatus){
} }
//------------ Group //------------ Group
if( digi[ID]->GetCupVer() >= MIN_VERSION_GROUP ){ if( digi[ID]->GetModelName() != "VX2730" && digi[ID]->GetCupVer() >= MIN_VERSION_GROUP ){
for( int k = 0 ; k < MaxNumberOfGroup; k++){ for( int k = 0 ; k < MaxNumberOfGroup; k++){
FillSpinBoxValueFromMemory(spbInputDelay[ID][k], PHA::GROUP::InputDelay, k); // PHA = PSD FillSpinBoxValueFromMemory(spbInputDelay[ID][k], PHA::GROUP::InputDelay, k); // PHA = PSD
} }
@ -2748,12 +2750,12 @@ void DigiSettingsPanel::UpdatePanelFromMemory(bool onlyStatus){
unsigned long haha = Utility::TenBase(digi[ID]->GetSettingValueFromMemory(PHA::CH::ChannelsTriggerMask, ch)); unsigned long haha = Utility::TenBase(digi[ID]->GetSettingValueFromMemory(PHA::CH::ChannelsTriggerMask, ch));
if( mask != haha) { if( mask != haha) {
isSame = false; isSame = false;
leTriggerMask[ID][MaxNumberOfChannel]->setText("Diff. value"); leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("Diff. value");
break; break;
} }
} }
if( isSame ) leTriggerMask[ID][MaxNumberOfChannel]->setText("0x" + QString::number(mask, 16).toUpper()); if( isSame ) leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("0x" + QString::number(mask, 16).toUpper());
}else{ }else{
unsigned long mask = Utility::TenBase(digi[ID]->GetSettingValueFromMemory(PHA::CH::ChannelsTriggerMask, cbChPick[ID]->currentData().toInt())); unsigned long mask = Utility::TenBase(digi[ID]->GetSettingValueFromMemory(PHA::CH::ChannelsTriggerMask, cbChPick[ID]->currentData().toInt()));
leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("0x" + QString::number(mask, 16).toUpper()); leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("0x" + QString::number(mask, 16).toUpper());