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: 5640b198aabe
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7475de681fa3
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Aug 20, 2020

  1. Copy the full SHA
    0b872e1 View commit details
  2. Copy the full SHA
    7475de6 View commit details
167 changes: 167 additions & 0 deletions scopeprotocols/AutocorrelationDecoder.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
/***********************************************************************************************************************
* *
* 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 "../scopehal/scopehal.h"
#include "AutocorrelationDecoder.h"

using namespace std;

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

AutocorrelationDecoder::AutocorrelationDecoder(string color)
: ProtocolDecoder(OscilloscopeChannel::CHANNEL_TYPE_ANALOG, color, CAT_MATH)
{
//Set up channels
m_signalNames.push_back("din");
m_channels.push_back(NULL);

m_range = 1;
m_offset = 0;

m_maxDeltaName = "Max offset";
m_parameters[m_maxDeltaName] = ProtocolDecoderParameter(ProtocolDecoderParameter::TYPE_INT);
m_parameters[m_maxDeltaName].SetIntVal(1000);
}

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

bool AutocorrelationDecoder::ValidateChannel(size_t i, OscilloscopeChannel* channel)
{
if( (i < 1) && (channel->GetType() == OscilloscopeChannel::CHANNEL_TYPE_ANALOG) )
return true;
return false;
}

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

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

double AutocorrelationDecoder::GetOffset()
{
return -m_offset;
}

string AutocorrelationDecoder::GetProtocolName()
{
return "Autocorrelation";
}

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

bool AutocorrelationDecoder::NeedsConfig()
{
return true;
}

void AutocorrelationDecoder::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "Autocorrelation(%s)",
m_channels[0]->m_displayname.c_str());

m_hwname = hwname;
m_displayname = m_hwname;
}

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

void AutocorrelationDecoder::Refresh()
{
//Get the input data
if(m_channels[0] == NULL)
{
SetData(NULL);
return;
}

auto din = dynamic_cast<AnalogWaveform*>(m_channels[0]->GetData());
if(!din)
{
SetData(NULL);
return;
}

//We need meaningful data
auto len = din->m_samples.size();
if(len == 0)
{
SetData(NULL);
return;
}

//Copy the units
m_yAxisUnit = m_channels[0]->GetYAxisUnits();

//Sanity check range
size_t range = m_parameters[m_maxDeltaName].GetIntVal();
if( len <= range)
{
SetData(NULL);
return;
}

//Set up the output waveform
auto cap = new AnalogWaveform;

size_t end = len - range;
for(size_t delta=1; delta <= range; delta ++)
{
double total = 0;
for(size_t i=0; i<end; i++)
total += din->m_samples[i] * din->m_samples[i+delta];

cap->m_samples.push_back(total / end);
cap->m_offsets.push_back(delta);
cap->m_durations.push_back(1);
}

//Calculate range of the output waveform
float x = GetMaxVoltage(cap);
float n = GetMinVoltage(cap);
m_range = x - n;
m_offset = (x+n)/2;

//Copy our time scales from the input
cap->m_timescale = din->m_timescale;
cap->m_startTimestamp = din->m_startTimestamp;
cap->m_startPicoseconds = din->m_startPicoseconds;

SetData(cap);
}
65 changes: 65 additions & 0 deletions scopeprotocols/AutocorrelationDecoder.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/***********************************************************************************************************************
* *
* 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 AutocorrelationDecoder
*/
#ifndef AutocorrelationDecoder_h
#define AutocorrelationDecoder_h

#include "../scopehal/ProtocolDecoder.h"

class AutocorrelationDecoder : public ProtocolDecoder
{
public:
AutocorrelationDecoder(std::string color);

virtual void Refresh();

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

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

virtual double GetVoltageRange();
virtual double GetOffset();
virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);

PROTOCOL_DECODER_INITPROC(AutocorrelationDecoder)

protected:
double m_range;
double m_offset;
std::string m_maxDeltaName;
};

#endif
2 changes: 2 additions & 0 deletions scopeprotocols/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})

set(SCOPEPROTOCOLS_SOURCES
ACCoupleDecoder.cpp
AutocorrelationDecoder.cpp
ADL5205Decoder.cpp
BaseMeasurementDecoder.cpp
CANDecoder.cpp
@@ -45,6 +46,7 @@ set(SCOPEPROTOCOLS_SOURCES
IPv4Decoder.cpp
JtagDecoder.cpp
LOMixDecoder.cpp
MagnitudeDecoder.cpp
MDIODecoder.cpp
MovingAverageDecoder.cpp
MultiplyDecoder.cpp
Loading