mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-24 05:53:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' into gal_e6_msg

Browse Source
This commit is contained in:
Carles Fernandez 2021-06-08 11:34:45 +02:00
commit a6c8f98d1d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/system_parameters/galileo_cnav_message.cc
View File

@ -61,9 +61,8 @@ void Galileo_Cnav_Message::read_HAS_page(const std::string& page_string)
d_new_HAS_page = false;
has_page = Galileo_HAS_page();
d_flag_CRC_test = CRC_test(Word_for_CRC_bits, checksum.to_ulong());
if (d_flag_CRC_test)
if (d_flag_CRC_test == true)
{
d_flag_CRC_test = true;
// CRC correct: Read 24 bits of HAS page header
read_HAS_page_header(page_string.substr(GALILEO_CNAV_PAGE_RESERVED_BITS, GALILEO_CNAV_PAGE_HEADER_BITS));
bool use_has = false;
@ -128,12 +127,12 @@ void Galileo_Cnav_Message::read_HAS_page_header(const std::string& page_string)
d_received_message_size = read_has_page_header_parameter(has_page_header, GALILEO_HAS_MESSAGE_SIZE) + 1; // "0" means 1
d_received_message_page_id = read_has_page_header_parameter(has_page_header, GALILEO_HAS_MESSAGE_PAGE_ID);
DLOG(INFO) << "HAS page header received: "
<< "d_has_page_status: " << static_cast<float>(d_has_page_status) << ", "
<< "d_has_reserved: " << static_cast<float>(d_has_reserved) << ", "
<< "d_received_message_type: " << static_cast<float>(d_received_message_type) << ", "
<< "d_received_message_id: " << static_cast<float>(d_received_message_id) << ", "
<< "d_received_message_size: " << static_cast<float>(d_received_message_size) << ", "
DLOG(INFO) << "HAS page header received " << page_string << ":\n"
<< "d_has_page_status: " << static_cast<float>(d_has_page_status) << "\n"
<< "d_has_reserved: " << static_cast<float>(d_has_reserved) << "\n"
<< "d_received_message_type: " << static_cast<float>(d_received_message_type) << "\n"
<< "d_received_message_id: " << static_cast<float>(d_received_message_id) << "\n"
<< "d_received_message_size: " << static_cast<float>(d_received_message_size) << "\n"
<< "d_received_message_page_id: " << static_cast<float>(d_received_message_page_id);
}
}

24
src/tests/unit-tests/system-parameters/galileo_e6b_reed_solomon_test.cc
View File

@ -517,3 +517,27 @@ TEST(ReedSolomonE6BTest, Decode113ErrorsWithErasure)
std::vector<uint8_t> decoded(encoded_input.begin(), encoded_input.begin() + 32);
EXPECT_TRUE(expected_output == decoded);
}
TEST(ReedSolomonE6BTest, DecodeErasure)
{
const std::vector<uint8_t> expected_output = {71, 12, 25, 210, 178, 81, 243, 9, 112, 98, 196, 203, 48, 125, 114, 165, 181, 193, 71, 174, 168, 42, 31, 128, 245, 87, 150, 58, 192, 66, 130, 179};
std::vector<uint8_t> encoded_input = {
71, 12, 25, 210, 178, 81, 243, 9, 112, 98, 196, 203, 48, 125, 114, 165, 181, 193, 71, 174, 168, 42, 31, 128, 245, 87, 150, 58, 192, 66, 130, 179, 133, 210, 122, 224, 75, 138, 20, 205, 14, 245, 209, 187, 246, 228, 12, 39, 244, 238, 223, 217, 84, 233, 137, 168, 153, 8, 94, 26, 99, 169, 149, 203, 115, 69, 211, 43, 70, 96, 70, 38, 160, 1, 232, 153, 223, 165, 93, 205, 101, 170, 60, 188, 198, 82, 168, 79, 95, 23, 118, 215, 187, 136, 24, 99, 252, 3, 144, 166, 117, 45, 168, 239, 77, 42, 246, 33, 122, 97, 242, 236, 13, 217, 96, 186, 71, 250, 242, 177, 125, 87, 27, 13, 118, 181, 178, 12, 27, 66, 31, 74, 127, 46, 112, 127, 116, 122, 190, 71, 240, 95, 78, 194, 113, 80, 46, 126, 74, 136, 118, 133, 105, 176, 47, 230, 162, 195, 93, 157, 72, 119, 13, 232, 151, 200, 191, 143, 75, 161, 111, 29, 158, 16, 181, 165, 92, 39, 17, 218, 228, 58, 176, 233, 55, 211, 195, 73, 37, 137, 232, 241, 150, 236, 152, 153, 53, 74, 81, 91, 160, 244, 21, 95, 176, 179, 141, 39, 61, 136, 16, 58, 160, 51, 210, 31, 134, 63, 203, 96, 219, 44, 231, 61, 220, 0, 241, 220, 207, 17, 52, 150, 117, 54, 222, 128, 101, 213, 164, 234, 74, 224, 57, 246, 70, 27, 202, 229, 4, 243, 128, 211, 158, 199, 4};
// Introduce 223 erasures:
std::vector<int> erasure_positions;
for (int i = 0; i < 223; i++)
{
encoded_input[i] = 0;
erasure_positions.push_back(i);
}
auto rs = std::make_unique<ReedSolomon>();
int result = rs->decode(encoded_input, erasure_positions);
EXPECT_TRUE(result == 223);
std::vector<uint8_t> decoded(encoded_input.begin(), encoded_input.begin() + 32);
EXPECT_TRUE(expected_output == decoded);
}