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

Apply performance-type-promotion-in-math-fn fix.

Browse Source 
Remove unused include, reorder header
This commit is contained in:
Carles Fernandez 2020-02-20 10:50:12 +01:00
parent 0a8c8d18a2
commit c6fc6eb020
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/acquisition/libs/acq_conf.cc
View File

@ -22,6 +22,7 @@
#include "item_type_helpers.h" #include "item_type_helpers.h"
#include <glog/logging.h> #include <glog/logging.h>
#include <gnuradio/gr_complex.h> #include <gnuradio/gr_complex.h>
#include <cmath>
Acq_Conf::Acq_Conf() Acq_Conf::Acq_Conf()
{ {
@ -148,6 +149,6 @@ void Acq_Conf::ConfigureAutomaticResampler(double opt_freq)
void Acq_Conf::SetDerivedParams() void Acq_Conf::SetDerivedParams()
{ {
samples_per_ms = static_cast<float>(resampled_fs) * 0.001; samples_per_ms = static_cast<float>(resampled_fs) * 0.001;
samples_per_chip = static_cast<unsigned int>(ceil(static_cast<float>(resampled_fs) / chips_per_second)); samples_per_chip = static_cast<unsigned int>(std::ceil(static_cast<float>(resampled_fs) / chips_per_second));
samples_per_code = samples_per_ms * ms_per_code; samples_per_code = samples_per_ms * ms_per_code;
} }

9
src/algorithms/acquisition/libs/acq_conf.h
View File

@ -22,13 +22,16 @@
#define GNSS_SDR_ACQ_CONF_H #define GNSS_SDR_ACQ_CONF_H
#include "configuration_interface.h" #include "configuration_interface.h"
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <string> #include <string>
class Acq_Conf class Acq_Conf
{ {
public: public:
Acq_Conf();
void SetFromConfiguration(ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq);
/* PCPS Acquisition configuration */ /* PCPS Acquisition configuration */
uint32_t sampled_ms; uint32_t sampled_ms;
uint32_t ms_per_code; uint32_t ms_per_code;
@ -60,10 +63,6 @@ public:
size_t it_size; size_t it_size;
std::string item_type; std::string item_type;
Acq_Conf();
void SetFromConfiguration(ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq);
private: private:
void SetDerivedParams(); void SetDerivedParams();