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

Commits on Jun 3, 2020

  1. USB2PCSDecoder: fix typo in sample duration calculation

    @miek
    miek committed Jun 3, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    makenowjust Hiroya Fujinami
    GPG key ID: 9F4CB6A0CB6B6BE9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    52af8a5 View commit details

  2. USB2PacketDecoder: fix typo in endpoint symbol parsing

    @miek
    miek committed Jun 3, 2020
    Copy the full SHA
    00fa95e View commit details

  3. Merge pull request #142 from miek/usb_decode 

    USB decoder fixes
    @azonenberg
    azonenberg authored Jun 3, 2020
    Copy the full SHA
    4b43648 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 scopeprotocols/USB2PCSDecoder.cpp
  2. +1 −1 scopeprotocols/USB2PacketDecoder.cpp
2 changes: 1 addition & 1 deletion scopeprotocols/USB2PCSDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -232,7 +232,7 @@ void USB2PCSDecoder::RefreshIterationSync(
int64_t& offset,
uint8_t& data)
{
size_t sample_ps = din->m_offsets[nin] * din->m_timescale;
size_t sample_ps = din->m_durations[nin] * din->m_timescale;
float sample_width_ui = sample_ps * 1.0f / ui_width;

//Keep track of our position in the sync sequence
2 changes: 1 addition & 1 deletion scopeprotocols/USB2PacketDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -268,7 +268,7 @@ void USB2PacketDecoder::Refresh()

cap->m_offsets.push_back(din->m_offsets[i]);
cap->m_durations.push_back(halfdur);
cap->m_samples.push_back(USB2PacketSymbol(USB2PacketSymbol::TYPE_ERROR,
cap->m_samples.push_back(USB2PacketSymbol(USB2PacketSymbol::TYPE_ENDP,
( last >> 7) | ( (sin.m_data & 0x7) << 1 )));

cap->m_offsets.push_back(din->m_offsets[i] + halfdur);