From c2120ce6bac9a5646f8c39a8e87cb4821d43dc5a Mon Sep 17 00:00:00 2001 From: Gastd Date: Tue, 22 Aug 2017 20:03:55 -0300 Subject: [PATCH] Update test configuration --- ...onass_l1_ca_dll_pll_c_aid_tracking_test.cc | 27 ++--------------- .../glonass_l1_ca_dll_pll_tracking_test.cc | 30 ++----------------- 2 files changed, 6 insertions(+), 51 deletions(-) diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index 5bb4fbdf8..9a65a43a6 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -47,7 +47,6 @@ #include "in_memory_configuration.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" -// #include "signal_conditioner.h" #include "glonass_l1_ca_dll_pll_c_aid_tracking.h" @@ -139,35 +138,15 @@ void GlonassL1CaDllPllCAidTrackingTest::init() gnss_synchro.PRN = 11; config->set_property("GNSS-SDR.internal_fs_hz", "6625000"); - - - std::string path = std::string(TEST_PATH); - std::string file = path + "signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_schar_10s.bin"; - const char * file_name = file.c_str(); - - config->set_property("SignalSource.implementation","File_Signal_Source"); - config->set_property("SignalSource.filename",file_name); - config->set_property("SignalSource.item_type","ibyte"); - config->set_property("SignalSource.sampling_frequency","6625000"); - - config->set_property("SignalConditioner.implementation","Signal_Conditioner"); - config->set_property("DataTypeAdapter.implementation","Ibyte_To_Complex"); - config->set_property("InputFilter.implementation","Pass_Through"); - config->set_property("InputFilter.item_type","gr_complex"); - config->set_property("Resampler.implementation","Direct_Resampler"); - config->set_property("Resampler.sample_freq_in","6625000"); - config->set_property("Resampler.sample_freq_out","2000000"); - config->set_property("Resampler.item_type","gr_complex"); - config->set_property("Tracking_1G.item_type", "gr_complex"); - config->set_property("Tracking_1G.dump", "true"); + config->set_property("Tracking_1G.dump", "false"); config->set_property("Tracking_1G.if", "0.0"); config->set_property("Tracking_1G.dump_filename", "./tracking_ch_"); config->set_property("Tracking_1G.implementation", "GLONASS_L1_CA_DLL_PLL_C_Aid_Tracking"); config->set_property("Tracking_1G.early_late_space_chips", "0.5"); config->set_property("Tracking_1G.order", "2"); - config->set_property("Tracking_1G.pll_bw_hz", "20"); - config->set_property("Tracking_1G.dll_bw_hz", "4"); + config->set_property("Tracking_1G.pll_bw_hz", "2"); + config->set_property("Tracking_1G.dll_bw_hz", "0.5"); } TEST_F(GlonassL1CaDllPllCAidTrackingTest, ValidationOfResults) diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index 9827a00ed..0957b3b24 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -47,10 +47,6 @@ #include "in_memory_configuration.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" -#include "array_signal_conditioner.h" -#include "signal_conditioner.h" -#include "ibyte_to_complex.h" -#include "direct_resampler_conditioner.h" #include "glonass_l1_ca_dll_pll_tracking.h" @@ -142,35 +138,15 @@ void GlonassL1CaDllPllTrackingTest::init() gnss_synchro.PRN = 11; config->set_property("GNSS-SDR.internal_fs_hz", "6625000"); - - - std::string path = std::string(TEST_PATH); - std::string file = path + "signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_schar_10s.bin"; - const char * file_name = file.c_str(); - - config->set_property("SignalSource.implementation","File_Signal_Source"); - config->set_property("SignalSource.filename",file_name); - config->set_property("SignalSource.item_type","ibyte"); - config->set_property("SignalSource.sampling_frequency","6625000"); - - config->set_property("SignalConditioner.implementation","Signal_Conditioner"); - config->set_property("DataTypeAdapter.implementation","Ibyte_To_Complex"); - config->set_property("InputFilter.implementation","Pass_Through"); - config->set_property("InputFilter.item_type","gr_complex"); - config->set_property("Resampler.implementation","Direct_Resampler"); - config->set_property("Resampler.sample_freq_in","6625000"); - config->set_property("Resampler.sample_freq_out","2000000"); - config->set_property("Resampler.item_type","gr_complex"); - config->set_property("Tracking_1G.item_type", "gr_complex"); - config->set_property("Tracking_1G.dump", "true"); + config->set_property("Tracking_1G.dump", "false"); config->set_property("Tracking_1G.if", "0.0"); config->set_property("Tracking_1G.dump_filename", "./tracking_ch_"); config->set_property("Tracking_1G.implementation", "GLONASS_L1_CA_DLL_PLL_Tracking"); config->set_property("Tracking_1G.early_late_space_chips", "0.5"); config->set_property("Tracking_1G.order", "2"); - config->set_property("Tracking_1G.pll_bw_hz", "20"); - config->set_property("Tracking_1G.dll_bw_hz", "4"); + config->set_property("Tracking_1G.pll_bw_hz", "2"); + config->set_property("Tracking_1G.dll_bw_hz", "0.5"); } TEST_F(GlonassL1CaDllPllTrackingTest, ValidationOfResults)