From d74f00c39a38eb79f7444fd928f134e3808f106c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 13:30:11 +0100 Subject: [PATCH 1/4] Remove unused variable --- src/algorithms/PVT/libs/rinex_printer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index 718393f3f..fa6b1296c 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -8295,7 +8295,7 @@ boost::posix_time::ptime Rinex_Printer::compute_UTC_time(const Glonass_Gnav_Ephe { double tod = 0.0; double glot2utc = 3 * 3600; - double obs_time_utc = 0.0, obs_time_glot = 0.0; + double obs_time_glot = 0.0; int i = 0; // Get observation time in nearly GLONASS time. Correction for leap seconds done at the end From 6a79018d2c4d56b122be4988bda4dc06c0560022 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 23:00:09 +0100 Subject: [PATCH 2/4] Add more verbose messages --- CMakeLists.txt | 12 ++++++------ src/tests/CMakeLists.txt | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09cf1a452..2e90646f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,7 +330,7 @@ set(GNSSSDR_ARMADILLO_LOCAL_VERSION "unstable") set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10") -set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.11") +set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.12") @@ -455,7 +455,7 @@ if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) message (STATUS "Googletest package has been found.") else(LIBGTEST_DEV_DIR) message (STATUS " Googletest has not been found.") - message (STATUS " Googletest will be downloaded and built automatically ") + message (STATUS " Googletest v${GNSSSDR_GTEST_LOCAL_VERSION} will be downloaded and built automatically ") message (STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ") endif(LIBGTEST_DEV_DIR) endif(GTEST_DIR) @@ -699,7 +699,7 @@ set(LOCAL_GFLAGS false) find_package(GFlags) if (NOT GFlags_FOUND) message (STATUS " gflags library has not been found.") - message (STATUS " gflags will be downloaded and built automatically ") + message (STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically ") message (STATUS " when doing 'make'. ") if(CMAKE_VERSION VERSION_LESS 3.2) @@ -767,7 +767,7 @@ if (NOT GLOG_FOUND OR ${LOCAL_GFLAGS}) if(NOT GFlags_FOUND) message(STATUS " or it is likely not linked to gflags.") endif(NOT GFlags_FOUND) - message (STATUS " glog will be downloaded and built automatically ") + message (STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically ") message (STATUS " when doing 'make'. ") if(NOT ${LOCAL_GFLAGS}) add_library(gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} UNKNOWN IMPORTED) @@ -956,7 +956,7 @@ endif(ARMADILLO_FOUND) if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO) message(STATUS " Armadillo has not been found.") - message(STATUS " Armadillo will be downloaded and built automatically") + message(STATUS " Armadillo ${GNSSSDR_ARMADILLO_LOCAL_VERSION} will be downloaded and built automatically") message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ") set(armadillo_BRANCH ${GNSSSDR_ARMADILLO_LOCAL_VERSION}) set(armadillo_RELEASE ${armadillo_BRANCH}) @@ -1099,7 +1099,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS if(MATIO_FOUND) message(STATUS " Matio installed version (${MATIO_VERSION_STRING}) is too old (>= ${GNSSSDR_MATIO_MIN_VERSION} is required).") endif(MATIO_FOUND) - message(STATUS " Matio will be downloaded and built automatically") + message(STATUS " Matio v${GNSSSDR_MATIO_LOCAL_VERSION} will be downloaded and built automatically") message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ") find_package(ZLIB) if(ZLIB_FOUND) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 85853b429..6090235b4 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -209,6 +209,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) ################################################################################ find_package(GPSTK) if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) + message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically donwloaded and built when doing 'make'.") if(NOT ENABLE_FPGA) if(CMAKE_VERSION VERSION_LESS 3.2) ExternalProject_Add( From 986487ba26fefa8752924ac6e278c61c8fb479cc Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 10 Mar 2018 23:01:12 +0100 Subject: [PATCH 3/4] Fix circle color --- src/utils/reproducibility/ieee-access18/plot_dump.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/reproducibility/ieee-access18/plot_dump.m b/src/utils/reproducibility/ieee-access18/plot_dump.m index 6bbb388c5..efc06e649 100644 --- a/src/utils/reproducibility/ieee-access18/plot_dump.m +++ b/src/utils/reproducibility/ieee-access18/plot_dump.m @@ -186,7 +186,7 @@ plot(0,0,'k*'); [x,y,z] = cylinder([TWO_DRMS TWO_DRMS],200); -plot(x(1,:),y(1,:),[0 0.6 0],'Color',[0 0.6 0]); +plot(x(1,:),y(1,:),'Color',[0 0.6 0]); str = strcat('2DRMS=',num2str(TWO_DRMS), ' m'); text(cosd(65)*TWO_DRMS,sind(65)*TWO_DRMS,str,'Color',[0 0.6 0]); From df1a3a13df7047f82854a37238c46bb3a99c60f0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 11 Mar 2018 20:09:49 +0100 Subject: [PATCH 4/4] Fix satellite --- .../reproducibility/ieee-access18/L2-access18.conf | 9 +++++++-- src/utils/reproducibility/ieee-access18/plot_dump.m | 10 ++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/utils/reproducibility/ieee-access18/L2-access18.conf b/src/utils/reproducibility/ieee-access18/L2-access18.conf index fff74d193..57e1af0a3 100644 --- a/src/utils/reproducibility/ieee-access18/L2-access18.conf +++ b/src/utils/reproducibility/ieee-access18/L2-access18.conf @@ -69,6 +69,9 @@ Channel7.signal=2S Channel8.signal=2S Channel9.signal=2S +;######### SPECIFIC CHANNELS CONFIG ###### + +Channel0.satellite=19 ;######### ACQUISITION GLOBAL CONFIG ############ @@ -89,14 +92,13 @@ Acquisition_2S.blocking=true ;######### TRACKING GLOBAL CONFIG ############ - Tracking_2S.implementation=GPS_L2_M_DLL_PLL_Tracking Tracking_2S.item_type=gr_complex Tracking_2S.pll_bw_hz=4.0; -Tracking_2S.dll_bw_hz=0.75; +Tracking_2S.dll_bw_hz=1; Tracking_2S.early_late_space_chips=0.5; @@ -104,14 +106,17 @@ Tracking_2S.dump=true Tracking_2S.dump_filename=./data/track_ch_ + ;######### TELEMETRY DECODER CONFIG ############ TelemetryDecoder_2S.implementation=GPS_L2C_Telemetry_Decoder + ;######### OBSERVABLES CONFIG ############ Observables.implementation=Hybrid_Observables + ;######### PVT CONFIG ############ PVT.implementation=RTKLIB_PVT diff --git a/src/utils/reproducibility/ieee-access18/plot_dump.m b/src/utils/reproducibility/ieee-access18/plot_dump.m index efc06e649..09941acf9 100644 --- a/src/utils/reproducibility/ieee-access18/plot_dump.m +++ b/src/utils/reproducibility/ieee-access18/plot_dump.m @@ -227,11 +227,13 @@ hSurface=surf(MRSE*x,MRSE*y,MRSE*z); % sphere centered at origin set(hSurface,'facecolor','none','edgecolor',[0 0.6 0],'edgealpha',1,'facealpha',1); %axis equal; -xlabel('North [m]','fontname','Times','fontsize', fontsize) -ylabel('East [m]','fontname','Times','fontsize', fontsize) -zlabel('Up [m]','fontname','Times','fontsize', fontsize) -str = strcat('MRSE=',num2str(MRSE), ' m'); +xlabel('North [m]','fontname','Times','fontsize', fontsize-2) +ylabel('East [m]','fontname','Times','fontsize', fontsize-2) +zlabel('Up [m]','fontname','Times','fontsize', fontsize-2) +str = strcat('MRSE=',num2str(MRSE), ' m') text(cosd(45)*MRSE,sind(45)*MRSE,20,str,'Color',[0 0.6 0]); +a=gca; +set(a,'fontsize',fontsize-6) hh=findall(hf,'-property','FontName'); set(hh,'FontName','Times');