mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 05:05:38 -05:00
Init Group Mode Str; Tweak Group List Conditions;
This commit is contained in:
@@ -225,6 +225,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
if ( (time(NULL) - state->last_vc_sync_time > 2) )
|
if ( (time(NULL) - state->last_vc_sync_time > 2) )
|
||||||
{
|
{
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -236,6 +237,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1035,6 +1037,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
for (j = start; j < end; j++) //go through the channels stored looking for active ones to tune to
|
for (j = start; j < end; j++) //go through the channels stored looking for active ones to tune to
|
||||||
{
|
{
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -1046,6 +1049,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1179,6 +1183,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
}
|
}
|
||||||
|
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -1190,6 +1195,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1374,6 +1380,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
for (j = 0; j < 6; j++) //go through the channels stored looking for active ones to tune to
|
for (j = 0; j < 6; j++) //go through the channels stored looking for active ones to tune to
|
||||||
{
|
{
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -1388,6 +1395,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -227,6 +227,7 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
|
|||||||
|
|
||||||
//set playback mode for this frame
|
//set playback mode for this frame
|
||||||
char mode[8];
|
char mode[8];
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -242,6 +243,7 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
|
|||||||
if (state->group_array[i].groupNumber == groupNumber)
|
if (state->group_array[i].groupNumber == groupNumber)
|
||||||
{
|
{
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -475,6 +475,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
fprintf (stderr, " Group [%05d] Source [%08d] LCN[%02d]", group, source, lcn);
|
fprintf (stderr, " Group [%05d] Source [%08d] LCN[%02d]", group, source, lcn);
|
||||||
|
|
||||||
char mode[8]; //allow, block, digital enc
|
char mode[8]; //allow, block, digital enc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -486,6 +487,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -611,6 +613,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
fprintf (stderr, " AFS [0x%03X] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
|
fprintf (stderr, " AFS [0x%03X] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
|
||||||
|
|
||||||
char mode[8]; //allow, block, digital enc
|
char mode[8]; //allow, block, digital enc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -622,6 +625,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -539,6 +539,7 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
|
|||||||
//run group/source analysis and tune if available/desired
|
//run group/source analysis and tune if available/desired
|
||||||
//group list mode so we can look and see if we need to block tuning any groups, etc
|
//group list mode so we can look and see if we need to block tuning any groups, etc
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -546,16 +547,18 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
|
|||||||
|
|
||||||
for (int i = 0; i < state->group_tally; i++)
|
for (int i = 0; i < state->group_tally; i++)
|
||||||
{
|
{
|
||||||
if (state->group_array[i].groupNumber == DestinationID) //source, or destination?
|
if (state->group_array[i].groupNumber == DestinationID && DestinationID != 0) //destination, if it isn't 0
|
||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
//might not be ideal if both source and group/target are both in the array
|
//might not be ideal if both source and group/target are both in the array
|
||||||
else if (state->group_array[i].groupNumber == SourceUnitID) //source, or destination?
|
else if (state->group_array[i].groupNumber == SourceUnitID && DestinationID == 0) //source, if destination is 0
|
||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1394,6 +1397,7 @@ void NXDN_decode_scch(dsd_opts * opts, dsd_state * state, uint8_t * Message, uin
|
|||||||
//run group/tgt analysis and tune if available/desired
|
//run group/tgt analysis and tune if available/desired
|
||||||
//group list mode so we can look and see if we need to block tuning any groups, etc
|
//group list mode so we can look and see if we need to block tuning any groups, etc
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -1405,6 +1409,7 @@ void NXDN_decode_scch(dsd_opts * opts, dsd_state * state, uint8_t * Message, uin
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
//group list mode so we can look and see if we need to block tuning any groups, etc
|
//group list mode so we can look and see if we need to block tuning any groups, etc
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -322,6 +323,7 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -420,6 +422,7 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
|
|
||||||
//group list mode so we can look and see if we need to block tuning any groups, etc
|
//group list mode so we can look and see if we need to block tuning any groups, etc
|
||||||
char mode[8]; //allow, block, digital, enc, etc
|
char mode[8]; //allow, block, digital, enc, etc
|
||||||
|
sprintf (mode, "%s", "");
|
||||||
|
|
||||||
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
//if we are using allow/whitelist mode, then write 'B' to mode for block
|
||||||
//comparison below will look for an 'A' to write to mode if it is allowed
|
//comparison below will look for an 'A' to write to mode if it is allowed
|
||||||
@@ -107,6 +108,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,6 +186,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -295,6 +298,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,6 +395,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -481,6 +486,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -628,6 +634,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -796,6 +803,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -909,6 +917,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1008,6 +1017,7 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
|
|||||||
{
|
{
|
||||||
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
fprintf (stderr, " [%s]", state->group_array[i].groupName);
|
||||||
strcpy (mode, state->group_array[i].groupMode);
|
strcpy (mode, state->group_array[i].groupMode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user