[hamradio-commits] [gnss-sdr] 116/236: Replacing the fxp_nco by the sincos kernel

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit b888573c3d5aa85192736ddeef31736fd8a31342
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Mar 21 01:49:59 2016 +0100

    Replacing the fxp_nco by the sincos kernel
---
 src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt   | 9 ++++++++-
 .../signal_generator/gnuradio_blocks/signal_generator_c.cc       | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 1d2c747..9fdfca2 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -27,6 +27,7 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
      ${GFlags_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+     ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
 file(GLOB SIGNAL_GENERATOR_BLOCK_HEADERS "*.h")
@@ -35,5 +36,11 @@ source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 target_link_libraries(signal_generator_blocks gnss_system_parameters gnss_sp_libs
                                               ${GNURADIO_RUNTIME_LIBRARIES}
                                               ${GNURADIO_FFT_LIBRARIES}
-                                              ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
+                                              ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
 )
+
+if(VOLK_GNSSSDR_FOUND)
+    # add_dependencies(signal_generator_blocks glog-${glog_RELEASE})
+else(VOLK_GNSSSDR_FOUND)
+    add_dependencies(signal_generator_blocks volk_gnsssdr_module)
+endif()
\ No newline at end of file
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 8ac39f7..8c95cb5 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -34,9 +34,9 @@
 #include <fstream>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "gps_sdr_signal_processing.h"
 #include "galileo_e1_signal_processing.h"
-#include "nco_lib.h"
 #include "galileo_e5_signal_processing.h"
 #include "Galileo_E1.h"
 #include "Galileo_E5a.h"
@@ -271,7 +271,9 @@ gr_vector_void_star &output_items)
     for (unsigned int sat = 0; sat < num_sats_; sat++)
         {
             float phase_step_rad = -static_cast<float>(GPS_TWO_PI) * doppler_Hz_[sat] / static_cast<float>(fs_in_);
-            fxp_nco(complex_phase_, vector_length_, start_phase_rad_[sat], phase_step_rad);
+            float _phase[1];
+            _phase[0] = -start_phase_rad_[sat];
+            volk_gnsssdr_s32f_sincos_32fc(complex_phase_, -phase_step_rad, _phase, vector_length_);
             start_phase_rad_[sat] += vector_length_ * phase_step_rad;
 
             out_idx = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git