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

.clang-format

@@ -47,13 +47,20 @@ DerivePointerAlignment: true
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks: Merge
 IncludeCategories:
-  - Regex:           '^<.*\.h>'
+  - Regex:           '^.*.h"'
     Priority:        1
-  - Regex:           '^<.*'
+  - Regex:           '^.*(boost|gflags|glog|gtest|gnuradio|volk|gnsssdr)/'
+    Priority:        2
+  - Regex:           '^.*(armadillo|matio)'
     Priority:        2
   - Regex:           '.*'
     Priority:        3
+  - Regex:           '^<.*\.h>'
+    Priority:        4
+  - Regex:           '^<.*'
+    Priority:        5
 IndentCaseLabels: false
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -73,7 +80,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -30,11 +30,11 @@
 
 
 #include "rtklib_pvt.h"
-#include "pvt_conf.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
-#include <boost/archive/xml_oarchive.hpp>
+#include "pvt_conf.h"
 #include <boost/archive/xml_iarchive.hpp>
+#include <boost/archive/xml_oarchive.hpp>
 #include <boost/serialization/map.hpp>
 #include <glog/logging.h>
 #if OLD_BOOST

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc

@@ -34,8 +34,8 @@
 #include "galileo_almanac_helper.h"
 #include "gnss_sdr_create_directory.h"
 #include "pvt_conf.h"
-#include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
+#include <boost/archive/xml_oarchive.hpp>
 #include <boost/exception/all.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/serialization/map.hpp>
@@ -43,9 +43,9 @@
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <algorithm>
+#include <exception>
 #include <iostream>
 #include <map>
-#include <exception>
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h

@@ -31,26 +31,26 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_CC_H
 #define GNSS_SDR_RTKLIB_PVT_CC_H
 
-#include "gps_ephemeris.h"
-#include "nmea_printer.h"
-#include "kml_printer.h"
-#include "gpx_printer.h"
 #include "geojson_printer.h"
+#include "gps_ephemeris.h"
+#include "gpx_printer.h"
+#include "kml_printer.h"
+#include "nmea_printer.h"
+#include "pvt_conf.h"
 #include "rinex_printer.h"
 #include "rtcm_printer.h"
-#include "pvt_conf.h"
 #include "rtklib_solver.h"
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/sync_block.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
 #include <chrono>
 #include <cstdint>
 #include <fstream>
-#include <utility>
 #include <string>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/types.h>
+#include <utility>
 
 
 class rtklib_pvt_cc;

src/algorithms/PVT/libs/hybrid_ls_pvt.cc

@@ -30,12 +30,12 @@
  */
 
 #include "hybrid_ls_pvt.h"
-#include "Galileo_E1.h"
 #include "GPS_L1_CA.h"
 #include "GPS_L2C.h"
+#include "Galileo_E1.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <utility>
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/hybrid_ls_pvt.h

@@ -32,12 +32,12 @@
 #ifndef GNSS_SDR_HYBRID_LS_PVT_H_
 #define GNSS_SDR_HYBRID_LS_PVT_H_
 
-#include "ls_pvt.h"
-#include "galileo_navigation_message.h"
-#include "gps_navigation_message.h"
-#include "gps_cnav_navigation_message.h"
 #include "galileo_almanac.h"
+#include "galileo_navigation_message.h"
 #include "gnss_synchro.h"
+#include "gps_cnav_navigation_message.h"
+#include "gps_navigation_message.h"
+#include "ls_pvt.h"
 #include "rtklib_rtkcmn.h"
 #include <fstream>
 #include <map>

src/algorithms/PVT/libs/pvt_conf.h

@@ -33,8 +33,8 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <string>
 #include <map>
+#include <string>
 
 class Pvt_Conf
 {

src/algorithms/PVT/libs/pvt_solution.h

@@ -33,9 +33,9 @@
 #define GNSS_SDR_PVT_SOLUTION_H_
 
 
+#include <armadillo>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <deque>
-#include <armadillo>
 
 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,21 +29,21 @@
  */
 
 #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 <boost/date_time/time_zone_base.hpp>
 #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 <glog/logging.h>
-#include <unistd.h>   // for getlogin_r()
 #include <algorithm>  // for min and max
 #include <cmath>      // for floor
 #include <cstdlib>    // for getenv()
 #include <iterator>
 #include <ostream>
 #include <set>
+#include <unistd.h>  // for getlogin_r()
 #include <utility>
 #include <vector>
 

src/algorithms/PVT/libs/rinex_printer.h

@@ -51,21 +51,21 @@
 #ifndef GNSS_SDR_RINEX_PRINTER_H_
 #define GNSS_SDR_RINEX_PRINTER_H_
 
-#include "gps_navigation_message.h"
-#include "gps_cnav_navigation_message.h"
-#include "galileo_navigation_message.h"
-#include "glonass_gnav_navigation_message.h"
+#include "GLONASS_L1_L2_CA.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
-#include "GLONASS_L1_L2_CA.h"
+#include "galileo_navigation_message.h"
+#include "glonass_gnav_navigation_message.h"
 #include "gnss_synchro.h"
+#include "gps_cnav_navigation_message.h"
+#include "gps_navigation_message.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <cstdint>
-#include <string>
 #include <fstream>
-#include <sstream>  // for stringstream
 #include <iomanip>  // for setprecision
 #include <map>
+#include <sstream>  // for stringstream
+#include <string>
 
 class Sbas_Raw_Msg;
 

src/algorithms/PVT/libs/rtcm_printer.cc

@@ -38,10 +38,10 @@
 #include <boost/filesystem/path_traits.hpp>  // for filesystem
 #include <glog/logging.h>
 #include <cstdint>
-#include <iomanip>
-#include <utility>
 #include <fcntl.h>  // for O_RDWR
+#include <iomanip>
 #include <termios.h>  // for tcgetattr
+#include <utility>
 
 
 using google::LogMessage;

src/algorithms/PVT/libs/rtklib_solver.cc

@@ -52,13 +52,13 @@
  * -----------------------------------------------------------------------*/
 
 #include "rtklib_solver.h"
-#include "rtklib_conversions.h"
-#include "rtklib_solution.h"
+#include "GLONASS_L1_L2_CA.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
-#include "GLONASS_L1_L2_CA.h"
-#include <matio.h>
+#include "rtklib_conversions.h"
+#include "rtklib_solution.h"
 #include <glog/logging.h>
+#include <matio.h>
 #include <utility>
 
 

src/algorithms/PVT/libs/rtklib_solver.h

@@ -55,14 +55,14 @@
 #define GNSS_SDR_RTKLIB_SOLVER_H_
 
 
-#include "rtklib_rtkpos.h"
-#include "galileo_navigation_message.h"
-#include "gps_navigation_message.h"
-#include "gps_cnav_navigation_message.h"
-#include "glonass_gnav_navigation_message.h"
 #include "galileo_almanac.h"
+#include "galileo_navigation_message.h"
+#include "glonass_gnav_navigation_message.h"
 #include "gnss_synchro.h"
+#include "gps_cnav_navigation_message.h"
+#include "gps_navigation_message.h"
 #include "pvt_solution.h"
+#include "rtklib_rtkpos.h"
 #include <fstream>
 #include <map>
 #include <string>

src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc

@@ -30,12 +30,12 @@
  */
 
 #include "galileo_e1_pcps_8ms_ambiguous_acquisition.h"
-#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 "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h

@@ -32,9 +32,9 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
 #include "galileo_pcps_8ms_acquisition_cc.h"
+#include "gnss_synchro.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -30,11 +30,11 @@
  */
 
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
+#include "Galileo_E1.h"
+#include "acq_conf.h"
 #include "configuration_interface.h"
 #include "galileo_e1_signal_processing.h"
-#include "Galileo_E1.h"
 #include "gnss_sdr_flags.h"
-#include "acq_conf.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h

@@ -33,9 +33,9 @@
 #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
-#include "complex_byte_to_float_x2.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc

@@ -30,9 +30,9 @@
  */
 
 #include "galileo_e1_pcps_ambiguous_acquisition_fpga.h"
+#include "Galileo_E1.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>

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h

@@ -33,11 +33,11 @@
 #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_FPGA_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
-#include "complex_byte_to_float_x2.h"
-#include <gnuradio/blocks/stream_to_vector.h>
 #include <gnuradio/blocks/float_to_complex.h>
+#include <gnuradio/blocks/stream_to_vector.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc

@@ -30,12 +30,12 @@
  */
 
 #include "galileo_e1_pcps_cccwsr_ambiguous_acquisition.h"
-#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 "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h

@@ -32,8 +32,8 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_cccwsr_acquisition_cc.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>

src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc

@@ -30,12 +30,12 @@
  */
 
 #include "galileo_e1_pcps_quicksync_ambiguous_acquisition.h"
-#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 "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h

@@ -32,8 +32,8 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_QUICKSYNC_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_QUICKSYNC_AMBIGUOUS_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_quicksync_acquisition_cc.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>

src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc

@@ -30,12 +30,12 @@
  */
 
 #include "galileo_e1_pcps_tong_ambiguous_acquisition.h"
-#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 "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h

@@ -32,8 +32,8 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_tong_acquisition_cc.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>

src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc

@@ -36,12 +36,12 @@
  */
 
 #include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
-#include <boost/math/distributions/exponential.hpp>
-#include <glog/logging.h>
-#include "galileo_e5_signal_processing.h"
 #include "Galileo_E5a.h"
 #include "configuration_interface.h"
+#include "galileo_e5_signal_processing.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 using google::LogMessage;
 

src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h

@@ -38,9 +38,9 @@
 #ifndef GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H_
 #define GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
 #include "galileo_e5a_noncoherent_iq_acquisition_caf_cc.h"
+#include "gnss_synchro.h"
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc

@@ -29,11 +29,11 @@
  */
 
 #include "galileo_e5a_pcps_acquisition.h"
+#include "Galileo_E5a.h"
+#include "acq_conf.h"
 #include "configuration_interface.h"
 #include "galileo_e5_signal_processing.h"
-#include "Galileo_E5a.h"
 #include "gnss_sdr_flags.h"
-#include "acq_conf.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr_complex.h>

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc

@@ -29,9 +29,9 @@
  */
 
 #include "galileo_e5a_pcps_acquisition_fpga.h"
+#include "Galileo_E5a.h"
 #include "configuration_interface.h"
 #include "galileo_e5_signal_processing.h"
-#include "Galileo_E5a.h"
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc

@@ -32,11 +32,11 @@
  */
 
 #include "glonass_l1_ca_pcps_acquisition.h"
+#include "GLONASS_L1_L2_CA.h"
+#include "acq_conf.h"
 #include "configuration_interface.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
-#include "acq_conf.h"
-#include "GLONASS_L1_L2_CA.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h

@@ -35,9 +35,9 @@
 #define GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
-#include "complex_byte_to_float_x2.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <string>
 

src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc

@@ -31,11 +31,11 @@
  */
 
 #include "glonass_l2_ca_pcps_acquisition.h"
+#include "GLONASS_L1_L2_CA.h"
+#include "acq_conf.h"
 #include "configuration_interface.h"
 #include "glonass_l2_signal_processing.h"
-#include "GLONASS_L1_L2_CA.h"
 #include "gnss_sdr_flags.h"
-#include "acq_conf.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h

@@ -34,9 +34,9 @@
 #define GNSS_SDR_GLONASS_L2_CA_PCPS_ACQUISITION_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
-#include "complex_byte_to_float_x2.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <string>
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -34,11 +34,11 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition.h"
-#include "configuration_interface.h"
-#include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
-#include "gnss_sdr_flags.h"
 #include "acq_conf.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h

@@ -37,9 +37,9 @@
 #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
-#include "complex_byte_to_float_x2.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc

@@ -33,11 +33,11 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
-#include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
+#include "acq_conf.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
-#include "acq_conf.h"
+#include "gps_sdr_signal_processing.h"
 #include <glog/logging.h>
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h

@@ -34,8 +34,8 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition_fine_doppler_cc.h"
 #include <string>
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc

@@ -34,13 +34,13 @@
  * -------------------------------------------------------------------------
  */
 
+#include "gps_l1_ca_pcps_acquisition_fpga.h"
+#include "GPS_L1_CA.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
-#include "gps_l1_ca_pcps_acquisition_fpga.h"
 #include "gps_sdr_signal_processing.h"
-#include "GPS_L1_CA.h"
-#include <gnuradio/fft/fft.h>
 #include <glog/logging.h>
+#include <gnuradio/fft/fft.h>
 #include <new>
 
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc

@@ -33,11 +33,11 @@
  */
 
 #include "gps_l1_ca_pcps_assisted_acquisition.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 "gps_sdr_signal_processing.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h

@@ -34,8 +34,8 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_assisted_acquisition_cc.h"
 #include <string>
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc

@@ -30,12 +30,12 @@
  */
 
 #include "gps_l1_ca_pcps_opencl_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#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 "gps_sdr_signal_processing.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h

@@ -32,8 +32,8 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_opencl_acquisition_cc.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc

@@ -31,12 +31,12 @@
  */
 
 #include "gps_l1_ca_pcps_quicksync_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#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 "gps_sdr_signal_processing.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h

@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_QUICKSYNC_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_QUICKSYNC_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
-#include "pcps_quicksync_acquisition_cc.h"
 #include "configuration_interface.h"
+#include "gnss_synchro.h"
+#include "pcps_quicksync_acquisition_cc.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc

@@ -30,12 +30,12 @@
  */
 
 #include "gps_l1_ca_pcps_tong_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#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 "gps_sdr_signal_processing.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h

@@ -32,10 +32,10 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
-#include "pcps_tong_acquisition_cc.h"
 #include "configuration_interface.h"
+#include "gnss_synchro.h"
+#include "pcps_tong_acquisition_cc.h"
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <string>
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc

@@ -32,11 +32,11 @@
  */
 
 #include "gps_l2_m_pcps_acquisition.h"
-#include "configuration_interface.h"
-#include "gps_l2c_signal.h"
 #include "GPS_L2C.h"
-#include "gnss_sdr_flags.h"
 #include "acq_conf.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gps_l2c_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h

@@ -35,9 +35,9 @@
 #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
-#include "complex_byte_to_float_x2.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc

@@ -32,10 +32,10 @@
  */
 
 #include "gps_l2_m_pcps_acquisition_fpga.h"
-#include "configuration_interface.h"
-#include "gps_l2c_signal.h"
 #include "GPS_L2C.h"
+#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include "gps_l2c_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h

@@ -35,11 +35,11 @@
 #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_FPGA_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
-#include "complex_byte_to_float_x2.h"
-#include <gnuradio/blocks/stream_to_vector.h>
 #include <gnuradio/blocks/float_to_complex.h>
+#include <gnuradio/blocks/stream_to_vector.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc

@@ -32,11 +32,11 @@
  */
 
 #include "gps_l5i_pcps_acquisition.h"
-#include "configuration_interface.h"
-#include "gps_l5_signal.h"
 #include "GPS_L5.h"
-#include "gnss_sdr_flags.h"
 #include "acq_conf.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gps_l5_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h

@@ -35,9 +35,9 @@
 #define GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
-#include "complex_byte_to_float_x2.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc

@@ -32,10 +32,10 @@
  */
 
 #include "gps_l5i_pcps_acquisition_fpga.h"
-#include "configuration_interface.h"
-#include "gps_l5_signal.h"
 #include "GPS_L5.h"
+#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include "gps_l5_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h

@@ -35,11 +35,11 @@
 #define GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_FPGA_H_
 
 #include "acquisition_interface.h"
+#include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
-#include "complex_byte_to_float_x2.h"
-#include <gnuradio/blocks/stream_to_vector.h>
 #include <gnuradio/blocks/float_to_complex.h>
+#include <gnuradio/blocks/stream_to_vector.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>
 

src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h

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

src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc

@@ -30,13 +30,13 @@
  */
 
 #include "galileo_pcps_8ms_acquisition_cc.h"
-#include <sstream>
-#include <utility>
+#include "control_message_factory.h"
 #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 <utility>
 
 using google::LogMessage;
 

src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h

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

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h

@@ -52,8 +52,8 @@
 #ifndef GNSS_SDR_PCPS_ACQUISITION_H_
 #define GNSS_SDR_PCPS_ACQUISITION_H_
 
-#include "gnss_synchro.h"
 #include "acq_conf.h"
+#include "gnss_synchro.h"
 #include <armadillo>
 #include <gnuradio/block.h>
 #include <gnuradio/fft/fft.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc

@@ -31,18 +31,18 @@
  */
 
 #include "pcps_acquisition_fine_doppler_cc.h"
-#include "gps_sdr_signal_processing.h"
-#include "control_message_factory.h"
 #include "GPS_L1_CA.h"
+#include "control_message_factory.h"
 #include "gnss_sdr_create_directory.h"
+#include "gps_sdr_signal_processing.h"
 #include <boost/filesystem/path.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <matio.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>  // std::rotate, std::fill_n
 #include <sstream>
-#include <matio.h>
 
 
 using google::LogMessage;

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h

@@ -49,12 +49,12 @@
 #ifndef GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
 #define GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
 
-#include "gnss_synchro.h"
 #include "acq_conf.h"
+#include "gnss_synchro.h"
 #include <armadillo>
 #include <gnuradio/block.h>
-#include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/gr_complex.h>
 #include <fstream>
 #include <string>
 

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc

@@ -39,9 +39,9 @@
  */
 
 
+#include "pcps_acquisition_fpga.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include "pcps_acquisition_fpga.h"
 
 
 #define AQ_DOWNSAMPLING_DELAY 40  // delay due to the downsampling filter in the acquisition

src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc

@@ -31,16 +31,16 @@
  */
 
 #include "pcps_assisted_acquisition_cc.h"
-#include <sstream>
-#include <utility>
+#include "GPS_L1_CA.h"
+#include "concurrent_map.h"
+#include "control_message_factory.h"
+#include "gps_acq_assist.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 "control_message_factory.h"
-#include "gps_acq_assist.h"
-#include "GPS_L1_CA.h"
+#include <sstream>
+#include <utility>
 
 extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h

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

src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc

@@ -35,8 +35,8 @@
  */
 
 #include "pcps_cccwsr_acquisition_cc.h"
-#include "control_message_factory.h"
 #include "GPS_L1_CA.h"  // GPS_TWO_PI
+#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h

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

src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc

@@ -49,10 +49,10 @@
  */
 
 #include "pcps_opencl_acquisition_cc.h"
+#include "GPS_L1_CA.h"  //GPS_TWO_PI
 #include "control_message_factory.h"
 #include "opencl/fft_base_kernels.h"
 #include "opencl/fft_internal.h"
-#include "GPS_L1_CA.h"  //GPS_TWO_PI
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h

@@ -54,8 +54,8 @@
 #include "gnss_synchro.h"
 #include "opencl/fft_internal.h"
 #include <gnuradio/block.h>
-#include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/gr_complex.h>
 #include <fstream>
 #include <string>
 #include <vector>

src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc

@@ -29,10 +29,10 @@
  */
 
 #include "pcps_quicksync_acquisition_cc.h"
-#include "control_message_factory.h"
 #include "GPS_L1_CA.h"
-#include <gnuradio/io_signature.h>
+#include "control_message_factory.h"
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>

src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h

@@ -53,13 +53,13 @@
 
 #include "gnss_synchro.h"
 #include <gnuradio/block.h>
-#include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
-#include <fstream>
-#include <string>
+#include <gnuradio/gr_complex.h>
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <fstream>
+#include <functional>
+#include <string>
 
 class pcps_quicksync_acquisition_cc;
 

src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc

@@ -49,8 +49,8 @@
  */
 
 #include "pcps_tong_acquisition_cc.h"
-#include "control_message_factory.h"
 #include "GPS_L1_CA.h"  // for GPS_TWO_PI
+#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h

@@ -53,8 +53,8 @@
 
 #include "gnss_synchro.h"
 #include <gnuradio/block.h>
-#include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
+#include <gnuradio/gr_complex.h>
 #include <fstream>
 #include <string>
 

src/algorithms/acquisition/libs/fpga_acquisition.cc

@@ -37,8 +37,8 @@
 #include "GPS_L1_CA.h"
 #include "gps_sdr_signal_processing.h"
 #include <glog/logging.h>
-#include <iostream>
 #include <fcntl.h>  // libraries used by the GIPO
+#include <iostream>
 #include <sys/mman.h>  // libraries used by the GIPO
 
 

src/algorithms/channel/adapters/channel.h

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

src/algorithms/channel/libs/channel_fsm.h

@@ -33,8 +33,8 @@
 #define GNSS_SDR_CHANNEL_FSM_H
 
 #include "acquisition_interface.h"
-#include "tracking_interface.h"
 #include "telemetry_decoder_interface.h"
+#include "tracking_interface.h"
 #include <gnuradio/msg_queue.h>
 #include <cstdint>
 #include <memory>

src/algorithms/channel/libs/channel_msg_receiver_cc.cc

@@ -30,9 +30,9 @@
 
 
 #include "channel_msg_receiver_cc.h"
+#include <glog/logging.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
-#include <glog/logging.h>
 #include <cstdint>
 
 using google::LogMessage;

src/algorithms/conditioner/adapters/array_signal_conditioner.cc

@@ -31,7 +31,6 @@
 
 #include "array_signal_conditioner.h"
 #include <glog/logging.h>
-
 #include <utility>
 
 

src/algorithms/conditioner/adapters/array_signal_conditioner.h

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

src/algorithms/conditioner/adapters/signal_conditioner.cc

@@ -31,7 +31,6 @@
 
 #include "signal_conditioner.h"
 #include <glog/logging.h>
-
 #include <utility>
 
 

src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h

@@ -34,8 +34,8 @@
 #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 <gnuradio/blocks/interleaved_char_to_complex.h>
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h

@@ -32,8 +32,8 @@
 #define GNSS_SDR_IBYTE_TO_CSHORT_H_
 
 #include "conjugate_sc.h"
-#include "interleaved_byte_to_complex_short.h"
 #include "gnss_block_interface.h"
+#include "interleaved_byte_to_complex_short.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <string>
 

src/algorithms/data_type_adapter/adapters/ishort_to_complex.h

@@ -33,8 +33,8 @@
 
 #include "conjugate_cc.h"
 #include "gnss_block_interface.h"
-#include <gnuradio/blocks/interleaved_short_to_complex.h>
 #include <gnuradio/blocks/file_sink.h>
+#include <gnuradio/blocks/interleaved_short_to_complex.h>
 #include <string>
 
 class ConfigurationInterface;

src/algorithms/input_filter/adapters/fir_filter.cc

@@ -31,10 +31,10 @@
 
 #include "fir_filter.h"
 #include "configuration_interface.h"
-#include <utility>
-#include <gnuradio/filter/pm_remez.h>
 #include <glog/logging.h>
+#include <gnuradio/filter/pm_remez.h>
 #include <volk/volk.h>
+#include <utility>
 
 
 using google::LogMessage;

src/algorithms/input_filter/adapters/fir_filter.h

@@ -33,16 +33,16 @@
 #ifndef GNSS_SDR_FIR_FILTER_H_
 #define GNSS_SDR_FIR_FILTER_H_
 
-#include "gnss_block_interface.h"
-#include "complex_byte_to_float_x2.h"
 #include "byte_x2_to_complex_byte.h"
-#include "short_x2_to_cshort.h"
+#include "complex_byte_to_float_x2.h"
 #include "cshort_to_float_x2.h"
-#include <gnuradio/gr_complex.h>
+#include "gnss_block_interface.h"
+#include "short_x2_to_cshort.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_char.h>
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/float_to_short.h>
+#include <gnuradio/gr_complex.h>
 #ifdef GR_GREATER_38
 #include <gnuradio/filter/fir_filter_blk.h>
 #else

src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc

@@ -31,12 +31,12 @@
 
 #include "freq_xlating_fir_filter.h"
 #include "configuration_interface.h"
-#include <utility>
-#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/filter/pm_remez.h>
-#include <gnuradio/filter/firdes.h>
 #include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <gnuradio/filter/firdes.h>
+#include <gnuradio/filter/pm_remez.h>
 #include <volk/volk.h>
+#include <utility>
 
 using google::LogMessage;
 

src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h

@@ -33,9 +33,9 @@
 #ifndef GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_
 #define GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_
 
+#include "complex_float_to_complex_byte.h"
 #include "gnss_block_interface.h"
 #include "short_x2_to_cshort.h"
-#include "complex_float_to_complex_byte.h"
 #ifdef GR_GREATER_38
 #include <gnuradio/filter/freq_xlating_fir_filter.h>
 #else
@@ -43,9 +43,9 @@
 #include <gnuradio/filter/freq_xlating_fir_filter_fcf.h>
 #include <gnuradio/filter/freq_xlating_fir_filter_scf.h>
 #endif
-#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/blocks/complex_to_float.h>
 #include <gnuradio/blocks/char_to_short.h>
+#include <gnuradio/blocks/complex_to_float.h>
+#include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_short.h>
 #include <string>
 #include <vector>

src/algorithms/input_filter/adapters/notch_filter.h

@@ -33,8 +33,8 @@
 #ifndef GNSS_SDR_NOTCH_FILTER_H_
 #define GNSS_SDR_NOTCH_FILTER_H_
 
-#include "notch_cc.h"
 #include "gnss_block_interface.h"
+#include "notch_cc.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <string>
 #include <vector>

src/algorithms/input_filter/adapters/pulse_blanking_filter.cc

@@ -33,9 +33,9 @@
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/filter/firdes.h>
+#include <cmath>
 #include <utility>
 #include <vector>
-#include <cmath>
 
 using google::LogMessage;
 

src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc

@@ -33,8 +33,8 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include <cstring>
 #include <cmath>
+#include <cstring>
 
 using google::LogMessage;
 

src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc

@@ -33,8 +33,8 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include <cstring>
 #include <cmath>
+#include <cstring>
 
 using google::LogMessage;
 

src/algorithms/libs/gnss_circular_deque.h

@@ -33,8 +33,9 @@
 
 #ifndef GNSS_SDR_CIRCULAR_DEQUE_H_
 #define GNSS_SDR_CIRCULAR_DEQUE_H_
-#include <vector>
+
 #include <boost/circular_buffer.hpp>
+#include <vector>
 
 template <class T>
 class Gnss_circular_deque

src/algorithms/libs/gnss_sdr_fpga_sample_counter.cc

@@ -31,20 +31,21 @@
 
 #include "gnss_sdr_fpga_sample_counter.h"
 #include "gnss_synchro.h"
+#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <cmath>
+#include <fcntl.h>  // libraries used by the GIPO
+#include <inttypes.h>
 #include <iostream>
 #include <string>
-#include <glog/logging.h>
-#include <fcntl.h>     // libraries used by the GIPO
 #include <sys/mman.h>  // libraries used by the GIPO
 
-#include <inttypes.h>
-
 #define PAGE_SIZE 0x10000             // default page size for the multicorrelator memory map
 #define TEST_REG_SANITY_CHECK 0x55AA  // value to check the presence of the test register (to detect the hw)
 
-gnss_sdr_fpga_sample_counter::gnss_sdr_fpga_sample_counter(double _fs, int32_t _interval_ms) : gr::block("fpga_fpga_sample_counter",
+gnss_sdr_fpga_sample_counter::gnss_sdr_fpga_sample_counter(
+    double _fs,
+    int32_t _interval_ms) : gr::block("fpga_fpga_sample_counter",
                                 gr::io_signature::make(0, 0, 0),
                                 gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
 {
@@ -299,7 +300,4 @@ uint32_t gnss_sdr_fpga_sample_counter::wait_for_interrupt_and_read_counter()
     // add number of passed samples or read the current counter value for more accuracy
     counter = samples_per_output;  //map_base[0];
     return counter;
-
 }
-
-

src/algorithms/libs/gnss_sdr_fpga_sample_counter.h

@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_FPGA_sample_counter_H_
 #define GNSS_SDR_FPGA_sample_counter_H_
 
-#include <gnuradio/block.h>
 #include <boost/shared_ptr.hpp>
+#include <gnuradio/block.h>
 #include <cstdint>
 
 class gnss_sdr_fpga_sample_counter;

src/algorithms/libs/gnss_sdr_sample_counter.cc

@@ -36,7 +36,10 @@
 #include <iostream>
 #include <string>
 
-gnss_sdr_sample_counter::gnss_sdr_sample_counter(double _fs, int32_t _interval_ms, size_t _size) : gr::sync_decimator("sample_counter",
+gnss_sdr_sample_counter::gnss_sdr_sample_counter(
+    double _fs,
+    int32_t _interval_ms,
+    size_t _size) : gr::sync_decimator("sample_counter",
                         gr::io_signature::make(1, 1, _size),
                         gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
                         static_cast<uint32_t>(std::round(_fs * static_cast<double>(_interval_ms) / 1e3)))

src/algorithms/libs/gnss_sdr_sample_counter.h

@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_SAMPLE_COUNTER_H_
 #define GNSS_SDR_SAMPLE_COUNTER_H_
 
-#include <gnuradio/sync_decimator.h>
 #include <boost/shared_ptr.hpp>
+#include <gnuradio/sync_decimator.h>
 #include <cstdint>
 
 
@@ -40,7 +40,10 @@ class gnss_sdr_sample_counter;
 
 typedef boost::shared_ptr<gnss_sdr_sample_counter> gnss_sdr_sample_counter_sptr;
 
-gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(double _fs, int32_t _interval_ms, size_t _size);
+gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(
+    double _fs,
+    int32_t _interval_ms,
+    size_t _size);
 
 class gnss_sdr_sample_counter : public gr::sync_decimator
 {

src/algorithms/libs/gnss_sdr_time_counter.h

@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_TIME_COUNTER_H_
 #define GNSS_SDR_TIME_COUNTER_H_
 
-#include <gnuradio/block.h>
 #include <boost/shared_ptr.hpp>
+#include <gnuradio/block.h>
 #include <cstdint>
 
 class gnss_sdr_time_counter;

src/algorithms/libs/gnss_sdr_valve.h

@@ -34,9 +34,9 @@
 #ifndef GNSS_SDR_GNSS_SDR_VALVE_H_
 #define GNSS_SDR_GNSS_SDR_VALVE_H_
 
-#include <gnuradio/sync_block.h>
-#include <gnuradio/msg_queue.h>
 #include <boost/shared_ptr.hpp>
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/sync_block.h>
 #include <cstdint>
 
 boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,

src/algorithms/libs/opencl/cl.hpp

@@ -146,10 +146,10 @@
 
 #ifdef _WIN32
 
-#include <windows.h>
-#include <malloc.h>
-#include <iterator>
 #include <intrin.h>
+#include <iterator>
+#include <malloc.h>
+#include <windows.h>
 
 #if defined(__CL_ENABLE_EXCEPTIONS)
 #include <exception>
@@ -169,12 +169,12 @@
 #endif
 
 #if defined(__APPLE__) || defined(__MACOSX)
-#include <OpenGL/OpenGL.h>
 #include <OpenCL/opencl.h>
+#include <OpenGL/OpenGL.h>
 #include <libkern/OSAtomic.h>
 #else
-#include <GL/gl.h>
 #include <CL/opencl.h>
+#include <GL/gl.h>
 #endif  // !__APPLE__
 
 // To avoid accidentally taking ownership of core OpenCL types
@@ -199,8 +199,8 @@
 #define CL_CALLBACK
 #endif  //CL_CALLBACK
 
-#include <utility>
 #include <limits>
+#include <utility>
 
 #if !defined(__NO_STD_VECTOR)
 #include <vector>
@@ -212,7 +212,6 @@
 
 #if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 #include <alloca.h>
-
 #include <emmintrin.h>
 #include <xmmintrin.h>
 #endif  // linux

src/algorithms/libs/opencl/fft_execute.cc

@@ -46,11 +46,11 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#include "fft_internal.h"
 #include "clFFT.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "fft_internal.h"
 #include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 #define min(a, b) (((a) < (b)) ? (a) : (b))

src/algorithms/libs/opencl/fft_internal.h

@@ -51,8 +51,8 @@
 
 #include "clFFT.h"
 #include <iostream>
-#include <string>
 #include <sstream>
+#include <string>
 
 using namespace std;
 

src/algorithms/libs/opencl/fft_kernelstring.cc

@@ -46,16 +46,16 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
+#include "clFFT.h"
+#include "fft_internal.h"
+#include <assert.h>
+#include <iostream>
+#include <math.h>
+#include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include <iostream>
-#include <sstream>
-#include <string>
 #include <string.h>
-#include <assert.h>
-#include "fft_internal.h"
-#include "clFFT.h"
+#include <string>
 
 using namespace std;