Translate DMR Id to callsign from a file.

This commit is contained in:
Jonathan Naylor
2016-04-12 18:26:13 +01:00
parent 9c59294c23
commit 8eb564ba37
18 changed files with 87 additions and 43 deletions

View File

@@ -119,8 +119,9 @@ void CNextion::clearDStar()
sendCommand("t1.txt=\"\"");
}
void CNextion::writeDMR(unsigned int slotNo, unsigned int srcId, bool group, unsigned int dstId, const char* type)
void CNextion::writeDMR(unsigned int slotNo, const char* src, bool group, unsigned int dstId, const char* type)
{
assert(src != NULL);
assert(type != NULL);
if (m_mode != MODE_DMR) {
@@ -135,7 +136,7 @@ void CNextion::writeDMR(unsigned int slotNo, unsigned int srcId, bool group, uns
if (slotNo == 1U) {
char text[30U];
::sprintf(text, "t0.txt=\"1 %s %u\"", type, srcId);
::sprintf(text, "t0.txt=\"1 %s %s\"", type, src);
sendCommand(text);
::sprintf(text, "t1.txt=\"%s%u\"", group ? "TG" : "", dstId);
@@ -143,7 +144,7 @@ void CNextion::writeDMR(unsigned int slotNo, unsigned int srcId, bool group, uns
} else {
char text[30U];
::sprintf(text, "t2.txt=\"2 %s %u\"", type, srcId);
::sprintf(text, "t2.txt=\"2 %s %s\"", type, src);
sendCommand(text);
::sprintf(text, "t3.txt=\"%s%u\"", group ? "TG" : "", dstId);