Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

conf/gnss-sdr_GPS_L1_bladeRF.conf

@@ -0,0 +1,110 @@
+[GNSS-SDR]
+
+;######### GLOBAL OPTIONS ##################
+GNSS-SDR.internal_fs_sps=2000000
+
+;######### SIGNAL_SOURCE CONFIG ############
+SignalSource.implementation=Osmosdr_Signal_Source
+SignalSource.item_type=gr_complex
+SignalSource.sampling_frequency=2000000
+SignalSource.freq=1575420000
+;# RF Gain: LNA Gain {0, 3, 6}
+SignalSource.gain=6
+;# IF Gain: N/A
+SignalSource.rf_gain=40
+;# BB Gain: RX VGA1 + VGA2 [5, 60]
+SignalSource.if_gain=48
+SignalSource.AGC_enabled=false
+SignalSource.samples=0
+SignalSource.repeat=false
+;# Next line enables the bladeRF
+SignalSource.osmosdr_args=bladerf=0
+SignalSource.enable_throttle_control=false
+SignalSource.dump=false
+SignalSource.dump_filename=./signal_source.dat
+
+;######### SIGNAL_CONDITIONER CONFIG ############
+SignalConditioner.implementation=Signal_Conditioner
+
+;######### DATA_TYPE_ADAPTER CONFIG ############
+DataTypeAdapter.implementation=Pass_Through
+
+;######### INPUT_FILTER CONFIG ############
+InputFilter.implementation=Freq_Xlating_Fir_Filter
+InputFilter.decimation_factor=1
+InputFilter.input_item_type=gr_complex
+InputFilter.output_item_type=gr_complex
+InputFilter.taps_item_type=float
+InputFilter.number_of_taps=5
+InputFilter.number_of_bands=2
+InputFilter.band1_begin=0.0
+InputFilter.band1_end=0.85
+InputFilter.band2_begin=0.9
+InputFilter.band2_end=1.0
+InputFilter.ampl1_begin=1.0
+InputFilter.ampl1_end=1.0
+InputFilter.ampl2_begin=0.0
+InputFilter.ampl2_end=0.0
+InputFilter.band1_error=1.0
+InputFilter.band2_error=1.0
+InputFilter.filter_type=bandpass
+InputFilter.grid_density=16
+InputFilter.dump=false
+InputFilter.dump_filename=../data/input_filter.dat
+
+;######### RESAMPLER CONFIG ############
+Resampler.implementation=Pass_Through
+
+;######### CHANNELS GLOBAL CONFIG ############
+Channels_1C.count=8
+Channels.in_acquisition=1
+Channel.signal=1C
+
+;######### ACQUISITION GLOBAL CONFIG ############
+Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
+Acquisition_1C.item_type=gr_complex
+Acquisition_1C.if=0
+Acquisition_1C.sampled_ms=1
+Acquisition_1C.threshold=0.015
+Acquisition_1C.doppler_max=10000
+Acquisition_1C.doppler_min=-10000
+Acquisition_1C.doppler_step=500
+Acquisition_1C.max_dwells=15
+Acquisition_1C.dump=false
+Acquisition_1C.dump_filename=./acq_dump.dat
+
+;######### TRACKING GLOBAL CONFIG ############
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
+Tracking_1C.item_type=gr_complex
+Tracking_1C.if=0
+Tracking_1C.pll_bw_hz=40.0;
+Tracking_1C.dll_bw_hz=2.0;
+Tracking_1C.order=3;
+Tracking_1C.early_late_space_chips=0.5;
+Tracking_1C.dump=false
+Tracking_1C.dump_filename=./tracking_ch_
+
+;######### TELEMETRY DECODER GPS CONFIG ############
+TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
+TelemetryDecoder_1C.dump=false
+
+;######### OBSERVABLES CONFIG ############
+#Observables.implementation=GPS_L1_CA_Observables
+Observables.implementation=Hybrid_Observables
+Observables.dump=false
+Observables.dump_filename=./observables.dat
+
+;######### PVT CONFIG ############
+;PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=Single
+PVT.output_rate_ms=100
+PVT.display_rate_ms=500
+PVT.iono_model=Broadcast
+PVT.trop_model=Saastamoinen
+PVT.flag_rtcm_server=false
+PVT.flag_rtcm_tty_port=false
+PVT.rtcm_dump_devname=/dev/pts/1
+PVT.rtcm_tcp_port=2101
+PVT.rtcm_MT1019_rate_ms=5000
+PVT.rtcm_MT1077_rate_ms=1000
+PVT.rinex_version=2

docs/manpage/gnss-sdr-manpage

@@ -9,11 +9,23 @@
 \fBgnss\-sdr\fR is a Global Navigation Satellite Systems Software Defined Receiver written in C++. It implements all the signal processing chain, taking as input raw samples coming from the output of an Analog\-to\-Digital Converter, and processing them up to the computation of the Position\-Velocity\-Time solution, including the generation of code and phase measurements. 
 \.TP
 \fBgnss\-sdr\fR is able to work with raw data files or, if there is computational power enough, in real time with suitable radio frequency front\-ends. The whole receiver is defined in a single configuration file, and therefore users can define theirs.
+\.TP
+There is some flexibility in how flags may be specified. The following examples are equivalent:
+\.RS 8
+\.TP
+gnss\-sdr \-c=/home/user/rx.conf
+\.TP
+gnss\-sdr \-\-c=/home/user/rx.conf
+\.TP
+gnss\-sdr \-c /home/user/rx.conf
+\.TP
+gnss\-sdr \-\-c /home/user/rx.conf
+\.RE
 .SH OPTIONS
 \fBgnss\-sdr\fR takes the following options:
 .TP
 \fB\-c=\fR\fI<path\-to\-configuration\-file>\fR or \fB\-config_file=\fR\fI<path\-to\-configuration\-file>\fR
-Set the configuration file.
+Set the configuration file. This flag is mandatory.
 .TP 
 \fB\-s=\fR\fI<path\-to\-raw\-signal\-file>\fR or \fB\-signal_source=\fR\fI<path\-to\-raw\-signal\-file>\fR 
 If defined, path to the file containing the signal samples (overrides the data file specified in the configuration file).

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -30,13 +30,14 @@
 
 
 #include "rtklib_pvt.h"
-#include <glog/logging.h>
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/math/common_factor_rt.hpp>
 #include <boost/serialization/map.hpp>
-#include "configuration_interface.h"
+#include <glog/logging.h>
-#include "gnss_sdr_flags.h"
+
 
 using google::LogMessage;
 

src/algorithms/PVT/adapters/rtklib_pvt.h

@@ -33,9 +33,9 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_H_
 #define GNSS_SDR_RTKLIB_PVT_H_
 
-#include <string>
 #include "pvt_interface.h"
 #include "rtklib_pvt_cc.h"
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc

@@ -29,17 +29,18 @@
  */
 
 #include "rtklib_pvt_cc.h"
-#include <algorithm>
-#include <iostream>
-#include <map>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/math/common_factor_rt.hpp>
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/serialization/map.hpp>
+#include <glog/logging.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
-#include <glog/logging.h>
+#include <algorithm>
+#include <iostream>
+#include <map>
+
 
 using google::LogMessage;
 

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h

@@ -31,20 +31,21 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_CC_H
 #define GNSS_SDR_RTKLIB_PVT_CC_H
 
-#include <chrono>
+
-#include <fstream>
-#include <utility>
-#include <string>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <gnuradio/sync_block.h>
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "geojson_printer.h"
 #include "rinex_printer.h"
 #include "rtcm_printer.h"
 #include "rtklib_solver.h"
+#include <gnuradio/sync_block.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <chrono>
+#include <fstream>
+#include <utility>
+#include <string>
 
 
 class rtklib_pvt_cc;

src/algorithms/PVT/libs/geojson_printer.cc

@@ -31,10 +31,11 @@
 
 
 #include "geojson_printer.h"
-#include <iomanip>
-#include <sstream>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
+#include <iomanip>
+#include <sstream>
+
 
 GeoJSON_Printer::GeoJSON_Printer()
 {

src/algorithms/PVT/libs/geojson_printer.h

@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_GEOJSON_PRINTER_H_
 #define GNSS_SDR_GEOJSON_PRINTER_H_
 
+#include "pvt_solution.h"
 #include <fstream>
 #include <memory>
 #include <string>
-#include "pvt_solution.h"
 
 
 /*!

src/algorithms/PVT/libs/hybrid_ls_pvt.cc

@@ -30,10 +30,10 @@
  */
 
 #include "hybrid_ls_pvt.h"
-#include <glog/logging.h>
 #include "Galileo_E1.h"
 #include "GPS_L1_CA.h"
 #include "GPS_L2C.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/hybrid_ls_pvt.h

@@ -32,16 +32,15 @@
 #ifndef GNSS_SDR_HYBRID_LS_PVT_H_
 #define GNSS_SDR_HYBRID_LS_PVT_H_
 
-#include <fstream>
-#include <iostream>
-#include <map>
-#include <string>
 #include "ls_pvt.h"
 #include "galileo_navigation_message.h"
 #include "gps_navigation_message.h"
 #include "gps_cnav_navigation_message.h"
 #include "gnss_synchro.h"
 #include "rtklib_rtkcmn.h"
+#include <fstream>
+#include <map>
+#include <string>
 
 /*!
  * \brief This class implements a simple PVT Least Squares solution

src/algorithms/PVT/libs/kml_printer.cc

@@ -30,9 +30,9 @@
  */
 
 #include "kml_printer.h"
-#include <sstream>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
+#include <sstream>
 
 using google::LogMessage;
 

src/algorithms/PVT/libs/kml_printer.h

@@ -33,11 +33,11 @@
 #ifndef GNSS_SDR_KML_PRINTER_H_
 #define GNSS_SDR_KML_PRINTER_H_
 
-#include <iostream>
+#include "pvt_solution.h"
 #include <fstream>
 #include <memory>
 #include <string>
-#include "pvt_solution.h"
+
 
 /*!
  * \brief Prints PVT information to OGC KML format file (can be viewed with Google Earth)

src/algorithms/PVT/libs/ls_pvt.cc

@@ -30,10 +30,10 @@
  */
 
 #include "ls_pvt.h"
-#include <exception>
-#include <stdexcept>
 #include "GPS_L1_CA.h"
 #include <glog/logging.h>
+#include <exception>
+#include <stdexcept>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/nmea_printer.cc

@@ -34,10 +34,10 @@
  */
 
 #include "nmea_printer.h"
-#include <fcntl.h>
-#include <termios.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
+#include <fcntl.h>
+#include <termios.h>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/nmea_printer.h

@@ -36,11 +36,9 @@
 #ifndef GNSS_SDR_NMEA_PRINTER_H_
 #define GNSS_SDR_NMEA_PRINTER_H_
 
-
+#include "pvt_solution.h"
-#include <iostream>
 #include <fstream>
 #include <string>
-#include "pvt_solution.h"
 
 
 /*!

src/algorithms/PVT/libs/pvt_solution.cc

@@ -30,9 +30,9 @@
  */
 
 #include "pvt_solution.h"
-#include <exception>
 #include "GPS_L1_CA.h"
 #include <glog/logging.h>
+#include <exception>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/pvt_solution.h

@@ -33,9 +33,9 @@
 #define GNSS_SDR_PVT_SOLUTION_H_
 
 
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <deque>
 #include <armadillo>
-#include <boost/date_time/posix_time/posix_time.hpp>
 
 const unsigned int PVT_MAX_CHANNELS = 90;
 const unsigned int PVT_MAX_PRN = 127;  // 126 is SBAS

src/algorithms/PVT/libs/rinex_printer.cc

@@ -29,6 +29,11 @@
  */
 
 #include "rinex_printer.h"
+#include <boost/date_time/time_zone_base.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/local_time/local_time.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <glog/logging.h>
 #include <unistd.h>  // for getlogin_r()
 #include <algorithm> // for min and max
 #include <cmath>     // for floor
@@ -38,11 +43,6 @@
 #include <set>
 #include <utility>
 #include <vector>
-#include <boost/date_time/time_zone_base.hpp>
-#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/local_time/local_time.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/rinex_printer.h

@@ -51,13 +51,6 @@
 #ifndef GNSS_SDR_RINEX_PRINTER_H_
 #define GNSS_SDR_RINEX_PRINTER_H_
 
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <sstream>  // for stringstream
-#include <iomanip>  // for setprecision
-#include <map>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include "gps_navigation_message.h"
 #include "gps_cnav_navigation_message.h"
 #include "galileo_navigation_message.h"
@@ -66,6 +59,12 @@
 #include "Galileo_E1.h"
 #include "GLONASS_L1_CA.h"
 #include "gnss_synchro.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <string>
+#include <fstream>
+#include <sstream>  // for stringstream
+#include <iomanip>  // for setprecision
+#include <map>
 
 class Sbas_Raw_Msg;
 

src/algorithms/PVT/libs/rtcm_printer.cc

@@ -32,12 +32,12 @@
  */
 
 #include "rtcm_printer.h"
-#include <iostream>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <glog/logging.h>
 #include <iomanip>
 #include <fcntl.h>    // for O_RDWR
 #include <termios.h>  // for tcgetattr
-#include <boost/date_time/posix_time/posix_time.hpp>
+
-#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/PVT/libs/rtcm_printer.h

@@ -34,10 +34,10 @@
 #ifndef GNSS_SDR_RTCM_PRINTER_H_
 #define GNSS_SDR_RTCM_PRINTER_H_
 
-#include <fstream>  // std::ofstream
-#include <iostream> // std::cout
-#include <memory>   // std::shared_ptr
 #include "rtcm.h"
+#include <fstream>  // std::ofstream
+#include <memory>   // std::shared_ptr
+
 
 /*!
  * \brief This class provides a implementation of a subset of the RTCM Standard 10403.2 messages

src/algorithms/PVT/libs/rtklib_solver.cc

@@ -52,11 +52,11 @@
  * -----------------------------------------------------------------------*/
 
 #include "rtklib_solver.h"
-#include <glog/logging.h>
 #include "rtklib_conversions.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
 #include "GLONASS_L1_CA.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/rtklib_solver.h

@@ -54,10 +54,7 @@
 #ifndef GNSS_SDR_RTKLIB_SOLVER_H_
 #define GNSS_SDR_RTKLIB_SOLVER_H_
 
-#include <fstream>
+
-#include <iostream>
-#include <map>
-#include <string>
 #include "rtklib_rtkpos.h"
 #include "galileo_navigation_message.h"
 #include "gps_navigation_message.h"
@@ -65,6 +62,10 @@
 #include "glonass_gnav_navigation_message.h"
 #include "gnss_synchro.h"
 #include "pvt_solution.h"
+#include <fstream>
+#include <map>
+#include <string>
+
 
 /*!
  * \brief This class implements a simple PVT Least Squares solution

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -30,13 +30,14 @@
  */
 
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
+#include "configuration_interface.h"
+#include "galileo_e1_signal_processing.h"
+#include "Galileo_E1.h"
+#include "gnss_sdr_flags.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include "galileo_e1_signal_processing.h"
+
-#include "Galileo_E1.h"
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h

@@ -32,14 +32,14 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc

@@ -29,14 +29,15 @@
  */
 
 #include "galileo_e5a_pcps_acquisition.h"
+#include "configuration_interface.h"
+#include "galileo_e5_signal_processing.h"
+#include "Galileo_E5a.h"
+#include "gnss_sdr_flags.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr_complex.h>
-#include "galileo_e5_signal_processing.h"
+
-#include "Galileo_E5a.h"
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h

@@ -31,11 +31,12 @@
 #ifndef GALILEO_E5A_PCPS_ACQUISITION_H_
 #define GALILEO_E5A_PCPS_ACQUISITION_H_
 
-#include <string>
+
-#include <gnuradio/blocks/stream_to_vector.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc

@@ -32,12 +32,12 @@
  */
 
 #include "glonass_l1_ca_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
+#include "configuration_interface.h"
-#include <glog/logging.h>
 #include "glonass_l1_signal_processing.h"
 #include "GLONASS_L1_CA.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h

@@ -34,14 +34,13 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
-
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -34,12 +34,13 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
+#include "configuration_interface.h"
-#include <glog/logging.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
+
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h

@@ -36,15 +36,14 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc

@@ -32,12 +32,12 @@
  */
 
 #include "gps_l2_m_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
+#include "configuration_interface.h"
-#include <glog/logging.h>
 #include "gps_l2c_signal.h"
 #include "GPS_L2C.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h

@@ -34,14 +34,14 @@
 #ifndef GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <string>
 
 
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc

@@ -32,12 +32,12 @@
  */
 
 #include "gps_l5i_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
+#include "configuration_interface.h"
-#include <glog/logging.h>
 #include "gps_l5_signal.h"
 #include "GPS_L5.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h

@@ -34,15 +34,14 @@
 #ifndef GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc

@@ -34,14 +34,13 @@
  */
 
 #include "pcps_acquisition.h"
-#include <cstring>
+#include "GPS_L1_CA.h"     // for GPS_TWO_PI
+#include "GLONASS_L1_CA.h" // for GLONASS_TWO_PI
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
 #include <volk/volk.h>
-#include "GPS_L1_CA.h" //GPS_TWO_PI
+#include <cstring>
-#include "GLONASS_L1_CA.h" //GLONASS_TWO_PI
-
 
 
 using google::LogMessage;

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h

@@ -52,13 +52,12 @@
 #ifndef GNSS_SDR_PCPS_ACQUISITION_H_
 #define GNSS_SDR_PCPS_ACQUISITION_H_
 
-
+#include "gnss_synchro.h"
-#include <string>
 #include <armadillo>
 #include <gnuradio/block.h>
 #include <gnuradio/fft/fft.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "gnss_synchro.h"
+#include <string>
 
 
 class pcps_acquisition;

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc

@@ -31,16 +31,16 @@
  */
 
 #include "pcps_acquisition_fine_doppler_cc.h"
-#include <algorithm>    // std::rotate, std::fill_n
+#include "gps_sdr_signal_processing.h"
-#include <sstream>
+#include "control_message_factory.h"
+#include "GPS_L1_CA.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "concurrent_map.h"
+#include <algorithm>    // std::rotate, std::fill_n
-#include "gps_sdr_signal_processing.h"
+#include <sstream>
-#include "control_message_factory.h"
+
-#include "GPS_L1_CA.h"
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h

@@ -48,12 +48,12 @@
 #ifndef GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
 #define GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
 
-#include <fstream>
+#include "gnss_synchro.h"
-#include <string>
 #include <gnuradio/block.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
-#include "gnss_synchro.h"
+#include <fstream>
+#include <string>
 
 class pcps_acquisition_fine_doppler_cc;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc

@@ -29,14 +29,14 @@
  */
 
 #include "pcps_quicksync_acquisition_cc.h"
-#include <cmath>
+#include "control_message_factory.h"
-#include <sstream>
+#include "GPS_L1_CA.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "control_message_factory.h"
+#include <cmath>
-#include "GPS_L1_CA.h"
+#include <sstream>
 
 
 using google::LogMessage;

src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h

@@ -51,15 +51,15 @@
 #ifndef GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_
 #define GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_
 
+#include "gnss_synchro.h"
+#include <gnuradio/block.h>
+#include <gnuradio/gr_complex.h>
+#include <gnuradio/fft/fft.h>
 #include <fstream>
 #include <string>
 #include <algorithm>
 #include <functional>
-#include <assert.h>
+#include <cassert>
-#include <gnuradio/block.h>
-#include <gnuradio/gr_complex.h>
-#include <gnuradio/fft/fft.h>
-#include "gnss_synchro.h"
 
 class pcps_quicksync_acquisition_cc;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc

@@ -49,13 +49,13 @@
  */
 
 #include "pcps_tong_acquisition_cc.h"
-#include <sstream>
+#include "control_message_factory.h"
+#include "GPS_L1_CA.h" // for GPS_TWO_PI
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "control_message_factory.h"
+#include <sstream>
-#include "GPS_L1_CA.h" //GPS_TWO_PI
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h

@@ -51,12 +51,13 @@
 #ifndef GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_
 #define GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_
 
-#include <fstream>
+#include "gnss_synchro.h"
-#include <string>
 #include <gnuradio/block.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
-#include "gnss_synchro.h"
+#include <fstream>
+#include <string>
+
 
 class pcps_tong_acquisition_cc;
 

src/algorithms/channel/adapters/channel.cc

@@ -30,10 +30,11 @@
  */
 
 #include "channel.h"
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 

src/algorithms/channel/adapters/channel.h

@@ -35,15 +35,15 @@
 #ifndef GNSS_SDR_CHANNEL_H_
 #define GNSS_SDR_CHANNEL_H_
 
-#include <memory>
-#include <string>
-#include <mutex>
-#include <gnuradio/msg_queue.h>
-#include <gnuradio/block.h>
 #include "channel_interface.h"
 #include "channel_fsm.h"
 #include "gnss_synchro.h"
 #include "channel_msg_receiver_cc.h"
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/block.h>
+#include <memory>
+#include <string>
+#include <mutex>
 
 class ConfigurationInterface;
 class AcquisitionInterface;

src/algorithms/channel/libs/channel_fsm.cc

@@ -30,8 +30,9 @@
  */
 
 #include "channel_fsm.h"
-#include <glog/logging.h>
 #include "control_message_factory.h"
+#include <glog/logging.h>
+
 
 
 ChannelFsm::ChannelFsm()

src/algorithms/channel/libs/channel_fsm.h

@@ -32,12 +32,13 @@
 #ifndef GNSS_SDR_CHANNEL_FSM_H
 #define GNSS_SDR_CHANNEL_FSM_H
 
-#include <mutex>
-#include <memory>
-#include <gnuradio/msg_queue.h>
 #include "acquisition_interface.h"
 #include "tracking_interface.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/msg_queue.h>
+#include <memory>
+#include <mutex>
+
 
 /*!
  * \brief This class implements a State Machine for channel

src/algorithms/channel/libs/channel_msg_receiver_cc.h

@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_CHANNEL_MSG_RECEIVER_CC_H
 #define GNSS_SDR_CHANNEL_MSG_RECEIVER_CC_H
 
-#include <gnuradio/block.h>
 #include "channel_fsm.h"
+#include <gnuradio/block.h>
 
 class channel_msg_receiver_cc;
 

src/algorithms/conditioner/adapters/signal_conditioner.h

@@ -32,9 +32,8 @@
 #ifndef GNSS_SDR_SIGNAL_CONDITIONER_H_
 #define GNSS_SDR_SIGNAL_CONDITIONER_H_
 
-#include <string>
 #include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 class AcquisitionInterface;

src/algorithms/data_type_adapter/adapters/byte_to_short.cc

@@ -29,8 +29,9 @@
  */
 
 #include "byte_to_short.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 

src/algorithms/data_type_adapter/adapters/byte_to_short.h

@@ -31,11 +31,10 @@
 #ifndef GNSS_SDR_BYTE_TO_SHORT_H_
 #define GNSS_SDR_BYTE_TO_SHORT_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/blocks/char_to_short.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
+#include <string>
-
 
 class ConfigurationInterface;
 

src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc

@@ -30,9 +30,9 @@
  */
 
 #include "ibyte_to_cbyte.h"
-#include <volk/volk.h>
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <volk/volk.h>
 
 using google::LogMessage;
 

src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h

@@ -32,12 +32,11 @@
 #ifndef GNSS_SDR_IBYTE_TO_CBYTE_H_
 #define GNSS_SDR_IBYTE_TO_CBYTE_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_ic.h"
 #include "gnss_block_interface.h"
 #include "interleaved_byte_to_complex_byte.h"
-
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc

@@ -29,8 +29,8 @@
  */
 
 #include "ibyte_to_complex.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h

@@ -31,13 +31,12 @@
 #ifndef GNSS_SDR_IBYTE_TO_COMPLEX_H_
 #define GNSS_SDR_IBYTE_TO_COMPLEX_H_
 
-#include <string>
-#include <gnuradio/blocks/interleaved_char_to_complex.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_cc.h"
 #include "gnss_block_interface.h"
 #include "gnss_synchro.h"
-
+#include <gnuradio/blocks/interleaved_char_to_complex.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc

@@ -30,9 +30,10 @@
  */
 
 #include "ibyte_to_cshort.h"
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+
 
 using google::LogMessage;
 

src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h

@@ -31,12 +31,11 @@
 #ifndef GNSS_SDR_IBYTE_TO_CSHORT_H_
 #define GNSS_SDR_IBYTE_TO_CSHORT_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
 #include "conjugate_sc.h"
 #include "interleaved_byte_to_complex_short.h"
-
+#include "gnss_block_interface.h"
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc

@@ -29,8 +29,8 @@
  */
 
 #include "ishort_to_complex.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/data_type_adapter/adapters/ishort_to_complex.h

@@ -31,12 +31,11 @@
 #ifndef GNSS_SDR_ISHORT_TO_COMPLEX_H_
 #define GNSS_SDR_ISHORT_TO_COMPLEX_H_
 
-#include <string>
-#include <gnuradio/blocks/interleaved_short_to_complex.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_cc.h"
 #include "gnss_block_interface.h"
-
+#include <gnuradio/blocks/interleaved_short_to_complex.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc

@@ -30,9 +30,9 @@
  */
 
 #include "ishort_to_cshort.h"
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h

@@ -31,12 +31,11 @@
 #ifndef GNSS_SDR_ISHORT_TO_CSHORT_H_
 #define GNSS_SDR_ISHORT_TO_CSHORT_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_sc.h"
 #include "gnss_block_interface.h"
 #include "interleaved_short_to_complex_short.h"
-
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/input_filter/adapters/beamformer_filter.cc

@@ -29,10 +29,10 @@
  */
 
 #include "beamformer_filter.h"
-#include <glog/logging.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "beamformer.h"
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
 
 
 using google::LogMessage;

src/algorithms/input_filter/adapters/beamformer_filter.h

@@ -32,9 +32,9 @@
 #ifndef GNSS_SDR_BEAMFORMER_FILTER_H_
 #define GNSS_SDR_BEAMFORMER_FILTER_H_
 
-#include <string>
-#include <gnuradio/hier_block2.h>
 #include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/input_filter/adapters/fir_filter.cc

@@ -30,11 +30,12 @@
  */
 
 #include "fir_filter.h"
+#include "configuration_interface.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/filter/pm_remez.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/fir_filter.h

@@ -33,9 +33,11 @@
 #ifndef GNSS_SDR_FIR_FILTER_H_
 #define GNSS_SDR_FIR_FILTER_H_
 
-#include <cmath>
+#include "gnss_block_interface.h"
-#include <string>
+#include "complex_byte_to_float_x2.h"
-#include <vector>
+#include "byte_x2_to_complex_byte.h"
+#include "short_x2_to_cshort.h"
+#include "cshort_to_float_x2.h"
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_char.h>
@@ -43,11 +45,9 @@
 #include <gnuradio/blocks/float_to_short.h>
 #include <gnuradio/filter/fir_filter_ccf.h>
 #include <gnuradio/filter/fir_filter_fff.h>
-#include "gnss_block_interface.h"
+#include <cmath>
-#include "complex_byte_to_float_x2.h"
+#include <string>
-#include "byte_x2_to_complex_byte.h"
+#include <vector>
-#include "short_x2_to_cshort.h"
-#include "cshort_to_float_x2.h"
 
 class ConfigurationInterface;
 

src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc

@@ -30,13 +30,13 @@
  */
 
 #include "freq_xlating_fir_filter.h"
+#include "configuration_interface.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/filter/pm_remez.h>
 #include <gnuradio/filter/firdes.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h

@@ -33,8 +33,9 @@
 #ifndef GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_
 #define GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_
 
-#include <string>
+#include "gnss_block_interface.h"
-#include <vector>
+#include "short_x2_to_cshort.h"
+#include "complex_float_to_complex_byte.h"
 #include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
 #include <gnuradio/filter/freq_xlating_fir_filter_fcf.h>
 #include <gnuradio/filter/freq_xlating_fir_filter_scf.h>
@@ -42,9 +43,8 @@
 #include <gnuradio/blocks/complex_to_float.h>
 #include <gnuradio/blocks/char_to_short.h>
 #include <gnuradio/blocks/float_to_short.h>
-#include "gnss_block_interface.h"
+#include <string>
-#include "short_x2_to_cshort.h"
+#include <vector>
-#include "complex_float_to_complex_byte.h"
 
 class ConfigurationInterface;
 

src/algorithms/input_filter/adapters/notch_filter.cc

@@ -30,10 +30,11 @@
  */
 
 #include "notch_filter.h"
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "notch_cc.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/notch_filter.h

@@ -33,12 +33,11 @@
 #ifndef GNSS_SDR_NOTCH_FILTER_H_
 #define GNSS_SDR_NOTCH_FILTER_H_
 
+#include "notch_cc.h"
+#include "gnss_block_interface.h"
+#include <gnuradio/blocks/file_sink.h>
 #include <string>
 #include <vector>
-#include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-#include "notch_cc.h"
-
 
 class ConfigurationInterface;
 

src/algorithms/input_filter/adapters/notch_filter_lite.cc

@@ -30,11 +30,11 @@
  */
 
 #include "notch_filter_lite.h"
-#include <cmath>
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "notch_lite_cc.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+#include <cmath>
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/notch_filter_lite.h

@@ -33,12 +33,11 @@
 #ifndef GNSS_SDR_NOTCH_FILTER_LITE_H_
 #define GNSS_SDR_NOTCH_FILTER_LITE_H_
 
-#include <string>
-#include <vector>
-#include <gnuradio/blocks/file_sink.h>
 #include "gnss_block_interface.h"
 #include "notch_lite_cc.h"
-
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
+#include <vector>
 
 class ConfigurationInterface;
 

src/algorithms/input_filter/adapters/pulse_blanking_filter.cc

@@ -28,13 +28,13 @@
  * -------------------------------------------------------------------------
  */
 
+#include "pulse_blanking_filter.h"
+#include "configuration_interface.h"
 #include <boost/lexical_cast.hpp>
-#include <vector>
-#include <cmath>
 #include <glog/logging.h>
 #include <gnuradio/filter/firdes.h>
-#include "configuration_interface.h"
+#include <vector>
-#include "pulse_blanking_filter.h"
+#include <cmath>
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/pulse_blanking_filter.h

@@ -32,11 +32,11 @@
 #ifndef GNSS_SDR_PULSE_BLANKING_FILTER_H_
 #define GNSS_SDR_PULSE_BLANKING_FILTER_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
 #include "gnss_block_interface.h"
 #include "pulse_blanking_cc.h"
+#include <gnuradio/blocks/file_sink.h>
+#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/input_filter/gnuradio_blocks/beamformer.cc

@@ -30,9 +30,9 @@
 
 
 #include "beamformer.h"
-#include <iostream>
-#include <sstream>
 #include <gnuradio/io_signature.h>
+#include <sstream>
+
 
 #define GNSS_SDR_BEAMFORMER_CHANNELS 8
 
@@ -53,7 +53,7 @@ beamformer::beamformer()
 
     for (int i = 0; i< GNSS_SDR_BEAMFORMER_CHANNELS; i++)
         {
-            weight_vector[i]=gr_complex(1,0);
+            weight_vector[i] = gr_complex(1,0);
         }
 }
 

src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc

@@ -29,13 +29,12 @@
  */
 
 #include "notch_cc.h"
-#include <cstring>
-#include <cmath>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-
+#include <cstring>
+#include <cmath>
 
 using google::LogMessage;
 

src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc

@@ -29,14 +29,12 @@
  */
 
 #include "notch_lite_cc.h"
-
-#include <cstring>
-#include <cmath>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-
+#include <cstring>
+#include <cmath>
 
 using google::LogMessage;
 

src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc

@@ -29,12 +29,11 @@
  */
 
 #include "pulse_blanking_cc.h"
-#include <cmath>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-
+#include <cmath>
 
 using google::LogMessage;
 

src/algorithms/libs/complex_float_to_complex_byte.cc

@@ -31,9 +31,7 @@
 
 #include "complex_float_to_complex_byte.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
-#include "volk_gnsssdr/volk_gnsssdr.h"
-
 
 
 complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte()
@@ -47,7 +45,7 @@ complex_float_to_complex_byte::complex_float_to_complex_byte() : sync_block("com
                         gr::io_signature::make (1, 1, sizeof(gr_complex)),
                         gr::io_signature::make (1, 1, sizeof(lv_8sc_t))) // lv_8sc_t is a Volk's typedef for std::complex<signed char>
 {
-    const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t);
+    const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_8sc_t);
     set_alignment(std::max(1, alignment_multiple));
 }
 

src/algorithms/libs/galileo_e1_signal_processing.cc

@@ -31,9 +31,9 @@
  */
 
 #include "galileo_e1_signal_processing.h"
-#include <string>
 #include "Galileo_E1.h"
 #include "gnss_signal_processing.h"
+#include <string>
 
 
 void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn)

src/algorithms/libs/galileo_e5_signal_processing.cc

@@ -32,9 +32,9 @@
  */
 
 #include "galileo_e5_signal_processing.h"
-#include <gnuradio/math.h>
 #include "Galileo_E5a.h"
 #include "gnss_signal_processing.h"
+#include <gnuradio/gr_complex.h>
 
 
 

src/algorithms/libs/gnss_sdr_flags.cc

@@ -29,7 +29,7 @@
  */
 
 
-#include <gnss_sdr_flags.h>
+#include "gnss_sdr_flags.h"
 #include <cstdint>
 #include <iostream>
 

src/algorithms/libs/gnss_sdr_valve.cc

@@ -31,11 +31,11 @@
  */
 
 #include "gnss_sdr_valve.h"
-#include <algorithm> // for min
-#include <cstring>  // for memcpy
-#include <gnuradio/io_signature.h>
 #include "control_message_factory.h"
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <algorithm> // for min
+#include <cstring>  // for memcpy
 
 gnss_sdr_valve::gnss_sdr_valve (size_t sizeof_stream_item,
         unsigned long long nitems,

src/algorithms/libs/gnss_signal_processing.cc

@@ -32,8 +32,8 @@
  */
 
 #include "gnss_signal_processing.h"
-#include <gnuradio/fxpt_nco.h>
 #include "GPS_L1_CA.h"
+#include <gnuradio/fxpt_nco.h>
 
 
 auto auxCeil2 = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };

src/algorithms/libs/gps_l2c_signal.cc

@@ -30,10 +30,10 @@
  * -------------------------------------------------------------------------
  */
 
-#include <gps_l2c_signal.h>
+#include "gps_l2c_signal.h"
+#include "GPS_L2C.h"
 #include <cstdint>
 #include <cmath>
-#include "GPS_L2C.h"
 
 
 int32_t gps_l2c_m_shift(int32_t x)

src/algorithms/libs/gps_l5_signal.cc

@@ -30,12 +30,12 @@
  * -------------------------------------------------------------------------
  */
 
-#include <iostream>
+#include "gps_l5_signal.h"
-#include <deque>
-#include <cmath>
-#include <cinttypes>
-#include <complex>
 #include "GPS_L5.h"
+#include <cinttypes>
+#include <cmath>
+#include <complex>
+#include <deque>
 
 
 std::deque<bool> l5i_xa_shift(std::deque<bool> xa)

src/algorithms/libs/pass_through.cc

@@ -31,11 +31,10 @@
  */
 
 #include "pass_through.h"
-#include <iostream>
+#include "configuration_interface.h"
-#include <complex>
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+#include <complex>
 
 using google::LogMessage;
 

src/algorithms/libs/pass_through.h

@@ -33,13 +33,13 @@
 #ifndef GNSS_SDR_PASS_THROUGH_H_
 #define GNSS_SDR_PASS_THROUGH_H_
 
-#include <string>
-#include <gnuradio/hier_block2.h>
-#include <gnuradio/blocks/copy.h>
-#include "gnss_block_interface.h"
 #include "conjugate_cc.h"
 #include "conjugate_sc.h"
 #include "conjugate_ic.h"
+#include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/blocks/copy.h>
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/libs/rtklib/rtklib.h

@@ -53,6 +53,9 @@
 #ifndef GNSS_SDR_RTKLIB_H_
 #define GNSS_SDR_RTKLIB_H_
 
+#include "MATH_CONSTANTS.h"
+#include "gnss_frequencies.h"
+#include "gnss_obs_codes.h"
 #include <pthread.h>
 #include <netinet/in.h>
 #include <cctype>
@@ -60,9 +63,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
-#include "gnss_obs_codes.h"
 
 
 /* macros --------------------------------------------------------------------*/

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc

@@ -20,11 +20,11 @@
 #include <config.h>
 #endif
 
+#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
+#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 #include <volk_gnsssdr/constants.h>      // for volk_gnsssdr_available_machines, volk_gnsssdr_c_compiler ...
 #include <iostream>                      // for operator<<, endl, cout, ostream
 #include <string>                        // for string
-#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
-#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 
 void print_alignment()
 {

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc

@@ -16,23 +16,23 @@
  * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include "kernel_tests.h"                      // for init_test_list
+#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
+#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
+#include "volk_gnsssdr_profile.h"
+#include "volk_gnsssdr/volk_gnsssdr_prefs.h"   // for volk_gnsssdr_get_config_path
+#include <boost/filesystem/operations.hpp>     // for create_directories, exists
+#include <boost/filesystem/path.hpp>           // for path, operator<<
+#include <boost/filesystem/path_traits.hpp>    // for filesystem
 #include <sys/stat.h>                          // for stat
 #include <cstddef>                             // for size_t
 #include <iostream>                            // for operator<<, basic_ostream
 #include <fstream>                             // IWYU pragma: keep
 #include <map>                                 // for map, map<>::iterator
 #include <utility>                             // for pair
-#include <vector>                              // for vector, vector<>::const_...
+#include <vector>                              // for vector, vector<>::const_..
-#include <boost/filesystem/operations.hpp>     // for create_directories, exists
+
-#include <boost/filesystem/path.hpp>           // for path, operator<<
-#include <boost/filesystem/path_traits.hpp>    // for filesystem
-#include <volk_gnsssdr/volk_gnsssdr_prefs.h>   // for volk_gnsssdr_get_config_path
-#include "kernel_tests.h"                      // for init_test_list
-#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
-#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
-#include "volk_gnsssdr_profile.h"
 
 
 namespace fs = boost::filesystem;

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc

@@ -17,6 +17,13 @@
  */
 
 #include "qa_utils.h"
+#include "volk_gnsssdr/volk_gnsssdr.h"              // for volk_gnsssdr_func_desc_t
+#include "volk_gnsssdr/volk_gnsssdr_malloc.h"       // for volk_gnsssdr_free, volk_gnsssdr_malloc
+#include <boost/foreach.hpp>                        // for auto_any_base
+#include <boost/lexical_cast.hpp>                   // for lexical_cast
+#include <boost/token_functions.hpp>                // for char_separator
+#include <boost/token_iterator.hpp>                 // for token_iterator
+#include <boost/tokenizer.hpp>                      // for tokenizer
 #include <cassert>                                  // for assert
 #include <chrono>                                   // for system_clock, duration,...
 #include <cmath>                                    // for sqrt, fabs, abs
@@ -28,13 +35,6 @@
 #include <map>                                      // for map
 #include <random>                                   // for random_device, default_random_engine, uniform_real_distribution
 #include <vector>                                   // for vector
-#include <boost/foreach.hpp>                        // for auto_any_base
-#include <boost/lexical_cast.hpp>                   // for lexical_cast
-#include <boost/token_functions.hpp>                // for char_separator
-#include <boost/token_iterator.hpp>                 // for token_iterator
-#include <boost/tokenizer.hpp>                      // for tokenizer
-#include <volk_gnsssdr/volk_gnsssdr.h>              // for volk_gnsssdr_func_desc_t
-#include <volk_gnsssdr/volk_gnsssdr_malloc.h>       // for volk_gnsssdr_free, volk_gnsssdr_malloc
 
 
 float uniform() {

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h

@@ -23,13 +23,13 @@
 #define _DARWIN_C_SOURCE
 #endif
 
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
+#include "volk_gnsssdr/volk_gnsssdr.h"          // for volk_gnsssdr_func_desc_t
 #include <cstdbool>       // for bool, false
 #include <cstdlib>        // for NULL
 #include <map>            // for map
 #include <string>         // for string, basic_string
 #include <vector>         // for vector
-#include <volk_gnsssdr/volk_gnsssdr.h>          // for volk_gnsssdr_func_desc_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 
 
 /************************************************

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc

@@ -18,6 +18,9 @@
  */
 
 
+#include "kernel_tests.h"       // for init_test_list
+#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 #include <cstdbool>             // for bool, false, true
 #include <iostream>             // for operator<<, basic_ostream, endl, char...
 #include <fstream>              // IWYU pragma: keep
@@ -25,9 +28,6 @@
 #include <string>               // for string, operator<<
 #include <utility>              // for pair
 #include <vector>               // for vector
-#include "kernel_tests.h"       // for init_test_list
-#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 
 void print_qa_xml(std::vector<volk_gnsssdr_test_results_t> results, unsigned int nfails);
 

src/algorithms/observables/adapters/hybrid_observables.cc

@@ -32,9 +32,10 @@
 
 #include "hybrid_observables.h"
 #include "configuration_interface.h"
-#include <glog/logging.h>
-#include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
+#include "GPS_L1_CA.h"
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 

src/algorithms/observables/adapters/hybrid_observables.h

@@ -34,10 +34,9 @@
 #ifndef GNSS_SDR_HYBRID_OBSERVABLES_H_
 #define GNSS_SDR_HYBRID_OBSERVABLES_H_
 
-#include <string>
-#include "observables_interface.h"
 #include "hybrid_observables_cc.h"
-
+#include "observables_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc

@@ -29,20 +29,21 @@
  */
 
 #include "hybrid_observables_cc.h"
+#include "Galileo_E1.h"
+#include "GPS_L1_CA.h"
+#include <armadillo>
+#include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <matio.h>
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <map>
 #include <vector>
 #include <utility>
-#include <armadillo>
+
-#include <gnuradio/io_signature.h>
-#include <gnuradio/block_detail.h>
-#include <gnuradio/buffer.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include "Galileo_E1.h"
-#include "GPS_L1_CA.h"
 
 using google::LogMessage;
 
@@ -506,11 +507,13 @@ int hybrid_observables_cc::general_work (int noutput_items ,
                                     // two points linear interpolation using adjacent (adj) values: y=y1+(x-x1)*(y2-y1)/(x2-x1)
                                     // TOW at the selected receiver time T_rx_s
                                     int element_key = gnss_synchro_map_iter->second.Channel_ID;
-                                    try{
+                                    try
-                                        adj_obs = adjacent_gnss_synchro_map.at(element_key);
-                                    }catch(const std::exception & ex)
                                     {
-                                        continue;
+                                            adj_obs = adjacent_gnss_synchro_map.at(element_key);
+                                    }
+                                    catch(const std::exception & ex)
+                                    {
+                                            continue;
                                     }
 
                                     double adj_T_rx_s = static_cast<double>(adj_obs.Tracking_sample_counter) / channel_fs_hz + adj_obs.Code_phase_samples / channel_fs_hz;

src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h

@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_HYBRID_OBSERVABLES_CC_H
 #define GNSS_SDR_HYBRID_OBSERVABLES_CC_H
 
+#include "gnss_synchro.h"
+#include <gnuradio/block.h>
 #include <fstream>
 #include <string>
-#include <gnuradio/block.h>
-#include "gnss_synchro.h"
 
 
 class hybrid_observables_cc;

src/algorithms/resampler/adapters/direct_resampler_conditioner.cc

@@ -30,15 +30,15 @@
  */
 
 #include "direct_resampler_conditioner.h"
-#include <cmath>
-#include <limits>
-#include <glog/logging.h>
-#include <gnuradio/blocks/file_sink.h>
-#include <volk/volk.h>
 #include "direct_resampler_conditioner_cc.h"
 #include "direct_resampler_conditioner_cs.h"
 #include "direct_resampler_conditioner_cb.h"
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <volk/volk.h>
+#include <cmath>
+#include <limits>
 
 using google::LogMessage;
 

src/algorithms/resampler/adapters/direct_resampler_conditioner.h

@@ -33,9 +33,9 @@
 #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_
 #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_
 
-#include <string>
-#include <gnuradio/hier_block2.h>
 #include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc

@@ -30,11 +30,11 @@
  */
 
 #include "mmse_resampler_conditioner.h"
-#include <cmath>
+#include "configuration_interface.h"
-#include <limits>
 #include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "configuration_interface.h"
+#include <cmath>
+#include <limits>
 
 using google::LogMessage;