WaveDAQ/drs4eb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made transparent trigger mode wok in multi-board configuration

Browse Source
This commit is contained in:
ritt
2016-11-28 16:57:50 +01:00
parent 12709a248e
commit 5ab32c3921
3 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/drsosc/ConfigDialog.cpp
+2 -2
View File
@@ -150,7 +150,7 @@ void ConfigDialog::UpdateControls()
m_cbExtRefclk->SetValue(m_osci->GetBoard(m_board)->GetRefclk() == 1);
if ((m_osci->GetBoard(m_board)->GetBoardType() == 8 || m_osci->GetBoard(m_board)->GetBoardType() == 9)
&& (!m_osci->IsMultiBoard() || m_board == 0))
&& !(m_osci->IsMultiBoard() && !m_frame->IsTranspTrigger() && m_board > 0))
m_frame->EnableTriggerConfig(true);
else
m_frame->EnableTriggerConfig(false);
@@ -178,7 +178,7 @@ void ConfigDialog::OnBoardSelect( wxCommandEvent& event )
wxT("DRS Oscilloscope"), wxOK | wxICON_STOP, this);
} else {
if (b->GetScaler(5) < 300000) {
str.Printf(wxT("No clock signal connected to CLK IN of board #%d"), i);
str.Printf(wxT("No clock signal connected to CLK IN of board #%d. Keeping internal clock."), m_frame->GetOsci()->GetBoard(i)->GetBoardSerialNumber());
wxMessageBox(str, wxT("DRS Oscilloscope"), wxOK | wxICON_STOP, this);
m_frame->SetRefclk(i, false);
} else {