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

Commits on Apr 12, 2021

  1. Cleaned up some unused parameters in Siglent driver. UartTrigger now …

    …only enables mark/space parity types on Siglent scopes since most others don't support them.
    azonenberg committed Apr 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b83d69d View commit details
Showing with 17 additions and 5 deletions.
  1. +5 −0 scopehal/LeCroyOscilloscope.cpp
  2. +2 −2 scopehal/SiglentSCPIOscilloscope.cpp
  3. +10 −3 scopehal/UartTrigger.cpp
5 changes: 5 additions & 0 deletions scopehal/LeCroyOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -4258,6 +4258,11 @@ void LeCroyOscilloscope::PushUartTrigger(UartTrigger* trig)
case UartTrigger::PARITY_EVEN:
m_transport->SendCommand("VBS? 'app.Acquisition.Trigger.Serial.UART.ParityType = \"Even\"");
break;

case UartTrigger::PARITY_MARK:
case UartTrigger::PARITY_SPACE:
LogWarning("LeCroy UART trigger does not support mark or space parity\n");
break;
}

//Pattern length depends on the current format.
4 changes: 2 additions & 2 deletions scopehal/SiglentSCPIOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -213,7 +213,7 @@ void SiglentSCPIOscilloscope::DetectOptions()
/**
@brief Creates digital channels for the oscilloscope
*/
void SiglentSCPIOscilloscope::AddDigitalChannels(unsigned int count)
void SiglentSCPIOscilloscope::AddDigitalChannels(unsigned int /*count*/)
{
LogWarning("Digital channels not implemented\n");
// Old code from LeCroy implementation
@@ -902,7 +902,7 @@ bool SiglentSCPIOscilloscope::ReadWavedescs(
return true;
}

void SiglentSCPIOscilloscope::RequestWaveforms(bool* enabled, uint32_t num_sequences, bool denabled)
void SiglentSCPIOscilloscope::RequestWaveforms(bool* enabled, uint32_t num_sequences, bool /*denabled*/)
{
//Ask for all analog waveforms
// This routine does the asking, but doesn't catch the data as it comes back
13 changes: 10 additions & 3 deletions scopehal/UartTrigger.cpp
Original file line number Diff line number Diff line change
@@ -29,13 +29,15 @@

#include "scopehal.h"
#include "UartTrigger.h"
#include "SiglentSCPIOscilloscope.h"

using namespace std;

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Construction / destruction

UartTrigger::UartTrigger(Oscilloscope* scope) : SerialTrigger(scope)
UartTrigger::UartTrigger(Oscilloscope* scope)
: SerialTrigger(scope)
{
CreateInput("din");

@@ -47,8 +49,13 @@ UartTrigger::UartTrigger(Oscilloscope* scope) : SerialTrigger(scope)
m_parameters[m_ptypename].AddEnumValue("None", PARITY_NONE);
m_parameters[m_ptypename].AddEnumValue("Even", PARITY_EVEN);
m_parameters[m_ptypename].AddEnumValue("Odd", PARITY_ODD);
m_parameters[m_ptypename].AddEnumValue("Mark", PARITY_MARK);
m_parameters[m_ptypename].AddEnumValue("Space", PARITY_SPACE);

//Constant 0/1 parity bits are not supported by some scopes as they're pretty rare
if(dynamic_cast<SiglentSCPIOscilloscope*>(scope) != NULL)
{
m_parameters[m_ptypename].AddEnumValue("Mark", PARITY_MARK);
m_parameters[m_ptypename].AddEnumValue("Space", PARITY_SPACE);
}

m_typename = "Trigger Type";
m_parameters[m_typename] = FilterParameter(FilterParameter::TYPE_ENUM, Unit(Unit::UNIT_COUNTS));