mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-02-07 14:40:12 +00:00
Code Issues Releases Wiki Activity

Unify operator name for exclusive or, use bitset instead of array for bools

Browse Source
This commit is contained in:
Carles Fernandez 2019-07-18 20:01:54 +02:00
parent 4628011e9e
commit 9f90384375
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/algorithms/libs/glonass_l1_signal_processing.cc
View File

@ -32,30 +32,26 @@
#include "glonass_l1_signal_processing.h" #include "glonass_l1_signal_processing.h"
#include <array> #include <array>
#include <bitset>
auto auxCeil = [](float x) { return static_cast<int32_t>(static_cast<int64_t>((x) + 1)); }; auto auxCeil = [](float x) { return static_cast<int32_t>(static_cast<int64_t>((x) + 1)); };
void glonass_l1_ca_code_gen_complex(gsl::span<std::complex<float>> _dest, /* int32_t _prn,*/ uint32_t _chip_shift) void glonass_l1_ca_code_gen_complex(gsl::span<std::complex<float>> _dest, /* int32_t _prn,*/ uint32_t _chip_shift)
{ {
const uint32_t _code_length = 511; const uint32_t _code_length = 511;
std::array<bool, _code_length> G1{}; std::bitset<_code_length> G1{};
std::array<bool, 9> G1_register{}; auto G1_register = std::bitset<9>{}.set(); // All true
bool feedback1; bool feedback1;
bool aux; bool aux;
uint32_t delay; uint32_t delay;
uint32_t lcv, lcv2; uint32_t lcv, lcv2;
for (lcv = 0; lcv < 9; lcv++)
{
G1_register[lcv] = true;
}
/* Generate G1 Register */ /* Generate G1 Register */
for (lcv = 0; lcv < _code_length; lcv++) for (lcv = 0; lcv < _code_length; lcv++)
{ {
G1[lcv] = G1_register[2]; G1[lcv] = G1_register[2];
feedback1 = G1_register[4] ^ G1_register[0]; feedback1 = G1_register[4] xor G1_register[0];
for (lcv2 = 0; lcv2 < 8; lcv2++) for (lcv2 = 0; lcv2 < 8; lcv2++)
{ {

12
src/algorithms/libs/glonass_l2_signal_processing.cc
View File

@ -32,30 +32,26 @@
#include "glonass_l2_signal_processing.h" #include "glonass_l2_signal_processing.h"
#include <array> #include <array>
#include <bitset>
auto auxCeil = [](float x) { return static_cast<int32_t>(static_cast<int64_t>((x) + 1)); }; auto auxCeil = [](float x) { return static_cast<int32_t>(static_cast<int64_t>((x) + 1)); };
void glonass_l2_ca_code_gen_complex(gsl::span<std::complex<float>> _dest, /* int32_t _prn,*/ uint32_t _chip_shift) void glonass_l2_ca_code_gen_complex(gsl::span<std::complex<float>> _dest, /* int32_t _prn,*/ uint32_t _chip_shift)
{ {
const uint32_t _code_length = 511; const uint32_t _code_length = 511;
std::array<bool, _code_length> G1{}; std::bitset<_code_length> G1{};
std::array<bool, 9> G1_register{}; auto G1_register = std::bitset<9>{}.set(); // All true
bool feedback1; bool feedback1;
bool aux; bool aux;
uint32_t delay; uint32_t delay;
uint32_t lcv, lcv2; uint32_t lcv, lcv2;
for (lcv = 0; lcv < 9; lcv++)
{
G1_register[lcv] = true;
}
/* Generate G1 Register */ /* Generate G1 Register */
for (lcv = 0; lcv < _code_length; lcv++) for (lcv = 0; lcv < _code_length; lcv++)
{ {
G1[lcv] = G1_register[2]; G1[lcv] = G1_register[2];
feedback1 = G1_register[4] ^ G1_register[0]; feedback1 = G1_register[4] xor G1_register[0];
for (lcv2 = 0; lcv2 < 8; lcv2++) for (lcv2 = 0; lcv2 < 8; lcv2++)
{ {