DMR - Tweak to CSBK (BTV_GRANT) and FLC (BTV);

This commit is contained in:
lwvmobile 2023-09-12 17:14:43 -04:00
parent 102966482b
commit 1f6f8f194b
2 changed files with 11 additions and 11 deletions

View File

@ -108,13 +108,13 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
uint32_t source = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[56], 24);
UNUSED2(st1, st3);
//broadcast calls do not carry src or tgt info
if (csbk_o == 50)
{
//seeting to all MS units and Dispatch? May need to just set to 0 and see what emb pulls out of it
target = 0xFFFFFF; //ALLMSI
source = 0xFFFECB; //DISPATI
}
//broadcast calls show no tgt/src info in ETSI manaual, but seem to correspond with same values in embedded link control
// if (csbk_o == 50)
// {
// //seeting to all MS units and Dispatch? May need to just set to 0 and see what emb pulls out of it
// target = 0xFFFFFF; //ALLMSI
// source = 0xFFFECB; //DISPATI
// }
//move mbc variables out of if statement
uint8_t mbc_lb = 0; //

View File

@ -426,17 +426,17 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
//REMUS! Uncomment Line Below if desired
// else strcat (state->call_string[slot], " ");
//Motorola FID 0x10 Only
if (fid == 0x10)
if (1 == 1) //fid == 0x10
{
/* Check the "Service Option" bits */
if(so & 0x20)
if( (fid == 0x10) && (so & 0x20) ) //Motorola FID 0x10 Only
{
//REMUS! Uncomment Line Below if desired
// strcat (state->call_string[slot], " TXI");
fprintf(stderr, "TXI ");
}
if (so & 0x10)
if ( (fid == 0x10) && (so & 0x10) ) //Motorola FID 0x10 Only
{
//REMUS! Uncomment Line Below if desired
// strcat (state->call_string[slot], " RPT");