[hamradio-commits] [gnss-sdr] 80/126: fixes from wrong merge

[Carles Fernandez]

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 3a56e09772a960330bd878d1e11cac663ae1a61f
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Nov 30 14:39:29 2015 +0100

    fixes from wrong merge
---
 .../observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc           | 4 ++--
 .../tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc   | 2 +-
 src/core/system_parameters/gnss_synchro.h                             | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
index 8a254a3..fcc3c78 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
@@ -264,8 +264,8 @@ int gps_l1_ca_observables_cc::general_work (int noutput_items, gr_vector_int &ni
                             d_dump_file.write((char*)&tmp_double, sizeof(double));
                             //tmp_double = (double)(current_gnss_synchro[i].Flag_valid_pseudorange==true);
                             //tmp_double = current_gnss_synchro[i].debug_var1;
-                            tmp_double = current_gnss_synchro[i].debug_var2;
-                            d_dump_file.write((char*)&tmp_double, sizeof(double));
+                            //tmp_double = current_gnss_synchro[i].debug_var2;
+                            //d_dump_file.write((char*)&tmp_double, sizeof(double));
                             tmp_double = current_gnss_synchro[i].PRN;
                             d_dump_file.write((char*)&tmp_double, sizeof(double));
                         }
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
index 96be747..fed2243 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
@@ -374,7 +374,7 @@ int galileo_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items,gr_vect
             //carrier phase accumulator for (K) Doppler estimation-
             d_acc_carrier_phase_rad -= GALILEO_TWO_PI * d_carrier_doppler_hz * static_cast<double>(d_current_prn_length_samples) / static_cast<double>(d_fs_in);
             //remnant carrier phase to prevent overflow in the code NCO
-            d_rem_carr_phase_rad = d_rem_carr_phase_rad + GALILEO_TWO_PI * d_carrier_doppler_hz * d_current_prn_length_samples / static_cast<double>(d_fs_in);
+            d_rem_carr_phase_rad = d_rem_carr_phase_rad + GALILEO_TWO_PI * d_carrier_doppler_hz * static_cast<double>(d_current_prn_length_samples) / static_cast<double>(d_fs_in);
             d_rem_carr_phase_rad = std::fmod(d_rem_carr_phase_rad, GALILEO_TWO_PI);
 
             // ################## DLL ##########################################################
diff --git a/src/core/system_parameters/gnss_synchro.h b/src/core/system_parameters/gnss_synchro.h
index 59aed13..27c1d6b 100644
--- a/src/core/system_parameters/gnss_synchro.h
+++ b/src/core/system_parameters/gnss_synchro.h
@@ -74,10 +74,6 @@ public:
     // Pseudorange
     double Pseudorange_m;
     bool Flag_valid_pseudorange;
-
-    //debug
-    double debug_var1;
-    double debug_var2;
 };
 
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git