mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-12-17 13:58:06 +00:00
Revert unnecessary moves
This commit is contained in:
@@ -46,20 +46,20 @@ CustomUDPSignalSource::CustomUDPSignalSource(const ConfigurationInterface* confi
|
||||
// DUMP PARAMETERS
|
||||
const std::string default_dump_file("./data/signal_source.dat");
|
||||
const std::string default_item_type("gr_complex");
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file));
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
|
||||
|
||||
// network PARAMETERS
|
||||
const std::string default_capture_device("eth0");
|
||||
const std::string default_address("127.0.0.1");
|
||||
const int default_port = 1234;
|
||||
const std::string address = configuration->property(role + ".origin_address", std::move(default_address));
|
||||
std::string capture_device = configuration->property(role + ".capture_device", std::move(default_capture_device));
|
||||
const std::string address = configuration->property(role + ".origin_address", default_address);
|
||||
std::string capture_device = configuration->property(role + ".capture_device", default_capture_device);
|
||||
int port = configuration->property(role + ".port", default_port);
|
||||
int payload_bytes = configuration->property(role + ".payload_bytes", 1024);
|
||||
|
||||
const std::string default_sample_type("cbyte");
|
||||
const std::string sample_type = configuration->property(role + ".sample_type", std::move(default_sample_type));
|
||||
item_type_ = configuration->property(role + ".item_type", std::move(default_item_type));
|
||||
const std::string sample_type = configuration->property(role + ".sample_type", default_sample_type);
|
||||
item_type_ = configuration->property(role + ".item_type", default_item_type);
|
||||
|
||||
udp_gnss_rx_source_ = Gr_Complex_Ip_Packet_Source::make(capture_device,
|
||||
address,
|
||||
|
||||
@@ -44,12 +44,12 @@ LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configurati
|
||||
const std::string default_item_type("gr_complex");
|
||||
const std::string default_dump_file("./labsat_output.dat");
|
||||
item_type_ = configuration->property(role + ".item_type", default_item_type);
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file));
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
|
||||
|
||||
const int64_t sampling_frequency_deprecated = configuration->property(role + ".sampling_frequency", static_cast<int64_t>(16368000));
|
||||
const int64_t throttle_frequency_sps = configuration->property(role + ".throttle_frequency_sps", static_cast<int64_t>(sampling_frequency_deprecated));
|
||||
|
||||
std::string channels_to_read = configuration->property(role + ".selected_channel", std::move(default_item_type));
|
||||
std::string channels_to_read = configuration->property(role + ".selected_channel", default_item_type);
|
||||
std::stringstream ss(channels_to_read);
|
||||
int found;
|
||||
while (ss.good())
|
||||
@@ -70,7 +70,7 @@ LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configurati
|
||||
}
|
||||
|
||||
const std::string default_filename("./example_capture.LS3");
|
||||
filename_ = configuration->property(role + ".filename", std::move(default_filename));
|
||||
filename_ = configuration->property(role + ".filename", default_filename);
|
||||
|
||||
const bool digital_io_enabled = configuration->property(role + ".digital_io_enabled", false);
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(const ConfigurationIn
|
||||
filename_vec_.push_back(configuration->property(role + ".filename" + std::to_string(n), default_filename));
|
||||
}
|
||||
|
||||
item_type_ = configuration->property(role + ".item_type", std::move(default_item_type));
|
||||
item_type_ = configuration->property(role + ".item_type", default_item_type);
|
||||
repeat_ = configuration->property(role + ".repeat", false);
|
||||
enable_throttle_control_ = configuration->property(role + ".enable_throttle_control", false);
|
||||
|
||||
|
||||
@@ -55,13 +55,13 @@ RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configurati
|
||||
// DUMP PARAMETERS
|
||||
const std::string default_dump_file("./data/signal_source.dat");
|
||||
const std::string default_item_type("gr_complex");
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file));
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
|
||||
|
||||
// rtl_tcp PARAMETERS
|
||||
const std::string default_address("127.0.0.1");
|
||||
const int16_t default_port = 1234;
|
||||
item_type_ = configuration->property(role + ".item_type", std::move(default_item_type));
|
||||
address_ = configuration->property(role + ".address", std::move(default_address));
|
||||
item_type_ = configuration->property(role + ".item_type", default_item_type);
|
||||
address_ = configuration->property(role + ".address", default_address);
|
||||
port_ = configuration->property(role + ".port", default_port);
|
||||
|
||||
if (item_type_ == "short")
|
||||
|
||||
@@ -56,8 +56,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInte
|
||||
{
|
||||
const std::string default_filename("./my_capture.dat");
|
||||
const std::string default_dump_filename("./my_capture_dump.dat");
|
||||
filename_ = configuration->property(role + ".filename", std::move(default_filename));
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_filename));
|
||||
filename_ = configuration->property(role + ".filename", default_filename);
|
||||
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
|
||||
|
||||
const int64_t bytes_seek = configuration->property(role + ".bytes_to_skip", static_cast<int64_t>(65536));
|
||||
const double sample_size_byte = static_cast<double>(adc_bits_) / 4.0;
|
||||
|
||||
Reference in New Issue
Block a user