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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f39cd4e89251
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e1f80c110bb
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 29, 2020

  1. Copy the full SHA
    5e1f80c View commit details
Showing with 7 additions and 3 deletions.
  1. +1 −0 scopehal/TektronixOscilloscope.cpp
  2. +6 −3 scopeprotocols/EyePattern.cpp
1 change: 1 addition & 0 deletions scopehal/TektronixOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -1258,6 +1258,7 @@ bool TektronixOscilloscope::AcquireDataMSO56(map<int, vector<WaveformBase*> >& p
cap->Resize(nsamples);

//We get dBm from the instrument, so just have to convert double to single precision
//TODO: are other units possible here?
for(size_t j=0; j<nsamples; j++)
{
cap->m_offsets[j] = j;
9 changes: 6 additions & 3 deletions scopeprotocols/EyePattern.cpp
Original file line number Diff line number Diff line change
@@ -91,8 +91,8 @@ void EyeWaveform::Normalize()

EyePattern::EyePattern(string color)
: Filter(OscilloscopeChannel::CHANNEL_TYPE_EYE, color, CAT_ANALYSIS)
, m_height(0)
, m_width(0)
, m_height(1)
, m_width(1)
, m_xoff(0)
, m_xscale(0)
{
@@ -409,6 +409,8 @@ void EyePattern::Refresh()
if(offset > twidth)
{
iclock ++;
if(iclock + 1 >= cend)
break;
offset = tstart - clock->m_offsets[iclock+1] * clock->m_timescale;
}

@@ -446,9 +448,10 @@ void EyePattern::Refresh()
int64_t pixel_x_round2 = round(pixel_x_f + m_xscale*cap->m_uiWidth);
int64_t pixel_x_round3 = round(pixel_x_f - m_xscale*cap->m_uiWidth);
int64_t xpos[] = { pixel_x_round, pixel_x_round2, pixel_x_round3 };
int64_t w = m_width;
for(auto x : xpos)
{
if( (x+1 < (int64_t)m_width) && (x >= 0) )
if( (x+1 < w) && (x >= 0) )
{
row1[x+0] += bin1 * dx_frac;
row1[x+1] += bin1 * (1-dx_frac);