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: 50c0c23b4a95
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59af49d88d4d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 14, 2021

  1. Fix digital levels and waveform offset

    @mubes
    mubes committed May 14, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    15219a6 View commit details

Commits on May 15, 2021

  1. Merge pull request #479 from mubes/digi_ints 

    Fix digital levels and waveform offset
    @azonenberg
    azonenberg authored May 15, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59af49d View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 scopehal/SiglentSCPIOscilloscope.cpp
6 changes: 3 additions & 3 deletions scopehal/SiglentSCPIOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ static const struct
{
const char* name;
float val;
} c_threshold_table[] = {{"TTL", 1.5F}, {"CMOS", 2.5F}, {"LVCMOS33", 3.3F}, {"LVCMOS25", 1.5F}, {NULL, 0}};
} c_threshold_table[] = {{"TTL", 1.5F}, {"CMOS", 1.65F}, {"LVCMOS33", 1.65F}, {"LVCMOS25", 1.25F}, {NULL, 0}};

static const std::chrono::milliseconds c_setting_delay(50); // Delay required when setting parameters via SCPI
static const char* c_custom_thresh = "CUSTOM,"; // Prepend string for custom digital threshold
@@ -995,9 +995,9 @@ vector<WaveformBase*> SiglentSCPIOscilloscope::ProcessAnalogWaveform(const char*
//cppcheck-suppress invalidPointerCast
double h_off = *reinterpret_cast<double*>(pdesc + 180) * FS_PER_SECOND; //fs from start of waveform to trigger

double h_off_frac = fmodf(h_off, interval); //fractional sample position, in fs
//double h_off_frac = fmodf(h_off, interval); //fractional sample position, in fs

//double h_off_frac = 0;//((interval*datalen)/2)+h_off;
double h_off_frac = 0;//((interval*datalen)/2)+h_off;

if(h_off_frac < 0)
h_off_frac = h_off; //interval + h_off_frac; //double h_unit = *reinterpret_cast<double*>(pdesc + 244);