Changed variable dst to string

This commit is contained in:
DF2ET 2016-04-16 10:28:45 +00:00
parent a853a8cad0
commit eeb6d0a57e

View file

@ -201,33 +201,33 @@ void CHD44780::writeDMR(unsigned int slotNo, const char* src, bool group, const
if (m_rows == 2U && m_cols == 16U) {
char buffer[16U];
if (slotNo == 1U) {
::sprintf(buffer, "%s > %s%u", src, group ? "TG" : "", dstId);
::sprintf(buffer, "%s > %s%s", src, group ? "TG" : "", dst);
::lcdPosition(m_fd, 0, 0);
::lcdPrintf(m_fd, "1 %.*s", m_cols - 2U, buffer);
} else {
::sprintf(buffer, "%s > %s%u", src, group ? "TG" : "", dstId);
::sprintf(buffer, "%s > %s%s", src, group ? "TG" : "", dst);
::lcdPosition(m_fd, 0, 1);
::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);
::sprintf(buffer, "%s %s > %s%s", type, src, group ? "TG" : "", dst);
::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);
::sprintf(buffer, "%s %s > %s%s", type, src, group ? "TG" : "", dst);
::lcdPosition(m_fd, 0, 2);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}
} else if (m_rows == 2U && m_cols == 40U) {
char buffer[40U];
if (slotNo == 1U) {
::sprintf(buffer, "%s %s > %s%u", type, src, group ? "TG" : "", dstId);
::sprintf(buffer, "%s %s > %s%s", type, src, group ? "TG" : "", dst);
::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);
::sprintf(buffer, "%s %s > %s%s", type, src, group ? "TG" : "", dst);
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}