Apply project's coding style

CMakeLists.txt

@@ -48,6 +48,8 @@ option(ENABLE_OSMOSDR "Enable the use of OsmoSDR and other front-ends (RTL-based
 option(ENABLE_FLEXIBAND "Enable the use of the signal source adater for the Teleorbit Flexiband GNURadio driver" OFF)
 option(ENABLE_ARRAY "Enable the use of CTTC's antenna array front-end as signal source (experimental)" OFF)
 option(ENABLE_GN3S "Enable the use of the GN3S dongle as signal source (experimental)" OFF)
+option(ENABLE_PLUTOSDR "Enable the use of ADALM-PLUTO Evaluation Boards (Analog Devices Inc.), requires gr-iio" OFF)
+option(ENABLE_FMCOMMS2 "Enable the use of FMCOMMS4-EBZ + ZedBoard hardware" OFF)
 
 # Performance analysis tools
 option(ENABLE_GPERFTOOLS "Enable linking to Gperftools libraries (tcmalloc and profiler)" OFF)

README.md

@@ -424,7 +424,7 @@ $ make
 $ sudo make install
 ~~~~~~
 
-With `Fmcomms2_Signal_Source` you can use any SDR hardware based on fmcomms2, including the ADALM-PLUTO (PlutoSdr) by configuring correctly the .conf file. The `Plutosdr_Signal_Source` offers a simplier manner to use the ADALM-PLUTO because implements only a subset of fmcomms2's parameters valid for it device.
+With `Fmcomms2_Signal_Source` you can use any SDR hardware based on fmcomms2, including the ADALM-PLUTO (PlutoSdr) by configuring correctly the .conf file. The `Plutosdr_Signal_Source` offers a simplier manner to use the ADALM-PLUTO because implements only a subset of fmcomms2's parameters valid for those devices.
 
 ###### Build OpenCL support (OPTIONAL):
 

conf/gnss-sdr_GPS_L1_fmcomms2_realtime.conf

@@ -5,10 +5,10 @@
 [GNSS-SDR]
 
 ;######### GLOBAL OPTIONS ##################
-;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz].
+;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [Sps].
 ;FOR USE GNSS-SDR WITH RTLSDR DONGLES USER MUST SET THE CALIBRATED SAMPLE RATE HERE
 ; i.e. using front-end-cal as reported here:http://www.cttc.es/publication/turning-a-television-into-a-gnss-receiver/
-GNSS-SDR.internal_fs_hz=2000000
+GNSS-SDR.internal_fs_sps=2000000
 
 
 ;######### SUPL RRLP GPS assistance configuration #####
@@ -119,27 +119,23 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-Observables.implementation=GPS_L1_CA_Observables
+Observables.implementation=Hybrid_Observables
 Observables.dump=false
 Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
+PVT.implementation=RTKLIB_PVT
-PVT.implementation=GPS_L1_CA_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
-
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
-;#averaging_depth: Number of PVT observations in the moving average algorithm
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
 PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
 PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
 PVT.flag_nmea_tty_port=false;
 PVT.nmea_dump_devname=/dev/pts/4
-PVT.dump=false
 PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
+PVT.dump=false

conf/gnss-sdr_GPS_L1_plutosdr_realtime.conf

@@ -5,10 +5,10 @@
 [GNSS-SDR]
 
 ;######### GLOBAL OPTIONS ##################
-;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz].
+;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [sps].
 ;FOR USE GNSS-SDR WITH RTLSDR DONGLES USER MUST SET THE CALIBRATED SAMPLE RATE HERE
 ; i.e. using front-end-cal as reported here:http://www.cttc.es/publication/turning-a-television-into-a-gnss-receiver/
-GNSS-SDR.internal_fs_hz=2000000
+GNSS-SDR.internal_fs_sps=2000000
 
 
 ;######### SUPL RRLP GPS assistance configuration #####
@@ -79,11 +79,23 @@ Tracking_1C.dll_bw_hz=4.0;
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 
 ;######### OBSERVABLES CONFIG ############
-Observables.implementation=GPS_L1_CA_Observables
+Observables.implementation=Hybrid_Observables
+Observables.dump=false
+Observables.dump_filename=./observables.dat
+
 
 ;######### PVT CONFIG ############
-PVT.implementation=GPS_L1_CA_PVT
+PVT.implementation=RTKLIB_PVT
-PVT.averaging_depth=100
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
-PVT.flag_averaging=true
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
-PVT.output_rate_ms=10
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
+PVT.output_rate_ms=100
 PVT.display_rate_ms=500
+PVT.dump_filename=./PVT
+PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
+PVT.flag_nmea_tty_port=false;
+PVT.nmea_dump_devname=/dev/pts/4
+PVT.flag_rtcm_server=false
+PVT.flag_rtcm_tty_port=false
+PVT.rtcm_dump_devname=/dev/pts/1
+PVT.dump=false

src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc

@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2017  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -110,9 +110,10 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface* configuration
         }
 }
 
+
 Fmcomms2SignalSource::~Fmcomms2SignalSource()
-{
+{}
-}
+
 
 void Fmcomms2SignalSource::connect(gr::top_block_sptr top_block)
 {

src/algorithms/signal_source/adapters/fmcomms2_signal_source.h

@@ -7,7 +7,7 @@
  * This class represent a fmcomms2 signal source. It use the gr_iio block
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2017  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -51,7 +51,7 @@ public:
 
     virtual ~Fmcomms2SignalSource();
 
-    std::string role()
+    inline std::string role() override
     {
         return role_;
     }
@@ -59,19 +59,20 @@ public:
     /*!
      * \brief Returns "fmcomms2_Signal_Source"
      */
-    std::string implementation()
+    inline std::string implementation() override
     {
         return "Fmcomms2_Signal_Source";
     }
-    size_t item_size()
+
+    inline size_t item_size() override
     {
         return item_size_;
     }
 
-    void connect(gr::top_block_sptr top_block);
+    void connect(gr::top_block_sptr top_block) override;
-    void disconnect(gr::top_block_sptr top_block);
+    void disconnect(gr::top_block_sptr top_block) override;
-    gr::basic_block_sptr get_left_block();
+    gr::basic_block_sptr get_left_block() override;
-    gr::basic_block_sptr get_right_block();
+    gr::basic_block_sptr get_right_block() override;
 
 private:
     std::string role_;

src/algorithms/signal_source/adapters/plutosdr_signal_source.cc

@@ -1,3 +1,33 @@
+/*!
+ * \file plutosdr_signal_source.cc
+ * \brief Signal source for PlutoSDR
+ * \author Rodrigo Muñoz, 2017, rmunozl(at)inacap.cl
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2017  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
 #include "plutosdr_signal_source.h"
 #include <iostream>
 #include <boost/format.hpp>
@@ -21,7 +51,7 @@ PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration
     std::string default_dump_file = "./data/signal_source.dat";
     uri_ = configuration->property(role + ".device_address", std::string("192.168.2.1"));
     freq_ = configuration->property(role + ".freq", GPS_L1_FREQ_HZ);
-	sample_rate_=configuration->property(role+".sampling_frequency",3000000);
+    sample_rate_  configuration->property(role + ".sampling_frequency", 3000000);
     bandwidth_ = configuration->property(role + ".bandwidth", 2000000);
     buffer_size_ = configuration->property(role + ".buffer_size", 0xA0000);
     decimation_ = configuration->property(role + ".decimation", 1);
@@ -46,7 +76,6 @@ PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration
 
     item_size_ = sizeof(gr_complex);
 
-
     std::cout << "device address: " << uri_ << std::endl;
     std::cout << "frequency : " << freq_ << "Hz" << std::endl;
     std::cout << "sample rate: " << sample_rate_ << "Hz" << std::endl;
@@ -72,9 +101,11 @@ PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration
         }
 }
 
+
 PlutosdrSignalSource::~PlutosdrSignalSource()
 {}
 
+
 void PlutosdrSignalSource::connect(gr::top_block_sptr top_block)
 {
     if (samples_ != 0)

src/algorithms/signal_source/adapters/plutosdr_signal_source.h

@@ -1,3 +1,33 @@
+/*!
+ * \file plutosdr_signal_source.h
+ * \brief Signal source for PlutoSDR
+ * \author Rodrigo Muñoz, 2017, rmunozl(at)inacap.cl
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2017  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
 
 #ifndef GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
 #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
@@ -22,7 +52,7 @@ public:
 
     virtual ~PlutosdrSignalSource();
 
-    std::string role()
+    std::string role() override
     {
         return role_;
     }
@@ -30,19 +60,19 @@ public:
     /*!
      * \brief Returns "Plutosdr_Signal_Source"
      */
-    std::string implementation()
+    std::string implementation() override
     {
         return "Plutosdr_Signal_Source";
     }
-    size_t item_size()
+    size_t item_size() override
     {
         return item_size_;
     }
 
-    void connect(gr::top_block_sptr top_block);
+    void connect(gr::top_block_sptr top_block) override;
-    void disconnect(gr::top_block_sptr top_block);
+    void disconnect(gr::top_block_sptr top_block) override;
-    gr::basic_block_sptr get_left_block();
+    gr::basic_block_sptr get_left_block() override;
-    gr::basic_block_sptr get_right_block();
+    gr::basic_block_sptr get_right_block() override;
 
 private:
     std::string role_;