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

Commits on Jul 1, 2020

  1. Copy the full SHA
    a50b2ae View commit details
  2. Copy the full SHA
    5bf1fe1 View commit details
1 change: 0 additions & 1 deletion scopeprotocols/ADL5205Decoder.cpp
Original file line number Diff line number Diff line change
@@ -123,7 +123,6 @@ void ADL5205Decoder::Refresh()
for(size_t i=0; i<len; i++)
{
auto s = din->m_samples[i];
SetData(NULL);

switch(phase)
{
1 change: 1 addition & 0 deletions scopeprotocols/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ set(SCOPEPROTOCOLS_SOURCES
HorizontalBathtubDecoder.cpp
I2CDecoder.cpp
IBM8b10bDecoder.cpp
IPv4Decoder.cpp
JtagDecoder.cpp
MDIODecoder.cpp
MovingAverageDecoder.cpp
4 changes: 2 additions & 2 deletions scopeprotocols/EthernetProtocolDecoder.cpp
Original file line number Diff line number Diff line change
@@ -430,7 +430,7 @@ string EthernetProtocolDecoder::GetText(int i)
if(sample.m_data.size() != 6)
return "[invalid dest MAC length]";

snprintf(tmp, sizeof(tmp), "Dest MAC: %02x:%02x:%02x:%02x:%02x:%02x",
snprintf(tmp, sizeof(tmp), "To %02x:%02x:%02x:%02x:%02x:%02x",
sample.m_data[0],
sample.m_data[1],
sample.m_data[2],
@@ -445,7 +445,7 @@ string EthernetProtocolDecoder::GetText(int i)
if(sample.m_data.size() != 6)
return "[invalid src MAC length]";

snprintf(tmp, sizeof(tmp), "Src MAC: %02x:%02x:%02x:%02x:%02x:%02x",
snprintf(tmp, sizeof(tmp), "From %02x:%02x:%02x:%02x:%02x:%02x",
sample.m_data[0],
sample.m_data[1],
sample.m_data[2],
Loading