[hamradio-commits] [gnss-sdr] 39/44: Merge branch 'next' of git+ssh://github.com/carlesfernandez/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 304261e7a79d174dba50f62d65ee4b10a9e7ff06
Merge: 4a1ca06 8eaa12e
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Feb 14 12:03:57 2015 +0100

    Merge branch 'next' of git+ssh://github.com/carlesfernandez/gnss-sdr
    into next
    
    Fixing tests

 conf/gnss-sdr.conf | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --cc conf/gnss-sdr.conf
index fe98ede,fe98ede..fefbb27
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@@ -29,10 -29,10 +29,12 @@@ GNSS-SDR.SUPL_CI=0x31b
  SignalSource.implementation=File_Signal_Source
  
  ;#filename: path to file with the captured GNSS signal samples to be processed
--SignalSource.filename=../data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
++;SignalSource.filename=../data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
++SignalSource.filename=../../../Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
  
  ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--SignalSource.item_type=short
++;SignalSource.item_type=short
++SignalSource.item_type=byte
  
  ;#sampling_frequency: Original Signal sampling frequency in [Hz]
  SignalSource.sampling_frequency=4000000
@@@ -75,7 -75,7 +77,10 @@@ SignalConditioner.implementation=Signal
  ;######### DATA_TYPE_ADAPTER CONFIG ############
  ;## Changes the type of input data. Please disable it in this version.
  ;#implementation: [Pass_Through] disables this block
--DataTypeAdapter.implementation=Ishort_To_Complex
++;DataTypeAdapter.implementation=Ishort_To_Complex
++;DataTypeAdapter.implementation=Ibyte_To_Cbyte
++DataTypeAdapter.implementation=Pass_Through
++DataTypeAdapter.item_type=byte
  
  ;######### INPUT_FILTER CONFIG ############
  ;## Filter the input data. Can be combined with frequency translation for IF signals
@@@ -86,8 -86,8 +91,8 @@@
  ;#[Freq_Xlating_Fir_Filter] enables FIR filter and a composite frequency translation that shifts IF down to zero Hz.
  
  ;InputFilter.implementation=Fir_Filter
--;InputFilter.implementation=Freq_Xlating_Fir_Filter
--InputFilter.implementation=Pass_Through
++InputFilter.implementation=Freq_Xlating_Fir_Filter
++;InputFilter.implementation=Pass_Through
  
  ;#dump: Dump the filtered data to a file.
  InputFilter.dump=false
@@@ -100,7 -100,7 +105,7 @@@ InputFilter.dump_filename=../data/input
  ;#These function calculates the optimal (in the Chebyshev/minimax sense) FIR filter inpulse reponse given a set of band edges, the desired reponse on those bands, and the weight given to the error in those bands.
  
  ;#input_item_type: Type and resolution for input signal samples. Use only gr_complex in this version.
--InputFilter.input_item_type=gr_complex
++InputFilter.input_item_type=byte
  
  ;#outut_item_type: Type and resolution for output filtered signal samples. Use only gr_complex in this version.
  InputFilter.output_item_type=gr_complex
@@@ -167,6 -167,6 +172,7 @@@ Resampler.dump_filename=../data/resampl
  
  ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
  Resampler.item_type=gr_complex
++;Resampler.item_type=cbyte
  
  ;#sample_freq_in: the sample frequency of the input signal
  Resampler.sample_freq_in=8000000

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