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

Commits on Mar 9, 2020

  1. Copy the full SHA
    0411814 View commit details
Showing with 8 additions and 1 deletion.
  1. +7 −1 scopeprotocols/ParallelBusDecoder.cpp
  2. +1 −0 scopeprotocols/ParallelBusDecoder.h
8 changes: 7 additions & 1 deletion scopeprotocols/ParallelBusDecoder.cpp
Original file line number Diff line number Diff line change
@@ -89,6 +89,12 @@ bool ParallelBusDecoder::NeedsConfig()
return true;
}

bool ParallelBusDecoder::IsOverlay()
{
//Probably doesn't make sense to be an overlay since we're not tied to the single bit we started decoding on
return false;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Actual decoder logic

@@ -133,7 +139,7 @@ void ParallelBusDecoder::Refresh()
bool end = false;
for(int j=0; j<width; j++)
{
if(inputs[j]->GetDepth() >= i)
if(inputs[j]->GetDepth() <= i)
{
end = true;
break;
1 change: 1 addition & 0 deletions scopeprotocols/ParallelBusDecoder.h
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@ class ParallelBusDecoder : public ProtocolDecoder

static std::string GetProtocolName();
virtual void SetDefaultName();
virtual bool IsOverlay();

virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);