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

small fix, prepare for clean up the git image for the firmware

Browse Source
This commit is contained in:
Ryan Tang 2025-05-15 13:29:15 -05:00
parent ceb4cf4563
commit ce9d2d3063
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ClassDigitizer2Gen.cpp
View File

@ -1202,7 +1202,7 @@ void Digitizer2Gen::ReadAllSettings(){
// here TempSens is same for PHA and PSD // here TempSens is same for PHA and PSD
if( ModelName == "VX2740" && boardSettings[i].GetPara() != PHA::DIG::TempSensADC0.GetPara()) continue; if( ModelName == "VX2740" && boardSettings[i].GetPara() != PHA::DIG::TempSensADC0.GetPara()) continue;
if( ModelName == "VX2730" && if( ModelName != "VX2740" &&
(boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() || (boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() ||
boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara() boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara()
) )
@ -1227,6 +1227,7 @@ void Digitizer2Gen::ReadAllSettings(){
for(int ch = 0; ch < nChannels ; ch++ ){ for(int ch = 0; ch < nChannels ; ch++ ){
for( int i = 0; i < (int) chSettings[ch].size(); i++){ for( int i = 0; i < (int) chSettings[ch].size(); i++){
if( chSettings[ch][i].ReadWrite() == RW::WriteOnly) continue; if( chSettings[ch][i].ReadWrite() == RW::WriteOnly) continue;
if( ModelName != "VX2730" && chSettings[ch][i].GetPara() == PSD::CH::ChGain.GetPara()) continue;
ReadValue(chSettings[ch][i], ch); ReadValue(chSettings[ch][i], ch);
} }
} }

12
mainwindow.cpp
View File

@ -759,7 +759,11 @@ void MainWindow::OpenDigitizers(){
bnComment->setEnabled(false); bnComment->setEnabled(false);
bnOpenScope->setEnabled(true); bnOpenScope->setEnabled(true);
chkSaveRun->setEnabled(true); chkSaveRun->setEnabled(true);
bnSyncHelper->setEnabled(true); if( nDigiConnected == 1 ) {
bnSyncHelper->setEnabled(false);
}else{
bnSyncHelper->setEnabled(true);
}
bnOpenDigitizers->setEnabled(false); bnOpenDigitizers->setEnabled(false);
bnOpenDigitizers->setStyleSheet(""); bnOpenDigitizers->setStyleSheet("");
cbAutoRun->setEnabled(true); cbAutoRun->setEnabled(true);
@ -1497,10 +1501,12 @@ void MainWindow::ProgramSettingsPanel(){
DatabaseIP = lDatbaseIP->text(); DatabaseIP = lDatbaseIP->text();
DatabaseName = lDatbaseName->text(); DatabaseName = lDatbaseName->text();
DatabaseToken = lDatbaseToken->text(); DatabaseToken = lDatbaseToken->text();
ElogIP = lElogIP->text();
analysisPath = lAnalysisPath->text(); analysisPath = lAnalysisPath->text();
masterExpDataPath = lExpDataPath->text(); masterExpDataPath = lExpDataPath->text();
expName = lExpName->text(); expName = lExpName->text();
ElogIP = lElogIP->text();
ElogUser = lElogUser->text();
ElogPWD = lElogPWD->text();
SaveProgramSettings(); SaveProgramSettings();
@ -2426,6 +2432,8 @@ void MainWindow::WriteElog(QString htmlText, QString subject, QString category,
arg << "-a" << "Subject=" + subject arg << "-a" << "Subject=" + subject
<< "-n " << "2" << htmlText ; << "-n " << "2" << htmlText ;
// printf("Elog command: %s\n", arg.join(" ").toStdString().c_str());
QProcess elogBash(this); QProcess elogBash(this);
elogBash.start("elog", arg); elogBash.start("elog", arg);
elogBash.waitForFinished(); elogBash.waitForFinished();