diff --git a/src/algorithms/libs/gnss_sdr_valve.cc b/src/algorithms/libs/gnss_sdr_valve.cc index 9f502d98c..ca4946c98 100644 --- a/src/algorithms/libs/gnss_sdr_valve.cc +++ b/src/algorithms/libs/gnss_sdr_valve.cc @@ -1,9 +1,9 @@ /*! * \file gnss_sdr_valve.cc - * \brief Brief description of the file here + * \brief Implementation of a GNU Radio block that sends a STOP message to the + * control queue right after a specific number of samples have passed through it. * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com * - * Detailed description of the file here if needed. * * ------------------------------------------------------------------------- * @@ -31,11 +31,8 @@ */ #include "gnss_sdr_valve.h" - #include - #include "control_message_factory.h" - #include #include diff --git a/src/algorithms/libs/gnss_sdr_valve.h b/src/algorithms/libs/gnss_sdr_valve.h index 376c451fc..942d17239 100644 --- a/src/algorithms/libs/gnss_sdr_valve.h +++ b/src/algorithms/libs/gnss_sdr_valve.h @@ -40,18 +40,18 @@ #include gr_block_sptr gnss_sdr_make_valve (size_t sizeof_stream_item, - int nitems, - gr_msg_queue_sptr queue); + int nitems, + gr_msg_queue_sptr queue); class gnss_sdr_valve : public gr_sync_block { friend gr_block_sptr gnss_sdr_make_valve(size_t sizeof_stream_item, - int nitems, - gr_msg_queue_sptr queue); + int nitems, + gr_msg_queue_sptr queue); gnss_sdr_valve (size_t sizeof_stream_item, - int nitems, - gr_msg_queue_sptr queue); + int nitems, + gr_msg_queue_sptr queue); int d_nitems; int d_ncopied_items; @@ -60,8 +60,8 @@ class gnss_sdr_valve : public gr_sync_block public: int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); }; #endif /*GNSS_SDR_GNSS_SDR_VALVE_H_*/ diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h index c427bf999..930e90749 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h @@ -50,21 +50,21 @@ class gps_l1_ca_dll_fll_pll_tracking_cc; typedef boost::shared_ptr - gps_l1_ca_dll_fll_pll_tracking_cc_sptr; +gps_l1_ca_dll_fll_pll_tracking_cc_sptr; gps_l1_ca_dll_fll_pll_tracking_cc_sptr gps_l1_ca_dll_fll_pll_make_tracking_cc(unsigned int satellite, - long if_freq, - long fs_in, - unsigned int vector_length, - gr_msg_queue_sptr queue, - bool dump, - std::string dump_filename, - int order, - float fll_bw_hz, - float pll_bw_hz, - float dll_bw_hz, - float early_late_space_chips); + long if_freq, + long fs_in, + unsigned int vector_length, + gr_msg_queue_sptr queue, + bool dump, + std::string dump_filename, + int order, + float fll_bw_hz, + float pll_bw_hz, + float dll_bw_hz, + float early_late_space_chips); //class gps_l1_ca_dll_pll_tracking_cc: public gr_sync_decimator @@ -78,30 +78,30 @@ private: friend gps_l1_ca_dll_fll_pll_tracking_cc_sptr gps_l1_ca_dll_fll_pll_make_tracking_cc(unsigned int satellite, - long if_freq, - long fs_in, unsigned - int vector_length, - gr_msg_queue_sptr queue, - bool dump, - std::string dump_filename, - int order, - float fll_bw_hz, - float pll_bw_hz, - float dll_bw_hz, - float early_late_space_chips); + long if_freq, + long fs_in, unsigned + int vector_length, + gr_msg_queue_sptr queue, + bool dump, + std::string dump_filename, + int order, + float fll_bw_hz, + float pll_bw_hz, + float dll_bw_hz, + float early_late_space_chips); gps_l1_ca_dll_fll_pll_tracking_cc(unsigned int satellite, - long if_freq, - long fs_in, unsigned - int vector_length, - gr_msg_queue_sptr queue, - bool dump, - std::string dump_filename, - int order, - float fll_bw_hz, - float pll_bw_hz, - float dll_bw_hz, - float early_late_space_chips); + long if_freq, + long fs_in, unsigned + int vector_length, + gr_msg_queue_sptr queue, + bool dump, + std::string dump_filename, + int order, + float fll_bw_hz, + float pll_bw_hz, + float dll_bw_hz, + float early_late_space_chips); void CN0_estimation_and_lock_detectors(); @@ -124,20 +124,20 @@ private: gr_complex* d_carr_sign; - gr_complex d_Early; - gr_complex d_Prompt; - gr_complex d_Prompt_prev; - gr_complex d_Late; + gr_complex d_Early; + gr_complex d_Prompt; + gr_complex d_Prompt_prev; + gr_complex d_Late; - float d_early_late_spc_chips; + float d_early_late_spc_chips; - float d_carrier_doppler_hz; - float d_code_freq_hz; - float d_code_phase_samples; - int d_current_prn_length_samples; - int d_next_prn_length_samples; - int d_FLL_wait; + float d_carrier_doppler_hz; + float d_code_freq_hz; + float d_code_phase_samples; + int d_current_prn_length_samples; + int d_next_prn_length_samples; + int d_FLL_wait; float d_rem_carr_phase; float d_rem_code_phase_samples; float d_next_rem_code_phase_samples; @@ -196,10 +196,10 @@ public: // gr_vector_const_void_star &input_items, // gr_vector_void_star &output_items) = 0; - //int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); + //int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); int general_work (int noutput_items, gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); + gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); void forecast (int noutput_items, gr_vector_int &ninput_items_required); diff --git a/src/main/main.cc b/src/main/main.cc index c4adaa8a5..1e75d7298 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -78,8 +78,9 @@ int main(int argc, char** argv) google::InitGoogleLogging(argv[0]); if (FLAGS_log_dir.empty()) { - std::cout << "Logging will be done at " << boost::filesystem::temp_directory_path() << std::endl - << "Use gnss-sdr --log_dir=/path/to/log to change that."<< std::endl; + // temp_directory_path() is only available from Boost 1.45. Ubuntu 10.10 ships with 1.42 + //std::cout << "Logging will be done at " << boost::filesystem::temp_directory_path() << std::endl + // << "Use gnss-sdr --log_dir=/path/to/log to change that."<< std::endl; } else {