[hamradio-commits] [gnss-sdr] 26/60: fixing conf files

[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 4ab6f6773306a69f5107741f2e85aa3aa0a2666d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Mar 1 22:34:04 2015 +0100

    fixing conf files
---
 conf/gnss-sdr.conf                                     | 18 ++++++------------
 ...nss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |  4 ++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf
index fefbb27..fe98ede 100644
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@ -29,12 +29,10 @@ GNSS-SDR.SUPL_CI=0x31b0
 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=../../../Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
+SignalSource.filename=../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=byte
+SignalSource.item_type=short
 
 ;#sampling_frequency: Original Signal sampling frequency in [Hz]
 SignalSource.sampling_frequency=4000000
@@ -77,10 +75,7 @@ SignalConditioner.implementation=Signal_Conditioner
 ;######### 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=Ibyte_To_Cbyte
-DataTypeAdapter.implementation=Pass_Through
-DataTypeAdapter.item_type=byte
+DataTypeAdapter.implementation=Ishort_To_Complex
 
 ;######### INPUT_FILTER CONFIG ############
 ;## Filter the input data. Can be combined with frequency translation for IF signals
@@ -91,8 +86,8 @@ DataTypeAdapter.item_type=byte
 ;#[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
@@ -105,7 +100,7 @@ InputFilter.dump_filename=../data/input_filter.dat
 ;#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=byte
+InputFilter.input_item_type=gr_complex
 
 ;#outut_item_type: Type and resolution for output filtered signal samples. Use only gr_complex in this version.
 InputFilter.output_item_type=gr_complex
@@ -172,7 +167,6 @@ Resampler.dump_filename=../data/resampler.dat
 
 ;#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
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
index 8513403..142c694 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
@@ -112,7 +112,7 @@ InputFilter0.dump_filename=../data/input_filter.dat
 ;#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.
-InputFilter0.input_item_type=float
+InputFilter0.input_item_type=gr_complex
 
 ;#outut_item_type: Type and resolution for output filtered signal samples. Use only gr_complex in this version.
 InputFilter0.output_item_type=gr_complex
@@ -204,7 +204,7 @@ InputFilter1.dump_filename=../data/input_filter.dat
 ;#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.
-InputFilter1.input_item_type=float
+InputFilter1.input_item_type=gr_complex
 
 ;#outut_item_type: Type and resolution for output filtered signal samples. Use only gr_complex in this version.
 InputFilter1.output_item_type=gr_complex

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