mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into tracking_debug

Browse Source
This commit is contained in:
Javier 2019-06-17 21:26:01 +02:00
commit bb8e7bc3a2
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc
View File

@ -1,13 +1,12 @@
/*!
* \file file_signal_source.cc
* \brief Implementation of a class that reads signals samples from a file
* and adapts it to a SignalSourceInterface
* \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
* Javier Arribas, 2011 jarribas(at)cttc.es
* \file multichannel_file_signal_source.cc
* \brief Implementation of a class that reads signals samples from files at
* different frequency band and adapts it to a SignalSourceInterface
* \author Javier Arribas, 2019 jarribas(at)cttc.es
*
* -------------------------------------------------------------------------
*
* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
*
* GNSS-SDR is a software defined Global Navigation
* Satellite Systems receiver
@ -201,7 +200,7 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(ConfigurationInterfac
{
int64_t bytes_to_skip = samples_to_skip * item_size_;
int64_t bytes_to_process = static_cast<int64_t>(size) - bytes_to_skip;
samples_ = floor(static_cast<double>(bytes_to_process) / static_cast<double>(item_size()) - ceil(0.002 * static_cast<double>(sampling_frequency_))); //process all the samples available in the file excluding at least the last 1 ms
samples_ = floor(static_cast<double>(bytes_to_process) / static_cast<double>(item_size()) - ceil(0.002 * static_cast<double>(sampling_frequency_))); // process all the samples available in the file excluding at least the last 1 ms
}
}
@ -220,7 +219,6 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(ConfigurationInterfac
valve_ = gnss_sdr_make_valve(item_size_, samples_ * n_channels_, queue_);
DLOG(INFO) << "valve(" << valve_->unique_id() << ")";
if (enable_throttle_control_)
{
for (unsigned int n = 0; n < n_channels_; n++)
@ -240,7 +238,6 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(ConfigurationInterfac
DLOG(INFO) << "Item size " << item_size_;
DLOG(INFO) << "Repeat " << repeat_;
if (in_streams_ > 0)
{
LOG(ERROR) << "A signal source does not have an input stream";

16
src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
View File

@ -1,15 +1,15 @@
/*!
* \file file_signal_source.h
* \brief Interface of a class that reads signals samples from a file
* and adapts it to a SignalSourceInterface
* \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
* \file multichannel_file_signal_source.h
* \brief Implementation of a class that reads signals samples from files at
* different frequency band and adapts it to a SignalSourceInterface
* \author Javier Arribas, 2019 jarribas(at)cttc.es
*
* This class represents a file signal source. Internally it uses a GNU Radio's
* gr_file_source as a connector to the data.
*
* -------------------------------------------------------------------------
*
* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
*
* GNSS-SDR is a software defined Global Navigation
* Satellite Systems receiver
@ -48,7 +48,7 @@
class ConfigurationInterface;
/*!
* \brief Class that reads signals samples from a file
* \brief Class that reads signals samples from files at different frequency bands
* and adapts it to a SignalSourceInterface
*/
class MultichannelFileSignalSource : public GNSSBlockInterface
@ -66,7 +66,7 @@ public:
}
/*!
* \brief Returns "File_Signal_Source".
* \brief Returns "Multichannel_File_Signal_Source".
*/
inline std::string implementation() override
{
@ -128,4 +128,4 @@ private:
bool enable_throttle_control_;
};
#endif /*GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H_*/
#endif /* GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H_ */