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

erroneous symbol replacement during decoder update, corrected and now functional

main
Jean-Michel Friedt 2023-12-31 10:21:02 +01:00
parent a051f8e6d1
commit da21ce007b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/m17_decoder_impl.cc
View File

@ -168,21 +168,21 @@ namespace gr {
for(uint8_t i=0; i<SYM_PER_PLD; i++) for(uint8_t i=0; i<SYM_PER_PLD; i++)
{ {
//bit 0 //bit 0
if(pld[i]>=symbol_map[3]) if(pld[i]>=symbol_levels[3])
{ {
soft_bit[i*2+1]=0xFFFF; soft_bit[i*2+1]=0xFFFF;
} }
else if(pld[i]>=symbol_map[2]) else if(pld[i]>=symbol_levels[2])
{ {
soft_bit[i*2+1]=-(float)0xFFFF/(symbol_map[3]-symbol_map[2])*symbol_map[2]+pld[i]*(float)0xFFFF/(symbol_map[3]-symbol_map[2]); soft_bit[i*2+1]=-(float)0xFFFF/(symbol_map[3]-symbol_map[2])*symbol_map[2]+pld[i]*(float)0xFFFF/(symbol_map[3]-symbol_map[2]);
} }
else if(pld[i]>=symbol_map[1]) else if(pld[i]>=symbol_levels[1])
{ {
soft_bit[i*2+1]=0x0000; soft_bit[i*2+1]=0x0000;
} }
else if(pld[i]>=symbol_map[0]) else if(pld[i]>=symbol_levels[0])
{ {
soft_bit[i*2+1]=(float)0xFFFF/(symbol_map[1]-symbol_map[0])*symbol_map[1]-pld[i]*(float)0xFFFF/(symbol_map[1]-symbol_map[0]); soft_bit[i*2+1]=(float)0xFFFF/(symbol_levels[1]-symbol_levels[0])*symbol_levels[1]-pld[i]*(float)0xFFFF/(symbol_levels[1]-symbol_levels[0]);
} }
else else
{ {
@ -190,13 +190,13 @@ namespace gr {
} }
//bit 1 //bit 1
if(pld[i]>=symbol_map[2]) if(pld[i]>=symbol_levels[2])
{ {
soft_bit[i*2]=0x0000; soft_bit[i*2]=0x0000;
} }
else if(pld[i]>=symbol_map[1]) else if(pld[i]>=symbol_levels[1])
{ {
soft_bit[i*2]=0x7FFF-pld[i]*(float)0xFFFF/(symbol_map[2]-symbol_map[1]); soft_bit[i*2]=0x7FFF-pld[i]*(float)0xFFFF/(symbol_levels[2]-symbol_levels[1]);
} }
else else
{ {