[hamradio-commits] [gnss-sdr] 269/303: Define all the commandline flags of the signal generator in a single file
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:36:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 6e97c5f2f903b6cd0ede1dc3541ffc263b4ee605
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Thu Feb 2 20:07:36 2017 +0100
Define all the commandline flags of the signal generator in a single
file
---
src/tests/CMakeLists.txt | 3 +-
src/tests/common-files/signal_generator_flags.h | 13 +++++++
src/tests/system-tests/obs_gps_l1_system_test.cc | 40 +++++++++++++---------
.../gps_l1_ca_telemetry_decoder_test.cc | 31 ++++++++---------
4 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 7724908..0dc9e83 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -234,6 +234,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
${CMAKE_SOURCE_DIR}/src/tests/unit-tests/signal-processing-blocks/libs
+ ${CMAKE_SOURCE_DIR}/src/tests/common-files
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
@@ -504,7 +505,7 @@ if(ENABLE_SYSTEM_TESTING)
)
if(ENABLE_SYSTEM_TESTING_EXTRA)
- add_executable(obs_gps_l1_system_test ${CMAKE_CURRENT_SOURCE_DIR}/system-tests/obs_gps_l1_system_test.cc )
+ add_executable(obs_gps_l1_system_test ${CMAKE_CURRENT_SOURCE_DIR}/system-tests/obs_gps_l1_system_test.cc)
if(NOT ${GTEST_DIR_LOCAL})
add_dependencies(obs_gps_l1_system_test gtest-${gtest_RELEASE} )
else(NOT ${GTEST_DIR_LOCAL})
diff --git a/src/tests/common-files/signal_generator_flags.h b/src/tests/common-files/signal_generator_flags.h
new file mode 100644
index 0000000..0a5e22a
--- /dev/null
+++ b/src/tests/common-files/signal_generator_flags.h
@@ -0,0 +1,13 @@
+
+#include <gflags/gflags.h>
+
+
+DEFINE_string(generator_binary, std::string(SW_GENERATOR_BIN), "Path of software-defined signal generator binary");
+DEFINE_string(rinex_nav_file, std::string(DEFAULT_RINEX_NAV), "Input RINEX navigation file");
+DEFINE_int32(duration, 100, "Duration of the experiment [in seconds, max = 300]");
+DEFINE_string(static_position, "30.286502,120.032669,100", "Static receiver position [log,lat,height]");
+DEFINE_string(dynamic_position, "", "Observer positions file, in .csv or .nmea format");
+DEFINE_string(filename_rinex_obs, "sim.16o", "Filename of output RINEX navigation file");
+DEFINE_string(filename_raw_data, "signal_out.bin", "Filename of output raw data file");
+DEFINE_int32(fs_gen_hz, 2600000, "Samppling frequency [Hz]");
+DEFINE_int32(test_satellite_PRN, 1, "PRN of the satellite under test (must be visible during the observation time)");
diff --git a/src/tests/system-tests/obs_gps_l1_system_test.cc b/src/tests/system-tests/obs_gps_l1_system_test.cc
index ae18180..2eb15b5 100644
--- a/src/tests/system-tests/obs_gps_l1_system_test.cc
+++ b/src/tests/system-tests/obs_gps_l1_system_test.cc
@@ -50,15 +50,16 @@
#include "concurrent_queue.h"
#include "control_thread.h"
#include "in_memory_configuration.h"
+#include "signal_generator_flags.h"
-DEFINE_string(generator_binary, std::string(SW_GENERATOR_BIN), "Path of software-defined signal generator binary");
-DEFINE_string(rinex_nav_file, std::string(DEFAULT_RINEX_NAV), "Input RINEX navigation file");
-DEFINE_int32(duration, 100, "Duration of the experiment [in seconds, max = 300]");
-DEFINE_string(static_position, "30.286502,120.032669,100", "Static receiver position [log,lat,height]");
-DEFINE_string(dynamic_position, "", "Observer positions file, in .csv or .nmea format");
-DEFINE_string(filename_rinex_obs, "sim.16o", "Filename of output RINEX navigation file");
-DEFINE_string(filename_raw_data, "signal_out.bin", "Filename of output raw data file");
+DECLARE_string(generator_binary);
+DECLARE_string(rinex_nav_file);
+DECLARE_int32(duration);
+DECLARE_string(static_position);
+DECLARE_string(dynamic_position);
+DECLARE_string(filename_rinex_obs);
+DECLARE_string(filename_raw_data);
// For GPS NAVIGATION (L1)
concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
@@ -237,11 +238,14 @@ int Obs_Gps_L1_System_Test::configure_receiver()
// Set the Signal Conditioner
config->set_property("SignalConditioner.implementation", "Signal_Conditioner");
- config->set_property("DataTypeAdapter.implementation", "Ibyte_To_Complex");
+ //config->set_property("DataTypeAdapter.implementation", "Ibyte_To_Complex");
+ config->set_property("DataTypeAdapter.implementation", "Ibyte_To_Cshort");
config->set_property("InputFilter.implementation", "Fir_Filter");
config->set_property("InputFilter.dump", "false");
- config->set_property("InputFilter.input_item_type", "gr_complex");
- config->set_property("InputFilter.output_item_type", "gr_complex");
+ //config->set_property("InputFilter.input_item_type", "gr_complex");
+ //config->set_property("InputFilter.output_item_type", "gr_complex");
+ config->set_property("InputFilter.input_item_type", "cshort");
+ config->set_property("InputFilter.output_item_type", "cshort");
config->set_property("InputFilter.taps_item_type", "float");
config->set_property("InputFilter.number_of_taps", std::to_string(number_of_taps));
config->set_property("InputFilter.number_of_bands", std::to_string(number_of_bands));
@@ -261,7 +265,8 @@ int Obs_Gps_L1_System_Test::configure_receiver()
config->set_property("InputFilter.IF", std::to_string(zero));
config->set_property("Resampler.implementation", "Pass_Through");
config->set_property("Resampler.dump", "false");
- config->set_property("Resampler.item_type", "gr_complex");
+ //config->set_property("Resampler.item_type", "gr_complex");
+ config->set_property("Resampler.item_type", "cshort");
config->set_property("Resampler.sample_freq_in", std::to_string(sampling_rate_internal));
config->set_property("Resampler.sample_freq_out", std::to_string(sampling_rate_internal));
@@ -271,8 +276,10 @@ int Obs_Gps_L1_System_Test::configure_receiver()
config->set_property("Channel.signal", "1C");
// Set Acquisition
- config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Tong_Acquisition");
- config->set_property("Acquisition_1C.item_type", "gr_complex");
+ //config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Tong_Acquisition");
+ config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
+ //config->set_property("Acquisition_1C.item_type", "gr_complex");
+ config->set_property("Acquisition_1C.item_type", "cshort");
config->set_property("Acquisition_1C.if", std::to_string(zero));
config->set_property("Acquisition_1C.coherent_integration_time_ms", std::to_string(coherent_integration_time_ms));
config->set_property("Acquisition_1C.threshold", std::to_string(threshold));
@@ -285,9 +292,10 @@ int Obs_Gps_L1_System_Test::configure_receiver()
config->set_property("Acquisition_1C.tong_max_dwells", std::to_string(tong_max_dwells));
// Set Tracking
- config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
- //config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
- config->set_property("Tracking_1C.item_type", "gr_complex");
+ //config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
+ config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
+ //config->set_property("Tracking_1C.item_type", "gr_complex");
+ config->set_property("Tracking_1C.item_type", "cshort");
config->set_property("Tracking_1C.if", std::to_string(zero));
config->set_property("Tracking_1C.dump", "false");
config->set_property("Tracking_1C.dump_filename", "./tracking_ch_");
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
index 4798b86..0f4a816 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -49,7 +49,6 @@
#include <gnuradio/blocks/null_sink.h>
#include <gnuradio/blocks/skiphead.h>
#include <gtest/gtest.h>
-
#include "GPS_L1_CA.h"
#include "gnss_block_factory.h"
#include "gnss_block_interface.h"
@@ -58,24 +57,22 @@
#include "in_memory_configuration.h"
#include "gnss_synchro.h"
#include "gps_l1_ca_telemetry_decoder.h"
-
-#include "../libs/tracking_true_obs_reader.h"
-#include "../libs/tracking_dump_reader.h"
-#include "../libs/tlm_dump_reader.h"
-
+#include "tracking_true_obs_reader.h"
+#include "tracking_dump_reader.h"
+#include "tlm_dump_reader.h"
#include "gps_l1_ca_dll_pll_tracking.h"
#include "gps_l1_ca_dll_pll_c_aid_tracking.h"
-
-DEFINE_string(generator_binary, std::string(SW_GENERATOR_BIN), "Path of software-defined signal generator binary");
-DEFINE_string(rinex_nav_file, std::string(DEFAULT_RINEX_NAV), "Input RINEX navigation file");
-DEFINE_int32(duration, 20, "Duration of the experiment [in seconds]");
-DEFINE_int32(fs_gen_hz, 2600000, "Samppling frequency [Hz]");
-DEFINE_string(static_position, "30.286502,120.032669,100", "Static receiver position [log,lat,height]");
-DEFINE_string(dynamic_position, "", "Observer positions file, in .csv or .nmea format");
-DEFINE_string(filename_rinex_obs, "sim.16o", "Filename of output RINEX navigation file");
-DEFINE_string(filename_raw_data, "signal_out.bin", "Filename of output raw data file");
-DEFINE_int32(test_satellite_PRN,1, "PRN of the satellite under test (must be visible during the observation time)");
-
+#include "signal_generator_flags.h"
+
+DECLARE_string(generator_binary);
+DECLARE_string(rinex_nav_file);
+DECLARE_int32(duration); // 20
+DECLARE_int32(fs_gen_hz);
+DECLARE_string(static_position);
+DECLARE_string(dynamic_position);
+DECLARE_string(filename_rinex_obs);
+DECLARE_string(filename_raw_data);
+DECLARE_int32(test_satellite_PRN);
// ######## GNURADIO BLOCK MESSAGE RECEVER FOR TRACKING MESSAGES #########
class GpsL1CADllPllTelemetryDecoderTest_msg_rx;
--
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