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: 31a7e4204e83
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0349683b2cd
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 30, 2020

  1. Fix ffts include path 

    From how FindFFTS.cmake works, LIBFFTS_INCLUDE_DIR will already
include the ffts/ component.

Fixes #230

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
    @smunaut
    smunaut committed Aug 30, 2020
    Copy the full SHA
    863ee1d View commit details

  2. Merge pull request #231 from smunaut/fix-ffts 

    Fix ffts include path
    @azonenberg
    azonenberg authored Aug 30, 2020

    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
    d034968 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 scopeprotocols/CMakeLists.txt
  2. +1 −1 scopeprotocols/DeEmbedFilter.h
  3. +1 −1 scopeprotocols/FFTFilter.h
  4. +1 −1 scopeprotocols/OFDMDemodulator.h
2 changes: 1 addition & 1 deletion scopeprotocols/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -87,6 +87,6 @@ target_link_libraries(scopeprotocols

target_include_directories(scopeprotocols
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${LIBFFTS_INCLUDE_DIR})
${LIBFFTS_INCLUDE_DIR})

install(TARGETS scopeprotocols LIBRARY DESTINATION /usr/lib)
2 changes: 1 addition & 1 deletion scopeprotocols/DeEmbedFilter.h
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
#define DeEmbedFilter_h

#include "../scopehal/AlignedAllocator.h"
#include <ffts/ffts.h>
#include <ffts.h>

class DeEmbedFilter : public Filter
{
2 changes: 1 addition & 1 deletion scopeprotocols/FFTFilter.h
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
#ifndef FFTFilter_h
#define FFTFilter_h

#include <ffts/ffts.h>
#include <ffts.h>

class FFTFilter : public Filter
{
2 changes: 1 addition & 1 deletion scopeprotocols/OFDMDemodulator.h
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
#ifndef OFDMDemodulator_h
#define OFDMDemodulator_h

#include <ffts/ffts.h>
#include <ffts.h>

class OFDMDemodulator : public Filter
{