mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-16 10:47:21 -05:00
P25 - MFID90 Moto Talker EOT ; Misc;
This commit is contained in:
@@ -364,8 +364,7 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
|
|||||||
else fprintf (stderr, " Unknown Format %02X MFID %02X SVC %02X", lc_format, lc_mfid, lc_svcopt);
|
else fprintf (stderr, " Unknown Format %02X MFID %02X SVC %02X", lc_format, lc_mfid, lc_svcopt);
|
||||||
}
|
}
|
||||||
|
|
||||||
//MFID 90 Embedded GPS -- SDRTrunk shows this is a LCW with the same format as
|
//MFID 90 Embedded GPS
|
||||||
//DMR Embedded GPS FLC (I have not observed this opcode for accuracy)
|
|
||||||
else if (lc_mfid == 0x90 && lc_opcode == 0x6)
|
else if (lc_mfid == 0x90 && lc_opcode == 0x6)
|
||||||
{
|
{
|
||||||
fprintf (stderr, " MFID90 (Moto)");
|
fprintf (stderr, " MFID90 (Moto)");
|
||||||
@@ -384,11 +383,11 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
|
|||||||
else if (lc_mfid == 0x90 && lc_opcode == 0x4)
|
else if (lc_mfid == 0x90 && lc_opcode == 0x4)
|
||||||
fprintf (stderr, " MFID90 (Moto) Group Regroup Delete");
|
fprintf (stderr, " MFID90 (Moto) Group Regroup Delete");
|
||||||
|
|
||||||
//Still unclear whether or not this signals the end of a call grant,
|
|
||||||
//or just the end of the current talker talking, so we won't tune away here
|
|
||||||
//MFID90 still uses the standard Call Termination as well at teardown
|
|
||||||
else if (lc_mfid == 0x90 && lc_opcode == 0xF)
|
else if (lc_mfid == 0x90 && lc_opcode == 0xF)
|
||||||
fprintf (stderr, " MFID90 (Moto) Call Termination");
|
{
|
||||||
|
uint32_t src = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24);
|
||||||
|
fprintf (stderr, " MFID90 (Moto) Talker EOT; SRC: %d", src);
|
||||||
|
}
|
||||||
|
|
||||||
//not a duplicate, this one will print if not MFID 0 or 1
|
//not a duplicate, this one will print if not MFID 0 or 1
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -443,7 +443,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//Some of these Opcodes that aren't found in any TIA manual come from SDRTrunk,
|
//Some of these Opcodes that aren't found in any TIA manual come from SDRTrunk (or other sources),
|
||||||
//but can't verify the accuracy of their meaning/context
|
//but can't verify the accuracy of their meaning/context
|
||||||
// else if ( (tsbk_byte[0] & 0x3F) == 0x05 )
|
// else if ( (tsbk_byte[0] & 0x3F) == 0x05 )
|
||||||
// {
|
// {
|
||||||
@@ -485,6 +485,22 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
|
|||||||
// fprintf (stderr, "%02X", tsbk_byte[i]);
|
// fprintf (stderr, "%02X", tsbk_byte[i]);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
// else if ( (tsbk_byte[0] & 0x3F) == 0x15 ) //noted on RR, but not observed as of yet, this may actualy be a LCW and not a TSBK?
|
||||||
|
// {
|
||||||
|
// fprintf (stderr, "\n");
|
||||||
|
// fprintf (stderr, " MFID 90 (Moto) Talker Alias: ");
|
||||||
|
// for (i = 2; i < 10; i++)
|
||||||
|
// fprintf (stderr, "%02X", tsbk_byte[i]);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// else if ( (tsbk_byte[0] & 0x3F) == 0x16 )
|
||||||
|
// {
|
||||||
|
// fprintf (stderr, "\n");
|
||||||
|
// fprintf (stderr, " MFID 90 (Moto) Something: "); //observed, but no idea
|
||||||
|
// for (i = 2; i < 10; i++)
|
||||||
|
// fprintf (stderr, "%02X", tsbk_byte[i]);
|
||||||
|
// }
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf (stderr, "%s",KCYN);
|
fprintf (stderr, "%s",KCYN);
|
||||||
@@ -527,7 +543,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
|
|||||||
if (opts->payload == 1)
|
if (opts->payload == 1)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "%s",KCYN);
|
fprintf (stderr, "%s",KCYN);
|
||||||
fprintf (stderr, "\n P25 PDU Payload #%d ", j);
|
fprintf (stderr, "\n P25 PDU Payload #%d ", j+1);
|
||||||
for (i = 0; i < 12; i++)
|
for (i = 0; i < 12; i++)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "[%02X]", tsbk_byte[i]);
|
fprintf (stderr, "[%02X]", tsbk_byte[i]);
|
||||||
|
|||||||
Reference in New Issue
Block a user