bds_b3i: Updating branch with new changes from upstream repo

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc

@@ -33,11 +33,9 @@
 
 #include "beidou_b1i_telemetry_decoder_gs.h"
 #include "Beidou_B1I.h"
-#include "beidou_dnav_almanac.h"
 #include "beidou_dnav_ephemeris.h"
+#include "beidou_dnav_iono.h"
 #include "beidou_dnav_utc_model.h"
-#include "convolutional.h"
-#include "display.h"
 #include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h

@@ -1,8 +1,7 @@
 /*!
  * \file beidou_b1i_telemetry_decoder_gs.h
  * \brief Implementation of a BEIDOU BI1 DNAV data decoder block
- * \details Code added as part of GSoC 2018 program. However new modifications
- * included to mimic decoding of existing signals
+ * \details Code added as part of GSoC 2018 program.
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.es
  *
@@ -35,15 +34,15 @@
 #define GNSS_SDR_BEIDOU_B1I_TELEMETRY_DECODER_GS_H
 
 
-#include "gnss_satellite.h"
 #include "beidou_dnav_navigation_message.h"
+#include "gnss_satellite.h"
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/block.h>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/block.h>      // for block
 #include <gnuradio/types.h>                  // for gr_vector_const_void_star
+#include <cstdint>
 #include <fstream>
 #include <string>
-#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
-#include <cstdint>
 
 
 class beidou_b1i_telemetry_decoder_gs;
@@ -52,10 +51,10 @@ using beidou_b1i_telemetry_decoder_gs_sptr = boost::shared_ptr<beidou_b1i_teleme
 
 beidou_b1i_telemetry_decoder_gs_sptr beidou_b1i_make_telemetry_decoder_gs(const Gnss_Satellite &satellite, bool dump);
 
+
 /*!
- * \brief This class implements a block that decodes the BeiDou DNAV data.
+ * \brief This class implements a block that decodes the GNAV data defined in BEIDOU ICD v5.1
  * \note Code added as part of GSoC 2018 program
- *
  */
 class beidou_b1i_telemetry_decoder_gs : public gr::block
 {

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc

@@ -35,8 +35,6 @@
 #include "beidou_dnav_almanac.h"
 #include "beidou_dnav_ephemeris.h"
 #include "beidou_dnav_utc_model.h"
-#include "convolutional.h"
-#include "display.h"
 #include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h

@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_BEIDOU_B3I_TELEMETRY_DECODER_GS_H
 #define GNSS_SDR_BEIDOU_B3I_TELEMETRY_DECODER_GS_H
 
-#include "gnss_satellite.h"
 #include "beidou_dnav_navigation_message.h"
+#include "gnss_satellite.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/types.h>                  // for gr_vector_const_void_star

src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h

@@ -34,15 +34,15 @@
 
 
 #include "galileo_fnav_message.h"
-#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
-#include <gnuradio/types.h>      // for gr_vector_const_void_star
 #include "galileo_navigation_message.h"
 #include "gnss_satellite.h"
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/block.h>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/block.h>      // for block
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
+#include <cstdint>
 #include <fstream>
 #include <string>
-#include <cstdint>
 
 class galileo_telemetry_decoder_gs;