mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-09 15:27:22 -05:00
DMR: Tait Talker Alias Single Block Embedded LC; #367
This commit is contained in:
@@ -142,7 +142,7 @@ Advanced Decoder options:
|
||||
-H '20029736A5D91042 C923EB0697484433 005EFC58A1905195 E28E9C7836AA2DB8'
|
||||
|
||||
-H <hex> Manually Enter Caltta 10/32/64 Char Basic Privacy Hex Key (see example below)
|
||||
-H C:40:0292081081
|
||||
-H C:40:1234567890
|
||||
-H C:128:736B9A9C5645288B243AD5CB8701EF8A'
|
||||
-H C:256:20029736A5D91042C923EB0697484433005EFC58A1905195E28E9C7836AA2DB8'
|
||||
|
||||
|
||||
@@ -214,8 +214,29 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
||||
goto END_FLCO;
|
||||
}
|
||||
|
||||
//Tait Talker Alias
|
||||
if (fid == 0x58 && flco == 0x08 && type == 3)
|
||||
{
|
||||
fprintf (stderr, "%s", KCYN);
|
||||
fprintf (stderr, " SLOT %d", state->currentslot+1);
|
||||
fprintf (stderr, " Tait Talker Alias: ");
|
||||
char tta_str[8]; memset(tta_str, 0, sizeof(tta_str));
|
||||
for (int i = 0; i < 7; i++)
|
||||
tta_str[i] = (uint8_t)ConvertBitIntoBytes(&lc_bits[16+(i*8)], 8);
|
||||
fprintf (stderr, "%s", tta_str);
|
||||
uint32_t source = 0;
|
||||
if (slot == 0)
|
||||
source = state->lastsrc;
|
||||
else source = state->lastsrcR;
|
||||
|
||||
if (state->event_history_s[slot].Event_History_Items[0].source_id == source)
|
||||
sprintf (state->event_history_s[slot].Event_History_Items[0].alias, "%s; ", tta_str);
|
||||
sprintf (state->generic_talker_alias[slot], "Talker Alias: %s; ", tta_str);
|
||||
|
||||
goto END_FLCO;
|
||||
}
|
||||
//Unknown Tait Things
|
||||
if (fid == 0x58)
|
||||
else if (fid == 0x58)
|
||||
{
|
||||
//NOTE: fid 0x58 (tait) had a single flco 0x06 emb observed, but without the other blocks (4,5,7) for an alias
|
||||
//will need to observe this one, or just remove it from the list, going to isolate tait lc for now
|
||||
|
||||
@@ -1548,7 +1548,7 @@
|
||||
printf (" -H '20029736A5D91042 C923EB0697484433 005EFC58A1905195 E28E9C7836AA2DB8' \n");
|
||||
printf ("\n");
|
||||
printf (" -H <hex> Manually Enter Caltta 10/32/64 Char Basic Privacy Hex Key (see example below)\n");
|
||||
printf (" -H C:40:0292081081 \n");
|
||||
printf (" -H C:40:1234567890 \n");
|
||||
printf (" -H C:128:736B9A9C5645288B243AD5CB8701EF8A' \n");
|
||||
printf (" -H C:256:20029736A5D91042C923EB0697484433005EFC58A1905195E28E9C7836AA2DB8' \n");
|
||||
printf ("\n");
|
||||
|
||||
Reference in New Issue
Block a user