diff --git a/README b/README index ab28f5d5c..137dfb341 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ How to set up the compilation environment for Ubuntu 9.10 and 10.04 -- Download GNU Radio 3.3.0 from ftp://ftp.gnu.org/gnu/gnuradio +- Download GNU Radio 3.3.0 or GNU Radio 3.4.2 from ftp://ftp.gnu.org/gnu/gnuradio - Compile and install following the instructions at http://gnuradio.org/redmine/wiki/1/UbuntuInstall - Install bjam with the command 'sudo apt-get install bjam' - Install Boost.Build with the command 'sudo apt-get install boost-build' -- Add the system variable GNURADIO_330_ROOT with the location of the sources of gnuradio-3.3.0 +- Add the system variable GNURADIO_ROOT with the location of the sources of gnuradio-3.3.0 or gnuradio-3.4.2 - Download gtest-1.4.0.tar.gz from http://code.google.com/p/googletest. - Unpack gtest-1.4.0.tar.gz into some folder. - From the folder containing gtest build the libraries and install them: @@ -74,7 +74,7 @@ to analyze the recorded data. (Sample of .bashrc configuration) export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib -export GNURADIO_330_ROOT=/home/gnss/sdr/gnuradio-3.3.0 +export GNURADIO_ROOT=/home/gnss/sdr/gnuradio-3.3.0 diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index 5effe3175..19491675e 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -17,7 +17,7 @@ ControlThread.wait_for_flowgraph=false SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed -SignalSource.filename=/media/DATALOGGER/signals/Agilent GPS Generator/cap2/agilent_cap2.dat +SignalSource.filename=/home/javier/signals/cap2/agilent_cap2.dat ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=gr_complex diff --git a/jamroot.jam b/jamroot.jam index 629ace93e..60122bc42 100644 --- a/jamroot.jam +++ b/jamroot.jam @@ -14,7 +14,7 @@ lib armadillo ; project : requirements OMNITHREAD_POSIX "-std=c++0x" -"-larmadillo" +"-larmadillo -lboost_thread -llapack -lblas" #"-std=c++0x `pkg-config --cflags itpp`" #"`pkg-config --libs itpp`" # src/utils @@ -46,11 +46,11 @@ project : requirements src/core/libs src/core/receiver src/core/system_parameters -$GNURADIO_330_ROOT/gr-usrp/src -$GNURADIO_330_ROOT/gnuradio-core/src/lib/runtime -$GNURADIO_330_ROOT/gnuradio-core/src/lib/filter -$GNURADIO_330_ROOT/gnuradio-core/src/lib/io -$GNURADIO_330_ROOT/gnuradio-core/src/lib/general -$GNURADIO_330_ROOT/gnuradio-core/src/lib/gengen ; +$GNURADIO_ROOT/gr-usrp/src +$GNURADIO_ROOT/gnuradio-core/src/lib/runtime +$GNURADIO_ROOT/gnuradio-core/src/lib/filter +$GNURADIO_ROOT/gnuradio-core/src/lib/io +$GNURADIO_ROOT/gnuradio-core/src/lib/general +$GNURADIO_ROOT/gnuradio-core/src/lib/gengen ; -build-project src ; \ No newline at end of file +build-project src ; diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 736c1a97a..f2cd09683 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -42,6 +42,7 @@ #include #include #include +#include #include #include diff --git a/src/algorithms/signal_source/adapters/usrp1_signal_source.cc b/src/algorithms/signal_source/adapters/usrp1_signal_source.cc index 67e9be80b..9f3388f6a 100644 --- a/src/algorithms/signal_source/adapters/usrp1_signal_source.cc +++ b/src/algorithms/signal_source/adapters/usrp1_signal_source.cc @@ -121,7 +121,10 @@ Usrp1SignalSource::Usrp1SignalSource(ConfigurationInterface* configuration, db_base_sptr subdev = usrp_source_->selected_subdev(usrp_subdev_spec( spec_side_, spec_subdev_)); - DLOG(INFO) << "Subdevice name is " << subdev->side_and_name(); + /*! + * The function side_and_name does not work on gnuradio 3.4.2.. + * DLOG(INFO) << "Subdevice name is " << subdev->side_and_name(); + */ DLOG(INFO) << "Subdevice frequency ranges from " << subdev->freq_min() << " to " << subdev->freq_max(); diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 19c97dda3..b46613411 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -36,6 +36,8 @@ #include #include "unistd.h" +#include + #include #include