[hamradio-commits] [gnss-sdr] 164/236: Removing the unused Output_filter block from the gnss_sdr flowgraph
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Tue Apr 26 16:02:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit b4e89666912d73d46f2514fc97df7beb81eea7b5
Author: Javier Arribas <javiarribas at gmail.com>
Date: Wed Apr 6 16:12:06 2016 +0200
Removing the unused Output_filter block from the gnss_sdr flowgraph
---
README.md | 13 ---
conf/gnss-sdr.conf | 5 -
conf/gnss-sdr_GPS_L1_GN3S_realtime.conf | 3 -
conf/gnss-sdr_GPS_L1_SPIR.conf | 5 -
conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf | 5 -
conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf | 5 -
conf/gnss-sdr_GPS_L1_USRP_realtime.conf | 5 -
conf/gnss-sdr_GPS_L1_acq_QuickSync.conf | 5 -
conf/gnss-sdr_GPS_L1_gr_complex.conf | 3 -
conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf | 5 -
conf/gnss-sdr_GPS_L1_ishort.conf | 3 -
conf/gnss-sdr_GPS_L1_nsr.conf | 3 -
conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf | 3 -
conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf | 6 --
conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf | 4 -
conf/gnss-sdr_GPS_L1_two_bits_cpx.conf | 3 -
conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf | 5 -
conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf | 5 -
conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf | 3 -
conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf | 5 -
conf/gnss-sdr_Galileo_E1_nsr.conf | 3 -
conf/gnss-sdr_Galileo_E1_short.conf | 5 -
conf/gnss-sdr_Galileo_E5a.conf | 5 -
conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf | 4 -
conf/gnss-sdr_Hybrid_byte.conf | 5 -
conf/gnss-sdr_Hybrid_byte_sim.conf | 5 -
conf/gnss-sdr_Hybrid_gr_complex.conf | 5 -
conf/gnss-sdr_Hybrid_nsr.conf | 5 -
conf/gnss-sdr_Hybrid_short.conf | 5 -
...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf | 5 -
...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf | 5 -
...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf | 5 -
...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf | 5 -
...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf | 5 -
...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf | 5 -
...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf | 5 -
...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf | 5 -
...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf | 5 -
...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 5 -
conf/gnss-sdr_multisource_Hybrid_nsr.conf | 5 -
conf/gnss-sdr_multisource_Hybrid_short.conf | 5 -
docs/doxygen/other/main_page.dox | 5 -
src/algorithms/CMakeLists.txt | 1 -
.../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc | 2 +-
.../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc | 2 +-
.../PVT/gnuradio_blocks/hybrid_pvt_cc.cc | 2 +-
src/algorithms/output_filter/CMakeLists.txt | 19 ----
.../output_filter/adapters/CMakeLists.txt | 37 --------
.../output_filter/adapters/file_output_filter.cc | 105 ---------------------
.../output_filter/adapters/file_output_filter.h | 83 ----------------
.../adapters/null_sink_output_filter.cc | 105 ---------------------
.../adapters/null_sink_output_filter.h | 88 -----------------
.../signal_source/adapters/gen_signal_source.h | 1 -
.../galileo_e5a_dll_pll_tracking_cc.cc | 5 -
src/core/receiver/CMakeLists.txt | 2 -
src/core/receiver/gnss_block_factory.cc | 24 -----
src/core/receiver/gnss_flowgraph.cc | 29 +-----
src/core/receiver/gnss_flowgraph.h | 1 -
src/tests/CMakeLists.txt | 7 --
src/tests/control_thread/control_thread_test.cc | 4 -
src/tests/flowgraph/gnss_flowgraph_test.cc | 9 --
src/tests/gnss_block/file_output_filter_test.cc | 47 ---------
...e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 1 -
src/tests/gnss_block/gnss_block_factory_test.cc | 35 -------
src/tests/test_main.cc | 1 -
65 files changed, 4 insertions(+), 807 deletions(-)
diff --git a/README.md b/README.md
index dc41995..6381ed9 100644
--- a/README.md
+++ b/README.md
@@ -1180,19 +1180,6 @@ $ gnss-sdr --RTCM_Port=12345 --RTCM_Ref_Station_ID=10
In order to get well-formatted GeoJSON, KML and RINEX files, always terminate ```gnss-sdr``` execution by pressing key ```q``` and then key ```ENTER```. Those files will be automatically deleted if no position fix have been obtained during the execution of the software receiver.
-#### Output filter
-
-Implements a sink for the signal stream.
-
-~~~~~~
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
-~~~~~~
-
-
-
About the software license
==========================
diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf
index abd8a47..e959a03 100644
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@ -313,8 +313,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf
index b5f2c8c..27004e8 100644
--- a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf
@@ -113,6 +113,3 @@ PVT.flag_rtcm_server=false
PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_SPIR.conf b/conf/gnss-sdr_GPS_L1_SPIR.conf
index 9881e4d..9229290 100644
--- a/conf/gnss-sdr_GPS_L1_SPIR.conf
+++ b/conf/gnss-sdr_GPS_L1_SPIR.conf
@@ -316,8 +316,3 @@ PVT.nmea_dump_devname=/dev/pts/4
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
index 17d1ad4..04a3c38 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
@@ -382,8 +382,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf
index da410de..88efbae 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf
@@ -398,8 +398,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
index 7f0ce90..38adb76 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
@@ -383,8 +383,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
index c0d5861..7ef0bab 100644
--- a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
@@ -300,8 +300,3 @@ PVT.flag_rtcm_server=false
PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_gr_complex.conf b/conf/gnss-sdr_GPS_L1_gr_complex.conf
index ed63788..235a809 100644
--- a/conf/gnss-sdr_GPS_L1_gr_complex.conf
+++ b/conf/gnss-sdr_GPS_L1_gr_complex.conf
@@ -82,6 +82,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
index 0b1f831..48a00fb 100644
--- a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
+++ b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
@@ -295,8 +295,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf
index bbea100..06c5d49 100644
--- a/conf/gnss-sdr_GPS_L1_ishort.conf
+++ b/conf/gnss-sdr_GPS_L1_ishort.conf
@@ -82,6 +82,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_nsr.conf b/conf/gnss-sdr_GPS_L1_nsr.conf
index ef1457f..64e08a6 100644
--- a/conf/gnss-sdr_GPS_L1_nsr.conf
+++ b/conf/gnss-sdr_GPS_L1_nsr.conf
@@ -135,6 +135,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=true
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf
index c3087fe..365a5a8 100644
--- a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf
+++ b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf
@@ -150,6 +150,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=true
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
index 1e3d3b3..1c3b4e9 100644
--- a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
@@ -293,9 +293,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=true
-
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
index 181ec89..72fa2cc 100644
--- a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
@@ -146,7 +146,3 @@ PVT.flag_rtcm_server=false
PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
index 8a638f5..fc3b6a1 100644
--- a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
+++ b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
@@ -134,6 +134,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
index a312d3c..9c15c8b 100644
--- a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
+++ b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
@@ -204,8 +204,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
index ff0f0bd..1ff5a37 100644
--- a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
@@ -161,8 +161,3 @@ PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf b/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
index 055962e..e868ca8 100644
--- a/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
@@ -84,6 +84,3 @@ PVT.flag_rtcm_server=true
PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
index 9774d7d..290e4b5 100644
--- a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
@@ -299,8 +299,3 @@ PVT.flag_rtcm_tty_port=false;
;#rtcm_dump_devname: serial device descriptor for RTCM logging
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Galileo_E1_nsr.conf b/conf/gnss-sdr_Galileo_E1_nsr.conf
index 73a7bb1..20f314d 100644
--- a/conf/gnss-sdr_Galileo_E1_nsr.conf
+++ b/conf/gnss-sdr_Galileo_E1_nsr.conf
@@ -129,6 +129,3 @@ PVT.flag_rtcm_server=false
PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Galileo_E1_short.conf b/conf/gnss-sdr_Galileo_E1_short.conf
index 62919ac..4b9d584 100644
--- a/conf/gnss-sdr_Galileo_E1_short.conf
+++ b/conf/gnss-sdr_Galileo_E1_short.conf
@@ -294,8 +294,3 @@ PVT.flag_rtcm_tty_port=false;
;#rtcm_dump_devname: serial device descriptor for RTCM logging
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Galileo_E5a.conf b/conf/gnss-sdr_Galileo_E5a.conf
index 6fb9078..65c6bdd 100644
--- a/conf/gnss-sdr_Galileo_E5a.conf
+++ b/conf/gnss-sdr_Galileo_E5a.conf
@@ -344,8 +344,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf
index fba005f..3978e72 100644
--- a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf
+++ b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf
@@ -154,7 +154,3 @@ PVT.flag_rtcm_server=true
PVT.flag_rtcm_tty_port=false
PVT.rtcm_dump_devname=/dev/pts/1
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Hybrid_byte.conf b/conf/gnss-sdr_Hybrid_byte.conf
index 3f3e793..729c2cb 100644
--- a/conf/gnss-sdr_Hybrid_byte.conf
+++ b/conf/gnss-sdr_Hybrid_byte.conf
@@ -343,8 +343,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Hybrid_byte_sim.conf b/conf/gnss-sdr_Hybrid_byte_sim.conf
index ce26c36..7208a89 100644
--- a/conf/gnss-sdr_Hybrid_byte_sim.conf
+++ b/conf/gnss-sdr_Hybrid_byte_sim.conf
@@ -353,8 +353,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Hybrid_gr_complex.conf b/conf/gnss-sdr_Hybrid_gr_complex.conf
index 213710e..ea60c18 100644
--- a/conf/gnss-sdr_Hybrid_gr_complex.conf
+++ b/conf/gnss-sdr_Hybrid_gr_complex.conf
@@ -346,8 +346,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Hybrid_nsr.conf b/conf/gnss-sdr_Hybrid_nsr.conf
index 30006e7..c473174 100644
--- a/conf/gnss-sdr_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_Hybrid_nsr.conf
@@ -348,8 +348,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_Hybrid_short.conf b/conf/gnss-sdr_Hybrid_short.conf
index a0e8bae..878bf28 100644
--- a/conf/gnss-sdr_Hybrid_short.conf
+++ b/conf/gnss-sdr_Hybrid_short.conf
@@ -354,8 +354,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
index 6e9f1d2..8767b21 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
@@ -342,8 +342,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
index 94b34d5..f5fd7cd 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
@@ -350,8 +350,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
index d71f588..00cf01b 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
@@ -348,8 +348,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
index 2b787f2..660aa89 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
@@ -349,8 +349,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
index 39f2cec..12fc2ba 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
@@ -344,8 +344,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
index 36859a7..9824f47 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
@@ -494,8 +494,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf
index bf3bb57..41017b8 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf
@@ -540,8 +540,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
index 49f36b4..ab5a9ab 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
@@ -418,8 +418,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
index a2edd7b..08c1788 100644
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
@@ -441,8 +441,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
index a2943a6..259425e 100644
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
@@ -655,8 +655,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
PVT.dump=false
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
index d2aceef..58e8709 100644
--- a/conf/gnss-sdr_multisource_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
@@ -490,8 +490,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_multisource_Hybrid_short.conf b/conf/gnss-sdr_multisource_Hybrid_short.conf
index f063619..2ef4255 100644
--- a/conf/gnss-sdr_multisource_Hybrid_short.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_short.conf
@@ -476,8 +476,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
PVT.dump_filename=./PVT
-;######### OUTPUT_FILTER CONFIG ############
-;# Receiver output filter: Leave this block disabled in this version
-OutputFilter.implementation=Null_Sink_Output_Filter
-OutputFilter.filename=data/gnss-sdr.dat
-OutputFilter.item_type=gr_complex
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox
index 35f0274..c1043c4 100644
--- a/docs/doxygen/other/main_page.dox
+++ b/docs/doxygen/other/main_page.dox
@@ -53,7 +53,6 @@ More details on GNSS-SDR signal processing blocks:
</ul>
\li \ref observables
\li \ref pvt
-\li \ref output_filter
\section overview Overview
@@ -125,7 +124,6 @@ This will create a folder named gnss-sdr with the following structure:
|-------input_filter
|-------libs
|-------observables
- |-------output_filter
|-------resampler
|-------signal_source
|-------telemetry_decoder
@@ -585,9 +583,6 @@ PVT.dump=false ; Enable or disable the PVT internal binary data file logging [tr
PVT.dump_filename=./PVT ; Log path and filename without extension.
\endverbatim
-\subsection output_filter Output filter
-
-(To be completed)
\section license About the software license
GNSS-SDR is released under the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">General Public License (GPL) v3</a>, thus securing practical usability, inspection,
diff --git a/src/algorithms/CMakeLists.txt b/src/algorithms/CMakeLists.txt
index 75a3b3c..d6f0521 100644
--- a/src/algorithms/CMakeLists.txt
+++ b/src/algorithms/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory(conditioner)
add_subdirectory(data_type_adapter)
add_subdirectory(observables)
add_subdirectory(telemetry_decoder)
-add_subdirectory(output_filter)
add_subdirectory(resampler)
add_subdirectory(signal_generator)
add_subdirectory(signal_source)
diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
index eca8f01..7ae1141 100644
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
@@ -54,7 +54,7 @@ galileo_e1_make_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue>
galileo_e1_pvt_cc::galileo_e1_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname) :
gr::block("galileo_e1_pvt_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
- gr::io_signature::make(1, 1, sizeof(gr_complex)))
+ gr::io_signature::make(0, 0, sizeof(gr_complex)))
{
d_output_rate_ms = output_rate_ms;
diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
index 194a02d..c93e59c 100644
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
@@ -72,7 +72,7 @@ gps_l1_ca_pvt_cc::gps_l1_ca_pvt_cc(unsigned int nchannels,
bool flag_rtcm_tty_port,
std::string rtcm_dump_devname) :
gr::block("gps_l1_ca_pvt_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
- gr::io_signature::make(1, 1, sizeof(gr_complex)) )
+ gr::io_signature::make(0, 0, sizeof(gr_complex)) )
{
d_output_rate_ms = output_rate_ms;
d_display_rate_ms = display_rate_ms;
diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
index e1aebd7..044c968 100644
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
@@ -58,7 +58,7 @@ hybrid_make_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queu
hybrid_pvt_cc::hybrid_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname) :
gr::block("hybrid_pvt_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
- gr::io_signature::make(1, 1, sizeof(gr_complex)))
+ gr::io_signature::make(0, 0, sizeof(gr_complex)))
{
d_output_rate_ms = output_rate_ms;
diff --git a/src/algorithms/output_filter/CMakeLists.txt b/src/algorithms/output_filter/CMakeLists.txt
deleted file mode 100644
index 3d34ffe..0000000
--- a/src/algorithms/output_filter/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2012-2015 (see AUTHORS file for a list of contributors)
-#
-# This file is part of GNSS-SDR.
-#
-# GNSS-SDR is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GNSS-SDR is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
-#
-
-add_subdirectory(adapters)
\ No newline at end of file
diff --git a/src/algorithms/output_filter/adapters/CMakeLists.txt b/src/algorithms/output_filter/adapters/CMakeLists.txt
deleted file mode 100644
index 6656b1b..0000000
--- a/src/algorithms/output_filter/adapters/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2012-2015 (see AUTHORS file for a list of contributors)
-#
-# This file is part of GNSS-SDR.
-#
-# GNSS-SDR is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GNSS-SDR is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
-#
-
-set(OUTPUTFILTER_ADAPTER_SOURCES
- file_output_filter.cc
- null_sink_output_filter.cc
-)
-
-include_directories(
- $(CMAKE_CURRENT_SOURCE_DIR)
- ${CMAKE_SOURCE_DIR}/src/core/interfaces
- ${CMAKE_SOURCE_DIR}/src/core/receiver
- ${GLOG_INCLUDE_DIRS}
- ${GFlags_INCLUDE_DIRS}
- ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
-file(GLOB OUTPUTFILTER_ADAPTER_HEADERS "*.h")
-add_library(out_adapters ${OUTPUTFILTER_ADAPTER_SOURCES} ${OUTPUTFILTER_ADAPTER_HEADERS})
-source_group(Headers FILES ${OUTPUTFILTER_ADAPTER_HEADERS})
-add_dependencies(out_adapters glog-${glog_RELEASE})
-target_link_libraries(out_adapters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
diff --git a/src/algorithms/output_filter/adapters/file_output_filter.cc b/src/algorithms/output_filter/adapters/file_output_filter.cc
deleted file mode 100644
index 86cde40..0000000
--- a/src/algorithms/output_filter/adapters/file_output_filter.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * \file file_output_filter.cc
- * \brief Implementation of an adapter of a file output filter block
- * to an OutputFilterInterface
- * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#include "file_output_filter.h"
-#include <glog/logging.h>
-#include <gnuradio/io_signature.h>
-#include "configuration_interface.h"
-
-using google::LogMessage;
-
-FileOutputFilter::FileOutputFilter(ConfigurationInterface* configuration,
- std::string role,
- unsigned int in_streams,
- unsigned int out_streams) :
- role_(role),
- in_streams_(in_streams),
- out_streams_(out_streams)
-{
- std::string default_filename = "./output.dat";
- std::string default_item_type = "short";
- filename_ = configuration->property(role + ".filename", default_filename);
- item_type_ = configuration->property(role + ".item_type", default_item_type);
- if(item_type_.compare("gr_complex") == 0)
- {
- item_size_ = sizeof(gr_complex);
- }
- else if(item_type_.compare("float") == 0)
- {
- item_size_ = sizeof(float);
- }
- else if(item_type_.compare("short") == 0)
- {
- item_size_ = sizeof(short);
- }
- else
- {
- LOG(WARNING) << item_type_ << " Unrecognized item type. Using short.";
- item_size_ = sizeof(short);
- }
- file_sink_ = gr::blocks::file_sink::make(item_size_, filename_.c_str());
- DLOG(INFO) << "file sink(" << file_sink_->unique_id() << ")";
-}
-
-
-
-FileOutputFilter::~FileOutputFilter()
-{}
-
-
-
-void FileOutputFilter::connect(gr::top_block_sptr top_block)
-{
- if(top_block) { /* top_block is not null */};
- DLOG(INFO) << "nothing to connect internally";
-}
-
-
-void FileOutputFilter::disconnect(gr::top_block_sptr top_block)
-{
- if(top_block) { /* top_block is not null */};
- // Nothing to disconnect internally
-}
-
-
-
-gr::basic_block_sptr FileOutputFilter::get_left_block()
-{
- return file_sink_;
-}
-
-
-
-gr::basic_block_sptr FileOutputFilter::get_right_block()
-{
- //return file_sink_;//gr_block_sptr();
- return gr::blocks::file_sink::sptr();
-}
diff --git a/src/algorithms/output_filter/adapters/file_output_filter.h b/src/algorithms/output_filter/adapters/file_output_filter.h
deleted file mode 100644
index 87052a6..0000000
--- a/src/algorithms/output_filter/adapters/file_output_filter.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * \file file_output_filter.h
- * \brief Interface of an adapter of a file output filter block to an
- * OutputFilterInterface
- * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
- *
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#ifndef GNSS_SDR_FILE_OUTPUT_FILTER_H_
-#define GNSS_SDR_FILE_OUTPUT_FILTER_H_
-
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-
-
-class ConfigurationInterface;
-
-/*!
- * \brief An output filter that sends its output
- * to a file without any change in the data format.
- */
-class FileOutputFilter : public GNSSBlockInterface
-{
-public:
- FileOutputFilter(ConfigurationInterface* configuration,
- std::string role,
- unsigned int in_streams,
- unsigned int out_streams);
-
- virtual ~FileOutputFilter();
- std::string role()
- {
- return role_;
- }
- std::string implementation()
- {
- return "File_Output_Filter";
- }
- size_t item_size()
- {
- return item_size_;
- }
- void connect(gr::top_block_sptr top_block);
- void disconnect(gr::top_block_sptr top_block);
- gr::basic_block_sptr get_left_block();
- gr::basic_block_sptr get_right_block();
-
-private:
- gr::blocks::file_sink::sptr file_sink_;
- size_t item_size_;
- std::string filename_;
- std::string item_type_;
- std::string role_;
- unsigned int in_streams_;
- unsigned int out_streams_;
-};
-
-#endif /*GNSS_SDR_FILE_OUTPUT_FILTER_H_*/
diff --git a/src/algorithms/output_filter/adapters/null_sink_output_filter.cc b/src/algorithms/output_filter/adapters/null_sink_output_filter.cc
deleted file mode 100644
index 51263ba..0000000
--- a/src/algorithms/output_filter/adapters/null_sink_output_filter.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * \file null_sink_output_filter.cc
- * \brief Implementation of an adapter of a null sink output filter block to an
- * OutputFilterInterface
- * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#include "null_sink_output_filter.h"
-#include <glog/logging.h>
-#include <gnuradio/io_signature.h>
-#include "configuration_interface.h"
-
-using google::LogMessage;
-
-NullSinkOutputFilter::NullSinkOutputFilter(ConfigurationInterface* configuration,
- std::string role,
- unsigned int in_streams,
- unsigned int out_streams) :
- role_(role),
- in_streams_(in_streams),
- out_streams_(out_streams)
-{
- std::string default_item_type = "short";
- item_type_ = configuration->property(role + ".item_type", default_item_type);
- if(item_type_.compare("gr_complex") == 0)
- {
- item_size_ = sizeof(gr_complex);
- }
- else if(item_type_.compare("short") == 0)
- {
- item_size_ = sizeof(short);
- }
- else if(item_type_.compare("float") == 0)
- {
- item_size_ = sizeof(float);
- }
- else
- {
- LOG(WARNING) << item_type_ << " unrecognized item type. Using float";
- item_size_ = sizeof(float);
- }
- sink_ = gr::blocks::null_sink::make(item_size_);
- DLOG(INFO) << "null_sink(" << sink_->unique_id() << ")";
-}
-
-
-
-NullSinkOutputFilter::~NullSinkOutputFilter()
-{}
-
-
-
-void NullSinkOutputFilter::connect(gr::top_block_sptr top_block)
-{
- if(top_block) { /* top_block is not null */};
- DLOG(INFO) << "nothing to connect internally";
-}
-
-
-
-void NullSinkOutputFilter::disconnect(gr::top_block_sptr top_block)
-{
- if(top_block) { /* top_block is not null */};
- // Nothing to connect
-}
-
-
-
-gr::basic_block_sptr NullSinkOutputFilter::get_left_block()
-{
- return sink_;
-}
-
-
-
-gr::basic_block_sptr NullSinkOutputFilter::get_right_block()
-{
- LOG(WARNING) << "Right block of a signal sink should not be retrieved";
- //return gr::blocks::sptr::make();
- return sink_;
-}
diff --git a/src/algorithms/output_filter/adapters/null_sink_output_filter.h b/src/algorithms/output_filter/adapters/null_sink_output_filter.h
deleted file mode 100644
index c4016ab..0000000
--- a/src/algorithms/output_filter/adapters/null_sink_output_filter.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * \file null_sink_output_filter.h
- * \brief Interface of an adapter of a null sink output filter block to an
- * OutputFilterInterface
- * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
- *
- * This class represents an implementation of an output filter that
- * sends its input to a null sink.
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#ifndef GNSS_SDR_NULL_SINK_OUTPUT_FILTER_H_
-#define GNSS_SDR_NULL_SINK_OUTPUT_FILTER_H_
-
-#include <string>
-#include <gnuradio/blocks/null_sink.h>
-#include "gnss_block_interface.h"
-
-
-class ConfigurationInterface;
-
-/*!
- * \brief This class implements a null sink output filter
- */
-class NullSinkOutputFilter : public GNSSBlockInterface
-{
-public:
- NullSinkOutputFilter(ConfigurationInterface* configuration,
- std::string role,
- unsigned int in_streams,
- unsigned int out_streams);
-
- virtual ~NullSinkOutputFilter();
- std::string item_type()
- {
- return item_type_;
- }
- std::string role()
- {
- return role_;
- }
- //! Returns "Null_Sink_Output_Filter"
- std::string implementation()
- {
- return "Null_Sink_Output_Filter";
- }
- size_t item_size()
- {
- return item_size_;
- }
- void connect(gr::top_block_sptr top_block);
- void disconnect(gr::top_block_sptr top_block);
- gr::basic_block_sptr get_left_block();
- gr::basic_block_sptr get_right_block();
-
-private:
- gr::blocks::null_sink::sptr sink_;
- size_t item_size_;
- std::string item_type_;
- std::string role_;
- unsigned int in_streams_;
- unsigned int out_streams_;
-};
-
-#endif /*GNSS_SDR_NULL_SINK_OUTPUT_FILTER_H_*/
diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h
index 0c8e7f7..b607f03 100644
--- a/src/algorithms/signal_source/adapters/gen_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.h
@@ -64,7 +64,6 @@ public:
size_t item_size(){ return 0; }
GNSSBlockInterface *signal_generator(){ return signal_generator_; }
- GNSSBlockInterface *output_filter(){ return filter_; }
private:
GNSSBlockInterface *signal_generator_;
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
index 32f3deb..5aead1a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
@@ -148,7 +148,6 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
d_correlator_outs[n] = gr_complex(0,0);
}
- std::cout<<"1"<<std::endl;
// map memory pointers of correlator outputs
d_Single_Early = &d_correlator_outs[0];
d_Single_Prompt = &d_correlator_outs[1];
@@ -162,7 +161,6 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
multicorrelator_cpu_Q.init(2 * d_vector_length, d_n_correlator_taps);
- std::cout<<"1"<<std::endl;
// correlator I single output for data (scalar)
d_Single_Prompt_data=static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
*d_Single_Prompt_data = gr_complex(0,0);
@@ -212,8 +210,6 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
d_state = 0;
systemName["E"] = std::string("Galileo");
-
- std::cout<<"end constructor"<<std::endl;
}
@@ -318,7 +314,6 @@ void Galileo_E5a_Dll_Pll_Tracking_cc::start_tracking()
<< " Code Phase correction [samples]=" << delay_correction_samples
<< " PULL-IN Code Phase [samples]=" << d_acq_code_phase_samples;
- std::cout<<"end start trk"<<std::endl;
}
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 5e75ae2..db7cc37 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -49,7 +49,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters
${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks
- ${CMAKE_SOURCE_DIR}/src/algorithms/output_filter/adapters
${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters
${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs
${CMAKE_SOURCE_DIR}/src/algorithms/conditioner/adapters
@@ -144,6 +143,5 @@ target_link_libraries(gnss_rx ${Boost_LIBRARIES}
obs_adapters
pvt_adapters
pvt_lib
- out_adapters
rx_core_lib
)
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 93a4460..ac3e742 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -49,8 +49,6 @@
#include "spir_file_signal_source.h"
#include "rtl_tcp_signal_source.h"
#include "two_bit_packed_file_signal_source.h"
-#include "null_sink_output_filter.h"
-#include "file_output_filter.h"
#include "channel.h"
#include "signal_conditioner.h"
@@ -269,15 +267,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetPVT(std::shared_ptr<Con
-std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetOutputFilter(std::shared_ptr<ConfigurationInterface> configuration,
- boost::shared_ptr<gr::msg_queue> queue)
-{
- std::string default_implementation = "Null_Sink_Output_Filter";
- std::string implementation = configuration->property("OutputFilter.implementation", default_implementation);
- LOG(INFO) << "Getting OutputFilter with implementation " << implementation;
- return GetBlock(configuration, "OutputFilter", implementation, 1, 0, queue);
-}
-
//********* GPS CHANNEL *****************
std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_GPS(
std::shared_ptr<ConfigurationInterface> configuration,
@@ -1418,19 +1407,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
out_streams, queue));
block = std::move(block_);
}
- // OUTPUT FILTERS --------------------------------------------------------------
- else if (implementation.compare("Null_Sink_Output_Filter") == 0)
- {
- std::unique_ptr<GNSSBlockInterface> block_(new NullSinkOutputFilter(configuration.get(), role, in_streams,
- out_streams));
- block = std::move(block_);
- }
- else if (implementation.compare("File_Output_Filter") == 0)
- {
- std::unique_ptr<GNSSBlockInterface> block_(new FileOutputFilter(configuration.get(), role, in_streams,
- out_streams));
- block = std::move(block_);
- }
else
{
// Log fatal. This causes execution to stop.
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index f15398f..b342771 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -105,7 +105,7 @@ void GNSSFlowgraph::connect()
{
/* Connects the blocks in the flowgraph
*
- * Signal Source > Signal conditioner >> Channels >> Observables >> PVT > Output filter
+ * Signal Source > Signal conditioner >> Channels >> Observables >> PVT
*/
LOG(INFO) << "Connecting flowgraph";
if (connected_)
@@ -185,19 +185,6 @@ void GNSSFlowgraph::connect()
return;
}
- // Signal Source > Signal conditioner >> Channels >> Observables > PVT > Output Filter
- try
- {
- output_filter_->connect(top_block_);
- }
- catch (std::exception& e)
- {
- LOG(WARNING) << "Can't connect output filter block internally";
- LOG(ERROR) << e.what();
- top_block_->disconnect_all();
- return;
- }
-
DLOG(INFO) << "blocks connected internally";
// Signal Source (i) > Signal conditioner (i) >
@@ -348,19 +335,6 @@ void GNSSFlowgraph::connect()
return;
}
- try
- {
- top_block_->connect(pvt_->get_right_block(), 0, output_filter_->get_left_block(), 0);
- }
- catch (std::exception& e)
- {
- LOG(WARNING) << "Can't connect PVT to output filter";
- LOG(ERROR) << e.what();
- top_block_->disconnect_all();
- return;
- }
-
- DLOG(INFO) << "PVT connected to output filter";
connected_ = true;
LOG(INFO) << "Flowgraph connected";
top_block_->dump();
@@ -546,7 +520,6 @@ void GNSSFlowgraph::init()
observables_ = block_factory_->GetObservables(configuration_, queue_);
pvt_ = block_factory_->GetPVT(configuration_, queue_);
- output_filter_ = block_factory_->GetOutputFilter(configuration_, queue_);
std::shared_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> channels = block_factory_->GetChannels(configuration_, queue_);
diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h
index 4b52509..3ca3183 100644
--- a/src/core/receiver/gnss_flowgraph.h
+++ b/src/core/receiver/gnss_flowgraph.h
@@ -130,7 +130,6 @@ private:
std::shared_ptr<GNSSBlockInterface> observables_;
std::shared_ptr<GNSSBlockInterface> pvt_;
- std::shared_ptr<GNSSBlockInterface> output_filter_;
std::vector<std::shared_ptr<ChannelInterface>> channels_;
gr::top_block_sptr top_block_;
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 2df4ed0..ede1f1e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -130,7 +130,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks
${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters
${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
- ${CMAKE_SOURCE_DIR}/src/algorithms/output_filter/adapters
${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
@@ -178,7 +177,6 @@ target_link_libraries(run_tests ${CLANG_FLAGS}
gnss_system_parameters
signal_generator_blocks
signal_generator_adapters
- out_adapters
pvt_gr_blocks
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
${GNSS_SDR_TEST_OPTIONAL_LIBS}
@@ -250,7 +248,6 @@ add_executable(gnss_block_test
${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/file_signal_source_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/fir_filter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/flowgraph/pass_through_test.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/file_output_filter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gnss_block_factory_test.cc
)
if(NOT ${ENABLE_PACKAGING})
@@ -269,7 +266,6 @@ target_link_libraries(gnss_block_test ${Boost_LIBRARIES}
gnss_rx
gnss_system_parameters
# signal_generator_blocks
- out_adapters
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
)
@@ -300,7 +296,6 @@ target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
gnss_rx
gnss_system_parameters
# signal_generator_blocks
- out_adapters
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
)
@@ -329,7 +324,6 @@ endif(NOT ${GTEST_DIR_LOCAL})
# gnss_rx
# gnss_system_parameters
# signal_generator_blocks
-# out_adapters
# ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
# )
# add_test(acq_test acq_test)
@@ -355,7 +349,6 @@ target_link_libraries(trk_test ${Boost_LIBRARIES}
gnss_rx
gnss_system_parameters
signal_generator_blocks
- out_adapters
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
)
diff --git a/src/tests/control_thread/control_thread_test.cc b/src/tests/control_thread/control_thread_test.cc
index 5b80eca..1548e27 100644
--- a/src/tests/control_thread/control_thread_test.cc
+++ b/src/tests/control_thread/control_thread_test.cc
@@ -79,8 +79,6 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages)
config->set_property("Observables.item_type", "gr_complex");
config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
config->set_property("PVT.item_type", "gr_complex");
- config->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- config->set_property("OutputFilter.item_type", "gr_complex");
std::shared_ptr<ControlThread> control_thread = std::make_shared<ControlThread>(config);
@@ -146,8 +144,6 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages2)
config->set_property("Observables.item_type", "gr_complex");
config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
config->set_property("PVT.item_type", "gr_complex");
- config->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- config->set_property("OutputFilter.item_type", "gr_complex");
std::unique_ptr<ControlThread> control_thread2(new ControlThread(config));
diff --git a/src/tests/flowgraph/gnss_flowgraph_test.cc b/src/tests/flowgraph/gnss_flowgraph_test.cc
index 7a92911..3772ad3 100644
--- a/src/tests/flowgraph/gnss_flowgraph_test.cc
+++ b/src/tests/flowgraph/gnss_flowgraph_test.cc
@@ -40,7 +40,6 @@
#include "acquisition_interface.h"
#include "tracking_interface.h"
#include "channel_interface.h"
-#include "null_sink_output_filter.h"
#include "pass_through.h"
#include "file_signal_source.h"
@@ -69,8 +68,6 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopOldNotation)
config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
- config->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- config->set_property("OutputFilter.item_type", "gr_complex");
std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
@@ -106,8 +103,6 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStop)
config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
- config->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- config->set_property("OutputFilter.item_type", "gr_complex");
std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
@@ -142,8 +137,6 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopGalileoE1B)
config->set_property("TelemetryDecoder_1B.implementation", "Galileo_E1B_Telemetry_Decoder");
config->set_property("Observables.implementation", "Galileo_E1B_Observables");
config->set_property("PVT.implementation", "GALILEO_E1_PVT");
- config->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- config->set_property("OutputFilter.item_type", "gr_complex");
std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
@@ -292,8 +285,6 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopHybrid)
config->set_property("Observables.implementation", "Hybrid_Observables");
config->set_property("PVT.implementation", "Hybrid_PVT");
- config->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- config->set_property("OutputFilter.item_type", "gr_complex");
std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
diff --git a/src/tests/gnss_block/file_output_filter_test.cc b/src/tests/gnss_block/file_output_filter_test.cc
deleted file mode 100644
index 9e53ed2..0000000
--- a/src/tests/gnss_block/file_output_filter_test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * \file file_output_filter_test.cc
- * \brief This class implements a Unit Test for the class FileOutputFilter.
- * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
- *
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#include <gtest/gtest.h>
-#include "file_output_filter.h"
-#include "in_memory_configuration.h"
-
-TEST(FileOutputFilter, Instantiate)
-{
- std::shared_ptr<InMemoryConfiguration> config = std::make_shared<InMemoryConfiguration>();
- std::string path = std::string(TEST_PATH);
- std::string file = path + "data/output.dat";
- config->set_property("Test.filename", file);
- config->set_property("Test.item_type", "float");
- std::unique_ptr<FileOutputFilter> output_filter(new FileOutputFilter(config.get(), "Test", 1, 0));
- int res = 0;
- if (output_filter) res = 1;
- ASSERT_EQ(1, res);
-}
diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index b85b130..8aa2fba 100644
--- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -50,7 +50,6 @@
#include "gen_signal_source.h"
#include "gnss_sdr_valve.h"
#include "pass_through.h"
-#include "file_output_filter.h"
#include "gnss_block_factory.h"
diff --git a/src/tests/gnss_block/gnss_block_factory_test.cc b/src/tests/gnss_block/gnss_block_factory_test.cc
index 812647e..22ed142 100644
--- a/src/tests/gnss_block/gnss_block_factory_test.cc
+++ b/src/tests/gnss_block/gnss_block_factory_test.cc
@@ -363,38 +363,3 @@ TEST(GNSS_Block_Factory_Test, InstantiateWrongPvt)
EXPECT_EQ(nullptr, pvt);
}
-
-
-TEST(GNSS_Block_Factory_Test, InstantiateNullSinkOutputFilter)
-{
- std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
- configuration->set_property("OutputFilter.implementation", "Null_Sink_Output_Filter");
- gr::msg_queue::sptr queue = gr::msg_queue::make(0);
- std::unique_ptr<GNSSBlockFactory> factory;
- std::unique_ptr<GNSSBlockInterface> output_filter = factory->GetOutputFilter(configuration, queue);
- EXPECT_STREQ("OutputFilter", output_filter->role().c_str());
- EXPECT_STREQ("Null_Sink_Output_Filter", output_filter->implementation().c_str());
-}
-
-
-TEST(GNSS_Block_Factory_Test, InstantiateFileOutputFilter)
-{
- std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
- configuration->set_property("OutputFilter.implementation", "File_Output_Filter");
- gr::msg_queue::sptr queue = gr::msg_queue::make(0);
- std::unique_ptr<GNSSBlockFactory> factory;
- std::unique_ptr<GNSSBlockInterface> output_filter = factory->GetOutputFilter(configuration, queue);
- EXPECT_STREQ("OutputFilter", output_filter->role().c_str());
- EXPECT_STREQ("File_Output_Filter", output_filter->implementation().c_str());
-}
-
-
-TEST(GNSS_Block_Factory_Test, InstantiateWrongOutputFilter)
-{
- std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
- configuration->set_property("OutputFilter.implementation", "Pepito");
- gr::msg_queue::sptr queue = gr::msg_queue::make(0);
- std::unique_ptr<GNSSBlockFactory> factory;
- std::unique_ptr<GNSSBlockInterface> output_filter = factory->GetOutputFilter(configuration, queue);
- EXPECT_EQ(nullptr, output_filter);
-}
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index c9ccf10..486bcfe 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -84,7 +84,6 @@ DECLARE_string(log_dir);
#include "formats/rtcm_test.cc"
#include "gnss_block/gnss_block_factory_test.cc"
#include "gnss_block/rtcm_printer_test.cc"
-#include "gnss_block/file_output_filter_test.cc"
#include "gnss_block/file_signal_source_test.cc"
#include "gnss_block/fir_filter_test.cc"
#include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list