From 05accfb1d72c6b6b45491eab7888e0ecaa7d6a7c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 12 Jan 2014 20:07:38 +0000 Subject: [PATCH] Tidying up includes: : C library, C++ library, other libraries' .h, project's .h. git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@476 64b25241-fba3-4117-9849-534c7e92360d --- src/algorithms/PVT/adapters/galileo_e1_pvt.h | 6 +- src/algorithms/PVT/adapters/gps_l1_ca_pvt.h | 6 +- .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h | 8 +- .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h | 8 +- src/algorithms/PVT/libs/galileo_e1_ls_pvt.h | 24 +-- src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h | 20 +-- src/algorithms/PVT/libs/kml_printer.h | 7 +- src/algorithms/PVT/libs/nmea_printer.h | 3 +- src/algorithms/PVT/libs/rinex_printer.cc | 25 ++-- src/algorithms/PVT/libs/rinex_printer.h | 3 +- ...alileo_e1_pcps_8ms_ambiguous_acquisition.h | 8 +- .../galileo_e1_pcps_ambiguous_acquisition.h | 8 +- ...leo_e1_pcps_cccwsr_ambiguous_acquisition.h | 8 +- ...lileo_e1_pcps_tong_ambiguous_acquisition.h | 8 +- .../adapters/gps_l1_ca_pcps_acquisition.h | 8 +- .../gps_l1_ca_pcps_acquisition_fine_doppler.h | 8 +- .../gps_l1_ca_pcps_assisted_acquisition.h | 8 +- .../gps_l1_ca_pcps_multithread_acquisition.h | 8 +- .../gps_l1_ca_pcps_opencl_acquisition.h | 8 +- .../gps_l1_ca_pcps_tong_acquisition.h | 9 +- .../galileo_pcps_8ms_acquisition_cc.h | 9 +- .../gnuradio_blocks/pcps_acquisition_cc.cc | 14 +- .../gnuradio_blocks/pcps_acquisition_cc.h | 7 +- .../pcps_acquisition_fine_doppler_cc.h | 9 +- .../pcps_assisted_acquisition_cc.h | 9 +- .../pcps_cccwsr_acquisition_cc.h | 12 +- .../pcps_multithread_acquisition_cc.h | 11 +- .../pcps_opencl_acquisition_cc.cc | 23 +-- .../pcps_opencl_acquisition_cc.h | 10 +- .../pcps_tong_acquisition_cc.h | 15 +- src/algorithms/channel/adapters/channel.cc | 51 +++---- src/algorithms/channel/adapters/channel.h | 14 +- .../channel/libs/gps_l1_ca_channel_fsm.cc | 10 +- .../channel/libs/gps_l1_ca_channel_fsm.h | 13 +- .../adapters/signal_conditioner.cc | 5 +- .../conditioner/adapters/signal_conditioner.h | 3 +- .../adapters/ishort_to_complex.h | 8 +- .../input_filter/adapters/fir_filter.h | 4 +- .../adapters/freq_xlating_fir_filter.h | 9 +- .../libs/galileo_e1_signal_processing.cc | 4 +- src/algorithms/libs/gnss_sdr_valve.cc | 5 +- src/algorithms/libs/pass_through.h | 6 +- .../adapters/galileo_e1_observables.h | 6 +- .../adapters/gps_l1_ca_observables.h | 6 +- .../galileo_e1_observables_cc.h | 8 +- .../gps_l1_ca_observables_cc.h | 8 +- .../adapters/file_output_filter.h | 8 +- .../adapters/null_sink_output_filter.h | 8 +- .../adapters/direct_resampler_conditioner.h | 3 +- .../direct_resampler_conditioner_cc.cc | 3 +- .../direct_resampler_conditioner_ss.cc | 6 +- .../adapters/signal_generator.h | 5 +- .../gnuradio_blocks/signal_generator_c.cc | 6 +- .../gnuradio_blocks/signal_generator_c.h | 11 +- .../adapters/file_signal_source.h | 6 +- .../adapters/gen_signal_source.h | 3 +- .../adapters/gn3s_signal_source.h | 6 +- .../adapters/nsr_file_signal_source.h | 8 +- .../adapters/rtlsdr_signal_source.cc | 28 ++-- .../adapters/rtlsdr_signal_source.h | 6 +- .../adapters/uhd_signal_source.h | 5 +- .../adapters/galileo_e1b_telemetry_decoder.h | 6 +- .../adapters/gps_l1_ca_telemetry_decoder.h | 5 +- .../adapters/sbas_l1_telemetry_decoder.h | 6 +- .../galileo_e1b_telemetry_decoder_cc.cc | 17 +-- .../galileo_e1b_telemetry_decoder_cc.h | 15 +- .../gps_l1_ca_telemetry_decoder_cc.cc | 8 +- .../gps_l1_ca_telemetry_decoder_cc.h | 11 +- .../sbas_l1_telemetry_decoder_cc.h | 9 +- .../libs/gps_l1_ca_subframe_fsm.cc | 4 +- .../galileo_e1_dll_pll_veml_tracking.cc | 15 +- .../galileo_e1_dll_pll_veml_tracking.h | 6 +- .../galileo_e1_tcp_connector_tracking.cc | 16 +- .../galileo_e1_tcp_connector_tracking.h | 6 +- .../gps_l1_ca_dll_fll_pll_tracking.cc | 15 +- .../adapters/gps_l1_ca_dll_fll_pll_tracking.h | 6 +- .../gps_l1_ca_dll_pll_optim_tracking.h | 6 +- .../adapters/gps_l1_ca_dll_pll_tracking.cc | 19 +-- .../adapters/gps_l1_ca_dll_pll_tracking.h | 10 +- .../gps_l1_ca_tcp_connector_tracking.cc | 16 +- .../gps_l1_ca_tcp_connector_tracking.h | 6 +- .../galileo_e1_dll_pll_veml_tracking_cc.h | 5 +- .../galileo_e1_tcp_connector_tracking_cc.h | 5 +- .../gps_l1_ca_dll_fll_pll_tracking_cc.cc | 18 +-- .../gps_l1_ca_dll_fll_pll_tracking_cc.h | 4 +- .../gps_l1_ca_dll_pll_optim_tracking_cc.h | 4 +- .../gps_l1_ca_dll_pll_tracking_cc.h | 5 +- .../gps_l1_ca_tcp_connector_tracking_cc.h | 5 +- src/algorithms/tracking/libs/correlator.cc | 7 +- src/algorithms/tracking/libs/correlator.h | 3 +- .../tracking/libs/lock_detectors.cc | 5 +- src/core/interfaces/gnss_block_interface.h | 5 +- src/core/libs/gnss_sdr_supl_client.cc | 5 +- src/core/libs/gnss_sdr_supl_client.h | 4 +- src/core/receiver/concurrent_map.h | 3 +- src/core/receiver/control_message_factory.h | 5 +- src/core/receiver/control_thread.cc | 20 ++- src/core/receiver/control_thread.h | 3 +- src/core/receiver/gnss_flowgraph.h | 3 +- src/core/system_parameters/gps_ephemeris.h | 3 +- .../gps_navigation_message.h | 13 +- src/core/system_parameters/gps_utc_model.cc | 139 +++++++++--------- .../sbas_ionospheric_correction.h | 7 +- .../sbas_satellite_correction.cc | 7 +- .../sbas_satellite_correction.h | 6 +- .../system_parameters/sbas_telemetry_data.cc | 4 +- .../system_parameters/sbas_telemetry_data.h | 12 +- src/core/system_parameters/sbas_time.h | 11 +- 108 files changed, 599 insertions(+), 496 deletions(-) diff --git a/src/algorithms/PVT/adapters/galileo_e1_pvt.h b/src/algorithms/PVT/adapters/galileo_e1_pvt.h index 4863d21e1..a6cc0b349 100644 --- a/src/algorithms/PVT/adapters/galileo_e1_pvt.h +++ b/src/algorithms/PVT/adapters/galileo_e1_pvt.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,9 +34,11 @@ #ifndef GNSS_SDR_GALILEO_E1_PVT_H_ #define GNSS_SDR_GALILEO_E1_PVT_H_ +#include +#include #include "pvt_interface.h" #include "galileo_e1_pvt_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/PVT/adapters/gps_l1_ca_pvt.h b/src/algorithms/PVT/adapters/gps_l1_ca_pvt.h index 8a5c19f64..c4be06778 100644 --- a/src/algorithms/PVT/adapters/gps_l1_ca_pvt.h +++ b/src/algorithms/PVT/adapters/gps_l1_ca_pvt.h @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -36,9 +36,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_PVT_H_ #define GNSS_SDR_GPS_L1_CA_PVT_H_ +#include +#include #include "pvt_interface.h" #include "gps_l1_ca_pvt_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h index 8a2be7921..9878de826 100644 --- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h +++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #define GNSS_SDR_GALILEO_E1_PVT_CC_H #include -#include -#include #include +#include +#include #include #include +#include +#include #include "galileo_navigation_message.h" #include "galileo_ephemeris.h" #include "galileo_utc_model.h" diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h index 15e5454a9..441133992 100644 --- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h +++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h @@ -4,7 +4,7 @@ * \author Javier Arribas, 2011. jarribas(at)cttc.es * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,11 +31,13 @@ #define GNSS_SDR_GPS_L1_CA_PVT_CC_H #include -#include -#include #include +#include +#include #include #include +#include +#include #include "gps_navigation_message.h" #include "gps_ephemeris.h" #include "gps_utc_model.h" diff --git a/src/algorithms/PVT/libs/galileo_e1_ls_pvt.h b/src/algorithms/PVT/libs/galileo_e1_ls_pvt.h index 261252f4b..a8f55b1b7 100644 --- a/src/algorithms/PVT/libs/galileo_e1_ls_pvt.h +++ b/src/algorithms/PVT/libs/galileo_e1_ls_pvt.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,24 +28,26 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_GALILEO_E1_LS_PVT_H_ #define GNSS_SDR_GALILEO_E1_LS_PVT_H_ -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include -#include "GPS_L1_CA.h" -#include "galileo_navigation_message.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "armadillo" #include "boost/date_time/posix_time/posix_time.hpp" +#include "GPS_L1_CA.h" +#include "galileo_navigation_message.h" #include "gnss_synchro.h" #include "galileo_ephemeris.h" #include "galileo_utc_model.h" diff --git a/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h b/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h index c15162543..169a77b33 100644 --- a/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h +++ b/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h @@ -5,7 +5,7 @@ * \author Javier Arribas, 2011. jarribas(at)cttc.es * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -27,20 +27,22 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_GPS_L1_CA_LS_PVT_H_ #define GNSS_SDR_GPS_L1_CA_LS_PVT_H_ -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gps_navigation_message.h" #include "GPS_L1_CA.h" #include "armadillo" diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h index 53f99e9d6..4638c09aa 100644 --- a/src/algorithms/PVT/libs/kml_printer.h +++ b/src/algorithms/PVT/libs/kml_printer.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,11 +30,12 @@ */ -#ifndef GNSS_SDR_KML_PRINTER_H_ -#define GNSS_SDR_KML_PRINTER_H_ +#ifndef GNSS_SDR_KML_PRINTER_H_ +#define GNSS_SDR_KML_PRINTER_H_ #include #include +#include #include "gps_l1_ca_ls_pvt.h" #include "galileo_e1_ls_pvt.h" diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h index 8f7e45662..0a2c5e114 100644 --- a/src/algorithms/PVT/libs/nmea_printer.h +++ b/src/algorithms/PVT/libs/nmea_printer.h @@ -10,7 +10,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -39,6 +39,7 @@ #include #include +#include #include "gps_l1_ca_ls_pvt.h" diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index 8fb0c4827..2bd82e0b0 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -5,7 +5,7 @@ * \author Carles Fernandez Prades, 2011. cfernandez(at)cttc.es * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -29,19 +29,15 @@ */ #include "rinex_printer.h" -#include "gps_navigation_message.h" -#include "gps_ephemeris.h" -#include "gps_iono.h" -#include "gps_utc_model.h" -#include "GPS_L1_CA.h" -#include "sbas_telemetry_data.h" -#include -#include #include // for getenv() +#include // for min and max +#include // for floor +#include #include #include -#include // for floor -#include // for min and max +#include +#include +#include #include "boost/date_time/time_zone_base.hpp" #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/local_time/local_time.hpp" @@ -49,6 +45,13 @@ #include #include #include +#include "sbas_telemetry_data.h" +#include "gps_navigation_message.h" +#include "gps_ephemeris.h" +#include "gps_iono.h" +#include "gps_utc_model.h" +#include "GPS_L1_CA.h" + diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h index bd6694487..ae86eb43f 100644 --- a/src/algorithms/PVT/libs/rinex_printer.h +++ b/src/algorithms/PVT/libs/rinex_printer.h @@ -25,7 +25,7 @@ * \author Carles Fernandez Prades, 2011. cfernandez(at)cttc.es * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -56,6 +56,7 @@ #include #include // for stringstream #include // for setprecision +#include #include "gps_navigation_message.h" #include "boost/date_time/posix_time/posix_time.hpp" #include "GPS_L1_CA.h" diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index 8cd210b65..dd7ddfc78 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #ifndef GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H_ #define GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "galileo_pcps_8ms_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 1c46ddccc..be0c9ac2a 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #ifndef GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_ #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index 99135d7d1..e4cfe6479 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #ifndef GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H_ #define GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_cccwsr_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index f33281f21..9a8268d4f 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #ifndef GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H_ #define GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_tong_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index 2e56e6e01..e620caa50 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -10,7 +10,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -36,11 +36,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_ #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h index 0c141c6d2..f5e60e18f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,11 +34,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H_ #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_acquisition_fine_doppler_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h index 283fadef0..3d3116dbd 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,11 +34,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H_ #define GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_assisted_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h index 1738d28dc..2ed349be1 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_PCPS_MULTITHREAD_ACQUISITION_H_ #define GNSS_SDR_GPS_L1_CA_PCPS_MULTITHREAD_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_multithread_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index c76813edd..688ba9659 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H_ #define GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_opencl_acquisition_cc.h" -#include -#include + class ConfigurationInterface; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index 5152e8d1f..26552a5d6 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,12 +32,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H_ #define GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H_ +#include +#include +#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_tong_acquisition_cc.h" -#include -#include - +#include "configuration_interface.h" class ConfigurationInterface; diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h index 8c5b36fe4..5c4b669d1 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,13 +33,14 @@ #define GNSS_SDR_PCPS_8MS_ACQUISITION_CC_H_ #include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc index 745673807..5656ab33e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,14 +33,14 @@ */ #include "pcps_acquisition_cc.h" -#include "gnss_signal_processing.h" -#include "control_message_factory.h" -#include +#include #include +#include #include #include #include -#include +#include "gnss_signal_processing.h" +#include "control_message_factory.h" using google::LogMessage; @@ -161,12 +161,12 @@ void pcps_acquisition_cc::init() // Create the carrier Doppler wipeoff signals d_grid_doppler_wipeoffs = new gr_complex*[d_num_doppler_bins]; - for (unsigned int doppler_index=0;doppler_index +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h index 9a2aa3d0f..a12667b03 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h @@ -22,7 +22,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -49,13 +49,14 @@ #define GNSS_SDR_PCPS_acquisition_fine_doppler_cc_H_ #include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h index 31600393a..3388342c7 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -22,7 +22,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -49,13 +49,14 @@ #define GNSS_SDR_PCPS_ASSISTED_ACQUISITION_CC_H_ #include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h index 416f1935a..6d3121f73 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -38,16 +38,18 @@ #define GNSS_SDR_PCPS_CCCWSR_ACQUISITION_CC_H_ #include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" -#include + class pcps_cccwsr_acquisition_cc; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h index 65df7ab0e..8d03c7832 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h @@ -24,7 +24,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -50,14 +50,17 @@ #ifndef GNSS_SDR_PCPS_MULTITHREAD_ACQUISITION_CC_H_ #define GNSS_SDR_PCPS_MULTITHREAD_ACQUISITION_CC_H_ +#include #include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 381b68e02..de190f39b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -15,7 +15,7 @@ * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency - * Approach", Birkha user, 2007. pp 81-84 + * Approach", Birkhauser, 2007. pp 81-84 * * \authors
    *
  • Javier Arribas, 2011. jarribas(at)cttc.es @@ -25,7 +25,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -49,18 +49,21 @@ */ #include "pcps_opencl_acquisition_cc.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gnss_signal_processing.h" #include "control_message_factory.h" #include "fft_base_kernels.h" #include "fft_internal.h" -#include -#include -#include -#include -#include -#include -#include -#include + + using google::LogMessage; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h index aa176137c..f2fb62617 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -25,7 +25,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -52,13 +52,15 @@ #define GNSS_SDR_PCPS_OPENCL_ACQUISITION_CC_H_ #include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "fft_internal.h" #include "gnss_synchro.h" diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h index 10d2f7d78..e40b29044 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -25,7 +25,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -48,17 +48,18 @@ * ------------------------------------------------------------------------- */ -#ifndef GNSS_SDR_PCPS_TONG_acquisition_cc_H_ -#define GNSS_SDR_PCPS_TONG_acquisition_cc_H_ +#ifndef GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_ +#define GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_ #include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #include "concurrent_queue.h" #include "gnss_synchro.h" @@ -234,4 +235,4 @@ public: gr_vector_void_star &output_items); }; -#endif /* GNSS_SDR_PCPS_TONG_acquisition_cc_H_ */ +#endif /* GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_ */ diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index a862aef14..426d00b29 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,19 +30,22 @@ */ #include "channel.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "acquisition_interface.h" #include "tracking_interface.h" #include "telemetry_decoder_interface.h" #include "configuration_interface.h" #include "gnss_flowgraph.h" -#include -#include -#include -#include -#include -#include -#include -#include + + + using google::LogMessage; @@ -66,35 +69,27 @@ Channel::Channel(ConfigurationInterface *configuration, unsigned int channel, // IMPORTANT: Do not change the order between set_doppler_max, set_doppler_step and set_threshold - unsigned int doppler_max = configuration->property("Acquisition" + boost::lexical_cast(channel_) - + ".doppler_max",0); - if(doppler_max==0) doppler_max = configuration->property("Acquisition.doppler_max",0); - - DLOG(INFO) << "Channel "<< channel_<<" Doppler_max = " << doppler_max << std::endl; + unsigned int doppler_max = configuration->property("Acquisition" + boost::lexical_cast(channel_) + ".doppler_max", 0); + if(doppler_max == 0) doppler_max = configuration->property("Acquisition.doppler_max", 0); + DLOG(INFO) << "Channel "<< channel_ << " Doppler_max = " << doppler_max; acq_->set_doppler_max(doppler_max); - unsigned int doppler_step = configuration->property("Acquisition" + boost::lexical_cast(channel_) - + ".doppler_step",0); - if(doppler_step==0) doppler_step = configuration->property("Acquisition.doppler_step",500); - - DLOG(INFO) << "Channel "<< channel_<<" Doppler_step = " << doppler_step << std::endl; + unsigned int doppler_step = configuration->property("Acquisition" + boost::lexical_cast(channel_) + ".doppler_step" ,0); + if(doppler_step == 0) doppler_step = configuration->property("Acquisition.doppler_step", 500); + DLOG(INFO) << "Channel "<< channel_ << " Doppler_step = " << doppler_step; acq_->set_doppler_step(doppler_step); - float threshold = configuration->property("Acquisition" + boost::lexical_cast(channel_) - + ".threshold",0.0); - if(threshold==0.0) threshold = configuration->property("Acquisition.threshold",0.0); + float threshold = configuration->property("Acquisition" + boost::lexical_cast(channel_) + ".threshold", 0.0); + if(threshold == 0.0) threshold = configuration->property("Acquisition.threshold", 0.0); acq_->set_threshold(threshold); acq_->init(); - repeat_ = configuration->property("Acquisition" + boost::lexical_cast< - std::string>(channel_) + ".repeat_satellite", false); - - DLOG(INFO) << "Channel " << channel_ << " satellite repeat = " << repeat_ - << std::endl; + repeat_ = configuration->property("Acquisition" + boost::lexical_cast(channel_) + ".repeat_satellite", false); + DLOG(INFO) << "Channel " << channel_ << " satellite repeat = " << repeat_; acq_->set_channel_queue(&channel_internal_queue_); trk_->set_channel_queue(&channel_internal_queue_); @@ -181,7 +176,7 @@ void Channel::set_signal(Gnss_Signal gnss_signal) { gnss_signal_ = gnss_signal; const char * str = gnss_signal_.get_signal().c_str(); // get a C style null terminated string - std::memcpy((void*)gnss_synchro_.Signal, str,3); // copy string into synchro char array: 2 char + null + std::memcpy((void*)gnss_synchro_.Signal, str, 3); // copy string into synchro char array: 2 char + null gnss_synchro_.Signal[2] = 0; // make sure that string length is only two characters gnss_synchro_.PRN = gnss_signal_.get_satellite().get_PRN(); gnss_synchro_.System = gnss_signal_.get_satellite().get_system_short().c_str()[0]; diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 8758ece46..e3a1238d8 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,7 +35,7 @@ #ifndef GNSS_SDR_CHANNEL_H_ #define GNSS_SDR_CHANNEL_H_ -//#include +#include #include #include "channel_interface.h" #include "gps_l1_ca_channel_fsm.h" @@ -51,7 +51,9 @@ class TrackingInterface; class TelemetryDecoderInterface; /*! - * \brief This class represents a GNSS channel. + * \brief This class represents a GNSS channel. It wraps an AcquisitionInterface, + * a Tracking Interface and a TelemetryDecoderInterface, and handles + * their interaction through a Finite State Machine * */ class Channel: public ChannelInterface @@ -78,9 +80,9 @@ public: AcquisitionInterface* acquisition(){ return acq_; } TrackingInterface* tracking(){ return trk_; } TelemetryDecoderInterface* telemetry(){ return nav_; } - void start_acquisition(); - void set_signal(Gnss_Signal gnss_signal_); - void start(); + void start_acquisition(); //!< Start the State Machine + void set_signal(Gnss_Signal gnss_signal_); //!< Sets the channel GNSS signal + void start(); //!< Start the thread void standby(); /*! * \brief Set stop_ to true and blocks the calling thread until diff --git a/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.cc b/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.cc index b8d6d6f3a..685daf16f 100644 --- a/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.cc +++ b/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.cc @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -29,10 +29,12 @@ */ #include "gps_l1_ca_channel_fsm.h" -#include "control_message_factory.h" -#include "channel.h" +#include #include #include +#include "control_message_factory.h" +#include "channel.h" + struct Ev_gps_channel_start_acquisition: sc::event< Ev_gps_channel_start_acquisition> { @@ -140,6 +142,8 @@ void GpsL1CaChannelFsm::Event_gps_failed_acquisition_no_repeat() { this->process_event(Ev_gps_channel_failed_acquisition_no_repeat()); } + +// Something is wrong here, we are using a memory after it ts freed void GpsL1CaChannelFsm::Event_gps_failed_tracking_standby() { this->process_event(Ev_gps_channel_failed_tracking_standby()); } diff --git a/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.h b/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.h index 4e826f69f..d388fbc42 100644 --- a/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.h +++ b/src/algorithms/channel/libs/gps_l1_ca_channel_fsm.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,21 +32,24 @@ #ifndef GNSS_SDR_GPS_L1_CA_CHANNEL_FSM_H #define GNSS_SDR_GPS_L1_CA_CHANNEL_FSM_H +#include +#include +#include #include #include #include #include #include #include -#include #include #include +#include #include "acquisition_interface.h" #include "tracking_interface.h" #include "telemetry_decoder_interface.h" -#include -#include -#include + + + namespace sc = boost::statechart; namespace mpl = boost::mpl; diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc index 89dd9ccb2..327899e67 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,7 +30,6 @@ */ #include "signal_conditioner.h" -#include "gnss_flowgraph.h" #include #include #include @@ -39,6 +38,8 @@ #include #include #include +#include "gnss_flowgraph.h" + using google::LogMessage; diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index aac2d719f..2de8544bb 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,6 +32,7 @@ #ifndef GNSS_SDR_SIGNAL_CONDITIONER_H_ #define GNSS_SDR_SIGNAL_CONDITIONER_H_ +#include #include #include "gnss_block_interface.h" #include "control_message_factory.h" diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h index 562ae8c43..847e90f6d 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,11 +31,13 @@ #ifndef GNSS_SDR_ISHORT_TO_COMPLEX_H_ #define GNSS_SDR_ISHORT_TO_COMPLEX_H_ -#include "gnss_synchro.h" -#include "gnss_block_interface.h" +#include #include #include #include +#include "gnss_synchro.h" +#include "gnss_block_interface.h" + class ConfigurationInterface; diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h index 0962027c5..624c9fe68 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.h +++ b/src/algorithms/input_filter/adapters/fir_filter.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,6 +34,8 @@ #define GNSS_SDR_FIR_FILTER_H_ #include +#include +#include #include #include #include diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h index 049d0a3bb..2f92a6aff 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,12 +33,15 @@ #ifndef GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_ #define GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_ -#include "gnss_synchro.h" -#include "gnss_block_interface.h" +#include +#include #include #include #include #include +#include "gnss_synchro.h" +#include "gnss_block_interface.h" + class ConfigurationInterface; diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc index f3210420a..a6136b749 100644 --- a/src/algorithms/libs/galileo_e1_signal_processing.cc +++ b/src/algorithms/libs/galileo_e1_signal_processing.cc @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,6 +31,8 @@ */ #include "galileo_e1_signal_processing.h" +#include + void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn, diff --git a/src/algorithms/libs/gnss_sdr_valve.cc b/src/algorithms/libs/gnss_sdr_valve.cc index c76a5deb8..367e0a021 100644 --- a/src/algorithms/libs/gnss_sdr_valve.cc +++ b/src/algorithms/libs/gnss_sdr_valve.cc @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,9 +31,10 @@ */ #include "gnss_sdr_valve.h" -#include +#include // for min #include #include +#include #include "control_message_factory.h" using google::LogMessage; diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h index f35801d5c..381bbda2b 100644 --- a/src/algorithms/libs/pass_through.h +++ b/src/algorithms/libs/pass_through.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,11 +33,9 @@ #ifndef GNSS_SDR_PASS_THROUGH_H_ #define GNSS_SDR_PASS_THROUGH_H_ +#include #include -//#include #include -//#include -//#include #include "gnss_block_interface.h" class ConfigurationInterface; diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.h b/src/algorithms/observables/adapters/galileo_e1_observables.h index 53f4c1d1d..2eee13e1c 100644 --- a/src/algorithms/observables/adapters/galileo_e1_observables.h +++ b/src/algorithms/observables/adapters/galileo_e1_observables.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,9 +34,11 @@ #ifndef GNSS_SDR_GALILEO_E1_OBSERVABLES_H_ #define GNSS_SDR_GALILEO_E1_OBSERVABLES_H_ +#include +#include #include "observables_interface.h" #include "galileo_e1_observables_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.h b/src/algorithms/observables/adapters/gps_l1_ca_observables.h index c1f6fa787..7d4f61dc7 100644 --- a/src/algorithms/observables/adapters/gps_l1_ca_observables.h +++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,9 +33,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_OBSERVABLES_H_ #define GNSS_SDR_GPS_L1_CA_OBSERVABLES_H_ +#include +#include #include "observables_interface.h" #include "gps_l1_ca_observables_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h index a604b69db..39a2a9a3e 100644 --- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,11 +34,13 @@ #define GNSS_SDR_GALILEO_E1_OBSERVABLES_CC_H #include -#include -#include #include +#include +#include #include #include +#include +#include #include "concurrent_queue.h" #include "galileo_navigation_message.h" #include "rinex_printer.h" diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h index 289faf8c9..84ee49a1e 100644 --- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h @@ -4,7 +4,7 @@ * \author Javier Arribas, 2011. jarribas(at)cttc.es * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,13 @@ #define GNSS_SDR_GPS_L1_CA_OBSERVABLES_CC_H #include -#include -#include #include +#include +#include #include #include +#include +#include #include "concurrent_queue.h" #include "gps_navigation_message.h" #include "rinex_printer.h" diff --git a/src/algorithms/output_filter/adapters/file_output_filter.h b/src/algorithms/output_filter/adapters/file_output_filter.h index d9ae0b1ac..7a40d157b 100644 --- a/src/algorithms/output_filter/adapters/file_output_filter.h +++ b/src/algorithms/output_filter/adapters/file_output_filter.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,13 +30,13 @@ * ------------------------------------------------------------------------- */ - - #ifndef GNSS_SDR_FILE_OUTPUT_FILTER_H_ #define GNSS_SDR_FILE_OUTPUT_FILTER_H_ -#include "gnss_block_interface.h" +#include #include +#include "gnss_block_interface.h" + class ConfigurationInterface; diff --git a/src/algorithms/output_filter/adapters/null_sink_output_filter.h b/src/algorithms/output_filter/adapters/null_sink_output_filter.h index c2416e2c6..74844b640 100644 --- a/src/algorithms/output_filter/adapters/null_sink_output_filter.h +++ b/src/algorithms/output_filter/adapters/null_sink_output_filter.h @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,13 +32,13 @@ * ------------------------------------------------------------------------- */ - - #ifndef GNSS_SDR_NULL_SINK_OUTPUT_FILTER_H_ #define GNSS_SDR_NULL_SINK_OUTPUT_FILTER_H_ -#include "gnss_block_interface.h" +#include #include +#include "gnss_block_interface.h" + class ConfigurationInterface; diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h index a8461cb17..14d2e0bfb 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,6 +33,7 @@ #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_ #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_ +#include #include #include "gnss_block_interface.h" diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc index e723d9115..de2273d96 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,6 +33,7 @@ #include "direct_resampler_conditioner_cc.h" +#include #include #include #include diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc index dd01c5858..24c43aedc 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_ss.cc @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,11 +33,13 @@ #include "direct_resampler_conditioner_ss.h" -#include "gps_sdr_signal_processing.h" +#include #include #include #include #include +#include "gps_sdr_signal_processing.h" + using google::LogMessage; diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h index 7df0e1895..fe0f9af5d 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.h +++ b/src/algorithms/signal_generator/adapters/signal_generator.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,11 +33,12 @@ #ifndef GNSS_SDR_SIGNAL_GENERATOR_H_ #define GNSS_SDR_SIGNAL_GENERATOR_H_ +#include +#include #include #include #include #include - #include "gnss_block_interface.h" #include "signal_generator_c.h" diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc index 980bd1c58..91af861c0 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,11 +28,11 @@ * ------------------------------------------------------------------------- */ -#include "signal_generator_c.h" #include +#include +#include "signal_generator_c.h" #include "gps_sdr_signal_processing.h" #include "galileo_e1_signal_processing.h" -#include #include "nco_lib.h" diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h index 3280c8667..f4c929da1 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -27,13 +27,18 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_SIGNAL_GENERATOR_C_H #define GNSS_SDR_SIGNAL_GENERATOR_C_H -#include "gnss_signal.h" +#include +#include +#include #include #include -#include +#include "gnss_signal.h" + + class signal_generator_c; diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index 025f9dda1..09eedacbd 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,12 +35,14 @@ #ifndef GNSS_SDR_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_FILE_SIGNAL_SOURCE_H_ -#include "gnss_block_interface.h" +#include #include #include #include #include #include +#include "gnss_block_interface.h" + class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h index f313ef509..c35e579ea 100644 --- a/src/algorithms/signal_source/adapters/gen_signal_source.h +++ b/src/algorithms/signal_source/adapters/gen_signal_source.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,6 +33,7 @@ #ifndef GNSS_SDR_GEN_SIGNAL_SOURCE_H_ #define GNSS_SDR_GEN_SIGNAL_SOURCE_H_ +#include #include #include "gnss_block_interface.h" diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index 199b24ccd..5479ff4f2 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,10 +32,12 @@ #ifndef GN3S_SIGNAL_SOURCE_H_ #define GN3S_SIGNAL_SOURCE_H_ +#include #include -#include "gnss_block_interface.h" #include #include +#include "gnss_block_interface.h" + class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h index e6796ea50..f8ba73edd 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,13 +35,15 @@ #ifndef GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_ #define GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_ -#include "gnss_block_interface.h" +#include #include -#include "unpack_byte_2bit_samples.h" #include #include #include #include +#include "gnss_block_interface.h" +#include "unpack_byte_2bit_samples.h" + class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/rtlsdr_signal_source.cc b/src/algorithms/signal_source/adapters/rtlsdr_signal_source.cc index f8f3cc271..e10e1ab67 100644 --- a/src/algorithms/signal_source/adapters/rtlsdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtlsdr_signal_source.cc @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,14 +30,15 @@ */ #include "rtlsdr_signal_source.h" +#include +#include +#include +#include #include #include "configuration_interface.h" #include "gnss_sdr_valve.h" -#include -#include -#include #include "GPS_L1_CA.h" -#include + using google::LogMessage; @@ -58,7 +59,7 @@ RtlsdrSignalSource::RtlsdrSignalSource(ConfigurationInterface* configuration, default_dump_file); // RTLSDR Driver parameters - AGC_enabled_ = configuration->property(role + ".AGC_enabled",true); + AGC_enabled_ = configuration->property(role + ".AGC_enabled", true); freq_ = configuration->property(role + ".freq", GPS_L1_FREQ_HZ); gain_ = configuration->property(role + ".gain", (double)40.0); rf_gain_ = configuration->property(role + ".rf_gain", (double)40.0); @@ -74,7 +75,14 @@ RtlsdrSignalSource::RtlsdrSignalSource(ConfigurationInterface* configuration, { item_size_ = sizeof(gr_complex); // 1. Make the driver instance - rtlsdr_source_ = osmosdr::source::make(); + try + { + rtlsdr_source_ = osmosdr::source::make(); + } + catch( boost::exception & e ) + { + DLOG(FATAL) << "Boost exception: " << boost::diagnostic_information(e); + } // 2 set sampling rate rtlsdr_source_->set_sample_rate(sample_rate_); @@ -100,9 +108,9 @@ RtlsdrSignalSource::RtlsdrSignalSource(ConfigurationInterface* configuration, else { rtlsdr_source_->set_gain_mode(false); - rtlsdr_source_->set_gain(gain_,0); - rtlsdr_source_->set_if_gain(rf_gain_,0); - rtlsdr_source_->set_bb_gain(if_gain_,0); + rtlsdr_source_->set_gain(gain_, 0); + rtlsdr_source_->set_if_gain(rf_gain_, 0); + rtlsdr_source_->set_bb_gain(if_gain_, 0); std::cout << boost::format("Actual RX Gain: %f dB...") % rtlsdr_source_->get_gain() << std::endl; LOG(INFO) << boost::format("Actual RX Gain: %f dB...") % rtlsdr_source_->get_gain(); } diff --git a/src/algorithms/signal_source/adapters/rtlsdr_signal_source.h b/src/algorithms/signal_source/adapters/rtlsdr_signal_source.h index 12b5d0d85..fef6df439 100644 --- a/src/algorithms/signal_source/adapters/rtlsdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtlsdr_signal_source.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,11 +32,11 @@ #ifndef GNSS_SDR_RTLSDR_SIGNAL_SOURCE_H_ #define GNSS_SDR_RTLSDR_SIGNAL_SOURCE_H_ +#include #include -#include -//#include #include #include +#include #include "gnss_block_interface.h" class ConfigurationInterface; diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index ee163209b..5eb016fe0 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,12 +31,13 @@ #ifndef GNSS_SDR_UHD_SIGNAL_SOURCE_H_ #define GNSS_SDR_UHD_SIGNAL_SOURCE_H_ +#include +#include #include #include #include #include #include -//#include #include "gnss_block_interface.h" class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h index fee7226d9..80baa1fac 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -7,7 +7,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,9 +34,11 @@ #ifndef GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_H_ #define GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_H_ +#include +#include #include "telemetry_decoder_interface.h" #include "galileo_e1b_telemetry_decoder_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index 8aaa447b5..b9dfd5e15 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,9 +33,10 @@ #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_ #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_ +#include +#include #include "telemetry_decoder_interface.h" #include "gps_l1_ca_telemetry_decoder_cc.h" -#include class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index bd63e6ec0..1cae93fd4 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,9 +33,11 @@ #ifndef GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_ #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_ +#include +#include #include "telemetry_decoder_interface.h" #include "sbas_l1_telemetry_decoder_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc index 854e206ff..d5b6e1e7f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -29,21 +29,21 @@ * ------------------------------------------------------------------------- */ -#include "gnss_synchro.h" + #include "galileo_e1b_telemetry_decoder_cc.h" +#include +#include #include #include -#include +#include #include #include #include -#include #include "control_message_factory.h" #include "galileo_navigation_message.h" #include "gnss_synchro.h" #include "convolutional.h" -#include -#include + #define CRC_ERROR_LIMIT 6 @@ -207,9 +207,7 @@ void galileo_e1b_telemetry_decoder_cc::decode_word(double *page_part_symbols,int viterbi_decoder(page_part_symbols_deint, page_part_bits); // 3. Call the Galileo page decoder - std::string page_String; - for(int i = 0; i < (frame_length/2); i++) { if (page_part_bits[i] > 0) @@ -220,10 +218,8 @@ void galileo_e1b_telemetry_decoder_cc::decode_word(double *page_part_symbols,int { page_String.push_back('0'); } - } - //std::cout<<"ch["< -#include +#include #include #include -#include "gnuradio/trellis/interleaver.h" -#include "gnuradio/trellis/permutation.h" -#include "gnuradio/fec/viterbi.h" +#include +#include +#include +#include "Galileo_E1.h" +#include "concurrent_queue.h" #include "gnss_satellite.h" #include "galileo_navigation_message.h" #include "galileo_ephemeris.h" diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc index d41f9988f..482835afb 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,17 +33,15 @@ * \todo Clean this code and move the telemetry definitions to GPS_L1_CA system definitions file */ -#include "gnss_synchro.h" + #include "gps_l1_ca_telemetry_decoder_cc.h" #include #include -#include +#include #include #include #include -#include #include "control_message_factory.h" - #include "gnss_synchro.h" #ifndef _rotl diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h index 08e505e4d..8b2a4c9fd 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h @@ -5,7 +5,7 @@ * \author Javier Arribas, 2011. jarribas(at)cttc.es * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,14 +31,13 @@ #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H - +#include +#include +#include +#include #include "GPS_L1_CA.h" #include "gps_l1_ca_subframe_fsm.h" #include "concurrent_queue.h" -#include -#include -#include -#include #include "gnss_satellite.h" diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h index 3d85705ec..ea303a1bd 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,10 +31,15 @@ #ifndef GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_CC_H #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_CC_H +#include // for copy +#include #include +#include +#include // for pair +#include +#include #include #include -#include #include "gnss_satellite.h" #include "viterbi_decoder.h" #include "sbas_telemetry_data.h" diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc index 156fb40c8..560c82f1d 100644 --- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc +++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -29,6 +29,8 @@ */ #include "gps_l1_ca_subframe_fsm.h" +#include +#include //************ GPS WORD TO SUBFRAME DECODER STATE MACHINE ********** diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc index bcef73d7f..c43d13b3c 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,15 +35,12 @@ */ #include "galileo_e1_dll_pll_veml_tracking.h" +#include +#include #include "GPS_L1_CA.h" #include "Galileo_E1.h" #include "configuration_interface.h" -#ifdef GNSS_SDR_USE_BOOST_ROUND - #include -#endif -//#include -#include -#include + using google::LogMessage; @@ -84,11 +81,7 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking( std::string default_dump_filename = "./track_ch"; dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused! -#ifdef GNSS_SDR_USE_BOOST_ROUND - vector_length = round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)); -#else vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)); -#endif //################# MAKE TRACKING GNURadio object ################### if (item_type.compare("gr_complex") == 0) { diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h index 791b518ea..7e5b0e672 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -37,9 +37,11 @@ #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_ #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_ +#include +#include #include "tracking_interface.h" #include "galileo_e1_dll_pll_veml_tracking_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc index 0697a02c8..f61aaf9ce 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -36,15 +36,12 @@ */ #include "galileo_e1_tcp_connector_tracking.h" +#include +#include #include "GPS_L1_CA.h" #include "Galileo_E1.h" #include "configuration_interface.h" -#ifdef GNSS_SDR_USE_BOOST_ROUND - #include -#endif -//#include -#include -#include + using google::LogMessage; @@ -87,11 +84,8 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking( std::string default_dump_filename = "./track_ch"; dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused! -#ifdef GNSS_SDR_USE_BOOST_ROUND - vector_length = round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)); -#else vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)); -#endif + //################# MAKE TRACKING GNURadio object ################### if (item_type.compare("gr_complex") == 0) { diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h index 45548f92e..7ecaa245f 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h @@ -13,7 +13,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2012-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2012-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -39,9 +39,11 @@ #ifndef GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_H_ #define GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_H_ +#include +#include #include "tracking_interface.h" #include "galileo_e1_tcp_connector_tracking_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc index 5bba6c900..76cf1ebeb 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -36,14 +36,11 @@ */ #include "gps_l1_ca_dll_fll_pll_tracking.h" -#include "GPS_L1_CA.h" -#include "configuration_interface.h" -#ifdef GNSS_SDR_USE_BOOST_ROUND - #include -#endif -//#include #include #include +#include "GPS_L1_CA.h" +#include "configuration_interface.h" + using google::LogMessage; @@ -91,11 +88,7 @@ GpsL1CaDllFllPllTracking::GpsL1CaDllFllPllTracking( std::string default_dump_filename = "./track_ch"; dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused! - #ifdef GNSS_SDR_USE_BOOST_ROUND - vector_length = round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); - #else vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); - #endif //################# MAKE TRACKING GNURadio object ################### diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h index 6c6e568ee..9f01071ec 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -38,9 +38,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_FLL_PLL_TRACKING_H_ #define GNSS_SDR_GPS_L1_CA_DLL_FLL_PLL_TRACKING_H_ +#include +#include #include "tracking_interface.h" #include "gps_l1_ca_dll_fll_pll_tracking_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h index 6969e6bb4..b984a67fd 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h @@ -13,7 +13,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -39,9 +39,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_H_ #define GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_H_ +#include +#include #include "tracking_interface.h" #include "gps_l1_ca_dll_pll_optim_tracking_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc index 33e9b291f..28194b706 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,15 +35,13 @@ * ------------------------------------------------------------------------- */ + +#include +#include #include "gps_l1_ca_dll_pll_tracking.h" #include "GPS_L1_CA.h" #include "configuration_interface.h" -#ifdef GNSS_SDR_USE_BOOST_ROUND - #include -#endif -//#include -#include -#include + using google::LogMessage; @@ -71,7 +69,7 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking( float dll_bw_hz; float early_late_space_chips; - item_type = configuration->property(role + ".item_type",default_item_type); + item_type = configuration->property(role + ".item_type", default_item_type); //vector_length = configuration->property(role + ".vector_length", 2048); fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); f_if = configuration->property(role + ".if", 0); @@ -83,11 +81,8 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking( std::string default_dump_filename = "./track_ch"; dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused! -#ifdef GNSS_SDR_USE_BOOST_ROUND - vector_length = round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); -#else vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); -#endif + //################# MAKE TRACKING GNURadio object ################### if (item_type.compare("gr_complex") == 0) { diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h index 5eb0f9bb7..a60219608 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -38,9 +38,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_ #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_ +#include +#include #include "tracking_interface.h" #include "gps_l1_ca_dll_pll_tracking_cc.h" -#include + class ConfigurationInterface; @@ -49,7 +51,6 @@ class ConfigurationInterface; */ class GpsL1CaDllPllTracking : public TrackingInterface { - public: GpsL1CaDllPllTracking(ConfigurationInterface* configuration, @@ -100,12 +101,9 @@ public: void start_tracking(); private: - gps_l1_ca_dll_pll_tracking_cc_sptr tracking_; size_t item_size_; - unsigned int channel_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc index c8bff74da..be22fc551 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -36,14 +36,11 @@ */ #include "gps_l1_ca_tcp_connector_tracking.h" -#include "GPS_L1_CA.h" -#include "configuration_interface.h" -#ifdef GNSS_SDR_USE_BOOST_ROUND - #include -#endif -//#include #include #include +#include "GPS_L1_CA.h" +#include "configuration_interface.h" + using google::LogMessage; @@ -85,11 +82,8 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking( std::string default_dump_filename = "./track_ch"; dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused! -#ifdef GNSS_SDR_USE_BOOST_ROUND - vector_length = round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); -#else vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); -#endif + //################# MAKE TRACKING GNURadio object ################### if (item_type.compare("gr_complex") == 0) { diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h index 1f5c9c265..deeea9a31 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h @@ -12,7 +12,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -38,9 +38,11 @@ #ifndef GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_H_ #define GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_H_ +#include +#include #include "tracking_interface.h" #include "gps_l1_ca_tcp_connector_tracking_cc.h" -#include + class ConfigurationInterface; diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h index 00a00b377..c65874a56 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h @@ -6,7 +6,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,11 +28,14 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H #include #include +#include +#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h index e36b3178d..7427a49db 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h @@ -13,7 +13,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,11 +35,14 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_CC_H #define GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_CC_H #include #include +#include +#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc index c58ad1d6a..fa674b046 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,6 +34,13 @@ * ------------------------------------------------------------------------- */ +#include +#include +#include +#include +#include +#include +#include #include "gnss_synchro.h" #include "gps_l1_ca_dll_fll_pll_tracking_cc.h" #include "gps_sdr_signal_processing.h" @@ -43,15 +50,6 @@ #include "tracking_FLL_PLL_filter.h" #include "control_message_factory.h" #include "gnss_flowgraph.h" -#include -#include -#include -#include -#include -#include -#include - - /*! * \todo Include in definition header file 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 94398dc5c..530f98a47 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 @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -39,6 +39,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h index 72e40427e..66891105a 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -39,6 +39,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h index dadc4f625..8e4ad732a 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,11 +33,14 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H #include #include +#include +#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h index dee85d797..547f72ced 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,11 +33,14 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_CC_H #define GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_CC_H #include #include +#include +#include #include #include #include diff --git a/src/algorithms/tracking/libs/correlator.cc b/src/algorithms/tracking/libs/correlator.cc index 6abcc1fc2..75982cb9d 100644 --- a/src/algorithms/tracking/libs/correlator.cc +++ b/src/algorithms/tracking/libs/correlator.cc @@ -10,7 +10,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,10 +33,9 @@ * ------------------------------------------------------------------------- */ -#include -//#include -#include "correlator.h" +#include "correlator.h" +#include #define LV_HAVE_SSE3 #include "volk_cw_epl_corr.h" diff --git a/src/algorithms/tracking/libs/correlator.h b/src/algorithms/tracking/libs/correlator.h index ba1d0bafd..d0e8bb110 100644 --- a/src/algorithms/tracking/libs/correlator.h +++ b/src/algorithms/tracking/libs/correlator.h @@ -11,7 +11,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -37,6 +37,7 @@ #ifndef GNSS_SDR_CORRELATOR_H_ #define GNSS_SDR_CORRELATOR_H_ +#include #include #include diff --git a/src/algorithms/tracking/libs/lock_detectors.cc b/src/algorithms/tracking/libs/lock_detectors.cc index d1fc60471..2468594b3 100644 --- a/src/algorithms/tracking/libs/lock_detectors.cc +++ b/src/algorithms/tracking/libs/lock_detectors.cc @@ -23,7 +23,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -49,8 +49,7 @@ #include "lock_detectors.h" #include "GPS_L1_CA.h" #include "Galileo_E1.h" -#include -//#include + /* * Signal-to-Noise (SNR) (\f$\rho\f$) estimator using the Signal-to-Noise Variance (SNV) estimator: diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h index 59b0d1a6f..97dcfaf50 100644 --- a/src/core/interfaces/gnss_block_interface.h +++ b/src/core/interfaces/gnss_block_interface.h @@ -10,7 +10,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,11 +34,10 @@ */ - #ifndef GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ #define GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ -//#include +#include #include /*! diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc index 35f402fa0..295711683 100644 --- a/src/core/libs/gnss_sdr_supl_client.cc +++ b/src/core/libs/gnss_sdr_supl_client.cc @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,8 +30,9 @@ * * ------------------------------------------------------------------------- */ -#include "gnss_sdr_supl_client.h" +#include "gnss_sdr_supl_client.h" +#include gnss_sdr_supl_client::gnss_sdr_supl_client() {} diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h index 1202ee741..187005cea 100644 --- a/src/core/libs/gnss_sdr_supl_client.h +++ b/src/core/libs/gnss_sdr_supl_client.h @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -36,6 +36,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/core/receiver/concurrent_map.h b/src/core/receiver/concurrent_map.h index 0a378e5bd..95e4d93bc 100644 --- a/src/core/receiver/concurrent_map.h +++ b/src/core/receiver/concurrent_map.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,6 +32,7 @@ #define GNSS_SDR_CONCURRENT_MAP_H #include +#include template diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h index c7ddd3398..f17e02f0b 100644 --- a/src/core/receiver/control_message_factory.h +++ b/src/core/receiver/control_message_factory.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2011 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,11 +28,10 @@ * ------------------------------------------------------------------------- */ - - #ifndef GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_ #define GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_ +#include #include //! Message described by who sent it and what it says diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 104adb369..ec0c11594 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -33,7 +33,16 @@ */ #include "control_thread.h" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include "gps_ephemeris.h" #include "gps_iono.h" #include "gps_utc_model.h" @@ -44,16 +53,11 @@ #include "galileo_almanac.h" #include "concurrent_queue.h" #include "concurrent_map.h" -#include -#include -#include -#include -#include #include "gnss_flowgraph.h" #include "file_configuration.h" #include "control_message_factory.h" -#include -#include + + extern concurrent_map global_gps_ephemeris_map; extern concurrent_map global_gps_iono_map; diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h index 524ccf1f4..a46ebbc78 100644 --- a/src/core/receiver/control_thread.h +++ b/src/core/receiver/control_thread.h @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -35,6 +35,7 @@ #ifndef GNSS_SDR_CONTROL_THREAD_H_ #define GNSS_SDR_CONTROL_THREAD_H_ +#include #include #include #include "control_message_factory.h" diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h index 83637c5f3..132a16535 100644 --- a/src/core/receiver/gnss_flowgraph.h +++ b/src/core/receiver/gnss_flowgraph.h @@ -9,7 +9,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2012 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include "GPS_L1_CA.h" diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h index 4769a2576..f934d7445 100644 --- a/src/core/system_parameters/gps_ephemeris.h +++ b/src/core/system_parameters/gps_ephemeris.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -34,6 +34,7 @@ #include #include +#include #include "boost/assign.hpp" #include #include "GPS_L1_CA.h" diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h index d37d084d9..57b362391 100644 --- a/src/core/system_parameters/gps_navigation_message.h +++ b/src/core/system_parameters/gps_navigation_message.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,14 +32,15 @@ #ifndef GNSS_SDR_GPS_NAVIGATION_MESSAGE_H_ #define GNSS_SDR_GPS_NAVIGATION_MESSAGE_H_ -#include -#include -#include -#include #include #include -#include "boost/assign.hpp" #include +#include +#include +#include +#include +#include +#include "boost/assign.hpp" #include "GPS_L1_CA.h" #include "gps_ephemeris.h" #include "gps_iono.h" diff --git a/src/core/system_parameters/gps_utc_model.cc b/src/core/system_parameters/gps_utc_model.cc index d391ea03c..3c82a1f87 100644 --- a/src/core/system_parameters/gps_utc_model.cc +++ b/src/core/system_parameters/gps_utc_model.cc @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -32,82 +32,79 @@ Gps_Utc_Model::Gps_Utc_Model() { - valid = false; - d_A1 = 0; - d_A0 = 0; - d_t_OT = 0; - i_WN_T = 0; - d_DeltaT_LS = 0; - i_WN_LSF = 0; - i_DN = 0; - d_DeltaT_LSF = 0; - - - + valid = false; + d_A1 = 0; + d_A0 = 0; + d_t_OT = 0; + i_WN_T = 0; + d_DeltaT_LS = 0; + i_WN_LSF = 0; + i_DN = 0; + d_DeltaT_LSF = 0; } double Gps_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week) { - double t_utc; - double t_utc_daytime; - double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * (double)(i_GPS_week - i_WN_T)); + double t_utc; + double t_utc_daytime; + double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * (double)(i_GPS_week - i_WN_T)); - // Determine if the effectivity time of the leap second event is in the past - int weeksToLeapSecondEvent = i_WN_LSF - i_GPS_week; + // Determine if the effectivity time of the leap second event is in the past + int weeksToLeapSecondEvent = i_WN_LSF - i_GPS_week; - if ((weeksToLeapSecondEvent) >= 0) // is not in the past - { - //Detect if the effectivity time and user's time is within six hours = 6 * 60 *60 = 21600 s - int secondOfLeapSecondEvent = i_DN * 24 * 60 * 60; - if (weeksToLeapSecondEvent > 0) - { - t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); - } - else //we are in the same week than the leap second event - { - if (abs(gpstime_corrected - secondOfLeapSecondEvent) > 21600) - { - /* 20.3.3.5.2.4a - * Whenever the effectivity time indicated by the WN_LSF and the DN values - * is not in the past (relative to the user's present time), and the user's - * present time does not fall in the time span which starts at six hours prior - * to the effectivity time and ends at six hours after the effectivity time, - * the UTC/GPS-time relationship is given by - */ - t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); - } - else - { - /* 20.3.3.5.2.4b - * Whenever the user's current time falls within the time span of six hours - * prior to the effectivity time to six hours after the effectivity time, - * proper accommodation of the leap second event with a possible week number - * transition is provided by the following expression for UTC: - */ - int W = fmod(gpstime_corrected - Delta_t_UTC - 43200, 86400) + 43200; - t_utc_daytime = fmod(W, 86400 + d_DeltaT_LSF - d_DeltaT_LS); - //implement something to handle a leap second event! - } - if ( (gpstime_corrected - secondOfLeapSecondEvent) > 21600) - { - Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800*(double)(i_GPS_week - i_WN_T)); - t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); - } - } - } - else // the effectivity time is in the past - { - /* 20.3.3.5.2.4c - * Whenever the effectivity time of the leap second event, as indicated by the - * WNLSF and DN values, is in the "past" (relative to the user's current time), - * and the user�s current time does not fall in the time span as given above - * in 20.3.3.5.2.4b,*/ - Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * (double)(i_GPS_week - i_WN_T)); - t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); - } + if (weeksToLeapSecondEvent >= 0) // is not in the past + { + //Detect if the effectivity time and user's time is within six hours = 6 * 60 *60 = 21600 s + int secondOfLeapSecondEvent = i_DN * 24 * 60 * 60; + if (weeksToLeapSecondEvent > 0) + { + t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); + } + else //we are in the same week than the leap second event + { + if (abs(gpstime_corrected - secondOfLeapSecondEvent) > 21600) + { + /* 20.3.3.5.2.4a + * Whenever the effectivity time indicated by the WN_LSF and the DN values + * is not in the past (relative to the user's present time), and the user's + * present time does not fall in the time span which starts at six hours prior + * to the effectivity time and ends at six hours after the effectivity time, + * the UTC/GPS-time relationship is given by + */ + t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); + } + else + { + /* 20.3.3.5.2.4b + * Whenever the user's current time falls within the time span of six hours + * prior to the effectivity time to six hours after the effectivity time, + * proper accommodation of the leap second event with a possible week number + * transition is provided by the following expression for UTC: + */ + int W = fmod(gpstime_corrected - Delta_t_UTC - 43200, 86400) + 43200; + t_utc_daytime = fmod(W, 86400 + d_DeltaT_LSF - d_DeltaT_LS); + //implement something to handle a leap second event! + } + if ( (gpstime_corrected - secondOfLeapSecondEvent) > 21600) + { + Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800*(double)(i_GPS_week - i_WN_T)); + t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); + } + } + } + else // the effectivity time is in the past + { + /* 20.3.3.5.2.4c + * Whenever the effectivity time of the leap second event, as indicated by the + * WNLSF and DN values, is in the "past" (relative to the user's current time), + * and the user�s current time does not fall in the time span as given above + * in 20.3.3.5.2.4b,*/ + Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * (double)(i_GPS_week - i_WN_T)); + t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); + } - double secondsOfWeekBeforeToday = 43200 * floor(gpstime_corrected / 43200); - t_utc = secondsOfWeekBeforeToday + t_utc_daytime; - return t_utc; + double secondsOfWeekBeforeToday = 43200 * floor(gpstime_corrected / 43200); + t_utc = secondsOfWeekBeforeToday + t_utc_daytime; + return t_utc; } diff --git a/src/core/system_parameters/sbas_ionospheric_correction.h b/src/core/system_parameters/sbas_ionospheric_correction.h index 58d9a243f..43f8a7b3d 100644 --- a/src/core/system_parameters/sbas_ionospheric_correction.h +++ b/src/core/system_parameters/sbas_ionospheric_correction.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,14 +31,15 @@ #ifndef SBAS_IONOSPHERIC_CORRECTION_H_ #define SBAS_IONOSPHERIC_CORRECTION_H_ +#include #include +#include #include #include #include #include #include -#include -#include + /*! * \brief Struct that represents a Ionospheric Grid Point (IGP) diff --git a/src/core/system_parameters/sbas_satellite_correction.cc b/src/core/system_parameters/sbas_satellite_correction.cc index 75052d5c9..2871f3e2c 100644 --- a/src/core/system_parameters/sbas_satellite_correction.cc +++ b/src/core/system_parameters/sbas_satellite_correction.cc @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,13 +28,14 @@ * ------------------------------------------------------------------------- */ +#include "sbas_satellite_correction.h" #include #include -#include #include +#include #include #include -#include "sbas_satellite_correction.h" + #define EVENT 2 // logs important events which don't occur every update() call #define FLOW 3 // logs the function calls of block processing functions diff --git a/src/core/system_parameters/sbas_satellite_correction.h b/src/core/system_parameters/sbas_satellite_correction.h index 22838d988..369e9272c 100644 --- a/src/core/system_parameters/sbas_satellite_correction.h +++ b/src/core/system_parameters/sbas_satellite_correction.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,11 +28,11 @@ * ------------------------------------------------------------------------- */ -#include "sbas_time.h" - #ifndef GNSS_SDR_SBAS_SATELLITE_CORRECTION_H_ #define GNSS_SDR_SBAS_SATELLITE_CORRECTION_H_ +#include "sbas_time.h" + struct Fast_Correction { Sbas_Time d_tof; // for fast corrections the time of applicability (tof) is defined as the time when the corresponding message was send diff --git a/src/core/system_parameters/sbas_telemetry_data.cc b/src/core/system_parameters/sbas_telemetry_data.cc index 5189ef563..dbfcc81a5 100644 --- a/src/core/system_parameters/sbas_telemetry_data.cc +++ b/src/core/system_parameters/sbas_telemetry_data.cc @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,8 +30,8 @@ #include #include -#include #include +#include #include #include #include "sbas_telemetry_data.h" diff --git a/src/core/system_parameters/sbas_telemetry_data.h b/src/core/system_parameters/sbas_telemetry_data.h index 059ff2c7a..aa2103ba6 100644 --- a/src/core/system_parameters/sbas_telemetry_data.h +++ b/src/core/system_parameters/sbas_telemetry_data.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -31,14 +31,14 @@ #ifndef GNSS_SDR_SBAS_TELEMETRY_DATA_H_ #define GNSS_SDR_SBAS_TELEMETRY_DATA_H_ -#include -#include -#include -#include #include #include -#include "boost/assign.hpp" #include +#include +#include +#include +#include +#include "boost/assign.hpp" #include "concurrent_queue.h" #include "sbas_time.h" diff --git a/src/core/system_parameters/sbas_time.h b/src/core/system_parameters/sbas_time.h index a7ad6f9f4..fa9c62059 100644 --- a/src/core/system_parameters/sbas_time.h +++ b/src/core/system_parameters/sbas_time.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -28,13 +28,14 @@ * ------------------------------------------------------------------------- */ -#include -#include -#include - #ifndef GNSS_SDR_SBAS_TIME_H_ #define GNSS_SDR_SBAS_TIME_H_ +#include +#include +#include +#include + #define EVENT 2 // logs important events which don't occur every update() call #define FLOW 3 // logs the function calls of block processing functions