Apply code formatting

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -78,4 +78,3 @@ add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_H
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
 
 target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
-

src/algorithms/signal_source/libs/fpga_switch.cc

@@ -35,7 +35,6 @@
  */
 
 #include "fpga_switch.h"
-
 #include <cmath>
 
 // FPGA stuff
@@ -100,16 +99,19 @@ fpga_switch::fpga_switch(std::string device_name)
     DLOG(INFO) << "Switch FPGA class created";
 }
 
+
 fpga_switch::~fpga_switch()
 {
     close_device();
 }
 
+
 void fpga_switch::set_switch_position(int switch_position)
 {
     d_map_base[0] = switch_position;
 }
 
+
 unsigned fpga_switch::fpga_switch_test_register(
     unsigned writeval)
 {
@@ -122,6 +124,7 @@ unsigned fpga_switch::fpga_switch_test_register(
     return readval;
 }
 
+
 void fpga_switch::close_device()
 {
     unsigned *aux = const_cast<unsigned *>(d_map_base);
@@ -132,5 +135,3 @@ void fpga_switch::close_device()
 
     close(d_device_descriptor);
 }
-    
-

src/algorithms/signal_source/libs/fpga_switch.h

@@ -55,7 +55,6 @@ private:
     // private functions
     unsigned fpga_switch_test_register(unsigned writeval);
     void close_device(void);
-	
 };
 
 #endif /* GNSS_SDR_FPGA_SWITCH_H_ */

src/algorithms/tracking/libs/fpga_multicorrelator_8sc.cc

@@ -35,9 +35,7 @@
  */
 
 #include "fpga_multicorrelator_8sc.h"
-
 #include <cmath>
-
 // FPGA stuff
 #include <new>
 
@@ -98,7 +96,6 @@ void fpga_multicorrelator_8sc::set_initial_sample(int samples_offset)
 void fpga_multicorrelator_8sc::set_local_code_and_taps(int code_length_chips,
     float *shifts_chips, int PRN)
 {
-
     d_shifts_chips = shifts_chips;
     d_code_length_chips = code_length_chips;
     fpga_multicorrelator_8sc::fpga_configure_tracking_gps_local_code(PRN);
@@ -116,14 +113,11 @@ void fpga_multicorrelator_8sc::update_local_code(float rem_code_phase_chips)
     fpga_multicorrelator_8sc::fpga_configure_code_parameters_in_fpga();
 }
 
-
 void fpga_multicorrelator_8sc::Carrier_wipeoff_multicorrelator_resampler(
     float rem_carrier_phase_in_rad, float phase_step_rad,
     float rem_code_phase_chips, float code_phase_step_chips,
     int signal_length_samples)
 {
-
-
     update_local_code(rem_code_phase_chips);
     d_rem_carrier_phase_in_rad = rem_carrier_phase_in_rad;
     d_code_phase_step_chips = code_phase_step_chips;
@@ -143,6 +137,7 @@ void fpga_multicorrelator_8sc::Carrier_wipeoff_multicorrelator_resampler(
     fpga_multicorrelator_8sc::read_tracking_gps_results();
 }
 
+
 fpga_multicorrelator_8sc::fpga_multicorrelator_8sc(int n_correlators,
     std::string device_name, unsigned int device_base)
 {
@@ -179,7 +174,6 @@ fpga_multicorrelator_8sc::fpga_multicorrelator_8sc(int n_correlators,
             gps_l1_ca_code_gen_int(&d_ca_codes[(int(GPS_L1_CA_CODE_LENGTH_CHIPS)) * (PRN - 1)], PRN, 0);
         }
     DLOG(INFO) << "TRACKING FPGA CLASS CREATED";
-    
 }
 
 
@@ -287,11 +281,9 @@ void fpga_multicorrelator_8sc::fpga_configure_tracking_gps_local_code(int PRN)
                             code_chip = 0;
                         }
                     // copy the local code to the FPGA memory one by one
-                    d_map_base[11] = LOCAL_CODE_FPGA_ENABLE_WRITE_MEMORY
+                    d_map_base[11] = LOCAL_CODE_FPGA_ENABLE_WRITE_MEMORY | code_chip | select_fpga_correlator;
-                            | code_chip | select_fpga_correlator;
                 }
-            select_fpga_correlator = select_fpga_correlator
+            select_fpga_correlator = select_fpga_correlator + LOCAL_CODE_FPGA_CORRELATOR_SELECT_COUNT;
-                    + LOCAL_CODE_FPGA_CORRELATOR_SELECT_COUNT;
         }
 }
 
@@ -341,21 +333,18 @@ void fpga_multicorrelator_8sc::fpga_compute_signal_parameters_in_fpga(void)
     d_code_phase_step_chips_num = static_cast<unsigned>(roundf(MAX_CODE_RESAMPLER_COUNTER * d_code_phase_step_chips));
     if (d_rem_carrier_phase_in_rad > M_PI)
         {
-            d_rem_carrier_phase_in_rad_temp = -2 * M_PI
+            d_rem_carrier_phase_in_rad_temp = -2 * M_PI + d_rem_carrier_phase_in_rad;
-                    + d_rem_carrier_phase_in_rad;
         }
     else if (d_rem_carrier_phase_in_rad < -M_PI)
         {
-            d_rem_carrier_phase_in_rad_temp = 2 * M_PI
+            d_rem_carrier_phase_in_rad_temp = 2 * M_PI + d_rem_carrier_phase_in_rad;
-                    + d_rem_carrier_phase_in_rad;
         }
     else
         {
             d_rem_carrier_phase_in_rad_temp = d_rem_carrier_phase_in_rad;
         }
     d_rem_carr_phase_rad_int = static_cast<int>(roundf(
-            (fabs(d_rem_carrier_phase_in_rad_temp) / M_PI)
+        (fabs(d_rem_carrier_phase_in_rad_temp) / M_PI) * pow(2, PHASE_CARR_NBITS_FRAC)));
-                    * pow(2, PHASE_CARR_NBITS_FRAC)));
     if (d_rem_carrier_phase_in_rad_temp < 0)
         {
             d_rem_carr_phase_rad_int = -d_rem_carr_phase_rad_int;
@@ -420,6 +409,7 @@ void fpga_multicorrelator_8sc::unlock_channel(void)
     d_map_base[12] = 1;  // unlock the channel
 }
 
+
 void fpga_multicorrelator_8sc::close_device()
 {
     unsigned *aux = const_cast<unsigned *>(d_map_base);
@@ -441,15 +431,16 @@ void fpga_multicorrelator_8sc::lock_channel(void)
     d_map_base[12] = 0;  // lock the channel
 }
 
+
 void fpga_multicorrelator_8sc::read_sample_counters(int *sample_counter, int *secondary_sample_counter, int *counter_corr_0_in, int *counter_corr_0_out)
 {
     *sample_counter = d_map_base[11];
     *secondary_sample_counter = d_map_base[8];
     *counter_corr_0_in = d_map_base[10];
     *counter_corr_0_out = d_map_base[9];
-	
 }
 
+
 void fpga_multicorrelator_8sc::reset_multicorrelator(void)
 {
     d_map_base[14] = 2;  // writing a 2 to d_map_base[14] resets the multicorrelator

src/algorithms/tracking/libs/fpga_multicorrelator_8sc.h

@@ -66,7 +66,8 @@ public:
     void Carrier_wipeoff_multicorrelator_resampler(
         float rem_carrier_phase_in_rad, float phase_step_rad,
         float rem_code_phase_chips, float code_phase_step_chips,
-            int signal_length_samples);bool free();
+        int signal_length_samples);
+    bool free();
     void set_channel(unsigned int channel);
     void set_initial_sample(int samples_offset);
     int read_sample_counter();
@@ -74,7 +75,6 @@ public:
     void unlock_channel(void);
     void read_sample_counters(int *sample_counter, int *secondary_sample_counter, int *counter_corr_0_in, int *counter_corr_0_out);  // debug
 
-	
 private:
     //const int *d_local_code_in;
     gr_complex *d_corr_out;
@@ -107,7 +107,6 @@ private:
     std::string d_device_name;
     unsigned int d_device_base;
 
-
     int *d_ca_codes;
 
     // private functions
@@ -121,9 +120,6 @@ private:
     void read_tracking_gps_results(void);
     void reset_multicorrelator(void);
     void close_device(void);
-	
-	// debug
-	//unsigned int first_time = 1;
 };
 
 #endif /* GNSS_SDR_FPGA_MULTICORRELATOR_H_ */

src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc

@@ -98,7 +98,6 @@ void send_tracking_gps_input_samples(FILE *rx_signal_file,
                 }
             if (num_remaining_samples > DMA_TRACK_TRANSFER_SIZE)
                 {
-
                     fread(buffer_DMA, DMA_TRACK_TRANSFER_SIZE, 1, rx_signal_file);
 
                     assert(DMA_TRACK_TRANSFER_SIZE == write(dma_descr, &buffer_DMA[0], DMA_TRACK_TRANSFER_SIZE));
@@ -189,8 +188,7 @@ void GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events(pmt::pmt_t msg)
 }
 
 
-GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() :
+GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : gr::block("GpsL1CADllPllTrackingTestFpga_msg_rx",
-        gr::block("GpsL1CADllPllTrackingTestFpga_msg_rx",
                                                                                    gr::io_signature::make(0, 0, 0),
                                                                                    gr::io_signature::make(0, 0, 0))
 {
@@ -204,7 +202,8 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() :
 
 
 GpsL1CADllPllTrackingTestFpga_msg_rx::~GpsL1CADllPllTrackingTestFpga_msg_rx()
-{}
+{
+}
 
 
 // ###########################################################
@@ -263,8 +262,7 @@ int GpsL1CADllPllTrackingTestFpga::configure_generator()
     p1 = std::string("-rinex_nav_file=") + FLAGS_rinex_nav_file;
     if (FLAGS_dynamic_position.empty())
         {
-            p2 = std::string("-static_position=") + FLAGS_static_position
+            p2 = std::string("-static_position=") + FLAGS_static_position + std::string(",") + std::to_string(FLAGS_duration * 10);
-                    + std::string(",") + std::to_string(FLAGS_duration * 10);
         }
     else
         {
@@ -468,7 +466,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
                 {
                     throw std::exception();
                 };
-                }) << "Failure opening true observables file";
+        })
+        << "Failure opening true observables file";
 
     top_block = gr::make_top_block("Tracking test");
     //std::shared_ptr<GpsL1CaDllPllCAidTrackingFpga> tracking = std::make_shared<GpsL1CaDllPllCAidTrackingFpga> (config.get(), "Tracking_1C", 1, 1);
@@ -483,7 +482,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
                 {
                     throw std::exception();
                 };
-                }) << "Failure reading true observables file";
+        })
+        << "Failure reading true observables file";
 
     //restart the epoch counter
     true_obs_data.restart();
@@ -492,33 +492,35 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
               << " Initial code delay [Chips]=" << true_obs_data.prn_delay_chips
               << std::endl;
 
-    gnss_synchro.Acq_delay_samples = (GPS_L1_CA_CODE_LENGTH_CHIPS
+    gnss_synchro.Acq_delay_samples = (GPS_L1_CA_CODE_LENGTH_CHIPS - true_obs_data.prn_delay_chips / GPS_L1_CA_CODE_LENGTH_CHIPS) * baseband_sampling_freq * GPS_L1_CA_CODE_PERIOD;
-            - true_obs_data.prn_delay_chips / GPS_L1_CA_CODE_LENGTH_CHIPS)
-            * baseband_sampling_freq * GPS_L1_CA_CODE_PERIOD;
     gnss_synchro.Acq_doppler_hz = true_obs_data.doppler_l1_hz;
     gnss_synchro.Acq_samplestamp_samples = 0;
 
     ASSERT_NO_THROW(
         {
             tracking->set_channel(gnss_synchro.Channel_ID);
-                }) << "Failure setting channel.";
+        })
+        << "Failure setting channel.";
 
     ASSERT_NO_THROW(
         {
             tracking->set_gnss_synchro(&gnss_synchro);
-                }) << "Failure setting gnss_synchro.";
+        })
+        << "Failure setting gnss_synchro.";
 
     ASSERT_NO_THROW(
         {
             tracking->connect(top_block);
-                }) << "Failure connecting tracking to the top_block.";
+        })
+        << "Failure connecting tracking to the top_block.";
 
     ASSERT_NO_THROW(
         {
             gr::blocks::null_sink::sptr sink = gr::blocks::null_sink::make(sizeof(Gnss_Synchro));
             top_block->connect(tracking->get_right_block(), 0, sink, 0);
             top_block->msg_connect(tracking->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events"));
-                }) << "Failure connecting the blocks of tracking test.";
+        })
+        << "Failure connecting the blocks of tracking test.";
 
     tracking->start_tracking();
 
@@ -527,8 +529,7 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
     const char *file_name = file.c_str();
 
     // start thread that sends the DMA samples to the FPGA
-    boost::thread t
+    boost::thread t{thread, top_block, file_name};
-        { thread, top_block, file_name };
 
     EXPECT_NO_THROW(
         {
@@ -537,7 +538,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
             tracking->reset();  // unlock the channel
             end = std::chrono::system_clock::now();
             elapsed_seconds = end - start;
-                }) << "Failure running the top_block.";
+        })
+        << "Failure running the top_block.";
 
     // wait until child thread terminates
     t.join();
@@ -572,7 +574,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
                 {
                     throw std::exception();
                 };
-                }) << "Failure opening tracking dump file";
+        })
+        << "Failure opening tracking dump file";
 
     nepoch = trk_dump.num_epochs();
     std::cout << "Measured observation epochs=" << nepoch << std::endl;
@@ -585,14 +588,11 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
     epoch_counter = 0;
     while (trk_dump.read_binary_obs())
         {
-            trk_timestamp_s(epoch_counter) = static_cast<double>(trk_dump.PRN_start_sample_count)
+            trk_timestamp_s(epoch_counter) = static_cast<double>(trk_dump.PRN_start_sample_count) / static_cast<double>(baseband_sampling_freq);
-                            / static_cast<double>(baseband_sampling_freq);
             trk_acc_carrier_phase_cycles(epoch_counter) = trk_dump.acc_carrier_phase_rad / GPS_TWO_PI;
             trk_Doppler_Hz(epoch_counter) = trk_dump.carrier_doppler_hz;
 
-            double delay_chips = GPS_L1_CA_CODE_LENGTH_CHIPS - GPS_L1_CA_CODE_LENGTH_CHIPS
+            double delay_chips = GPS_L1_CA_CODE_LENGTH_CHIPS - GPS_L1_CA_CODE_LENGTH_CHIPS * (fmod((static_cast<double>(trk_dump.PRN_start_sample_count) + trk_dump.aux1) / static_cast<double>(baseband_sampling_freq), 1.0e-3) / 1.0e-3);
-                                    * (fmod( (static_cast<double>(trk_dump.PRN_start_sample_count) + trk_dump.aux1)
-                                    / static_cast<double>(baseband_sampling_freq), 1.0e-3) / 1.0e-3);
 
             trk_prn_delay_chips(epoch_counter) = delay_chips;
             epoch_counter++;