[hamradio-commits] [gnss-sdr] 45/60: Merge branch 'next' of git+ssh://github.com/gnss-sdr/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 944dd2c0d1b12b4a96a38a9b015b30f6884a198d
Merge: fde51c4 0bd2ee5
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Mar 4 20:54:15 2015 +0100

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 ...sdr_multichannel_GPS_L1_Flexiband_realtime.conf | 78 ++++++++++++++++++++--
 conf/gnss-sdr_multisource_Hybrid_short.conf        |  8 +--
 .../adapters/flexiband_signal_source.cc            |  9 ++-
 src/core/receiver/gnss_flowgraph.cc                | 23 ++++++-
 4 files changed, 102 insertions(+), 16 deletions(-)

diff --cc src/core/receiver/gnss_flowgraph.cc
index f2986d9,2183330..7f9d287
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@@ -227,7 -227,25 +227,28 @@@ void GNSSFlowgraph::connect(
                              for (int j = 0; j < RF_Channels; j++)
                                  {
                                      //Connect the multichannel signal source to multiple signal conditioners
-                                     top_block_->connect(sig_source_.at(i)->get_right_block(), j, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
 -                            	    // check number of signal source output ports todo!
 -                            		if (sig_source_.at(i)->get_right_block()->input_signature()->max_streams()>1)
 -                            		{
 -                                        top_block_->connect(sig_source_.at(i)->get_right_block(), j, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
 -                                        //std::cout<<"connect sig_source_ "<<i<<" stream "<<j<<" to conditioner "<<j<<std::endl;
 -                            		}else{
 -                            			if (j==0)
 -                            			{
 -                            				// RF_channel 0 backward compatibility with single channel sources
 -                                            top_block_->connect(sig_source_.at(i)->get_right_block(), 0, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
 -                                            //std::cout<<"connect sig_source_ "<<i<<" stream "<<0<<" to conditioner "<<j<<std::endl;
 -                            			}else{
 -                            				// Multiple channel sources using multiple output blocks of single channel (requires RF_channel selector in call)
 -                                            top_block_->connect(sig_source_.at(i)->get_right_block(j), 0, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
++                                    // check number of signal source output ports todo!
++                                    if (sig_source_.at(i)->get_right_block()->input_signature()->max_streams() > 1)
++                                        {
++                                            top_block_->connect(sig_source_.at(i)->get_right_block(), j, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
+                                             //std::cout<<"connect sig_source_ "<<i<<" stream "<<j<<" to conditioner "<<j<<std::endl;
 -                            			}
 -
 -                            		}
++                                        }
++                                    else
++                                        {
++                                            if (j == 0)
++                                                {
++                                                    // RF_channel 0 backward compatibility with single channel sources
++                                                    top_block_->connect(sig_source_.at(i)->get_right_block(), 0, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
++                                                    //std::cout<<"connect sig_source_ "<<i<<" stream "<<0<<" to conditioner "<<j<<std::endl;
++                                                }
++                                            else
++                                                {
++                                                    // Multiple channel sources using multiple output blocks of single channel (requires RF_channel selector in call)
++                                                    top_block_->connect(sig_source_.at(i)->get_right_block(j), 0, sig_conditioner_.at(signal_conditioner_ID)->get_left_block(), 0);
++                                                    //std::cout<<"connect sig_source_ "<<i<<" stream "<<j<<" to conditioner "<<j<<std::endl;
++                                                }
++                                        }
+ 
                                      signal_conditioner_ID++;
                                  }
                          }

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