mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Merge branch 'next' of https://github.com/mmajoral/gnss-sdr into fpga_extended_coherent_integration
This commit is contained in:
		| @@ -174,7 +174,7 @@ private: | |||||||
|     std::weak_ptr<ChannelFsm> channel_fsm_; |     std::weak_ptr<ChannelFsm> channel_fsm_; | ||||||
|     unsigned int doppler_max_; |     unsigned int doppler_max_; | ||||||
|     unsigned int doppler_step_; |     unsigned int doppler_step_; | ||||||
|     unsigned int doppler_center_; |     int doppler_center_; | ||||||
|     unsigned int sampled_ms_; |     unsigned int sampled_ms_; | ||||||
|     unsigned int max_dwells_; |     unsigned int max_dwells_; | ||||||
|     unsigned int in_streams_; |     unsigned int in_streams_; | ||||||
|   | |||||||
| @@ -184,7 +184,7 @@ private: | |||||||
|     float threshold_; |     float threshold_; | ||||||
|     unsigned int doppler_max_; |     unsigned int doppler_max_; | ||||||
|     unsigned int doppler_step_; |     unsigned int doppler_step_; | ||||||
|     unsigned int doppler_center_; |     int doppler_center_; | ||||||
|     unsigned int sampled_ms_; |     unsigned int sampled_ms_; | ||||||
|     unsigned int max_dwells_; |     unsigned int max_dwells_; | ||||||
|     int64_t fs_in_; |     int64_t fs_in_; | ||||||
|   | |||||||
| @@ -181,7 +181,7 @@ private: | |||||||
|     float threshold_; |     float threshold_; | ||||||
|     unsigned int doppler_max_; |     unsigned int doppler_max_; | ||||||
|     unsigned int doppler_step_; |     unsigned int doppler_step_; | ||||||
|     unsigned int doppler_center_; |     int doppler_center_; | ||||||
|     unsigned int max_dwells_; |     unsigned int max_dwells_; | ||||||
|     int64_t fs_in_; |     int64_t fs_in_; | ||||||
|     bool dump_; |     bool dump_; | ||||||
|   | |||||||
| @@ -181,7 +181,7 @@ private: | |||||||
|     float threshold_; |     float threshold_; | ||||||
|     unsigned int doppler_max_; |     unsigned int doppler_max_; | ||||||
|     unsigned int doppler_step_; |     unsigned int doppler_step_; | ||||||
|     unsigned int doppler_center_; |     int doppler_center_; | ||||||
|     unsigned int max_dwells_; |     unsigned int max_dwells_; | ||||||
|     int64_t fs_in_; |     int64_t fs_in_; | ||||||
|     bool dump_; |     bool dump_; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Marc Majoral
					Marc Majoral