mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-30 23:03:05 +00:00 
			
		
		
		
	Merge branch 'antonioramosdet-GPS_L1_change_symbol_history' into next
This commit is contained in:
		| @@ -105,6 +105,8 @@ gps_l1_ca_telemetry_decoder_cc::gps_l1_ca_telemetry_decoder_cc( | |||||||
|     flag_PLL_180_deg_phase_locked = false; |     flag_PLL_180_deg_phase_locked = false; | ||||||
|     d_preamble_time_samples = 0; |     d_preamble_time_samples = 0; | ||||||
|     d_TOW_at_current_symbol_ms = 0; |     d_TOW_at_current_symbol_ms = 0; | ||||||
|  |     d_symbol_history.resize(GPS_CA_PREAMBLE_LENGTH_SYMBOLS + 1);  // Change fixed buffer size | ||||||
|  |     d_symbol_history.clear();                                     // Clear all the elements in the buffer | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -395,11 +397,6 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__ | |||||||
|                 } |                 } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     // remove used symbols from history |  | ||||||
|     if (d_symbol_history.size() > required_symbols) |  | ||||||
|         { |  | ||||||
|             d_symbol_history.pop_front(); |  | ||||||
|         } |  | ||||||
|     //3. Make the output (copy the object contents to the GNURadio reserved memory) |     //3. Make the output (copy the object contents to the GNURadio reserved memory) | ||||||
|     *out[0] = current_symbol; |     *out[0] = current_symbol; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -36,9 +36,9 @@ | |||||||
| #include "gnss_satellite.h" | #include "gnss_satellite.h" | ||||||
| #include "gnss_synchro.h" | #include "gnss_synchro.h" | ||||||
| #include <gnuradio/block.h> | #include <gnuradio/block.h> | ||||||
| #include <deque> |  | ||||||
| #include <fstream> | #include <fstream> | ||||||
| #include <string> | #include <string> | ||||||
|  | #include <boost/circular_buffer.hpp> | ||||||
|  |  | ||||||
| class gps_l1_ca_telemetry_decoder_cc; | class gps_l1_ca_telemetry_decoder_cc; | ||||||
|  |  | ||||||
| @@ -79,7 +79,7 @@ private: | |||||||
|     bool d_flag_frame_sync; |     bool d_flag_frame_sync; | ||||||
|  |  | ||||||
|     // symbols |     // symbols | ||||||
|     std::deque<Gnss_Synchro> d_symbol_history; |     boost::circular_buffer<Gnss_Synchro> d_symbol_history; | ||||||
|  |  | ||||||
|     double d_symbol_accumulator; |     double d_symbol_accumulator; | ||||||
|     short int d_symbol_accumulator_counter; |     short int d_symbol_accumulator_counter; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez