GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-15 10:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refine/Fix YSF FICH Element Decode #143

Browse Source
This commit is contained in:
lwvmobile
2023-06-30 01:15:05 -04:00
parent 432ad448ba
commit 7a4bd2833f
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ysf.c
View File

@@ -816,24 +816,25 @@ void processYSF(dsd_opts * opts, dsd_state * state)
if (cm == 0) fprintf (stderr, "Group/CQ "); if (cm == 0) fprintf (stderr, "Group/CQ ");
if (cm == 3) fprintf (stderr, "Private "); if (cm == 3) fprintf (stderr, "Private ");
if (cm == 1) fprintf (stderr, "Reserved "); if (cm == 1) fprintf (stderr, "Res: 1 ");
if (cm == 2) fprintf (stderr, "Reserved "); if (cm == 2) fprintf (stderr, "Res: 2 ");
if (mr == 0) fprintf (stderr, "Direct Wave "); if (vp == 0) fprintf (stderr, "Local (Simplex) ");
if (mr == 1) fprintf (stderr, "Downlink (Busy) "); if (vp == 1) fprintf (stderr, "Internet (Rep) ");
if (mr == 2) fprintf (stderr, "Downlink (Free) ");
if (vp == 1) fprintf (stderr, "Local (Simplex) "); if (mr == 0) fprintf (stderr, "(Direct Wave) ");
if (vp == 0) fprintf (stderr, "Internet (Rep) "); if (mr == 1) fprintf (stderr, "(Uplink Free) ");
if (mr == 2) fprintf (stderr, "(Uplink Busy) ");
if (mr > 2 && mr < 7) fprintf (stderr, "Res: %03d ", mr);
if (st && sc != 69) fprintf (stderr, "SQL "); if (st && sc != 69) fprintf (stderr, "SQL ");
if (st && sc != 69) fprintf (stderr, "CODE: %X ", sc); if (st && sc != 69) fprintf (stderr, "CODE: %03d ", sc);
//print out current block numbering and frame numbering //print out current block numbering and frame numbering
// fprintf (stderr, "BN: %d BT: %d FN: %d FT: %d ", bn, bt, fn, ft); // fprintf (stderr, "BN: %d BT: %d FN: %d FT: %d ", bn, bt, fn, ft);
//simplified version //simplified version
if (ft != 0) //if frame total is greater than 0 if (ft != 0 && err == 0) //if frame total is greater than 0
fprintf (stderr, "FN:%d-%d ", fn, ft); fprintf (stderr, "FN:%d-%d ", fn, ft);
if (opts->payload == 1) if (opts->payload == 1)
@@ -846,6 +847,7 @@ void processYSF(dsd_opts * opts, dsd_state * state)
if (err != 0) if (err != 0)
{ {
fprintf (stderr, "%s", KRED); fprintf (stderr, "%s", KRED);
fprintf (stderr, "FICH ");
if (err == -1) if (err == -1)
fprintf (stderr, "(FEC ERR)"); fprintf (stderr, "(FEC ERR)");
if (err == -2) if (err == -2)
@@ -900,9 +902,12 @@ void processYSF(dsd_opts * opts, dsd_state * state)
} }
// send VCH to ehr voice handler -- buffer run // send VCH to ehr voice handler
ysf_ehr (opts, state, vbuf, 0, 4); ysf_ehr (opts, state, vbuf, 0, 4);
//send DCH to decoder
ysf_conv_dch (opts, state, bn, bt, fn, ft, dbuf);
} }