[hamradio-commits] [gnss-sdr] 09/60: Merging multichannel stuff. Merge branch 'next' of https://github.com/Arribas/gnss-sdr into next

[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 e4fb7a294d4fba05ef287281eab6f572ffe23106
Merge: c9ee0c4 5b37329
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Feb 27 11:20:41 2015 +0100

    Merging multichannel stuff. Merge branch 'next' of https://github.com/Arribas/gnss-sdr into next

 conf/gnss-sdr_Hybrid_nsr.conf                      |   2 +-
 ...dr_multichannel_GPS_L1_USRP_X300_realtime.conf} | 319 +++++++++++++--------
 ...r.conf => gnss-sdr_multisource_Hybrid_nsr.conf} | 242 ++++++++++++----
 ...conf => gnss-sdr_multisource_Hybrid_short.conf} | 289 ++++++++++++++-----
 .../conditioner/adapters/signal_conditioner.cc     |   8 -
 .../signal_source/adapters/uhd_signal_source.cc    | 306 ++++++++++++--------
 .../signal_source/adapters/uhd_signal_source.h     |  33 +--
 src/core/interfaces/gnss_block_interface.h         |  20 ++
 src/core/receiver/gnss_block_factory.cc            |  52 ++--
 src/core/receiver/gnss_block_factory.h             |   4 +-
 src/core/receiver/gnss_flowgraph.cc                | 188 ++++++------
 src/core/receiver/gnss_flowgraph.h                 |  11 +-
 12 files changed, 974 insertions(+), 500 deletions(-)

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