mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-28 18:04:51 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2019-08-14 12:31:42 +02:00
commit 046a73c4a8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
8 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
View File

@ -2104,17 +2104,24 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
* 30 | Galileo E1B + GLONASS L2 C/A * 30 | Galileo E1B + GLONASS L2 C/A
* 31 | GPS L2C + GLONASS L2 C/A * 31 | GPS L2C + GLONASS L2 C/A
* 32 | GPS L1 C/A + Galileo E1B + GPS L5 + Galileo E5a * 32 | GPS L1 C/A + Galileo E1B + GPS L5 + Galileo E5a
* 50 | Beidou B1I * 500 | BeiDou B1I
* 51 | Beidou B1I + GPS L1 C/A * 501 | BeiDou B1I + GPS L1 C/A
* 52 | Beidou B1I + Galileo E1B * 502 | BeiDou B1I + Galileo E1B
* 53 | Beidou B1I + GLONASS L1 C/A * 503 | BeiDou B1I + GLONASS L1 C/A
* 54 | Beidou B1I + GPS L1 C/A + Galileo E1B * 504 | BeiDou B1I + GPS L1 C/A + Galileo E1B
* 55 | Beidou B1I + GPS L1 C/A + GLONASS L1 C/A + Galileo E1B * 505 | BeiDou B1I + GPS L1 C/A + GLONASS L1 C/A + Galileo E1B
* 56 | Beidou B1I + Beidou B3I * 506 | BeiDou B1I + Beidou B3I
* 60 | Beidou B3I * 600 | BeiDou B3I
* 61 | Beidou B3I + GPS L2C * 601 | BeiDou B3I + GPS L2C
* 62 | Beidou B3I + GLONASS L2 C/A * 602 | BeiDou B3I + GLONASS L2 C/A
* 63 | Beidou B3I + GPS L2C + GLONASS L2 C/A * 603 | BeiDou B3I + GPS L2C + GLONASS L2 C/A
* 604 | BeiDou B3I + GPS L1 C/A
* 605 | BeiDou B3I + Galileo E1B
* 606 | BeiDou B3I + GLONASS L1 C/A
* 607 | BeiDou B3I + GPS L1 C/A + Galileo E1B
* 608 | BeiDou B3I + GPS L1 C/A + Galileo E1B + BeiDou B1I
* 609 | BeiDou B3I + GPS L1 C/A + Galileo E1B + GLONASS L1 C/A
* 610 | BeiDou B3I + GPS L1 C/A + Galileo E1B + GLONASS L1 C/A + BeiDou B1I
*/ */
// ####################### RINEX FILES ################# // ####################### RINEX FILES #################

4
src/algorithms/libs/rtklib/rtklib_preceph.cc
View File

@ -481,8 +481,8 @@ void readsp3(const char *file, nav_t *nav, int opt)
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
int readsap(const char *file, gtime_t time, nav_t *nav) int readsap(const char *file, gtime_t time, nav_t *nav)
{ {
pcvs_t pcvs = {0, 0, (pcv_t *){nullptr}}; pcvs_t pcvs{};
pcv_t pcv0 = {0, {}, {}, {0, 0}, {0, 0}, {{}, {}}, {{}, {}}}; pcv_t pcv0{};
pcv_t *pcv; pcv_t *pcv;
int i; int i;

19
src/algorithms/libs/rtklib/rtklib_rtksvr.cc
View File

@ -479,25 +479,8 @@ void decodefile(rtksvr_t *svr, int index)
{ {
glo_fcn[i] = '0'; glo_fcn[i] = '0';
} }
pcv_t pcvt0[MAXSAT] = {{0, {'0'}, {'0'}, {0, 0.0}, {0, 0.0}, {{0.0}, {0.0}}, {{0.0}, {0.0}}}};
sbsfcorr_t sbsfcorr0 = {{0, 0.0}, 0.0, 0.0, 0.0, 0, 0, 0};
sbslcorr_t sbslcorr0 = {{0, 0.0}, 0, {0.0}, {0.0}, 0.0, 0.0};
sbssat_t sbssat0 = {0, 0, 0, {{0, sbsfcorr0, sbslcorr0}}};
sbsigp_t sbsigp0[MAXNIGP] = {{{0, 0.0}, 0, 0, 0, 0.0}};
sbsion_t sbsion0[MAXBAND + 1] = {{0, 0, {*sbsigp0}}};
dgps_t dgps0[MAXSAT] = {{{0, 0.0}, 0.0, 0.0, 0, 0.0}};
ssr_t ssr0[MAXSAT] = {{{{0, 0.0}}, {0.0}, {0}, 0, 0, 0, 0, {0.0}, {0.0}, {0.0}, 0.0, {0.0}, {0.0}, {0.0}, 0.0, 0.0, '0'}};
lexeph_t lexeph0[MAXSAT] = {{{0, 0.0}, {0, 0.0}, 0, 0, 0, {0.0}, {0.0}, {0.0}, {0.0}, 0.0, 0.0, 0.0, {0.0}}};
stec_t stec0[MAXSTA] = {{{0, 0.0}, 0, 0.0, 0.0, {0.0}, 0}};
trop_t trop0[MAXSTA] = {{{0, 0.0}, {0.0}, {0.0}}};
pppcorr_t pppcorr0 = {0, {{0}, {0}}, {{0.0}, {0.0}}, {0}, {0}, {0}, {0}, {stec0}, {trop0}};
nav_t nav = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
{0, 0, (erpd_t *){nullptr}}, {0.0}, {0.0}, {0.0}, {0.0}, {0.0}, {0.0}, {0.0}, {0.0},
{0.0}, {0.0}, {0.0}, {0.0}, 0, {{0.0}, {0.0}}, {{0.0}, {0.0}}, {{{0.0}}, {{0.0}}, {{0.0}}},
{0.0}, {0.0}, {*glo_fcn}, {*pcvt0}, sbssat0, {*sbsion0}, {*dgps0}, {*ssr0}, {*lexeph0},
{{0, 0.0}, 0.0, {0.0}, {{0.0}, {0.0}}}, pppcorr0};
nav_t nav{};
char file[1024]; char file[1024];
int nb; int nb;

5
src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
View File

@ -144,8 +144,7 @@ void signal_generator_c::init()
} }
} }
} }
std::default_random_engine e1(r());
std::default_random_engine e2(r());
std::uniform_int_distribution<int> uniform_dist(0, RAND_MAX); std::uniform_int_distribution<int> uniform_dist(0, RAND_MAX);
} }
@ -277,6 +276,8 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
work_counter_++; work_counter_++;
std::default_random_engine e1(r());
std::default_random_engine e2(r());
unsigned int out_idx = 0; unsigned int out_idx = 0;
unsigned int i = 0; unsigned int i = 0;
unsigned int k = 0; unsigned int k = 0;

2
src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
View File

@ -150,8 +150,6 @@ private:
std::vector<gr_complex> complex_phase_; std::vector<gr_complex> complex_phase_;
unsigned int work_counter_{}; unsigned int work_counter_{};
std::random_device r; std::random_device r;
std::default_random_engine e1;
std::default_random_engine e2;
std::uniform_int_distribution<int> uniform_dist; std::uniform_int_distribution<int> uniform_dist;
std::normal_distribution<float> normal_dist; std::normal_distribution<float> normal_dist;
}; };

11
src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
View File

@ -38,6 +38,7 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <vector>
labsat23_source_sptr labsat23_make_source_sptr(const char *signal_file_basename, int channel_selector, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue) labsat23_source_sptr labsat23_make_source_sptr(const char *signal_file_basename, int channel_selector, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue)
@ -428,9 +429,9 @@ int labsat23_source::general_work(int noutput_items,
int n_int16_to_read = noutput_items / 8; int n_int16_to_read = noutput_items / 8;
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
int16_t memblock[n_int16_to_read]; std::vector<int16_t> memblock(n_int16_to_read);
binary_input_file->read(reinterpret_cast<char *>(memblock), n_int16_to_read * 2); binary_input_file->read(reinterpret_cast<char *>(memblock.data()), n_int16_to_read * 2);
n_int16_to_read = binary_input_file->gcount() / 2; //from bytes to int16 n_int16_to_read = binary_input_file->gcount() / 2; // from bytes to int16
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
int output_pointer = 0; int output_pointer = 0;
@ -486,8 +487,8 @@ int labsat23_source::general_work(int noutput_items,
int n_int16_to_read = noutput_items / 4; int n_int16_to_read = noutput_items / 4;
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {
int16_t memblock[n_int16_to_read]; std::vector<int16_t> memblock(n_int16_to_read);
binary_input_file->read(reinterpret_cast<char *>(memblock), n_int16_to_read * 2); binary_input_file->read(reinterpret_cast<char *>(memblock.data()), n_int16_to_read * 2);
n_int16_to_read = binary_input_file->gcount() / 2; // from bytes to int16 n_int16_to_read = binary_input_file->gcount() / 2; // from bytes to int16
if (n_int16_to_read > 0) if (n_int16_to_read > 0)
{ {

2
src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
View File

@ -72,7 +72,7 @@ TEST(CpuMulticorrelatorRealCodesTest, MeasureExecutionTime)
std::chrono::duration<double> elapsed_seconds(0); std::chrono::duration<double> elapsed_seconds(0);
int max_threads = FLAGS_cpu_multicorrelator_real_codes_max_threads_test; int max_threads = FLAGS_cpu_multicorrelator_real_codes_max_threads_test;
std::vector<std::thread> thread_pool; std::vector<std::thread> thread_pool;
Cpu_Multicorrelator_Real_Codes* correlator_pool[max_threads]; std::vector<Cpu_Multicorrelator_Real_Codes*> correlator_pool(max_threads);
unsigned int correlation_sizes[3] = {2048, 4096, 8192}; unsigned int correlation_sizes[3] = {2048, 4096, 8192};
double execution_times[3]; double execution_times[3];

2
src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
View File

@ -69,7 +69,7 @@ TEST(CpuMulticorrelatorTest, MeasureExecutionTime)
std::chrono::duration<double> elapsed_seconds(0); std::chrono::duration<double> elapsed_seconds(0);
int max_threads = FLAGS_cpu_multicorrelator_max_threads_test; int max_threads = FLAGS_cpu_multicorrelator_max_threads_test;
std::vector<std::thread> thread_pool; std::vector<std::thread> thread_pool;
Cpu_Multicorrelator* correlator_pool[max_threads]; std::vector<Cpu_Multicorrelator*> correlator_pool(max_threads);
unsigned int correlation_sizes[3] = {2048, 4096, 8192}; unsigned int correlation_sizes[3] = {2048, 4096, 8192};
double execution_times[3]; double execution_times[3];