mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-25 22:43:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-beidou' into next (Fixes: #311)

Browse Source
This commit is contained in:
Carles Fernandez 2019-09-18 21:47:17 +02:00
commit 3b86a8f05a
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc
View File

@ -132,7 +132,7 @@ void beidou_b1i_telemetry_decoder_gs::decode_bch15_11_01(const int32_t *bits, st
{
int32_t bit;
int32_t err;
std::array<int32_t, 4> reg{1, 1, 1, 1};
std::array<int32_t, 4> reg{-1, -1, -1, -1};
const std::array<int32_t, 15> errind{14, 13, 10, 12, 6, 9, 4, 11, 0, 5, 7, 8, 1, 3, 2};
for (uint32_t i = 0; i < 15; i++)
@ -150,11 +150,16 @@ void beidou_b1i_telemetry_decoder_gs::decode_bch15_11_01(const int32_t *bits, st
reg[1] *= bit;
}
err = errind[reg[0] + reg[1] * 2 + reg[2] * 4 + reg[3] * 8];
for (uint32_t i = 0; i < 4; ++i)
{
reg[i] = (reg[i] + 1) / 2;
}
err = reg[0] + reg[1] * 2 + reg[2] * 4 + reg[3] * 8;
if (err > 0 and err < 16)
{
decbits[err - 1] *= -1;
decbits[errind[err - 1]] *= -1;
}
}

11
src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc
View File

@ -133,7 +133,7 @@ void beidou_b3i_telemetry_decoder_gs::decode_bch15_11_01(const int32_t *bits,
{
int32_t bit;
int32_t err;
std::array<int32_t, 4> reg{1, 1, 1, 1};
std::array<int32_t, 4> reg{-1, -1, -1, -1};
const std::array<int32_t, 15> errind{14, 13, 10, 12, 6, 9, 4, 11, 0, 5, 7, 8, 1, 3, 2};
for (uint32_t i = 0; i < 15; i++)
@ -151,11 +151,16 @@ void beidou_b3i_telemetry_decoder_gs::decode_bch15_11_01(const int32_t *bits,
reg[1] *= bit;
}
err = errind[reg[0] + reg[1] * 2 + reg[2] * 4 + reg[3] * 8];
for (uint32_t i = 0; i < 4; ++i)
{
reg[i] = (reg[i] + 1) / 2;
}
err = reg[0] + reg[1] * 2 + reg[2] * 4 + reg[3] * 8;
if (err > 0 and err < 16)
{
decbits[err - 1] *= -1;
decbits[errind[err - 1]] *= -1;
}
}