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

Commits on Sep 30, 2020

  1. Copy the full SHA
    7887aa4 View commit details
Showing with 252 additions and 0 deletions.
  1. +1 −0 scopeprotocols/CMakeLists.txt
  2. +182 −0 scopeprotocols/DutyCycleMeasurement.cpp
  3. +67 −0 scopeprotocols/DutyCycleMeasurement.h
  4. +1 −0 scopeprotocols/scopeprotocols.cpp
  5. +1 −0 scopeprotocols/scopeprotocols.h
1 change: 1 addition & 0 deletions scopeprotocols/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ set(SCOPEPROTOCOLS_SOURCES
DownsampleFilter.cpp
DramRefreshActivateMeasurement.cpp
DramRowColumnLatencyMeasurement.cpp
DutyCycleMeasurement.cpp
DVIDecoder.cpp
Ethernet10BaseTDecoder.cpp
Ethernet100BaseTDecoder.cpp
182 changes: 182 additions & 0 deletions scopeprotocols/DutyCycleMeasurement.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
/***********************************************************************************************************************
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2020 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
* following conditions are met: *
* *
* * Redistributions of source code must retain the above copyright notice, this list of conditions, and the *
* following disclaimer. *
* *
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the *
* following disclaimer in the documentation and/or other materials provided with the distribution. *
* *
* * Neither the name of the author nor the names of any contributors may be used to endorse or promote products *
* derived from this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR *
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***********************************************************************************************************************/

#include "scopeprotocols.h"
#include "DutyCycleMeasurement.h"

using namespace std;

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

DutyCycleMeasurement::DutyCycleMeasurement(string color)
: Filter(OscilloscopeChannel::CHANNEL_TYPE_ANALOG, color, CAT_MEASUREMENT)
{
m_yAxisUnit = Unit(Unit::UNIT_PERCENT);

//Set up channels
CreateInput("din");

m_midpoint = 0.5;
m_range = 1;

m_rmin = 0;
m_rmax = 0.001;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Factory methods

bool DutyCycleMeasurement::ValidateChannel(size_t i, StreamDescriptor stream)
{
if(stream.m_channel == NULL)
return false;

if( (i == 0) && (stream.m_channel->GetType() == OscilloscopeChannel::CHANNEL_TYPE_ANALOG) )
return true;

return false;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Accessors

void DutyCycleMeasurement::ClearSweeps()
{
m_midpoint = 0.5;
m_range = 1;

m_rmin = 0;
m_rmax = 0.001;
}

void DutyCycleMeasurement::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "DutyCycle(%s)", GetInputDisplayName(0).c_str());
m_hwname = hwname;
m_displayname = m_hwname;
}

string DutyCycleMeasurement::GetProtocolName()
{
return "Duty Cycle";
}

bool DutyCycleMeasurement::IsOverlay()
{
//we create a new analog channel
return false;
}

bool DutyCycleMeasurement::NeedsConfig()
{
//automatic configuration
return false;
}

double DutyCycleMeasurement::GetVoltageRange()
{
return m_range;
}

double DutyCycleMeasurement::GetOffset()
{
return -m_midpoint;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Actual decoder logic

void DutyCycleMeasurement::Refresh()
{
//Make sure we've got valid inputs
if(!VerifyAllInputsOKAndAnalog())
{
SetData(NULL, 0);
return;
}
auto din = GetAnalogInputWaveform(0);

//Find average voltage of the waveform and use that as the zero crossing
float midpoint = GetAvgVoltage(din);

//Timestamps of the edges
vector<double> edges;
FindZeroCrossings(din, midpoint, edges);
if(edges.size() < 2)
{
SetData(NULL, 0);
return;
}

//Create the output
auto cap = new AnalogWaveform;

//Figure out edge polarity
bool initial_polarity = (din->m_samples[0] > midpoint);

size_t elen = edges.size();
for(size_t i=0; i < (elen - 2); i+= 2)
{
//measure from edge to 2 edges later, since we find all zero crossings regardless of polarity
double start = edges[i];
double mid = edges[i+1];
double end = edges[i+2];

double t1 = mid-start;
double t2 = end-mid;
double total = t1+t2;

double duty;

//T1 is high time
if(!initial_polarity)
duty = t1/total;
else
duty = t2/total;

cap->m_offsets.push_back(start);
cap->m_durations.push_back(total);
cap->m_samples.push_back(duty);

m_rmin = min(m_rmin, duty);
m_rmax = max(m_rmax, duty);
}

m_range = m_rmax - m_rmin;
m_midpoint = m_rmin + m_range/2;

SetData(cap, 0);

//Copy start time etc from the input. Timestamps are in picoseconds.
cap->m_timescale = 1;
cap->m_startTimestamp = din->m_startTimestamp;
cap->m_startPicoseconds = din->m_startPicoseconds;
}
67 changes: 67 additions & 0 deletions scopeprotocols/DutyCycleMeasurement.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/***********************************************************************************************************************
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2020 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
* following conditions are met: *
* *
* * Redistributions of source code must retain the above copyright notice, this list of conditions, and the *
* following disclaimer. *
* *
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the *
* following disclaimer in the documentation and/or other materials provided with the distribution. *
* *
* * Neither the name of the author nor the names of any contributors may be used to endorse or promote products *
* derived from this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR *
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***********************************************************************************************************************/

/**
@file
@author Andrew D. Zonenberg
@brief Declaration of DutyCycleMeasurement
*/
#ifndef DutyCycleMeasurement_h
#define DutyCycleMeasurement_h

class DutyCycleMeasurement : public Filter
{
public:
DutyCycleMeasurement(std::string color);

virtual void Refresh();

virtual bool NeedsConfig();
virtual bool IsOverlay();

static std::string GetProtocolName();
virtual void SetDefaultName();

virtual void ClearSweeps();

virtual double GetVoltageRange();
virtual double GetOffset();

virtual bool ValidateChannel(size_t i, StreamDescriptor stream);

PROTOCOL_DECODER_INITPROC(DutyCycleMeasurement)

protected:
double m_midpoint;
double m_range;
double m_rmax;
double m_rmin;
};

#endif
1 change: 1 addition & 0 deletions scopeprotocols/scopeprotocols.cpp
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ void ScopeProtocolStaticInit()
AddDecoderClass(DownsampleFilter);
AddDecoderClass(DramRefreshActivateMeasurement);
AddDecoderClass(DramRowColumnLatencyMeasurement);
AddDecoderClass(DutyCycleMeasurement);
AddDecoderClass(DVIDecoder);
AddDecoderClass(Ethernet10BaseTDecoder);
AddDecoderClass(Ethernet100BaseTDecoder);
1 change: 1 addition & 0 deletions scopeprotocols/scopeprotocols.h
Original file line number Diff line number Diff line change
@@ -56,6 +56,7 @@
#include "DownsampleFilter.h"
#include "DramRefreshActivateMeasurement.h"
#include "DramRowColumnLatencyMeasurement.h"
#include "DutyCycleMeasurement.h"
#include "DVIDecoder.h"
#include "EthernetProtocolDecoder.h" //must be before all other ethernet decodes
#include "EthernetAutonegotiationDecoder.h"