mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-16 05:00:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2018-03-28 08:36:52 +02:00
commit 8ca2f0cb1d
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/resampler/adapters/CMakeLists.txt
View File

@ -32,9 +32,9 @@ include_directories(
) )
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
add_definitions( -DGR_GREATER_38=1 ) add_definitions( -DGR_GREATER_38=1 )
endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h") file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h")

4
src/algorithms/signal_source/libs/CMakeLists.txt
View File

@ -60,14 +60,16 @@ set (SIGNAL_SOURCE_LIB_SOURCES
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${GLOG_INCLUDE_DIRS}
${OPT_DRIVER_INCLUDE_DIRS} ${OPT_DRIVER_INCLUDE_DIRS}
) )
file(GLOB SIGNAL_SOURCE_LIB_HEADERS "*.h") file(GLOB SIGNAL_SOURCE_LIB_HEADERS "*.h")
list(SORT SIGNAL_SOURCE_LIB_HEADERS) list(SORT SIGNAL_SOURCE_LIB_HEADERS)
list(SORT SIGNAL_SOURCE_LIB_SOURCES)
add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS}) add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS}) source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
add_dependencies(signal_source_lib glog-${glog_RELEASE})
target_link_libraries(signal_source_lib ${OPT_LIBRARIES}) target_link_libraries(signal_source_lib ${OPT_LIBRARIES})

6
src/algorithms/signal_source/libs/ad9361_manager.cc
View File

@ -31,7 +31,7 @@
*/ */
#include "ad9361_manager.h" #include "ad9361_manager.h"
#include <glog/logging.h> #include <glog/logging.h>
#include <math.h> #include <cmath>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -309,7 +309,6 @@ bool config_ad9361_rx_remote(std::string remote_host,
rxcfg.lo_hz = freq_; // 2.5 GHz rf frequency rxcfg.lo_hz = freq_; // 2.5 GHz rf frequency
rxcfg.rfport = rf_port_select_.c_str(); // port A (select for rf freq.) rxcfg.rfport = rf_port_select_.c_str(); // port A (select for rf freq.)
std::cout << "AD9361 Acquiring IIO REMOTE context in host " << remote_host << std::endl; std::cout << "AD9361 Acquiring IIO REMOTE context in host " << remote_host << std::endl;
struct iio_context *ctx; struct iio_context *ctx;
// Streaming devices // Streaming devices
@ -489,7 +488,6 @@ bool config_ad9361_lo_local(unsigned long bandwidth_,
std::cout << "Failed to set TX DDS frequency Q: " << ret << std::endl; std::cout << "Failed to set TX DDS frequency Q: " << ret << std::endl;
} }
ret = iio_channel_attr_write_double(dds_channel0_I, "phase", 0.0); ret = iio_channel_attr_write_double(dds_channel0_I, "phase", 0.0);
if (ret < 0) if (ret < 0)
{ {
@ -516,7 +514,6 @@ bool config_ad9361_lo_local(unsigned long bandwidth_,
//disable TX2 //disable TX2
ret = iio_device_attr_write_double(ad9361_phy, "out_voltage1_hardwaregain", -89.0); ret = iio_device_attr_write_double(ad9361_phy, "out_voltage1_hardwaregain", -89.0);
if (ret < 0) if (ret < 0)
{ {
@ -529,7 +526,6 @@ bool config_ad9361_lo_local(unsigned long bandwidth_,
struct iio_channel *dds_channel1_Q; struct iio_channel *dds_channel1_Q;
dds_channel1_Q = iio_device_find_channel(dds, "TX2_Q_F1", true); dds_channel1_Q = iio_device_find_channel(dds, "TX2_Q_F1", true);
ret = iio_channel_attr_write_double(dds_channel1_I, "scale", 0); ret = iio_channel_attr_write_double(dds_channel1_I, "scale", 0);
if (ret < 0) if (ret < 0)
{ {

4
src/core/receiver/CMakeLists.txt
View File

@ -90,9 +90,9 @@ if(ENABLE_FMCOMMS2)
set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
endif(ENABLE_FMCOMMS2) endif(ENABLE_FMCOMMS2)
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
add_definitions( -DGR_GREATER_38=1 ) add_definitions( -DGR_GREATER_38=1 )
endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
include_directories( include_directories(

4
src/tests/CMakeLists.txt
View File

@ -161,9 +161,9 @@ if(GNUPLOT_FOUND)
add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}") add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}")
endif(GNUPLOT_FOUND) endif(GNUPLOT_FOUND)
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
add_definitions( -DGR_GREATER_38=1 ) add_definitions( -DGR_GREATER_38=1 )
endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
################################################################################ ################################################################################