mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-12 19:20:32 +00:00
Code Issues Releases Wiki Activity

The global parameter name GNSS-SDR.internal_fs_hz has been replaced by

Browse Source 
GNSS-SDR.internal_fs_sps
This commit is contained in:
Carles Fernandez 2017-09-02 11:36:19 +02:00
parent c474ea31d5
commit 0ac2f7bd74
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
View File

@ -20,7 +20,8 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition(
item_type_ = configuration_->property(role + ".item_type", default_item_type); item_type_ = configuration_->property(role + ".item_type", default_item_type);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); long fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
if_ = configuration_->property(role + ".if", 0); if_ = configuration_->property(role + ".if", 0);
dump_ = configuration_->property(role + ".dump", false); dump_ = configuration_->property(role + ".dump", false);
doppler_max_ = configuration_->property(role + ".doppler_max", 5000); doppler_max_ = configuration_->property(role + ".doppler_max", 5000);

3
src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
View File

@ -26,7 +26,8 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
float early_late_space_chips; float early_late_space_chips;
item_type_ = configuration->property(role + ".item_type", default_item_type); item_type_ = configuration->property(role + ".item_type", default_item_type);
//vector_length = configuration->property(role + ".vector_length", 2048); //vector_length = configuration->property(role + ".vector_length", 2048);
fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
f_if = configuration->property(role + ".if", 0); f_if = configuration->property(role + ".if", 0);
dump = configuration->property(role + ".dump", false); dump = configuration->property(role + ".dump", false);
pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0); pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);

3
src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
View File

@ -62,7 +62,8 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking(
float dll_bw_hz; float dll_bw_hz;
float early_late_space_chips; float early_late_space_chips;
item_type = configuration->property(role + ".item_type", default_item_type); item_type = configuration->property(role + ".item_type", default_item_type);
fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
f_if = configuration->property(role + ".if", 0); f_if = configuration->property(role + ".if", 0);
dump = configuration->property(role + ".dump", false); dump = configuration->property(role + ".dump", false);
pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0); pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);

4
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
View File

@ -175,7 +175,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::config_1()
config = std::make_shared<InMemoryConfiguration>(); config = std::make_shared<InMemoryConfiguration>();
config->set_property("GNSS-SDR.internal_fs_hz", std::to_string(fs_in)); config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(fs_in));
config->set_property("SignalSource.fs_hz", std::to_string(fs_in)); config->set_property("SignalSource.fs_hz", std::to_string(fs_in));
@ -245,7 +245,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::config_2()
config = std::make_shared<InMemoryConfiguration>(); config = std::make_shared<InMemoryConfiguration>();
config->set_property("GNSS-SDR.internal_fs_hz", std::to_string(fs_in)); config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(fs_in));
config->set_property("SignalSource.fs_hz", std::to_string(fs_in)); config->set_property("SignalSource.fs_hz", std::to_string(fs_in));

2
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
View File

@ -104,7 +104,7 @@ void GlonassL1CaPcpsAcquisitionTest::init()
std::string signal = "1G"; std::string signal = "1G";
signal.copy(gnss_synchro.Signal, 2, 0); signal.copy(gnss_synchro.Signal, 2, 0);
gnss_synchro.PRN = 1; gnss_synchro.PRN = 1;
config->set_property("GNSS-SDR.internal_fs_hz", "62314000"); config->set_property("GNSS-SDR.internal_fs_sps", "62314000");
config->set_property("Acquisition.item_type", "gr_complex"); config->set_property("Acquisition.item_type", "gr_complex");
config->set_property("Acquisition.if", "9540000"); config->set_property("Acquisition.if", "9540000");
config->set_property("Acquisition.coherent_integration_time_ms", "1"); config->set_property("Acquisition.coherent_integration_time_ms", "1");

2
src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
View File

@ -137,7 +137,7 @@ void GlonassL1CaDllPllCAidTrackingTest::init()
signal.copy(gnss_synchro.Signal, 2, 0); signal.copy(gnss_synchro.Signal, 2, 0);
gnss_synchro.PRN = 11; gnss_synchro.PRN = 11;
config->set_property("GNSS-SDR.internal_fs_hz", "6625000"); config->set_property("GNSS-SDR.internal_fs_sps", "6625000");
config->set_property("Tracking_1G.item_type", "gr_complex"); config->set_property("Tracking_1G.item_type", "gr_complex");
config->set_property("Tracking_1G.dump", "false"); config->set_property("Tracking_1G.dump", "false");
config->set_property("Tracking_1G.if", "0.0"); config->set_property("Tracking_1G.if", "0.0");

2
src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
View File

@ -137,7 +137,7 @@ void GlonassL1CaDllPllTrackingTest::init()
signal.copy(gnss_synchro.Signal, 2, 0); signal.copy(gnss_synchro.Signal, 2, 0);
gnss_synchro.PRN = 11; gnss_synchro.PRN = 11;
config->set_property("GNSS-SDR.internal_fs_hz", "6625000"); config->set_property("GNSS-SDR.internal_fs_sps", "6625000");
config->set_property("Tracking_1G.item_type", "gr_complex"); config->set_property("Tracking_1G.item_type", "gr_complex");
config->set_property("Tracking_1G.dump", "false"); config->set_property("Tracking_1G.dump", "false");
config->set_property("Tracking_1G.if", "0.0"); config->set_property("Tracking_1G.if", "0.0");