ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed second half of writeDMR function

This commit is contained in:
phl0 2016-04-14 23:31:57 +02:00
parent ebe33ceb24
commit a34d5c43d0
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
HD44780.cpp
View File

@ -206,24 +206,39 @@ void CHD44780::writeDMR(unsigned int slotNo, const char* src, bool group, unsign
} }
} }
if (slotNo == 1U) { if (m_rows == 2U && m_cols == 16U) {
char buffer[40U]; char buffer[16U];
if (m_cols > 16U) if (slotNo == 1U) {
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
else
::sprintf(buffer, "%s > %s%u", src, group ? "TG" : "", dstId); ::sprintf(buffer, "%s > %s%u", src, group ? "TG" : "", dstId);
::lcdPosition(m_fd, 0, 0);
::lcdPosition(m_fd, 0, m_rows > 2U ? 1 : 0); ::lcdPrintf(m_fd, "1 %.*s", m_cols - 2U, buffer);
::lcdPrintf(m_fd, "1 %.*s", m_cols - 2U, buffer); } else {
} else {
char buffer[40U];
if (m_cols > 16U)
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
else
::sprintf(buffer, "%s > %s%u", src, group ? "TG" : "", dstId); ::sprintf(buffer, "%s > %s%u", src, group ? "TG" : "", dstId);
::lcdPosition(m_fd, 0, 1);
::lcdPosition(m_fd, 0, m_rows > 2U ? 2 : 1); ::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer); }
} else if (m_rows == 4U && m_cols == 20U) {
char buffer[20U];
if (slotNo == 1U) {
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "1 %.*s", m_cols - 2U, buffer);
} else {
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
::lcdPosition(m_fd, 0, 2);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}
} else if (m_rows == 2 && m_cols == 40U) {
char buffer[40U];
if (slotNo == 1U) {
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
::lcdPosition(m_fd, 0, 0);
::lcdPrintf(m_fd, "1 %.*s", m_cols - 2U, buffer);
} else {
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}
} }
m_dmr = true; m_dmr = true;