From 737c98bf8a7ac0eba91d3c4415f2acf0dd4f991b Mon Sep 17 00:00:00 2001 From: Kevin Luchsinger Date: Sat, 8 Oct 2016 21:26:10 +0200 Subject: [PATCH 1/4] fixes issue #76 (timestamps did "overflow" after 536 seconds) --- lib/preamble_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/preamble_impl.cc b/lib/preamble_impl.cc index c52523d..c55dd7a 100644 --- a/lib/preamble_impl.cc +++ b/lib/preamble_impl.cc @@ -121,7 +121,7 @@ static pmt::pmt_t tag_to_timestamp(gr::tag_t tstamp, uint64_t abs_sample_cnt, in // int((abs_sample_cnt - tstamp.offset)/sps) is the integer offset // (abs_sample_cnt - tstamp.offset)/sps is the fractional offset - uint64_t int_offset = int(abs_sample_cnt - tstamp.offset)/rate; + uint64_t int_offset = (abs_sample_cnt - tstamp.offset)/rate; double frac_offset = ((abs_sample_cnt - tstamp.offset) % rate) / double(rate); uint64_t abs_whole = last_whole_stamp + int_offset; From f96b83cb48321d7cd51cdedf3c9af6242b670a17 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Wed, 16 Nov 2016 16:32:40 -0800 Subject: [PATCH 2/4] Remove unneeded parameter from rx_path.get_threshold. --- python/rx_path.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/rx_path.py b/python/rx_path.py index b89ff2d..1b47585 100644 --- a/python/rx_path.py +++ b/python/rx_path.py @@ -83,6 +83,6 @@ class rx_path(gr.hier_block2): def get_pmf(self, pmf): return not (self._bb == self._demod) - def get_threshold(self, threshold): + def get_threshold(self): return self._sync.get_threshold() From eb63b0034f084de9618ee3033d17037b4b8e28ac Mon Sep 17 00:00:00 2001 From: gnieboer Date: Sun, 12 Mar 2017 15:07:44 -0400 Subject: [PATCH 3/4] Updated FindQwt to include add'l search paths --- cmake/Modules/FindQwt.cmake | 39 ++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index f2cf344..0933f32 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -4,23 +4,34 @@ # QWT_FOUND If false, do not try to use Qwt find_path (QWT_INCLUDE_DIRS - NAMES qwt_plot.h - PATHS - /usr/local/include/qwt-qt4 - /usr/local/include/qwt - /usr/include/qwt-qt4 - /usr/include/qwt - /opt/local/include/qwt - /sw/include/qwt + NAMES qwt_plot.h + HINTS + ${CMAKE_INSTALL_PREFIX}/include/qwt + ${CMAKE_PREFIX_PATH}/include/qwt + PATHS + /usr/local/include/qwt-qt4 + /usr/local/include/qwt + /usr/include/qwt6 + /usr/include/qwt-qt4 + /usr/include/qwt + /usr/include/qwt5 + /opt/local/include/qwt + /sw/include/qwt + /usr/local/lib/qwt.framework/Headers ) find_library (QWT_LIBRARIES - NAMES qwt-qt4 qwt - PATHS - /usr/local/lib - /usr/lib - /opt/local/lib - /sw/lib + NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5 + HINTS + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + ${CMAKE_PREFIX_PATH}/lib + PATHS + /usr/local/lib + /usr/lib + /opt/local/lib + /sw/lib + /usr/local/lib/qwt.framework ) # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if From 3b65986159c078921ed697334080591d79f2327c Mon Sep 17 00:00:00 2001 From: gnieboer Date: Sun, 12 Mar 2017 15:08:18 -0400 Subject: [PATCH 4/4] Updated GrBoost.cmake to include quoted string fix from GR --- cmake/Modules/GrBoost.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index d2e91a6..fcac5cf 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -87,7 +87,7 @@ set(Boost_NOGO_VERSIONS ) foreach(ver ${Boost_NOGO_VERSIONS}) - if(${Boost_VERSION} EQUAL ${ver}) + if("${Boost_VERSION}" STREQUAL "${ver}") if(NOT ENABLE_BAD_BOOST) MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.") set(Boost_FOUND FALSE) @@ -95,5 +95,5 @@ foreach(ver ${Boost_NOGO_VERSIONS}) MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.") set(Boost_FOUND TRUE) endif(NOT ENABLE_BAD_BOOST) - endif(${Boost_VERSION} EQUAL ${ver}) + endif("${Boost_VERSION}" STREQUAL "${ver}") endforeach(ver)