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

Commits on Feb 21, 2020

  1. Copy the full SHA
    08ed8c2 View commit details
  2. TMDSRenderer: changed control character rendering to CTL instead of C…

    …, to avoid confusion with hex characters
    azonenberg committed Feb 21, 2020
    Copy the full SHA
    8684233 View commit details
  3. Copy the full SHA
    bbb1e23 View commit details
Showing with 5 additions and 3 deletions.
  1. +3 −1 scopehal/CaptureChannel.h
  2. +1 −1 scopeprotocols/ClockRecoveryDecoder.cpp
  3. +1 −1 scopeprotocols/TMDSRenderer.cpp
4 changes: 3 additions & 1 deletion scopehal/CaptureChannel.h
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2019 Andrew D. Zonenberg *
* Copyright (c) 2012-2020 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -79,6 +79,8 @@ class CaptureChannelBase
virtual int64_t GetEndTime() const =0;

virtual int64_t GetSampleStart(size_t i) const =0;
int64_t GetSampleEnd(size_t i) const
{ return GetSampleStart(i) + GetSampleLen(i); }
virtual int64_t GetSampleLen(size_t i) const =0;

virtual bool EqualityTest(size_t i, size_t j) const =0;
2 changes: 1 addition & 1 deletion scopeprotocols/ClockRecoveryDecoder.cpp
Original file line number Diff line number Diff line change
@@ -228,7 +228,7 @@ void ClockRecoveryDecoder::Refresh()
//Allow multiple edges in the UI if the frequency is way off.
int64_t tnext = edges[nedge];
cycles_open_loop ++;
while(tnext + center < edgepos)
while( (tnext + center < edgepos) && (nedge+1 < edges.size()) )
{
//Find phase error
int64_t delta = (edgepos - tnext) - period;
2 changes: 1 addition & 1 deletion scopeprotocols/TMDSRenderer.cpp
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ string TMDSRenderer::GetText(int i)
switch(s.m_type)
{
case TMDSSymbol::TMDS_TYPE_CONTROL:
snprintf(tmp, sizeof(tmp), "C%d", s.m_data);
snprintf(tmp, sizeof(tmp), "CTL%d", s.m_data);
break;

case TMDSSymbol::TMDS_TYPE_GUARD: