[hamradio-commits] [gnss-sdr] 47/60: Code cleaning

[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 37884afd0dbdd700f2cc0e6c59e349e55f3b0d08
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Mar 4 21:22:35 2015 +0100

    Code cleaning
---
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       | 28 +++++++++++-----------
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |  2 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
index cecfcd5..385a5e7 100644
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
@@ -199,7 +199,7 @@ int galileo_e1_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_it
                 {
                     if (in[i][0].Flag_valid_pseudorange == true)
                         {
-                	        global_galileo_almanac_map.read(i, d_ls_pvt->galileo_almanac);
+                            global_galileo_almanac_map.read(i, d_ls_pvt->galileo_almanac);
                             break;
                         }
                     i++;
@@ -226,7 +226,7 @@ int galileo_e1_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_it
                             //ToDo: Implement Galileo RINEX and Galileo NMEA outputs
                             //   d_nmea_printer->Print_Nmea_Line(d_ls_pvt, d_flag_averaging);
                             //
-                            if (!b_rinex_header_writen) //  & we have utc data in nav message!
+                            if (!b_rinex_header_writen)
                                 {
                                     std::map<int,Galileo_Ephemeris>::iterator galileo_ephemeris_iter;
                                     galileo_ephemeris_iter = d_ls_pvt->galileo_ephemeris_map.begin();
@@ -246,18 +246,18 @@ int galileo_e1_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_it
                                             rp->log_rinex_nav(rp->navGalFile, d_ls_pvt->galileo_ephemeris_map);
                                             d_last_sample_nav_output = d_sample_counter;
                                         }
-                                       std::map<int, Galileo_Ephemeris>::iterator galileo_ephemeris_iter;
-                                       galileo_ephemeris_iter = d_ls_pvt->galileo_ephemeris_map.begin();
-                                       if (galileo_ephemeris_iter != d_ls_pvt->galileo_ephemeris_map.end())
-                                          {
-                                              rp->log_rinex_obs(rp->obsFile, galileo_ephemeris_iter->second, d_rx_time, gnss_pseudoranges_map);
-                                          }
-                                       if (!b_rinex_header_updated && (d_ls_pvt->galileo_utc_model.A0_6 != 0))
-                                           {
-                                               rp->update_nav_header(rp->navGalFile, d_ls_pvt->galileo_iono, d_ls_pvt->galileo_utc_model, d_ls_pvt->galileo_almanac);
-                                               rp->update_obs_header(rp->obsFile, d_ls_pvt->galileo_utc_model);
-                                               b_rinex_header_updated = true;
-                                           }
+                                    std::map<int, Galileo_Ephemeris>::iterator galileo_ephemeris_iter;
+                                    galileo_ephemeris_iter = d_ls_pvt->galileo_ephemeris_map.begin();
+                                    if (galileo_ephemeris_iter != d_ls_pvt->galileo_ephemeris_map.end())
+                                        {
+                                            rp->log_rinex_obs(rp->obsFile, galileo_ephemeris_iter->second, d_rx_time, gnss_pseudoranges_map);
+                                        }
+                                    if (!b_rinex_header_updated && (d_ls_pvt->galileo_utc_model.A0_6 != 0))
+                                        {
+                                            rp->update_nav_header(rp->navGalFile, d_ls_pvt->galileo_iono, d_ls_pvt->galileo_utc_model, d_ls_pvt->galileo_almanac);
+                                            rp->update_obs_header(rp->obsFile, d_ls_pvt->galileo_utc_model);
+                                            b_rinex_header_updated = true;
+                                        }
                                 }
                         }
                 }
diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
index 3402978..ac49a20 100644
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
@@ -264,7 +264,7 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_ite
                             d_kml_dump->print_position(d_ls_pvt, d_flag_averaging);
                             d_nmea_printer->Print_Nmea_Line(d_ls_pvt, d_flag_averaging);
 
-                            if (!b_rinex_header_writen) //  & we have utc data in nav message!
+                            if (!b_rinex_header_writen)
                                 {
                                     std::map<int,Gps_Ephemeris>::iterator gps_ephemeris_iter;
                                     gps_ephemeris_iter = d_ls_pvt->gps_ephemeris_map.begin();
diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
index 5e22a36..94e6617 100644
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
@@ -208,7 +208,7 @@ int hybrid_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
                 {
                     if (in[i][0].Flag_valid_pseudorange == true)
                         {
-                	        arrived_galileo_almanac = global_galileo_almanac_map.read(i, d_ls_pvt->galileo_almanac);
+                            arrived_galileo_almanac = global_galileo_almanac_map.read(i, d_ls_pvt->galileo_almanac);
                             break;
                         }
                     i++;
@@ -366,7 +366,7 @@ int hybrid_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
         }
 
     consume_each(1); //one by one
-    return 0;
+    return noutput_items;
 }
 
 

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