sebastian
/
gr-satnogs
mirror of https://gitlab.com/LongHairedHacker/gr-satnogs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix 8b10b word count issue

This commit is contained in:
Manolis Surligas 2018-01-31 22:33:59 +02:00
parent f33f46edb9
commit 392b93306f
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ccsds_rs_decoder_mm_impl.cc
View File

@ -66,22 +66,26 @@ namespace gr {
const int *erasures_ref; const int *erasures_ref;
size_t erasures_len; size_t erasures_len;
pmt::pmt_t pmt_data = pmt::dict_ref(m, pmt::mp("pdu"), pmt::PMT_NIL); pmt::pmt_t pmt_data = pmt::dict_ref(m, pmt::intern("data"), pmt::PMT_NIL);
pmt::pmt_t pmt_erasures = pmt::dict_ref(m, pmt::mp("erasures"), pmt::pmt_t pmt_erasures = pmt::dict_ref(m, pmt::intern("erasures"),
pmt::PMT_NIL); pmt::PMT_NIL);
if (pmt::equal (pmt::PMT_NIL, pmt_data) if (pmt::equal (pmt::PMT_NIL, pmt_data)) {
|| pmt::equal (pmt::PMT_NIL, pmt_erasures)) {
LOG_ERROR("Invalid message format."); LOG_ERROR("Invalid message format.");
} }
data_ref = pmt::u8vector_elements(pmt_data, data_len); data_ref = pmt::u8vector_elements(pmt_data, data_len);
memcpy(data, data_ref, data_len); memcpy(data, data_ref, data_len);
erasures_len = pmt::blob_length(pmt_erasures); if( pmt::equal (pmt::PMT_NIL, pmt_erasures)) {
erasures_ref = pmt::s32vector_elements(pmt_erasures, erasures_len); decode_rs_ccsds(data, NULL, 0, (int)(255 - data_len));
memcpy(erasures, erasures_ref, erasures_len * sizeof(int)); }
else {
decode_rs_ccsds(data, erasures, (int)erasures_len, (int)(255 - data_len)); erasures_len = pmt::blob_length(pmt_erasures);
erasures_ref = pmt::s32vector_elements(pmt_erasures, erasures_len);
memcpy(erasures, erasures_ref, erasures_len * sizeof(int));
decode_rs_ccsds(data, erasures, (int)erasures_len,
(int)(255 - data_len));
}
message_port_pub(pmt::mp("pdu"), pmt::make_blob(data, 223)); message_port_pub(pmt::mp("pdu"), pmt::make_blob(data, 223));
} }

14
lib/decoder_8b10b_impl.cc
View File

@ -191,15 +191,19 @@ namespace gr
d_word_cnt++; d_word_cnt++;
if(d_word_cnt == d_max_frame_len) { if(d_word_cnt == d_max_frame_len / 10) {
d_state = IN_SYNC; d_state = IN_SYNC;
pmt::pmt_t data = pmt::init_u8vector (d_max_frame_len / 10, pmt::pmt_t data = pmt::init_u8vector (d_max_frame_len / 10,
d_8b_words); d_8b_words);
pmt::pmt_t erasures = pmt::init_s32vector (d_erasure_cnt,
d_erasures_indexes);
pmt::pmt_t out = pmt::make_dict(); pmt::pmt_t out = pmt::make_dict();
pmt::dict_add(out, pmt::mp("pdu"), data); if (d_erasure_cnt > 0) {
pmt::dict_add(out, pmt::mp("erasures"), erasures); pmt::pmt_t erasures = pmt::init_s32vector (d_erasure_cnt,
d_erasures_indexes);
out = pmt::dict_add (out, pmt::intern ("erasures"), erasures);
}
out = pmt::dict_add(out, pmt::intern("data"), data);
message_port_pub (pmt::mp ("pdu"), out); message_port_pub (pmt::mp ("pdu"), out);
return (i+1) * 10; return (i+1) * 10;