[hamradio-commits] [gnss-sdr] 23/27: Merge branch 'osmoflags' of https://github.com/anthony-arnold/gnss-sdr into anthony-arnold-osmoflags

[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 f556660e1f189f23711fa6c7c52a6caab5ce23cc
Merge: bf1c612 9d61617
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Apr 30 20:13:14 2015 +0200

    Merge branch 'osmoflags' of https://github.com/anthony-arnold/gnss-sdr
    into anthony-arnold-osmoflags

 CMakeLists.txt                                     |   4 +-
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         | 308 +++++++++++++++++++++
 src/algorithms/libs/CMakeLists.txt                 |  16 +-
 .../gnuradio_blocks/CMakeLists.txt                 |  10 +-
 .../adapters/nsr_file_signal_source.cc             |   2 +-
 .../adapters/osmosdr_signal_source.cc              |   8 +-
 .../signal_source/adapters/osmosdr_signal_source.h |   1 +
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   6 +-
 src/main/CMakeLists.txt                            |  24 +-
 src/utils/front-end-cal/CMakeLists.txt             |  49 ++--
 10 files changed, 371 insertions(+), 57 deletions(-)

diff --cc src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
index ea89aed,ea89aed..f14ff57
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
@@@ -114,7 -114,7 +114,7 @@@ NsrFileSignalSource::NsrFileSignalSourc
          {
              /*!
               * BUG workaround: The GNU Radio file source does not stop the receiver after reaching the End of File.
--             * A possible solution is to compute the file length in samples using file size, excluding the last 100 milliseconds, and enable always the
++             * A possible solution is to compute the file length in samples using file size, excluding the last 2 milliseconds, and enable always the
               * valve block
               */
              std::ifstream file (filename_.c_str(), std::ios::in | std::ios::binary | std::ios::ate);

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