USRP1 source, that was build upon gnuradio-usrp, has been deactivated. Now GNSS-SDR is compatible with GNU Radio 3.5.0

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@87 64b25241-fba3-4117-9849-534c7e92360d

conf/gnss-sdr.conf

@@ -17,8 +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=/home/javier/signals/cap2/agilent_cap2.dat
+SignalSource.filename=/media/sf_Shared/sc2_d16.dat
-
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
 SignalSource.item_type=gr_complex
 

jamroot.jam

@@ -1,22 +1,14 @@
-import testing ;
 
 lib gtest ;
 lib glog ;
 lib gflags ;
 lib gnuradio-core ;
-lib gnuradio-usrp ;
-lib profiler ;
-lib gsl ;
-lib gslcblas ;
-#lib itpp ;
 lib armadillo ;
 
 project : requirements
 <define>OMNITHREAD_POSIX
-
 <cxxflags>"-std=c++0x -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"
 <linkflags>"-larmadillo -lboost_thread -llapack -lblas -lprofiler -ltcmalloc"
-
 <include>src/algorithms/acquisition/adapters
 <include>src/algorithms/acquisition/gnuradio_blocks
 <include>src/algorithms/channel/adapters
@@ -44,7 +36,7 @@ project : requirements
 <include>src/core/libs
 <include>src/core/receiver
 <include>src/core/system_parameters
-<include>$GNURADIO_ROOT/gr-usrp/src
+#<include>$GNURADIO_ROOT/gr-usrp/src
 <include>$GNURADIO_ROOT/gnuradio-core/src/lib/runtime
 <include>$GNURADIO_ROOT/gnuradio-core/src/lib/filter
 <include>$GNURADIO_ROOT/gnuradio-core/src/lib/io

src/algorithms/acquisition/adapters/gps_l1_ca_tong_pcps_acquisition.cc

@@ -33,7 +33,7 @@
 #include "gps_l1_ca_tong_pcps_acquisition.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
-
+#include <iostream>
 #include <gnuradio/gr_io_signature.h>
 #include <gnuradio/gr_stream_to_vector.h>
 #include <gnuradio/gr_vector_to_stream.h>

src/algorithms/conditioner/adapters/direct_resampler_conditioner.cc

@@ -32,7 +32,7 @@
 
 #include "direct_resampler_conditioner.h"
 
-#include <gnuradio/usrp_source_c.h>
+// #include <gnuradio/usrp_source_c.h>
 #include <gnuradio/gr_file_sink.h>
 
 #include "direct_resampler_conditioner_cc.h"

src/algorithms/signal_source/adapters/file_signal_source.cc

@@ -39,7 +39,7 @@
 #include <string>
 #include <iostream>
 #include <fstream>
-
+#include <iomanip>
 
 #include <glog/log_severity.h>
 #include <glog/logging.h>

src/algorithms/signal_source/adapters/jamfile.jam

@@ -1,4 +1,5 @@
 project : build-dir ../../../../build ;
 
 obj file_signal_source : file_signal_source.cc ;
-obj usrp1_signal_source : usrp1_signal_source.cc ;
+#obj usrp1_signal_source : usrp1_signal_source.cc ;
+

src/core/receiver/gnss_block_factory.cc

@@ -50,7 +50,7 @@
 #include "null_sink_output_filter.h"
 #include "file_output_filter.h"
 #include "channel.h"
-#include "usrp1_signal_source.h"
+//#include "usrp1_signal_source.h"
 #include "direct_resampler_conditioner.h"
 #include "gps_l1_ca_gps_sdr_acquisition.h"
 #include "gps_l1_ca_pcps_acquisition.h"
@@ -235,11 +235,11 @@ GNSSBlockInterface* GNSSBlockFactory::GetBlock(
         block = new FileOutputFilter(configuration, role, in_streams,
                 out_streams);
     }
-    else if (implementation.compare("USRP1_Signal_Source") == 0)
+//    else if (implementation.compare("USRP1_Signal_Source") == 0)
-    {
+//    {
-        block = new Usrp1SignalSource(configuration, role, in_streams,
+//        block = new Usrp1SignalSource(configuration, role, in_streams,
-                out_streams, queue);
+//                out_streams, queue);
-    }
+//    }
     else if (implementation.compare("Direct_Resampler") == 0)
     {
         block = new DirectResamplerConditioner(configuration, role,

src/core/receiver/gnss_flowgraph.cc

@@ -35,7 +35,7 @@
 
 #include <exception>
 #include "unistd.h"
-
+#include <iostream>
 #include <boost/lexical_cast.hpp>
 
 #include <glog/log_severity.h>

src/jamfile.jam

@@ -2,3 +2,4 @@ build-project algorithms ;
 build-project core ;
 build-project main ;
 # build-project tests ;
+

src/main/jamfile.jam

@@ -26,7 +26,7 @@ exe gnss-sdr : main.cc
 ../algorithms/output_filter/adapters//file_output_filter
 ../algorithms/output_filter/adapters//null_sink_output_filter
 ../algorithms/signal_source/adapters//file_signal_source
-../algorithms/signal_source/adapters//usrp1_signal_source
+#../algorithms/signal_source/adapters//usrp1_signal_source
 ../algorithms/telemetry_decoder/adapters//gps_l1_ca_telemetry_decoder
 ../algorithms/telemetry_decoder/gnuradio_blocks//gps_l1_ca_telemetry_decoder_cc
 ../algorithms/telemetry_decoder/libs//gps_l1_ca_subframe_fsm
@@ -54,7 +54,7 @@ exe gnss-sdr : main.cc
 ../core/system_parameters//gps_telemetry
 ../..//gflags
 ../..//glog
-../..//gnuradio-core
+../..//gnuradio-core ;
-../..//gnuradio-usrp ;
+#../..//gnuradio-usrp ;
 
 install ../../install : gnss-sdr ;