ua1zbe
/
dsd-fme-01.09.2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

M17: Fix META Decode when not IV and Decode META Text as UTF-8 and Not RAW;

This commit is contained in:
lwvmobile 2024-06-07 22:20:36 -04:00
parent 94688fddd4
commit c87ad08371
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/m17.c
View File

@ -191,7 +191,7 @@ void M17decodeLSF(dsd_state * state)
if (lsf_et == 0 && state->m17_meta[0] != 0) //not sure if this applies universally, or just to text data byte 0 for null data if (lsf_et == 0 && state->m17_meta[0] != 0) //not sure if this applies universally, or just to text data byte 0 for null data
{ {
uint8_t meta[15]; meta[0] = lsf_es + 90; //add identifier for pkt decoder uint8_t meta[15]; meta[0] = lsf_es + 90; //add identifier for pkt decoder
for (i = 0; i < 14; i++) meta[i+1] = state->m17_lsf[i]; for (i = 0; i < 14; i++) meta[i+1] = state->m17_meta[i];
fprintf (stderr, "\n "); fprintf (stderr, "\n ");
//Note: We don't have opts here, so in the future, if we need it, we will need to pass it here //Note: We don't have opts here, so in the future, if we need it, we will need to pass it here
decodeM17PKT (NULL, state, meta, 15); //decode META decodeM17PKT (NULL, state, meta, 15); //decode META
@ -3225,8 +3225,8 @@ void decodeM17PKT(dsd_opts * opts, dsd_state * state, uint8_t * input, int len)
else fprintf (stderr, " Reserved Station Type: %02X;", station_type); else fprintf (stderr, " Reserved Station Type: %02X;", station_type);
} }
//Any Other Text Based //1600 Arbitrary Data, or META Text Message
else if (protocol >= 90) else if (protocol == 90 || protocol == 99)
{ {
fprintf (stderr, " "); fprintf (stderr, " ");
for (i = 1; i < len; i++) for (i = 1; i < len; i++)