the tracking module is now sending 1 synchro_data per data symbol.

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h

@@ -24,7 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
@@ -32,16 +32,15 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_FPGA_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_FPGA_H_
 
+#include "acq_conf.h"
 #include "channel_fsm.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
-#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
-#include <volk/volk_complex.h>       // for lv_16sc_t
-#include <cstddef>                   // for size_t
 #include <memory>
 #include <string>
 #include <vector>
 
-class Gnss_Synchro;
+
 class ConfigurationInterface;
 
 /*!
@@ -73,8 +72,7 @@ public:
 
     size_t item_size() override
     {
-        size_t item_size = sizeof(lv_16sc_t);
-        return item_size;
+        return item_size_;
     }
 
     void connect(gr::top_block_sptr top_block) override;
@@ -85,7 +83,7 @@ public:
     /*!
      * \brief Set acquisition/tracking common Gnss_Synchro object pointer
      * to efficiently exchange synchronization data between acquisition and
-     * tracking blocks
+     *  tracking blocks
      */
     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;
 
@@ -157,6 +155,7 @@ public:
 private:
     ConfigurationInterface* configuration_;
     pcps_acquisition_fpga_sptr acquisition_fpga_;
+    size_t item_size_;
     bool acquire_pilot_;
     uint32_t channel_;
     std::weak_ptr<ChannelFsm> channel_fsm_;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h

@@ -24,7 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
@@ -34,16 +34,12 @@
 
 
 #include "channel_fsm.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition_fpga.h"
-#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
-#include <volk/volk_complex.h>       // for lv_16sc_t
-#include <cstddef>                   // for size_t
-#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-class Gnss_Synchro;
 class ConfigurationInterface;
 
 
@@ -76,7 +72,7 @@ public:
 
     inline size_t item_size() override
     {
-        return sizeof(lv_16sc_t);
+        return item_size_;
     }
 
     void connect(gr::top_block_sptr top_block) override;
@@ -87,7 +83,7 @@ public:
     /*!
      * \brief Set acquisition/tracking common Gnss_Synchro object pointer
      * to efficiently exchange synchronization data between acquisition and
-     * tracking blocks
+     *  tracking blocks
      */
     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;
 
@@ -169,6 +165,7 @@ public:
 private:
     ConfigurationInterface* configuration_;
     pcps_acquisition_fpga_sptr acquisition_fpga_;
+    size_t item_size_;
     std::string item_type_;
     std::string dump_filename_;
     std::string role_;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h

@@ -38,14 +38,11 @@
 
 #include "channel_fsm.h"
 #include "pcps_acquisition_fpga.h"
-#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
-#include <volk/volk_complex.h>       // for lv_16sc_t
-#include <cstddef>                   // for size_t
 #include <memory>
 #include <string>
 #include <vector>
 
-class Gnss_Synchro;
+
 class ConfigurationInterface;
 
 /*!
@@ -77,8 +74,7 @@ public:
 
     inline size_t item_size() override
     {
-        size_t item_size = sizeof(lv_16sc_t);
-        return item_size;
+        return item_size_;
     }
 
     void connect(gr::top_block_sptr top_block) override;
@@ -161,6 +157,7 @@ public:
 private:
     ConfigurationInterface* configuration_;
     pcps_acquisition_fpga_sptr acquisition_fpga_;
+    size_t item_size_;
     uint32_t channel_;
     std::weak_ptr<ChannelFsm> channel_fsm_;
     uint32_t doppler_max_;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h

@@ -27,7 +27,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
@@ -37,14 +37,11 @@
 
 #include "channel_fsm.h"
 #include "pcps_acquisition_fpga.h"
-#include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
-#include <volk/volk_complex.h>       // for lv_16sc_t
-#include <cstddef>                   // for size_t
 #include <memory>
 #include <string>
 #include <vector>
 
-class Gnss_Synchro;
+
 class ConfigurationInterface;
 
 /*!
@@ -76,7 +73,7 @@ public:
 
     inline size_t item_size() override
     {
-        return sizeof(lv_16sc_t);
+        return item_size_;
     }
 
     void connect(gr::top_block_sptr top_block) override;
@@ -159,6 +156,7 @@ public:
 private:
     ConfigurationInterface* configuration_;
     pcps_acquisition_fpga_sptr acquisition_fpga_;
+    size_t item_size_;
     std::string item_type_;
     uint32_t channel_;
     std::weak_ptr<ChannelFsm> channel_fsm_;