From 1fa1a5886765779082b5f7a0550cc2ab7d5fd006 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 31 Dec 2016 16:01:26 +0000 Subject: [PATCH] Display DMR embedded data. --- DMRDefines.h | 9 +++++++-- DMREmbeddedLC.cpp | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/DMRDefines.h b/DMRDefines.h index 40cab79..f0ab1db 100644 --- a/DMRDefines.h +++ b/DMRDefines.h @@ -114,8 +114,13 @@ const unsigned char FID_ETSI = 0U; const unsigned char FID_DMRA = 16U; enum FLCO { - FLCO_GROUP = 0, - FLCO_USER_USER = 3 + FLCO_GROUP = 0, + FLCO_USER_USER = 3, + FLCO_TALKER_ALIAS_HEADER = 4, + FLCO_TALKER_ALIAS_BLOCK1 = 5, + FLCO_TALKER_ALIAS_BLOCK2 = 6, + FLCO_TALKER_ALIAS_BLOCK3 = 7, + FLCO_GPS_INFO = 8 }; #endif diff --git a/DMREmbeddedLC.cpp b/DMREmbeddedLC.cpp index 2163bd4..829a250 100644 --- a/DMREmbeddedLC.cpp +++ b/DMREmbeddedLC.cpp @@ -258,7 +258,28 @@ CDMRLC* CDMREmbeddedLC::processMultiBlockEmbeddedLC() case FLCO_GROUP: case FLCO_USER_USER: return lc; + case FLCO_GPS_INFO: + CUtils::dump(1U, "DMR, Embedded GPS Info", lcData, 72U); + delete lc; + return NULL; + case FLCO_TALKER_ALIAS_HEADER: + CUtils::dump(1U, "DMR, Embedded Talker Alias Header", lcData, 72U); + delete lc; + return NULL; + case FLCO_TALKER_ALIAS_BLOCK1: + CUtils::dump(1U, "DMR, Embedded Talker Alias Block 1", lcData, 72U); + delete lc; + return NULL; + case FLCO_TALKER_ALIAS_BLOCK2: + CUtils::dump(1U, "DMR, Embedded Talker Alias Block 2", lcData, 72U); + delete lc; + return NULL; + case FLCO_TALKER_ALIAS_BLOCK3: + CUtils::dump(1U, "DMR, Embedded Talker Alias Block 3", lcData, 72U); + delete lc; + return NULL; default: + CUtils::dump(1U, "DMR, Unknown Embedded Data", lcData, 72U); delete lc; return NULL; }