mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-30 23:03:05 +00:00 
			
		
		
		
	Remove redundant parameter SignalSource.enable_FPGA
This commit is contained in:
		| @@ -519,19 +519,9 @@ int GNSSFlowgraph::connect_fpga_flowgraph() | ||||
|     // Connect the counter | ||||
|     if (sig_source_.at(0) != nullptr) | ||||
|         { | ||||
|             if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) | ||||
|             if (connect_fpga_sample_counter() != 0) | ||||
|                 { | ||||
|                     if (connect_sample_counter() != 0) | ||||
|                         { | ||||
|                             return 1; | ||||
|                         } | ||||
|                 } | ||||
|             else | ||||
|                 { | ||||
|                     if (connect_fpga_sample_counter() != 0) | ||||
|                         { | ||||
|                             return 1; | ||||
|                         } | ||||
|                     return 1; | ||||
|                 } | ||||
|         } | ||||
|     else | ||||
| @@ -546,11 +536,6 @@ int GNSSFlowgraph::connect_fpga_flowgraph() | ||||
|             return 1; | ||||
|         } | ||||
|  | ||||
|     if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) | ||||
|         { | ||||
|             check_signal_conditioners(); | ||||
|         } | ||||
|  | ||||
|     assign_channels(); | ||||
|  | ||||
|     if (connect_observables_to_pvt() != 0) | ||||
| @@ -572,27 +557,9 @@ int GNSSFlowgraph::connect_fpga_flowgraph() | ||||
|  | ||||
| int GNSSFlowgraph::disconnect_fpga_flowgraph() | ||||
| { | ||||
|     if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) | ||||
|     if (disconnect_fpga_sample_counter() != 0) | ||||
|         { | ||||
|             if (disconnect_signal_sources_from_signal_conditioners() != 0) | ||||
|                 { | ||||
|                     return 1; | ||||
|                 } | ||||
|         } | ||||
|  | ||||
|     if (configuration_->property(sig_source_.at(0)->role() + ".enable_FPGA", false) == false) | ||||
|         { | ||||
|             if (disconnect_sample_counter() != 0) | ||||
|                 { | ||||
|                     return 1; | ||||
|                 } | ||||
|         } | ||||
|     else | ||||
|         { | ||||
|             if (disconnect_fpga_sample_counter() != 0) | ||||
|                 { | ||||
|                     return 1; | ||||
|                 } | ||||
|             return 1; | ||||
|         } | ||||
|  | ||||
|     if (disconnect_monitors() != 0) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez