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

This commit is contained in:
Carles Fernandez 2019-07-24 12:17:57 +02:00
commit ad389f7b1a
4 changed files with 4 additions and 4 deletions

View File

@ -174,7 +174,7 @@ private:
std::weak_ptr<ChannelFsm> channel_fsm_;
unsigned int doppler_max_;
unsigned int doppler_step_;
unsigned int doppler_center_;
int doppler_center_;
unsigned int sampled_ms_;
unsigned int max_dwells_;
unsigned int in_streams_;

View File

@ -184,7 +184,7 @@ private:
float threshold_;
unsigned int doppler_max_;
unsigned int doppler_step_;
unsigned int doppler_center_;
int doppler_center_;
unsigned int sampled_ms_;
unsigned int max_dwells_;
int64_t fs_in_;

View File

@ -181,7 +181,7 @@ private:
float threshold_;
unsigned int doppler_max_;
unsigned int doppler_step_;
unsigned int doppler_center_;
int doppler_center_;
unsigned int max_dwells_;
int64_t fs_in_;
bool dump_;

View File

@ -181,7 +181,7 @@ private:
float threshold_;
unsigned int doppler_max_;
unsigned int doppler_step_;
unsigned int doppler_center_;
int doppler_center_;
unsigned int max_dwells_;
int64_t fs_in_;
bool dump_;