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

Commits on Sep 16, 2020

  1. Copy the full SHA
    516ccb0 View commit details
Showing with 14 additions and 129 deletions.
  1. +0 −55 scopehal/AgilentEdgeTrigger.cpp
  2. +0 −62 scopehal/AgilentEdgeTrigger.h
  3. +7 −8 scopehal/AgilentOscilloscope.cpp
  4. +0 −1 scopehal/CMakeLists.txt
  5. +5 −0 scopehal/EdgeTrigger.cpp
  6. +2 −1 scopehal/EdgeTrigger.h
  7. +0 −2 scopehal/scopehal.cpp
55 changes: 0 additions & 55 deletions scopehal/AgilentEdgeTrigger.cpp

This file was deleted.

62 changes: 0 additions & 62 deletions scopehal/AgilentEdgeTrigger.h

This file was deleted.

15 changes: 7 additions & 8 deletions scopehal/AgilentOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@

#include "scopehal.h"
#include "AgilentOscilloscope.h"
#include "AgilentEdgeTrigger.h"
#include "EdgeTrigger.h"

using namespace std;

@@ -694,16 +694,16 @@ void AgilentOscilloscope::PullTrigger()
void AgilentOscilloscope::PullEdgeTrigger()
{
//Clear out any triggers of the wrong type
if( (m_trigger != NULL) && (dynamic_cast<AgilentEdgeTrigger*>(m_trigger) != NULL) )
if( (m_trigger != NULL) && (dynamic_cast<EdgeTrigger*>(m_trigger) != NULL) )
{
delete m_trigger;
m_trigger = NULL;
}

//Create a new trigger if necessary
if(m_trigger == NULL)
m_trigger = new AgilentEdgeTrigger(this);
AgilentEdgeTrigger* et = dynamic_cast<AgilentEdgeTrigger*>(m_trigger);
m_trigger = new EdgeTrigger(this);
EdgeTrigger* et = dynamic_cast<EdgeTrigger*>(m_trigger);

lock_guard<recursive_mutex> lock(m_mutex);

@@ -730,7 +730,7 @@ void AgilentOscilloscope::PullEdgeTrigger()
else if (reply == "EITH")
et->SetType(EdgeTrigger::EDGE_ANY);
else if (reply == "ALT")
et->SetTypeExt(AgilentEdgeTrigger::EDGE_ALTERNATING);
et->SetType(EdgeTrigger::EDGE_ALTERNATING);
}

void AgilentOscilloscope::PushTrigger()
@@ -770,8 +770,7 @@ void AgilentOscilloscope::PushEdgeTrigger(EdgeTrigger* trig)
case EdgeTrigger::EDGE_ANY:
m_transport->SendCommand("TRIG:SLOPE EITH");
break;

case AgilentEdgeTrigger::EDGE_ALTERNATING:
case EdgeTrigger::EDGE_ALTERNATING:
m_transport->SendCommand("TRIG:SLOPE ALT");
break;

@@ -783,7 +782,7 @@ void AgilentOscilloscope::PushEdgeTrigger(EdgeTrigger* trig)
vector<string> AgilentOscilloscope::GetTriggerTypes()
{
vector<string> ret;
ret.push_back(AgilentEdgeTrigger::GetTriggerName());
ret.push_back(EdgeTrigger::GetTriggerName());
return ret;
}

1 change: 0 additions & 1 deletion scopehal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@ set(SCOPEHAL_SOURCES

FlowGraphNode.cpp
Trigger.cpp
AgilentEdgeTrigger.cpp
EdgeTrigger.cpp
PulseWidthTrigger.cpp

5 changes: 5 additions & 0 deletions scopehal/EdgeTrigger.cpp
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@

#include "scopehal.h"
#include "EdgeTrigger.h"
#include "AgilentOscilloscope.h"

using namespace std;

@@ -45,6 +46,10 @@ EdgeTrigger::EdgeTrigger(Oscilloscope* scope)
m_parameters[m_typename].AddEnumValue("Rising", EDGE_RISING);
m_parameters[m_typename].AddEnumValue("Falling", EDGE_FALLING);
m_parameters[m_typename].AddEnumValue("Any", EDGE_ANY);

//Only Agilent scopes are known to support this
if(dynamic_cast<AgilentOscilloscope*>(scope) != NULL)
m_parameters[m_typename].AddEnumValue("Alternating", EDGE_ALTERNATING);
}

EdgeTrigger::~EdgeTrigger()
3 changes: 2 additions & 1 deletion scopehal/EdgeTrigger.h
Original file line number Diff line number Diff line change
@@ -48,7 +48,8 @@ class EdgeTrigger : public Trigger
{
EDGE_RISING,
EDGE_FALLING,
EDGE_ANY
EDGE_ANY,
EDGE_ALTERNATING
};

void SetType(EdgeType type)
2 changes: 0 additions & 2 deletions scopehal/scopehal.cpp
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@
#include "SiglentSCPIOscilloscope.h"
#include "TektronixOscilloscope.h"

#include "AgilentEdgeTrigger.h"
#include "EdgeTrigger.h"
#include "PulseWidthTrigger.h"

@@ -117,7 +116,6 @@ void DriverStaticInit()
AddDriverClass(SignalGeneratorOscilloscope);
AddDriverClass(TektronixOscilloscope);

AddTriggerClass(AgilentEdgeTrigger);
AddTriggerClass(EdgeTrigger);
AddTriggerClass(PulseWidthTrigger);
}