Last retouches of the new factory and flowgraph.

src/core/receiver/control_thread.cc

@@ -179,6 +179,7 @@ void ControlThread::run()
     galileo_ephemeris_data_collector_thread_.timed_join(boost::posix_time::seconds(1));
     galileo_iono_data_collector_thread_.timed_join(boost::posix_time::seconds(1));
     galileo_utc_model_data_collector_thread_.timed_join(boost::posix_time::seconds(1));
+
     //Join keyboard threads
     keyboard_thread_.timed_join(boost::posix_time::seconds(1));
 

src/core/receiver/control_thread.h

@@ -109,7 +109,6 @@ public:
         return flowgraph_;
     }
 
-
 private:
     //SUPL assistance classes
     gnss_sdr_supl_client supl_client_acquisition_;
@@ -172,7 +171,6 @@ private:
 
     void galileo_iono_data_collector();
 
-
     void apply_action(unsigned int what);
     std::shared_ptr<GNSSFlowgraph> flowgraph_;
     std::shared_ptr<ConfigurationInterface> configuration_;

src/core/receiver/gnss_block_factory.cc

@@ -558,6 +558,11 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
 }
 
 
+/*
+ * Not very elegant, Acq, Ttk and Tlm blocks must be added here, too.
+ * To be fixed!
+ */
+
 std::unique_ptr<AcquisitionInterface> GNSSBlockFactory::GetAcqBlock(
         std::shared_ptr<ConfigurationInterface> configuration,
         std::string role,

src/core/receiver/gnss_flowgraph.cc

@@ -487,7 +487,6 @@ void GNSSFlowgraph::set_signals_list()
     /*
      * Sets a sequential list of GNSS satellites
      */
-
     std::set<unsigned int>::iterator available_gnss_prn_iter;
 
     /*
@@ -498,7 +497,6 @@ void GNSSFlowgraph::set_signals_list()
     /*
      * Read GNSS-SDR default GNSS system and signal
      */
-
     std::string default_system = configuration_->property("Channel.system", std::string("GPS"));
     std::string default_signal = configuration_->property("Channel.signal", std::string("1C"));
 
@@ -506,7 +504,6 @@ void GNSSFlowgraph::set_signals_list()
      * Loop to create the list of GNSS Signals
      * To add signals from other systems, add another loop 'for'
      */
-
     if (default_system.compare(std::string("GPS")) == 0)
         {
             /*

src/core/receiver/gnss_flowgraph.h

@@ -109,15 +109,10 @@ public:
     }
 
 private:
-    void init();
+    void init(); // Populates the SV PRN list available for acquisition and tracking
-    /*
-     * \brief Populates the SV PRN list available for acquisition and tracking
-     */
     void set_signals_list();
-    /*
+    void set_channels_state(); // Initializes the channels state (start acquisition or keep standby)
-     * \brief Initializes the channels state (start acquisition or keep standby) using the configuration parameters (number of channels and max channels in acquisition)
+                               // using the configuration parameters (number of channels and max channels in acquisition)
-     */
-    void set_channels_state();
     bool connected_;
     bool running_;
     unsigned int channels_count_;