FGFS-4.1/gr-air-modes
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bistromath/gr-air-modes

Browse Source
This commit is contained in:
Nick Foster
2017-09-28 13:30:33 -07:00
parent f6ba6da8ba 48c1afc3ba
commit 0b6c383506
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Modules/FindQwt.cmake
+25 -14
View File
@@ -4,23 +4,34 @@
# QWT_FOUND If false, do not try to use Qwt # QWT_FOUND If false, do not try to use Qwt
find_path (QWT_INCLUDE_DIRS find_path (QWT_INCLUDE_DIRS
NAMES qwt_plot.h NAMES qwt_plot.h
PATHS HINTS
/usr/local/include/qwt-qt4 ${CMAKE_INSTALL_PREFIX}/include/qwt
/usr/local/include/qwt ${CMAKE_PREFIX_PATH}/include/qwt
/usr/include/qwt-qt4 PATHS
/usr/include/qwt /usr/local/include/qwt-qt4
/opt/local/include/qwt /usr/local/include/qwt
/sw/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 find_library (QWT_LIBRARIES
NAMES qwt-qt4 qwt NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5
PATHS HINTS
/usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib
/usr/lib ${CMAKE_INSTALL_PREFIX}/lib64
/opt/local/lib ${CMAKE_PREFIX_PATH}/lib
/sw/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 # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if
cmake/Modules/GrBoost.cmake
+2 -2
View File
@@ -87,7 +87,7 @@ set(Boost_NOGO_VERSIONS
) )
foreach(ver ${Boost_NOGO_VERSIONS}) foreach(ver ${Boost_NOGO_VERSIONS})
if(${Boost_VERSION} EQUAL ${ver}) if("${Boost_VERSION}" STREQUAL "${ver}")
if(NOT ENABLE_BAD_BOOST) if(NOT ENABLE_BAD_BOOST)
MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.") MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.")
set(Boost_FOUND FALSE) 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.") MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.")
set(Boost_FOUND TRUE) set(Boost_FOUND TRUE)
endif(NOT ENABLE_BAD_BOOST) endif(NOT ENABLE_BAD_BOOST)
endif(${Boost_VERSION} EQUAL ${ver}) endif("${Boost_VERSION}" STREQUAL "${ver}")
endforeach(ver) endforeach(ver)
lib/preamble_impl.cc
+1 -1
View File
@@ -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 // int((abs_sample_cnt - tstamp.offset)/sps) is the integer offset
// (abs_sample_cnt - tstamp.offset)/sps is the fractional 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); double frac_offset = ((abs_sample_cnt - tstamp.offset) % rate) / double(rate);
uint64_t abs_whole = last_whole_stamp + int_offset; uint64_t abs_whole = last_whole_stamp + int_offset;
python/rx_path.py
+1 -1
View File
@@ -83,6 +83,6 @@ class rx_path(gr.hier_block2):
def get_pmf(self, pmf): def get_pmf(self, pmf):
return not (self._bb == self._demod) return not (self._bb == self._demod)
def get_threshold(self, threshold): def get_threshold(self):
return self._sync.get_threshold() return self._sync.get_threshold()