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

Fix Slot0/2 Thing 

Fix Slot0/2 Thing
This commit is contained in:
lwvmobile 2022-05-12 21:38:55 -04:00 committed by GitHub
parent 6de3e6c9f3
commit 685c8aebe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dmr_bs.c
View File

@ -51,8 +51,8 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
//memset(&state->TS2SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
//Init slot lights
sprintf (state->slot0light, " slot0 ");
sprintf (state->slot1light, " slot1 ");
sprintf (state->slot1light, " slot0 ");
sprintf (state->slot2light, " slot1 ");
//Init the color code status
state->color_code_ok = 0;

6
src/dsd_frame.c
View File

@ -200,8 +200,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
sprintf (state->fsubtype, " VOICE ");
if (opts->dmr_stereo == 0 && state->synctype < 32) // -T option for DMR (TDMA) stereo
{
sprintf (state->slot0light, " slot0 ");
sprintf (state->slot1light, " slot1 ");
sprintf (state->slot2light, " slot2 ");
processDMRvoice (opts, state);
}
if (opts->dmr_stereo == 0 && state->synctype == 32)
@ -241,16 +241,16 @@ processFrame (dsd_opts * opts, dsd_state * state)
{
closeMbeOutFile (opts, state);
state->err_str[0] = 0;
sprintf (state->slot0light, " slot0 ");
sprintf (state->slot1light, " slot1 ");
sprintf (state->slot2light, " slot2 ");
processDMRdata (opts, state);
}
//switch dmr_stereo to 0 when handling BS data frame syncs with processDMRdata
if (opts->dmr_stereo == 1)
{
state->dmr_stereo = 0; //set the state to zero for handling pure data frames
sprintf (state->slot0light, " slot0 ");
sprintf (state->slot1light, " slot1 ");
sprintf (state->slot2light, " slot2 ");
processDMRdata (opts, state);
}
}

2
src/dsd_frame_sync.c
View File

@ -390,7 +390,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
fprintf (stderr,"Demod mode: %s Nac: %4X\n", modulation, state->nac);
fprintf (stderr,"Frame Type: %s Talkgroup: %7i\n", state->ftype, state->lasttg);
fprintf (stderr,"Frame Subtype: %s Source: %12i\n", state->fsubtype, state->lastsrc);
fprintf (stderr,"TDMA activity: %s %s Voice errors: %s\n", state->slot0light, state->slot1light, state->err_str);
fprintf (stderr,"TDMA activity: %s %s Voice errors: %s\n", state->slot1light, state->slot2light, state->err_str);
fprintf (stderr,"+----------------------------------------------------------------+\n");
for (i = 0; i < 10; i++)
{

4
src/dsd_main.c
View File

@ -104,8 +104,8 @@ noCarrier (dsd_opts * opts, dsd_state * state)
state->numtdulc = 0;
//sprintf (state->slot0light, " slot0 ");
//sprintf (state->slot0light, " slot0 ");
sprintf (state->slot0light, "");
sprintf (state->slot1light, "");
sprintf (state->slot2light, "");
state->firstframe = 0;
if (opts->audio_gain == (float) 0)
{
@ -313,8 +313,8 @@ initState (dsd_state * state)
state->firstframe = 0;
//sprintf (state->slot0light, " slot0 ");
//sprintf (state->slot1light, " slot1 ");
sprintf (state->slot0light, "");
sprintf (state->slot1light, "");
sprintf (state->slot2light, "");
state->aout_gain = 25;
memset (state->aout_max_buf, 0, sizeof (float) * 200);
state->aout_max_buf_p = state->aout_max_buf;