[hamradio-commits] [gnss-sdr] 54/60: Merge branch 'cross-compile' of https://github.com/anthony-arnold/gnss-sdr into anthony-cross-compile

Sun Mar 22 11:15:45 UTC 2015

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 ce5783ca613eb864316d95f1a8c5e8f870b9fee5
Merge: b052f7a c42ce67
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Mar 20 21:14:56 2015 +0100

    Merge branch 'cross-compile' of
    https://github.com/anthony-arnold/gnss-sdr into anthony-cross-compile
    
    # 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.

 CMakeLists.txt                                     | 136 ++++++++++-----------
 cmake/Modules/TestForARM.cmake                     |   2 +-
 cmake/Modules/TestForSSE.cmake                     |   2 +-
 conf/gnss-sdr.conf                                 |  18 ++-
 conf/gnss-sdr_Galileo_E1_short.conf                |   6 +-
 conf/gnss-sdr_Hybrid_short.conf                    |   6 +-
 .../volk_gnsssdr/CMakeLists.txt                    |   1 +
 .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c         |  17 ++-
 8 files changed, 101 insertions(+), 87 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
diff --cc conf/gnss-sdr_Galileo_E1_short.conf
index 3998eb2,3998eb2..df1dabe
--- a/conf/gnss-sdr_Galileo_E1_short.conf
+++ b/conf/gnss-sdr_Galileo_E1_short.conf
@@@ -17,7 -17,7 +17,7 @@@ ControlThread.wait_for_flowgraph=fals
  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
  
  ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
  SignalSource.item_type=short
@@@ -166,7 -166,7 +166,7 @@@ Resampler.sample_freq_out=400000
  ;#count: Number of available GPS satellite channels.
  Channels_GPS.count=0
  ;#count: Number of available Galileo satellite channels.
--Channels_Galileo.count=4
++Channels_Galileo.count=8
  ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
  Channels.in_acquisition=1
  ;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
@@@ -193,7 -193,7 +193,7 @@@ Acquisition_Galileo.implementation=Gali
  ;#threshold: Acquisition threshold
  ;Acquisition_Galileo.threshold=0
  ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] 
--Acquisition_Galileo.pfa=0.0000002
++Acquisition_Galileo.pfa=0.000002
  ;#doppler_max: Maximum expected Doppler shift [Hz]
  Acquisition_Galileo.doppler_max=15000
  ;#doppler_max: Doppler step in the grid search [Hz]
diff --cc conf/gnss-sdr_Hybrid_short.conf
index 2650e29,2650e29..7115468
--- a/conf/gnss-sdr_Hybrid_short.conf
+++ b/conf/gnss-sdr_Hybrid_short.conf
@@@ -17,7 -17,7 +17,7 @@@ ControlThread.wait_for_flowgraph=fals
  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
  
  ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
  SignalSource.item_type=short
@@@ -164,9 -164,9 +164,9 @@@ Resampler.sample_freq_out=400000
  
  ;######### CHANNELS GLOBAL CONFIG ############
  ;#count: Number of available GPS satellite channels.
--Channels_GPS.count=2
++Channels_GPS.count=4
  ;#count: Number of available Galileo satellite channels.
--Channels_Galileo.count=2
++Channels_Galileo.count=4
  ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
  Channels.in_acquisition=1
  ;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS

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

