M17_Project
/
gr-m17
mirror of https://github.com/M17-Project/gr-m17.git
1
0
Fork 0
Code Issues Releases Wiki Activity

collect full SMS

dev
Wojciech Kaczmarski 2026-02-06 11:54:23 +01:00
parent 05d6629f37
commit 1de4cc2645
2 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/m17_decoder_impl.cc
View File

@ -432,7 +432,7 @@ namespace gr
if (!syncd)
{
float dist; // Euclidean distance for finding syncwords in the symbol stream
float dist; // Euclidean distance for finding syncwords in the symbol stream
// push new symbol
for (uint8_t i = 0; i < 7; i++)
@ -654,7 +654,7 @@ namespace gr
fprintf(stderr, ") ");
}
detour1:
detour1:
// META
if (_debug_ctrl == true)
{
@ -709,7 +709,7 @@ namespace gr
_expected_next_fn = (_fn + 1) % 0x8000;
}
else if (flp == 1)// lsf
else if (flp == 1) // lsf
{
if (_debug_ctrl == true)
{
@ -800,7 +800,7 @@ namespace gr
_signed_str = 0;
fprintf(stderr, ") ");
detour2:
detour2:
// META
fprintf(stderr, "META: ");
for (uint8_t i = 0; i < 14; i++)
@ -818,35 +818,52 @@ namespace gr
fprintf(stderr, " e=%1.1f\n", (float)e / 0xFFFF);
}
}
else // packet frame
{
// decode
uint8_t frame_data[25] = {0};
uint8_t eof = 0;
uint8_t pkt_fn = 0;
uint32_t e = decode_pkt_frame(_packet_frame_data, &eof, &pkt_fn, _pld);
static uint16_t wr_offs = 0;
static uint16_t len = 0;
// TODO: do this only if the whole packet has been reconstructed
// TODO: test code! valid for single-farme packets ONLY
if (eof && _packet_frame_data[0]==0x05 && !CRC_M17(_packet_frame_data, pkt_fn))
uint32_t e = decode_pkt_frame(frame_data, &eof, &pkt_fn, _pld);
if (!eof)
{
// handle message output (for a text message)
pmt::pmt_t msg;
decode_callsign_bytes(d_dst, _lsf.dst);
decode_callsign_bytes(d_src, _lsf.src);
memcpy(&rcvd_msg[wr_offs], frame_data, 25);
wr_offs += 25;
}
pmt::pmt_t dict = pmt::make_dict();
dict = pmt::dict_add(dict, pmt::mp("src"), pmt::intern((char *)d_src));
dict = pmt::dict_add(dict, pmt::mp("dst"), pmt::intern((char *)d_dst));
else
{
memcpy(&rcvd_msg[wr_offs], frame_data, pkt_fn);
len = wr_offs + pkt_fn;
msg = pmt::init_u8vector(2, _lsf.type);
dict = pmt::dict_add(dict, pmt::mp("type"), msg);
msg = pmt::init_u8vector(14, _lsf.meta);
dict = pmt::dict_add(dict, pmt::mp("meta"), msg);
// TODO: we use last LSF data that might be outdated
if (rcvd_msg[0] == 0x05 && CRC_M17((uint8_t *)rcvd_msg, len) == 0)
{
// handle message output (for a text message)
pmt::pmt_t msg;
decode_callsign_bytes(d_dst, _lsf.dst);
decode_callsign_bytes(d_src, _lsf.src);
dict = pmt::dict_add(dict, pmt::mp("sms"), pmt::intern((char*)&_packet_frame_data[1]));
pmt::pmt_t dict = pmt::make_dict();
dict = pmt::dict_add(dict, pmt::mp("src"), pmt::intern((char *)d_src));
dict = pmt::dict_add(dict, pmt::mp("dst"), pmt::intern((char *)d_dst));
message_port_pub(pmt::mp("fields"), dict);
msg = pmt::init_u8vector(2, _lsf.type);
dict = pmt::dict_add(dict, pmt::mp("type"), msg);
msg = pmt::init_u8vector(14, _lsf.meta);
dict = pmt::dict_add(dict, pmt::mp("meta"), msg);
dict = pmt::dict_add(dict, pmt::mp("sms"), pmt::intern((char *)&rcvd_msg[1]));
message_port_pub(pmt::mp("fields"), dict);
wr_offs = 0;
}
}
if (!eof)

8
lib/m17_decoder_impl.h
View File

@ -22,7 +22,7 @@ namespace gr
class m17_decoder_impl : public m17_decoder
{
private:
//M17
// M17
static constexpr int PAYLOAD_BYTES = 16;
bool _debug_data = false;
@ -61,13 +61,13 @@ namespace gr
uint8_t _lich_cnt; // LICH_CNT
uint8_t lich_chunks_rcvd = 0; // flags set for each LSF chunk received
uint16_t enc_data[272]; // raw frame data soft bits
uint16_t enc_data[272]; // raw frame data soft bits
uint8_t _stream_frame_data[16]; // decoded stream frame data, 128 bits
uint8_t _packet_frame_data[25]; // decoded stream frame data, 200 bits
char rcvd_msg[33 * 25 - 4]; // packet frame data
uint8_t digest[16] = {0};
uint8_t syncd = 0; // syncword found?
uint8_t flp = 0; // stream rame=0, LSF=1, packet frame=2
uint8_t flp = 0; // stream rame=0, LSF=1, packet frame=2
uint8_t pushed; // counter for pushed symbols
char d_dst[12], d_src[12]; // decoded strings