saving temporary changes before merging with usptream next branch

added functions that allow the tests to read the scaling factor used by the FFT and the IFFT during acquisition

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc

@@ -491,6 +491,12 @@ void GalileoE1PcpsAmbiguousAcquisitionFpga::reset_acquisition(void)
 	acquisition_fpga_->reset_acquisition();
 }
 
+// this function is only used for the unit tests
+void GalileoE1PcpsAmbiguousAcquisitionFpga::read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor)
+{
+	acquisition_fpga_->read_fpga_total_scale_factor(total_scale_factor, fw_scale_factor);
+}
+
 void GalileoE1PcpsAmbiguousAcquisitionFpga::connect(gr::top_block_sptr top_block)
 {
   //  printf("top acq connect\n");

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h

@@ -151,6 +151,11 @@ public:
       */
      void reset_acquisition(void);
 
+     /*!
+      * \brief This function is only used in the unit tests
+      */
+     void read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor);
+
 private:
     ConfigurationInterface* configuration_;
     //pcps_acquisition_sptr acquisition_;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc

@@ -375,6 +375,12 @@ void GalileoE5aPcpsAcquisitionFpga::reset_acquisition(void)
 	acquisition_fpga_->reset_acquisition();
 }
 
+// this function is only used for the unit tests
+void GalileoE5aPcpsAcquisitionFpga::read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor)
+{
+	acquisition_fpga_->read_fpga_total_scale_factor(total_scale_factor, fw_scale_factor);
+}
+
 void GalileoE5aPcpsAcquisitionFpga::connect(gr::top_block_sptr top_block)
 {
 //    if (item_type_.compare("gr_complex") == 0)

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h

@@ -139,6 +139,11 @@ public:
      */
     void reset_acquisition(void);
 
+    /*!
+     * \brief This function is only used in the unit tests
+     */
+    void read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor);
+
 private:
     //float calculate_threshold(float pfa);
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc

@@ -278,6 +278,13 @@ void GpsL1CaPcpsAcquisitionFpga::reset_acquisition(void)
 	acquisition_fpga_->reset_acquisition();
 }
 
+// this function is only used for the unit tests
+void GpsL1CaPcpsAcquisitionFpga::read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor)
+{
+	acquisition_fpga_->read_fpga_total_scale_factor(total_scale_factor, fw_scale_factor);
+}
+
+
 void GpsL1CaPcpsAcquisitionFpga::connect(gr::top_block_sptr top_block)
 {
     // nothing to connect

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h

@@ -149,6 +149,11 @@ public:
      */
     void reset_acquisition(void);
 
+    /*!
+     * \brief This function is only used in the unit tests
+     */
+    void read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor);
+
 private:
     ConfigurationInterface* configuration_;
     pcps_acquisition_fpga_sptr acquisition_fpga_;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc

@@ -342,6 +342,11 @@ void GpsL5iPcpsAcquisitionFpga::reset_acquisition(void)
 	acquisition_fpga_->reset_acquisition();
 }
 
+// this function is only used for the unit tests
+void GpsL5iPcpsAcquisitionFpga::read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor)
+{
+	acquisition_fpga_->read_fpga_total_scale_factor(total_scale_factor, fw_scale_factor);
+}
 
 void GpsL5iPcpsAcquisitionFpga::connect(gr::top_block_sptr top_block)
 {

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h

@@ -149,6 +149,11 @@ public:
      */
     void reset_acquisition(void);
 
+    /*!
+     * \brief This function is only used in the unit tests
+     */
+    void read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor);
+
 private:
     ConfigurationInterface* configuration_;
     //pcps_acquisition_sptr acquisition_;

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc

@@ -406,4 +406,7 @@ void pcps_acquisition_fpga::reset_acquisition(void)
 	acquisition_fpga->reset_acquisition();
 }
 
-
+void pcps_acquisition_fpga::read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor)
+{
+	acquisition_fpga->read_fpga_total_scale_factor(total_scale_factor, fw_scale_factor);
+}

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h

@@ -246,6 +246,11 @@ public:
      * \brief This funciton is only used for the unit tests
      */
     void reset_acquisition(void);
+
+    /*!
+     * \brief This funciton is only used for the unit tests
+     */
+    void read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor);
 };
 
 #endif /* GNSS_SDR_PCPS_ACQUISITION_FPGA_H_*/

src/algorithms/acquisition/libs/fpga_acquisition.cc

@@ -509,3 +509,12 @@ void fpga_acquisition::set_single_doppler_flag(unsigned int single_doppler_flag)
 	d_single_doppler_flag = single_doppler_flag;
 }
 
+// this function is only used for the unit tests
+void fpga_acquisition::read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor)
+{
+	uint32_t readval = 0;
+	readval = d_map_base[7];
+	*total_scale_factor = readval;
+	readval = d_map_base[8];
+	*fw_scale_factor = readval;
+}

src/algorithms/acquisition/libs/fpga_acquisition.h

@@ -98,6 +98,11 @@ public:
      */
     void reset_acquisition(void);
 
+    /*!
+     * \brief this function is only used in the unit test
+     */
+    void read_fpga_total_scale_factor(uint32_t *total_scale_factor, uint32_t *fw_scale_factor);
+
 private:
     int64_t d_fs_in;
     // data related to the hardware module and the driver

src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc

@@ -843,269 +843,269 @@ bool HybridObservablesTestFpga::acquire_signal()
 				}
     	}
     else
-    {
+    	{
-    	unsigned int code_length;
+			unsigned int code_length;
-	    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
+			if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
-	    {
-	    	code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)));
-	    }
-	    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
-	    {
-	        code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
-	    }
-	    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
-	    {
-	        code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS)));
-
-	    }
-	    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
-	    {
-	        code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L5i_CODE_RATE_HZ / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS))));
-	    }
-
-        float nbits = ceilf(log2f((float)code_length));
-        unsigned int fft_size = pow(2, nbits);
-        unsigned int nsamples_total = fft_size;
-
-	    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
-	    {
-	    	acquisition_GpsL1Ca_Fpga->set_single_doppler_flag(1);
-	    }
-	    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
-	    {
-	    	acquisition_GpsE1_Fpga->set_single_doppler_flag(1);
-	    }
-	    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
-	    {
-	    	acquisition_GpsE5a_Fpga->set_single_doppler_flag(1);
-	    }
-	    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
-	    {
-	    	acquisition_GpsL5_Fpga->set_single_doppler_flag(1);
-	    }
-
-        int acq_doppler_max = config->property("Acquisition.doppler_max", FLAGS_external_signal_acquisition_doppler_max_hz);
-        int acq_doppler_step = config->property("Acquisition.doppler_step", FLAGS_external_signal_acquisition_doppler_step_hz);
-
-        int num_doppler_steps = (2*acq_doppler_max)/acq_doppler_step + 1;
-
-        float result_table[MAX_PRN_IDX][num_doppler_steps][2];
-
-        for (unsigned int PRN = 1; PRN < MAX_PRN_IDX; PRN++)
 			{
-
+				code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)));
-        	uint32_t max_index = 0;
+			}
-	        float max_magnitude = 0.0;
+			else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
-	        uint64_t initial_sample = 0;
+			{
-	        float power_sum = 0;
+				code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
-	        uint32_t doppler_index = 0;
+			}
-
+			else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
-	        uint32_t max_index_iteration;
+			{
-	        float max_magnitude_iteration;
+				code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS)));
-	        uint64_t initial_sample_iteration;
-	        float power_sum_iteration;
-	        uint32_t doppler_index_iteration;
-	        int doppler_shift_selected;
-	        int doppler_num = 0;
-
-			for (int doppler_shift = -acq_doppler_max;doppler_shift <= acq_doppler_max;doppler_shift = doppler_shift + acq_doppler_step)
-				{
-					tmp_gnss_synchro.PRN = PRN;
-
-					pthread_mutex_lock(&mutex_obs_test);
-					send_samples_start_obs_test = 0;
-					pthread_mutex_unlock(&mutex_obs_test);
-
-				    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsL1Ca_Fpga->reset_acquisition(); // reset the whole system including the sample counters
-				    	acquisition_GpsL1Ca_Fpga->set_doppler_max(doppler_shift);
-				    	acquisition_GpsL1Ca_Fpga->set_doppler_step(0);
-
-				    	acquisition_GpsL1Ca_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
-				    	acquisition_GpsL1Ca_Fpga->init();
-				    	acquisition_GpsL1Ca_Fpga->set_local_code();
-				    	args.freq_band = 0;
-				    }
-				    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
-				    {
-				    	//printf("starting configuring acquisition\n");
-				    	acquisition_GpsE1_Fpga->reset_acquisition(); // reset the whole system including the sample counters
-				    	acquisition_GpsE1_Fpga->set_doppler_max(doppler_shift);
-				    	acquisition_GpsE1_Fpga->set_doppler_step(0);
-
-				    	acquisition_GpsE1_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
-				    	acquisition_GpsE1_Fpga->init();
-				    	acquisition_GpsE1_Fpga->set_local_code();
-				    	args.freq_band = 0;
-				    	//printf("ending configuring acquisition\n");
-				    }
-				    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsE5a_Fpga->reset_acquisition(); // reset the whole system including the sample counters
-				    	acquisition_GpsE5a_Fpga->set_doppler_max(doppler_shift);
-				    	acquisition_GpsE5a_Fpga->set_doppler_step(0);
-
-				    	acquisition_GpsE5a_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
-				    	acquisition_GpsE5a_Fpga->init();
-				    	acquisition_GpsE5a_Fpga->set_local_code();
-				    	args.freq_band = 1;
-				    }
-				    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsL5_Fpga->reset_acquisition(); // reset the whole system including the sample counters
-				    	acquisition_GpsL5_Fpga->set_doppler_max(doppler_shift);
-				    	acquisition_GpsL5_Fpga->set_doppler_step(0);
-
-				    	acquisition_GpsL5_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
-				    	acquisition_GpsL5_Fpga->init();
-				    	acquisition_GpsL5_Fpga->set_local_code();
-				    	args.freq_band = 1;
-				    }
-
-			        args.file = file;
-			        args.nsamples_tx = fft_size; //50000;		// max size of the FFT
-			        if (test_observables_skip_samples_already_used == 1)
-			        {
-			        	args.skip_used_samples = (PRN -1)*fft_size;
-			        }
-			        else
-			        {
-			        	args.skip_used_samples = 0;
-			        }
-
-					// create DMA child process
-					if (pthread_create(&thread_DMA, NULL, handler_DMA_obs_test, (void *)&args) < 0)
-					{
-						printf("ERROR cannot create DMA Process\n");
-					}
-
-					msg_rx->rx_message = 0;
-					top_block->start();
-
-					pthread_mutex_lock(&mutex_obs_test);
-					send_samples_start_obs_test = 1;
-					pthread_mutex_unlock(&mutex_obs_test);
-
-				    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsL1Ca_Fpga->reset();
-				    }
-				    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsE1_Fpga->reset();
-				    }
-				    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsE5a_Fpga->reset();
-				    }
-				    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsL5_Fpga->reset();
-				    }
-
-					if (start_msg == true)
-						{
-							std::cout << "Reading external signal file: " << FLAGS_signal_file << std::endl;
-							std::cout << "Searching for " << System_and_Signal << " Satellites..." << std::endl;
-							std::cout << "[";
-							start_msg = false;
-						}
-
-					// wait for the child DMA process to finish
-					pthread_join(thread_DMA, NULL);
-
-					pthread_mutex_lock(&mutex_obs_test);
-					send_samples_start_obs_test = 0;
-					pthread_mutex_unlock(&mutex_obs_test);
-
-					while (msg_rx->rx_message == 0)
-						{
-							usleep(100000);
-						}
-
-				    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsL1Ca_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
-				    }
-				    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsE1_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
-				    }
-				    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsE5a_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
-				    }
-				    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
-				    {
-				    	acquisition_GpsL5_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
-				    }
-
-					result_table[PRN][doppler_num][0] = max_magnitude_iteration;
-					result_table[PRN][doppler_num][1] = power_sum_iteration;
-					doppler_num = doppler_num + 1;
-
-					if (max_magnitude_iteration > max_magnitude)
-					{
-				        max_index = max_index_iteration;
-				        max_magnitude = max_magnitude_iteration;
-				        initial_sample = initial_sample_iteration;
-				        power_sum = power_sum_iteration;
-				        doppler_index = doppler_index_iteration;
-				        doppler_shift_selected = doppler_shift;
-					}
-					top_block->stop();
-				}
-
-		        power_sum = (power_sum - max_magnitude) / (fft_size - 1);
-				float test_statistics = (max_magnitude / power_sum);
-				float threshold = config->property("Acquisition.threshold", FLAGS_external_signal_acquisition_threshold);
-				if (test_statistics > threshold)
-					{
-						std::cout << " " << PRN << " ";
-						//doppler_measurements_map.insert(std::pair<int, double>(PRN, static_cast<double>(doppler_shift_selected)));
-						//code_delay_measurements_map.insert(std::pair<int, double>(PRN, static_cast<double>(max_index % nsamples_total)));
-						//acq_samplestamp_map.insert(std::pair<int, double>(PRN, initial_sample)); // should be 0 (first sample upon which acq starts is always 0 in this case)
-						gnss_synchro_vec.push_back(tmp_gnss_synchro);
-					}
-				else
-					{
-						std::cout << " . ";
-					}
-
-				std::cout.flush();
 
 			}
-
+			else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
-			uint32_t max_index = 0;
-			float max_magnitude = 0.0;
-			uint64_t initial_sample = 0;
-			float power_sum = 0;
-			uint32_t doppler_index = 0;
-
-			if (test_observables_show_results_table == 1)
 			{
-				for (unsigned int PRN = 1; PRN < MAX_PRN_IDX; PRN++)
+				code_length = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L5i_CODE_RATE_HZ / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS))));
+			}
+
+			float nbits = ceilf(log2f((float)code_length));
+			unsigned int fft_size = pow(2, nbits);
+			unsigned int nsamples_total = fft_size;
+
+			if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
+			{
+				acquisition_GpsL1Ca_Fpga->set_single_doppler_flag(1);
+			}
+			else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
+			{
+				acquisition_GpsE1_Fpga->set_single_doppler_flag(1);
+			}
+			else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
+			{
+				acquisition_GpsE5a_Fpga->set_single_doppler_flag(1);
+			}
+			else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
+			{
+				acquisition_GpsL5_Fpga->set_single_doppler_flag(1);
+			}
+
+			int acq_doppler_max = config->property("Acquisition.doppler_max", FLAGS_external_signal_acquisition_doppler_max_hz);
+			int acq_doppler_step = config->property("Acquisition.doppler_step", FLAGS_external_signal_acquisition_doppler_step_hz);
+
+			int num_doppler_steps = (2*acq_doppler_max)/acq_doppler_step + 1;
+
+			float result_table[MAX_PRN_IDX][num_doppler_steps][2];
+
+			for (unsigned int PRN = 1; PRN < MAX_PRN_IDX; PRN++)
 				{
-					std::cout << std::endl << "############################################ Results for satellite " << PRN << std::endl;
+
-					int doppler_num = 0;
+				uint32_t max_index = 0;
-					for (int doppler_shift = -acq_doppler_max;doppler_shift <= acq_doppler_max;doppler_shift = doppler_shift + acq_doppler_step)
+				float max_magnitude = 0.0;
+				uint64_t initial_sample = 0;
+				float power_sum = 0;
+				uint32_t doppler_index = 0;
+
+				uint32_t max_index_iteration;
+				float max_magnitude_iteration;
+				uint64_t initial_sample_iteration;
+				float power_sum_iteration;
+				uint32_t doppler_index_iteration;
+				int doppler_shift_selected;
+				int doppler_num = 0;
+
+				for (int doppler_shift = -acq_doppler_max;doppler_shift <= acq_doppler_max;doppler_shift = doppler_shift + acq_doppler_step)
 					{
-						max_magnitude = result_table[PRN][doppler_num][0];
+						tmp_gnss_synchro.PRN = PRN;
-						power_sum = result_table[PRN][doppler_num][1];
+
+						pthread_mutex_lock(&mutex_obs_test);
+						send_samples_start_obs_test = 0;
+						pthread_mutex_unlock(&mutex_obs_test);
+
+						if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsL1Ca_Fpga->reset_acquisition(); // reset the whole system including the sample counters
+							acquisition_GpsL1Ca_Fpga->set_doppler_max(doppler_shift);
+							acquisition_GpsL1Ca_Fpga->set_doppler_step(0);
+
+							acquisition_GpsL1Ca_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
+							acquisition_GpsL1Ca_Fpga->init();
+							acquisition_GpsL1Ca_Fpga->set_local_code();
+							args.freq_band = 0;
+						}
+						else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
+						{
+							//printf("starting configuring acquisition\n");
+							acquisition_GpsE1_Fpga->reset_acquisition(); // reset the whole system including the sample counters
+							acquisition_GpsE1_Fpga->set_doppler_max(doppler_shift);
+							acquisition_GpsE1_Fpga->set_doppler_step(0);
+
+							acquisition_GpsE1_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
+							acquisition_GpsE1_Fpga->init();
+							acquisition_GpsE1_Fpga->set_local_code();
+							args.freq_band = 0;
+							//printf("ending configuring acquisition\n");
+						}
+						else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsE5a_Fpga->reset_acquisition(); // reset the whole system including the sample counters
+							acquisition_GpsE5a_Fpga->set_doppler_max(doppler_shift);
+							acquisition_GpsE5a_Fpga->set_doppler_step(0);
+
+							acquisition_GpsE5a_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
+							acquisition_GpsE5a_Fpga->init();
+							acquisition_GpsE5a_Fpga->set_local_code();
+							args.freq_band = 1;
+						}
+						else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsL5_Fpga->reset_acquisition(); // reset the whole system including the sample counters
+							acquisition_GpsL5_Fpga->set_doppler_max(doppler_shift);
+							acquisition_GpsL5_Fpga->set_doppler_step(0);
+
+							acquisition_GpsL5_Fpga->set_gnss_synchro(&tmp_gnss_synchro);
+							acquisition_GpsL5_Fpga->init();
+							acquisition_GpsL5_Fpga->set_local_code();
+							args.freq_band = 1;
+						}
+
+						args.file = file;
+						args.nsamples_tx = fft_size; //50000;		// max size of the FFT
+						if (test_observables_skip_samples_already_used == 1)
+						{
+							args.skip_used_samples = (PRN -1)*fft_size;
+						}
+						else
+						{
+							args.skip_used_samples = 0;
+						}
+
+						// create DMA child process
+						if (pthread_create(&thread_DMA, NULL, handler_DMA_obs_test, (void *)&args) < 0)
+						{
+							printf("ERROR cannot create DMA Process\n");
+						}
+
+						msg_rx->rx_message = 0;
+						top_block->start();
+
+						pthread_mutex_lock(&mutex_obs_test);
+						send_samples_start_obs_test = 1;
+						pthread_mutex_unlock(&mutex_obs_test);
+
+						if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsL1Ca_Fpga->reset();
+						}
+						else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsE1_Fpga->reset();
+						}
+						else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsE5a_Fpga->reset();
+						}
+						else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsL5_Fpga->reset();
+						}
+
+						if (start_msg == true)
+							{
+								std::cout << "Reading external signal file: " << FLAGS_signal_file << std::endl;
+								std::cout << "Searching for " << System_and_Signal << " Satellites..." << std::endl;
+								std::cout << "[";
+								start_msg = false;
+							}
+
+						// wait for the child DMA process to finish
+						pthread_join(thread_DMA, NULL);
+
+						pthread_mutex_lock(&mutex_obs_test);
+						send_samples_start_obs_test = 0;
+						pthread_mutex_unlock(&mutex_obs_test);
+
+						while (msg_rx->rx_message == 0)
+							{
+								usleep(100000);
+							}
+
+						if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsL1Ca_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+						}
+						else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsE1_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+						}
+						else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsE5a_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+						}
+						else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
+						{
+							acquisition_GpsL5_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+						}
+
+						result_table[PRN][doppler_num][0] = max_magnitude_iteration;
+						result_table[PRN][doppler_num][1] = power_sum_iteration;
 						doppler_num = doppler_num + 1;
 
-						std::cout << "Doppler shift " << doppler_shift << std::endl;
+						if (max_magnitude_iteration > max_magnitude)
-						std::cout << "Max magnitude = " << max_magnitude << "Power sum = " << power_sum << std::endl;
+						{
+							max_index = max_index_iteration;
+							max_magnitude = max_magnitude_iteration;
+							initial_sample = initial_sample_iteration;
+							power_sum = power_sum_iteration;
+							doppler_index = doppler_index_iteration;
+							doppler_shift_selected = doppler_shift;
+						}
+						top_block->stop();
+					}
 
-						power_sum = (power_sum - max_magnitude) / (fft_size - 1);
+					power_sum = (power_sum - max_magnitude) / (fft_size - 1);
-						float test_statistics = (max_magnitude / power_sum);
+					float test_statistics = (max_magnitude / power_sum);
-						std::cout << "test_statistics = " << test_statistics << std::endl;
+					float threshold = config->property("Acquisition.threshold", FLAGS_external_signal_acquisition_threshold);
+					if (test_statistics > threshold)
+						{
+							std::cout << " " << PRN << " ";
+							//doppler_measurements_map.insert(std::pair<int, double>(PRN, static_cast<double>(doppler_shift_selected)));
+							//code_delay_measurements_map.insert(std::pair<int, double>(PRN, static_cast<double>(max_index % nsamples_total)));
+							//acq_samplestamp_map.insert(std::pair<int, double>(PRN, initial_sample)); // should be 0 (first sample upon which acq starts is always 0 in this case)
+							gnss_synchro_vec.push_back(tmp_gnss_synchro);
+						}
+					else
+						{
+							std::cout << " . ";
+						}
 
+					std::cout.flush();
+
+				}
+
+				uint32_t max_index = 0;
+				float max_magnitude = 0.0;
+				uint64_t initial_sample = 0;
+				float power_sum = 0;
+				uint32_t doppler_index = 0;
+
+				if (test_observables_show_results_table == 1)
+				{
+					for (unsigned int PRN = 1; PRN < MAX_PRN_IDX; PRN++)
+					{
+						std::cout << std::endl << "############################################ Results for satellite " << PRN << std::endl;
+						int doppler_num = 0;
+						for (int doppler_shift = -acq_doppler_max;doppler_shift <= acq_doppler_max;doppler_shift = doppler_shift + acq_doppler_step)
+						{
+							max_magnitude = result_table[PRN][doppler_num][0];
+							power_sum = result_table[PRN][doppler_num][1];
+							doppler_num = doppler_num + 1;
+
+							std::cout << "Doppler shift " << doppler_shift << std::endl;
+							std::cout << "Max magnitude = " << max_magnitude << "Power sum = " << power_sum << std::endl;
+
+							power_sum = (power_sum - max_magnitude) / (fft_size - 1);
+							float test_statistics = (max_magnitude / power_sum);
+							std::cout << "test_statistics = " << test_statistics << std::endl;
+
+						}
 					}
 				}
-			}
+		}
-    }
     std::cout << "]" << std::endl;
     std::cout << "-------------------------------------------\n";
 
@@ -1899,7 +1899,7 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults)
                 }
         }
 
-
+    printf("@@@@@@@@@@@@@@@@@@@@@@@@@@ Signal Acquired\n");
     configure_receiver(FLAGS_PLL_bw_hz_start,
         FLAGS_DLL_bw_hz_start,
         FLAGS_PLL_narrow_bw_hz,

src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc

@@ -901,7 +901,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 
         int num_doppler_steps = (2*acq_doppler_max)/acq_doppler_step + 1;
 
-        float result_table[MAX_PRN_IDX][num_doppler_steps][2];
+        float result_table[MAX_PRN_IDX][num_doppler_steps][4];
 
         for (unsigned int PRN = 1; PRN < MAX_PRN_IDX; PRN++)
 			{
@@ -913,6 +913,8 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 	        uint32_t doppler_index = 0;
 
 	        uint32_t max_index_iteration;
+	        uint32_t total_fft_scaling_factor;
+	        uint32_t fw_fft_scaling_factor;
 	        float max_magnitude_iteration;
 	        uint64_t initial_sample_iteration;
 	        float power_sum_iteration;
@@ -1039,22 +1041,28 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 				    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_Fpga") == 0)
 				    {
 				    	acquisition_GpsL1Ca_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+				    	acquisition_GpsL1Ca_Fpga->read_fpga_total_scale_factor(&total_fft_scaling_factor, &fw_fft_scaling_factor);
 				    }
 				    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking_Fpga") == 0)
 				    {
 				    	acquisition_GpsE1_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+				    	acquisition_GpsE1_Fpga->read_fpga_total_scale_factor(&total_fft_scaling_factor, &fw_fft_scaling_factor);
 				    }
 				    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_Fpga") == 0)
 				    {
 				    	acquisition_GpsE5a_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+				    	acquisition_GpsE5a_Fpga->read_fpga_total_scale_factor(&total_fft_scaling_factor, &fw_fft_scaling_factor);
 				    }
 				    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0)
 				    {
 				    	acquisition_GpsL5_Fpga->read_acquisition_results(&max_index_iteration, &max_magnitude_iteration,&initial_sample_iteration, &power_sum_iteration, &doppler_index_iteration);
+				    	acquisition_GpsL5_Fpga->read_fpga_total_scale_factor(&total_fft_scaling_factor, &fw_fft_scaling_factor);
 				    }
 
 					result_table[PRN][doppler_num][0] = max_magnitude_iteration;
 					result_table[PRN][doppler_num][1] = power_sum_iteration;
+					result_table[PRN][doppler_num][2] = total_fft_scaling_factor;
+					result_table[PRN][doppler_num][3] = fw_fft_scaling_factor;
 					doppler_num = doppler_num + 1;
 
 					if (max_magnitude_iteration > max_magnitude)
@@ -1089,6 +1097,8 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 			}
 
 			uint32_t max_index = 0;
+			uint32_t total_fft_scaling_factor;
+			uint32_t fw_fft_scaling_factor;
 			float max_magnitude = 0.0;
 			uint64_t initial_sample = 0;
 			float power_sum = 0;
@@ -1104,11 +1114,13 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 					{
 						max_magnitude = result_table[PRN][doppler_num][0];
 						power_sum = result_table[PRN][doppler_num][1];
+						total_fft_scaling_factor = result_table[PRN][doppler_num][2];
+						fw_fft_scaling_factor = result_table[PRN][doppler_num][3];
 						doppler_num = doppler_num + 1;
 
 						std::cout << "Doppler shift " << doppler_shift << std::endl;
 						std::cout << "Max magnitude = " << max_magnitude << "Power sum = " << power_sum << std::endl;
-
+						std::cout << "FFT total scaling factor = " << total_fft_scaling_factor << " FW FFT scaling factor = " << fw_fft_scaling_factor << std::endl;
 						power_sum = (power_sum - max_magnitude) / (fft_size - 1);
 						float test_statistics = (max_magnitude / power_sum);
 						std::cout << "test_statistics = " << test_statistics << std::endl;