Merge remote-tracking branch 'g4klx/master'

This commit is contained in:
Andy CA6JAU 2016-12-31 15:57:02 -03:00
commit 0a20ec7360
2 changed files with 28 additions and 2 deletions

View file

@ -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

View file

@ -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;
}