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

Commits on May 26, 2020

  1. 8b10b decode: reformatted error display

    @azonenberg
    azonenberg committed May 26, 2020
    Copy the full SHA
    35ddd2d View commit details

  2. Updated to latest logtools

    @azonenberg
    azonenberg committed May 26, 2020
    Copy the full SHA
    2f756a8 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 log
  2. +1 −1 scopeprotocols/IBM8b10bDecoder.cpp
2 changes: 1 addition & 1 deletion log
Submodule log updated from 4df744 to d27a7b
2 changes: 1 addition & 1 deletion scopeprotocols/IBM8b10bDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -346,7 +346,7 @@ string IBM8b10bDecoder::GetText(int i)

char tmp[32];
if(s.m_error)
snprintf(tmp, sizeof(tmp), "ERR");
snprintf(tmp, sizeof(tmp), "ERROR");
else if(s.m_control)
snprintf(tmp, sizeof(tmp), "K%d.%d", left, right);
else