mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-19 20:27:26 -05:00
Fix Slot0/2 Thing
Fix Slot0/2 Thing
This commit is contained in:
@@ -51,8 +51,8 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
|
|||||||
//memset(&state->TS2SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
|
//memset(&state->TS2SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
|
||||||
|
|
||||||
//Init slot lights
|
//Init slot lights
|
||||||
sprintf (state->slot0light, " slot0 ");
|
sprintf (state->slot1light, " slot0 ");
|
||||||
sprintf (state->slot1light, " slot1 ");
|
sprintf (state->slot2light, " slot1 ");
|
||||||
|
|
||||||
//Init the color code status
|
//Init the color code status
|
||||||
state->color_code_ok = 0;
|
state->color_code_ok = 0;
|
||||||
|
|||||||
@@ -200,8 +200,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
|
|||||||
sprintf (state->fsubtype, " VOICE ");
|
sprintf (state->fsubtype, " VOICE ");
|
||||||
if (opts->dmr_stereo == 0 && state->synctype < 32) // -T option for DMR (TDMA) stereo
|
if (opts->dmr_stereo == 0 && state->synctype < 32) // -T option for DMR (TDMA) stereo
|
||||||
{
|
{
|
||||||
sprintf (state->slot0light, " slot0 ");
|
|
||||||
sprintf (state->slot1light, " slot1 ");
|
sprintf (state->slot1light, " slot1 ");
|
||||||
|
sprintf (state->slot2light, " slot2 ");
|
||||||
processDMRvoice (opts, state);
|
processDMRvoice (opts, state);
|
||||||
}
|
}
|
||||||
if (opts->dmr_stereo == 0 && state->synctype == 32)
|
if (opts->dmr_stereo == 0 && state->synctype == 32)
|
||||||
@@ -241,16 +241,16 @@ processFrame (dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
closeMbeOutFile (opts, state);
|
closeMbeOutFile (opts, state);
|
||||||
state->err_str[0] = 0;
|
state->err_str[0] = 0;
|
||||||
sprintf (state->slot0light, " slot0 ");
|
|
||||||
sprintf (state->slot1light, " slot1 ");
|
sprintf (state->slot1light, " slot1 ");
|
||||||
|
sprintf (state->slot2light, " slot2 ");
|
||||||
processDMRdata (opts, state);
|
processDMRdata (opts, state);
|
||||||
}
|
}
|
||||||
//switch dmr_stereo to 0 when handling BS data frame syncs with processDMRdata
|
//switch dmr_stereo to 0 when handling BS data frame syncs with processDMRdata
|
||||||
if (opts->dmr_stereo == 1)
|
if (opts->dmr_stereo == 1)
|
||||||
{
|
{
|
||||||
state->dmr_stereo = 0; //set the state to zero for handling pure data frames
|
state->dmr_stereo = 0; //set the state to zero for handling pure data frames
|
||||||
sprintf (state->slot0light, " slot0 ");
|
|
||||||
sprintf (state->slot1light, " slot1 ");
|
sprintf (state->slot1light, " slot1 ");
|
||||||
|
sprintf (state->slot2light, " slot2 ");
|
||||||
processDMRdata (opts, state);
|
processDMRdata (opts, state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
|
|||||||
fprintf (stderr,"Demod mode: %s Nac: %4X\n", modulation, state->nac);
|
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 Type: %s Talkgroup: %7i\n", state->ftype, state->lasttg);
|
||||||
fprintf (stderr,"Frame Subtype: %s Source: %12i\n", state->fsubtype, state->lastsrc);
|
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");
|
fprintf (stderr,"+----------------------------------------------------------------+\n");
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -104,8 +104,8 @@ noCarrier (dsd_opts * opts, dsd_state * state)
|
|||||||
state->numtdulc = 0;
|
state->numtdulc = 0;
|
||||||
//sprintf (state->slot0light, " slot0 ");
|
//sprintf (state->slot0light, " slot0 ");
|
||||||
//sprintf (state->slot0light, " slot0 ");
|
//sprintf (state->slot0light, " slot0 ");
|
||||||
sprintf (state->slot0light, "");
|
|
||||||
sprintf (state->slot1light, "");
|
sprintf (state->slot1light, "");
|
||||||
|
sprintf (state->slot2light, "");
|
||||||
state->firstframe = 0;
|
state->firstframe = 0;
|
||||||
if (opts->audio_gain == (float) 0)
|
if (opts->audio_gain == (float) 0)
|
||||||
{
|
{
|
||||||
@@ -313,8 +313,8 @@ initState (dsd_state * state)
|
|||||||
state->firstframe = 0;
|
state->firstframe = 0;
|
||||||
//sprintf (state->slot0light, " slot0 ");
|
//sprintf (state->slot0light, " slot0 ");
|
||||||
//sprintf (state->slot1light, " slot1 ");
|
//sprintf (state->slot1light, " slot1 ");
|
||||||
sprintf (state->slot0light, "");
|
|
||||||
sprintf (state->slot1light, "");
|
sprintf (state->slot1light, "");
|
||||||
|
sprintf (state->slot2light, "");
|
||||||
state->aout_gain = 25;
|
state->aout_gain = 25;
|
||||||
memset (state->aout_max_buf, 0, sizeof (float) * 200);
|
memset (state->aout_max_buf, 0, sizeof (float) * 200);
|
||||||
state->aout_max_buf_p = state->aout_max_buf;
|
state->aout_max_buf_p = state->aout_max_buf;
|
||||||
|
|||||||
Reference in New Issue
Block a user