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

Commits on May 11, 2020

  1. Copy the full SHA
    dbe600f View commit details
  2. Copy the full SHA
    b032de7 View commit details
Showing with 13 additions and 1 deletion.
  1. +2 −0 scopeprotocols/ClockRecoveryDebugDecoder.cpp
  2. +10 −1 scopeprotocols/ClockRecoveryDecoder.cpp
  3. +1 −0 scopeprotocols/ClockRecoveryDecoder.h
2 changes: 2 additions & 0 deletions scopeprotocols/ClockRecoveryDebugDecoder.cpp
Original file line number Diff line number Diff line change
@@ -41,6 +41,8 @@ ClockRecoveryDebugDecoder::ClockRecoveryDebugDecoder(string color)
//Set up channels
m_signalNames.push_back("PLL");
m_channels.push_back(NULL);

m_yAxisUnit = Unit(Unit::UNIT_PS);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
11 changes: 10 additions & 1 deletion scopeprotocols/ClockRecoveryDecoder.cpp
Original file line number Diff line number Diff line change
@@ -57,6 +57,15 @@ ClockRecoveryDecoder::ClockRecoveryDecoder(string color)
m_nominalPeriod = 0;
}

ClockRecoveryDecoder::~ClockRecoveryDecoder()
{
if(m_phaseErrorCapture)
{
delete m_phaseErrorCapture;
m_phaseErrorCapture = NULL;
}
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Factory methods

@@ -146,7 +155,7 @@ void ClockRecoveryDecoder::Refresh()

//Create debug capture
if(m_phaseErrorCapture != NULL)
m_phaseErrorCapture = NULL;
delete m_phaseErrorCapture;
m_phaseErrorCapture = new AnalogCapture;
m_phaseErrorCapture->m_startTimestamp = din->m_startTimestamp;
m_phaseErrorCapture->m_startPicoseconds = din->m_startPicoseconds;
1 change: 1 addition & 0 deletions scopeprotocols/ClockRecoveryDecoder.h
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ class ClockRecoveryDecoder : public ProtocolDecoder
{
public:
ClockRecoveryDecoder(std::string color);
virtual ~ClockRecoveryDecoder();

virtual void Refresh();