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

fixed using old firmware with new libraries

Browse Source
This commit is contained in:
Ryan Tang 2023-10-26 17:03:23 -04:00
parent abc0c99d6e
commit e3edb4e9d7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DigiParameters.h
View File

@ -5,6 +5,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#define MIN_VERSION_GROUP 2022122300
enum ANSTYPE {INTEGER, FLOAT, LIST, STR, BYTE, BINARY, NONE}; enum ANSTYPE {INTEGER, FLOAT, LIST, STR, BYTE, BINARY, NONE};
enum TYPE {CH, DIG, LVDS, VGA, GROUP}; enum TYPE {CH, DIG, LVDS, VGA, GROUP};
enum RW { ReadOnly, WriteOnly, ReadWrite}; enum RW { ReadOnly, WriteOnly, ReadWrite};

10
digiSettingsPanel.cpp
View File

@ -787,8 +787,7 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
} }
if( digi[iDigi]->GetCupVer() >= 2023091800 ){ {//^====================== Group = InputDelay
//^====================== Group = InputDelay
bdGroup[iDigi] = new QWidget(this); bdGroup[iDigi] = new QWidget(this);
bdTab->addTab(bdGroup[iDigi], "Input Delay"); bdTab->addTab(bdGroup[iDigi], "Input Delay");
QGridLayout * groupLayout = new QGridLayout(bdGroup[iDigi]); QGridLayout * groupLayout = new QGridLayout(bdGroup[iDigi]);
@ -799,8 +798,7 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
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));
} }
}else{ bdGroup[iDigi]->setEnabled(digi[iDigi]->GetCupVer() >= MIN_VERSION_GROUP);
bdGroup[iDigi] = nullptr;
} }
} }
@ -2616,9 +2614,11 @@ void DigiSettingsPanel::UpdatePanelFromMemory(bool onlyStatus){
} }
//------------ Group //------------ Group
if( 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
} }
}
//@============================== Channel setting/ status //@============================== Channel setting/ status
@ -3114,7 +3114,7 @@ void DigiSettingsPanel::FillSpinBoxValueFromMemory(RSpinBox *&spb, const Reg par
QString result = QString::fromStdString(digi[ID]->GetSettingValue(para, ch_index)); QString result = QString::fromStdString(digi[ID]->GetSettingValue(para, ch_index));
//printf("%s === %s, %d, %p\n", __func__, result.toStdString().c_str(), ID, spb); //printf("%s === %s, %d, %p\n", __func__, result.toStdString().c_str(), ID, spb);
if( para.GetPara() == PHA::GROUP::InputDelay.GetPara()) { if( para.GetPara() == PHA::GROUP::InputDelay.GetPara() && digi[ID]->GetCupVer() >= MIN_VERSION_GROUP) {
spb->setValue(result.toInt()*8); spb->setValue(result.toInt()*8);
}else{ }else{
spb->setValue(result.toDouble()); spb->setValue(result.toDouble());