GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-14 09:47:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

NXDN -- TG Hold Support for Type-C; #132

Browse Source
This commit is contained in:
lwvmobile
2023-10-05 08:28:24 -04:00
parent 677ad50f79
commit e1348b838b
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nxdn_element.c
View File

@@ -483,6 +483,16 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
}
}
//TG Hold during VCALL_ASSGN_DUP, allow tuning to TG hold channel assignment
if (MessageType == 0x5 && opts->p25_is_tuned == 1 && opts->p25_trunk == 1)
{
if ( state->tg_hold != 0 && state->tg_hold == DestinationID )
{
MessageType = 0x04; //convert to VCALL
// opts->p25_is_tuned = 0; //open tuning back up to tune
}
}
//assign active call to string (might place inside of tune decision to get multiple ones?)
if (state->nxdn_rcn == 0)
sprintf (state->active_channel[0], "Active Ch: %d TG: %d; ", Channel, DestinationID);
@@ -562,6 +572,14 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
}
}
//TG hold on NXDN -- block non-matching target, allow matching DestinationID
if (state->tg_hold != 0 && state->tg_hold != DestinationID) sprintf (mode, "%s", "B");
if (state->tg_hold != 0 && state->tg_hold == DestinationID)
{
sprintf (mode, "%s", "A");
opts->p25_is_tuned = 0; //unlock tuner at this stage and not above check
}
//check to see if the source/target candidate is blocked first
if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0)) //DE is digital encrypted, B is block
{
@@ -1562,7 +1580,7 @@ char * NXDN_Call_Type_To_Str(uint8_t CallType)
{
case 0: Ptr = "Broadcast Call"; break;
case 1: Ptr = "Group Call"; break;
case 2: Ptr = "Transmission Release"; break; //"Unspecified Call" This value is used only on TX_REL message.
case 2: Ptr = "Idle"; break; //"Unspecified Call" This value is used only on Idle Burst TX_REL message.
case 3: Ptr = "Session Call"; break; //"reserved" is session call on Type D
case 4: Ptr = "Private Call"; break;
case 5: Ptr = "Reserved"; break;