mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-30 06:52:58 +00:00
Code Issues Releases Wiki Activity

GNSS-SDR Array blocks update

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@482 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Javier Arribas
2014-02-18 19:40:44 +00:00
parent ae053127b4
commit 28d6b9a122
18 changed files with 950 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/algorithms/signal_source/adapters/CMakeLists.txt
View File

@@ -69,12 +69,12 @@ if($ENV{RAW_ARRAY_DRIVER})
)
# Set up variables
#set(GRDBFCTTC_INCLUDE_DIRS ${GRDBFCTTC_DIR}/include ${GRDBFCTTC_DIR} ${GRDBFCTTC_DIR}/src)
#set(GRDBFCTTC_LIBRARIES
# "${CMAKE_CURRENT_BINARY_DIR}/../../../../gr-dbfcttc/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gr-dbfcttc${CMAKE_SHARED_LIBRARY_SUFFIX}"
#)
#set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GRDBFCTTC_LIBRARIES})
#set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GRDBFCTTC_INCLUDE_DIRS})
set(GRDBFCTTC_INCLUDE_DIRS ${GRDBFCTTC_DIR}/include ${GRDBFCTTC_DIR} ${GRDBFCTTC_DIR}/src)
set(GRDBFCTTC_LIBRARIES
"${CMAKE_CURRENT_BINARY_DIR}/../../../../gr-dbfcttc/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gnuradio-dbfcttc${CMAKE_SHARED_LIBRARY_SUFFIX}"
)
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GRDBFCTTC_LIBRARIES})
set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GRDBFCTTC_INCLUDE_DIRS})
set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} raw_array_signal_source.cc)
endif($ENV{RAW_ARRAY_DRIVER})

7
src/algorithms/signal_source/adapters/raw_array_signal_source.cc
View File

@@ -45,12 +45,15 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
std::string default_item_type = "gr_complex";
std::string default_dump_file = "./data/raw_array_source.dat";
item_type_ = configuration->property(role + ".item_type", default_item_type);
//dump_ = configuration->property(role + ".dump", false);
//dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
dump_=false;
std::string eth_device_;
eth_device_ = configuration->property(role + ".ethernet_dev", "eth0");
std::string default_ethernet_dev = "eth0";
eth_device_ = configuration->property(role + ".ethernet_dev", default_ethernet_dev);
int channels_;
channels_ = configuration->property(role + ".channels", 8);

3
src/algorithms/signal_source/adapters/raw_array_signal_source.h
View File

@@ -62,7 +62,7 @@ public:
*/
std::string implementation()
{
return "RawArraySignalSource";
return "Raw_Array_Signal_Source";
}
size_t item_size()
{
@@ -82,6 +82,7 @@ private:
long samples_;
bool dump_;
std::string dump_filename_;
std::string eth_device_;
gr::block_sptr raw_array_source_;
gr::blocks::file_sink::sptr file_sink_;
boost::shared_ptr<gr::msg_queue> queue_;