mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Add work on osnma receiver

Browse Source
This commit is contained in:
Carles Fernandez 2023-05-27 11:43:41 +02:00
parent ee13784dd2
commit 46aca38ade
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/libs/osnma_msg_receiver.cc
View File

@ -148,7 +148,7 @@ void osnma_msg_receiver::read_dsm_block(const std::shared_ptr<OSNMA_msg>& osnma_
if (d_osnma_data.d_dsm_header.dsm_block_id == 0) if (d_osnma_data.d_dsm_header.dsm_block_id == 0)
{ {
// Get number of blocks in message // Get number of blocks in message
uint8_t nb = (osnma_msg->hkroot[2] & 0b11110000) >> 4; uint8_t nb = get_number_blocks(d_dsm_message[d_osnma_data.d_dsm_header.dsm_id][0]);
uint16_t number_of_blocks = 0; uint16_t number_of_blocks = 0;
if (d_osnma_data.d_dsm_header.dsm_id < 12) if (d_osnma_data.d_dsm_header.dsm_id < 12)
{ {
@ -194,6 +194,9 @@ void osnma_msg_receiver::read_dsm_block(const std::shared_ptr<OSNMA_msg>& osnma_
} }
} }
process_dsm_message(dsm_msg); process_dsm_message(dsm_msg);
d_dsm_message[d_osnma_data.d_dsm_header.dsm_id] = std::array<uint8_t, 256>{};
d_dsm_id_received[d_osnma_data.d_dsm_header.dsm_id] = std::array<uint8_t, 16>{};
d_number_of_blocks[d_osnma_data.d_dsm_header.dsm_id] = 0;
} }
} }

6
src/core/system_parameters/Galileo_OSNMA.h
View File

@ -134,6 +134,7 @@ constexpr std::uint8_t mask_cpks{0x07};
constexpr std::uint8_t mask_nma_header_reserved{0x01}; constexpr std::uint8_t mask_nma_header_reserved{0x01};
constexpr std::uint8_t mask_dsm_id{0x01}; constexpr std::uint8_t mask_dsm_id{0x01};
constexpr std::uint8_t mask_dsm_block_id{0x0F}; constexpr std::uint8_t mask_dsm_block_id{0x0F};
constexpr std::uint8_t mask_dsm_number_blocks{0XF0};
#else #else
constexpr std::uint8_t mask_nmas{0b1100'0000}; constexpr std::uint8_t mask_nmas{0b1100'0000};
constexpr std::uint8_t mask_cid{0b0011'0000}; constexpr std::uint8_t mask_cid{0b0011'0000};
@ -141,6 +142,7 @@ constexpr std::uint8_t mask_cpks{0b0000'1110};
constexpr std::uint8_t mask_nma_header_reserved{0b0000'0001}; constexpr std::uint8_t mask_nma_header_reserved{0b0000'0001};
constexpr std::uint8_t mask_dsm_id{0b0000'0001}; constexpr std::uint8_t mask_dsm_id{0b0000'0001};
constexpr std::uint8_t mask_dsm_block_id{0b0000'1111}; constexpr std::uint8_t mask_dsm_block_id{0b0000'1111};
constexpr std::uint8_t mask_dsm_number_blocks{0b1111'0000};
#endif #endif
@ -174,6 +176,10 @@ inline uint8_t get_dsm_block_id(uint8_t dsm_header)
return dsm_header & mask_dsm_block_id; return dsm_header & mask_dsm_block_id;
} }
inline uint8_t get_number_blocks(uint8_t dsm_message_0)
{
return (dsm_message_0 & mask_dsm_number_blocks) >> 4;
}
/** \} */ /** \} */
/** \} */ /** \} */