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: 214b29e0df2f
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67c4b11975a5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 10, 2020

  1. Copy the full SHA
    67c4b11 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 scopehal/LeCroyOscilloscope.cpp
5 changes: 5 additions & 0 deletions scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -3133,6 +3133,11 @@ void LeCroyOscilloscope::SetSampleDepth(uint64_t depth)
snprintf(tmp, sizeof(tmp), "MSIZ %ld", depth);
m_transport->SendCommand(tmp);
m_memoryDepth = depth;

//We need to reconfigure the trigger in order to keep the offset left-aligned when changing depth
size_t off = GetTriggerOffset();
m_triggerOffsetValid = false;
SetTriggerOffset(off);
}

void LeCroyOscilloscope::SetSampleRate(uint64_t rate)