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

Commits on May 3, 2021

  1. Implement SetChannelVoltageRange for RS3000

    @fsedano
    fsedano committed May 3, 2021
    Copy the full SHA
    09e5eaa View commit details

  2. Fix typos

    @fsedano
    fsedano committed May 3, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9b7c6b View commit details

  3. Merge pull request #451 from fsedano/add_channel_range 

    Implement SetChannelVoltageRange for RS3000
    @azonenberg
    azonenberg authored May 3, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84da3c6 View commit details
Showing with 10 additions and 3 deletions.
  1. +10 −3 scopehal/RohdeSchwarzOscilloscope.cpp
13 changes: 10 additions & 3 deletions scopehal/RohdeSchwarzOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -394,10 +394,17 @@ double RohdeSchwarzOscilloscope::GetChannelVoltageRange(size_t i)
return range;
}

void RohdeSchwarzOscilloscope::SetChannelVoltageRange(size_t /*i*/, double /*range*/)
void RohdeSchwarzOscilloscope::SetChannelVoltageRange(size_t i, double range)
{
//FIXME
LogWarning("RohdeSchwarzOscilloscope::SetChannelVoltageRange unimplemented\n");
{
lock_guard<recursive_mutex> lock(m_cacheMutex);
m_channelVoltageRanges[i] = range;
}

lock_guard<recursive_mutex> lock(m_mutex);
char cmd[128];
snprintf(cmd, sizeof(cmd), "%s:RANGE %.4f", m_channels[i]->GetHwname().c_str(), range);
m_transport->SendCommand(cmd);
}

OscilloscopeChannel* RohdeSchwarzOscilloscope::GetExternalTrigger()