Merging the work on macOS Sierra

Arribas · Sep 22, 2016 · 0f514e5 · 0f514e5
2 parents d7124d4 + baf06a8
commit 0f514e5
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -195,6 +195,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
      set(OS_IS_MACOSX TRUE)
      exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
      string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
+     if(${DARWIN_VERSION} MATCHES "16")
+         set(MACOS_SIERRA TRUE)
+         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS Sierra 10.12")
+     endif(${DARWIN_VERSION} MATCHES "16")
      if(${DARWIN_VERSION} MATCHES "15")
          set(MACOSX_EL_CAPITAN TRUE)
          set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
@@ -431,7 +437,7 @@ if(NOT VOLK_GNSSSDR_FOUND)
                                 -DENABLE_PROFILING=${ENABLE_PROFILING}
                                 -DCMAKE_CXX_FLAGS=${CXX_FLAGS}
                                 -DCMAKE_C_FLAGS=${C_FLAGS}
-                                ${STRIP_VOLK_GNSSSDR_PROFILE} 
+                                ${STRIP_VOLK_GNSSSDR_PROFILE}
                                 ${USE_THIS_PYTHON} )
     if(CMAKE_TOOLCHAIN_FILE)
         set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
@@ -461,10 +467,10 @@ if(NOT VOLK_GNSSSDR_FOUND)
     add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
         ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
-        
+
     add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr-config-info
-        ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr-config-info)    
+        ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr-config-info)
 endif(NOT VOLK_GNSSSDR_FOUND)
 
 
@@ -721,7 +727,7 @@ if(OS_IS_LINUX)
                        /usr/lib/gcc/x86_64-linux-gnu/5
                        /usr/lib/gcc/i686-linux-gnu/5
                        /usr/lib/gcc/arm-linux-gnueabi/5
-                       /usr/lib/gcc/arm-linux-gnueabihf/5                       
+                       /usr/lib/gcc/arm-linux-gnueabihf/5
                        /usr/lib/gcc/aarch64-linux-gnu/5
                 )
     if(NOT GFORTRAN)
@@ -800,18 +806,18 @@ endif(NOT ARMADILLO_FOUND)
 ################################################################################
 find_package(GnuTLS)
 find_library(GNUTLS_OPENSSL_LIBRARY NAMES gnutls-openssl libgnutls-openssl.so.27
-                                    HINTS /usr/lib 
-                                          /usr/lib64 
-                                          /usr/local/lib 
-                                          /usr/local/lib64 
+                                    HINTS /usr/lib
+                                          /usr/lib64
+                                          /usr/local/lib
+                                          /usr/local/lib64
                                           /opt/local/lib
                                           /usr/lib/x86_64-linux-gnu
                                           /usr/lib/aarch64-linux-gnu
                                           /usr/lib/arm-linux-gnueabihf
                                           /usr/lib/arm-linux-gnueabi
                                           /usr/lib/i386-linux-gnu
              )
- 
+
 if(NOT GNUTLS_OPENSSL_LIBRARY)
      message(STATUS "Looking for OpenSSL instead...")
      find_package(OpenSSL)

diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf
@@ -6,18 +6,18 @@
 
 ;######### GLOBAL OPTIONS ##################
 ;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz].
-GNSS-SDR.internal_fs_hz=4000000
+GNSS-SDR.internal_fs_hz=2000000
 
 ;######### CONTROL_THREAD CONFIG ############
 ControlThread.wait_for_flowgraph=false
 
 ;######### SIGNAL_SOURCE CONFIG ############
 SignalSource.implementation=File_Signal_Source
-SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
+SignalSource.filename=/Users/carlesfernandez/Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
 SignalSource.item_type=ishort
 SignalSource.sampling_frequency=4000000
 SignalSource.freq=1575420000
-SignalSource.samples=250000000
+SignalSource.samples=0
 SignalSource.repeat=false
 SignalSource.dump=false
 SignalSource.dump_filename=../data/signal_source.dat
@@ -27,40 +27,50 @@ SignalSource.enable_throttle_control=false
 ;######### SIGNAL_CONDITIONER CONFIG ############
 SignalConditioner.implementation=Signal_Conditioner
 
-DataTypeAdapter.implementation=Ishort_To_Complex
+;DataTypeAdapter.implementation=Ishort_To_Complex
+DataTypeAdapter.implementation=Ishort_To_Cshort
 InputFilter.implementation=Pass_Through
-InputFilter.input_item_type=gr_complex
-InputFilter.output_item_type=gr_complex
-Resampler.implementation=Pass_Through
-Resampler.item_type=gr_complex
-
+;InputFilter.input_item_type=gr_complex
+;InputFilter.output_item_type=gr_complex
+InputFilter.item_type=cshort
+;Resampler.implementation=Pass_Through
+;Resampler.item_type=gr_complex
+Resampler.implementation=Direct_Resampler
+Resampler.sample_freq_in=4000000
+Resampler.sample_freq_out=2000000
+;Resampler.item_type=gr_complex
+Resampler.item_type=cshort
 
 ;######### CHANNELS GLOBAL CONFIG ############
 Channels_1C.count=8
 Channels.in_acquisition=1
 Channel.signal=1C
+;Channel.item_type=cshort
 
 
 ;######### ACQUISITION GLOBAL CONFIG ############
 Acquisition_1C.dump=false
 Acquisition_1C.dump_filename=./acq_dump.dat
-Acquisition_1C.item_type=gr_complex
+Acquisition_1C.item_type=cshort
 Acquisition_1C.if=0
 Acquisition_1C.sampled_ms=1
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition_1C.threshold=0.006
-;Acquisition_1C.pfa=0.01
+Acquisition_1C.threshold=0.008
+;Acquisition_1C.pfa=0.000001
 Acquisition_1C.doppler_max=10000
-Acquisition_1C.doppler_step=500
+Acquisition_1C.doppler_step=250
+Acquisition_1C.tong_init_val=2
+Acquisition_1C.tong_max_val=10
+Acquisition_1C.tong_max_dwells=20
 
 ;######### TRACKING GLOBAL CONFIG ############
-Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-Tracking_1C.item_type=gr_complex
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_C_Aid_Tracking
+Tracking_1C.item_type=cshort
 Tracking_1C.if=0
 Tracking_1C.dump=false
 Tracking_1C.dump_filename=../data/epl_tracking_ch_
-Tracking_1C.pll_bw_hz=45.0;
-Tracking_1C.dll_bw_hz=2.0;
+Tracking_1C.pll_bw_hz=40.0;
+Tracking_1C.dll_bw_hz=4.0;
 Tracking_1C.order=3;
 
 ;######### TELEMETRY DECODER GPS CONFIG ############

diff --git a/conf/gnss-sdr_Galileo_E1_ishort.conf b/conf/gnss-sdr_Galileo_E1_ishort.conf
@@ -14,7 +14,7 @@ GNSS-SDR.internal_fs_hz=4000000
 SignalSource.implementation=File_Signal_Source
 
 ;#filename: path to file with the captured GNSS signal samples to be processed
-SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
+SignalSource.filename=/Users/carlesfernandez/Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
 
 ;#item_type: Type and resolution for each of the signal samples.
 SignalSource.item_type=ishort