Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7ed2ed4f48cf
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 934df1613d53
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 7, 2019

  1. OscilloscopeWindow: don't crash if badly behaved driver returns garba… 

    …ge trigger channel
    @azonenberg
    azonenberg committed Jun 7, 2019
    Copy the full SHA
    934df16 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 glscopeclient/OscilloscopeWindow.cpp
9 changes: 8 additions & 1 deletion glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -733,7 +733,14 @@ void OscilloscopeWindow::UpdateStatusBar()
//TODO: redo this for multiple scopes
auto scope = m_scopes[0];
char tmp[256];
string name = scope->GetChannel(scope->GetTriggerChannelIndex())->GetHwname();
size_t trig_idx = scope->GetTriggerChannelIndex();
OscilloscopeChannel* chan = scope->GetChannel(trig_idx);
if(chan == NULL)
{
LogWarning("Trigger channel (index %zu) is NULL", trig_idx);
return;
}
string name = chan->GetHwname();
float voltage = scope->GetTriggerVoltage();
if(voltage < 1)
snprintf(tmp, sizeof(tmp), "%s %.0f mV", name.c_str(), voltage*1000);