MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add extra commits and hopefully fix missing line on HD44780 in DMR mode,

Browse Source
This commit is contained in:
Jonathan Naylor
2016-04-12 17:46:48 +01:00
parent 469fd8623b
commit 9c59294c23
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HD44780.cpp
View File

@@ -112,6 +112,7 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your, co
assert(my1 != NULL); assert(my1 != NULL);
assert(my2 != NULL); assert(my2 != NULL);
assert(your != NULL); assert(your != NULL);
assert(type != NULL);
::lcdClear(m_fd); ::lcdClear(m_fd);
@@ -157,14 +158,14 @@ void CHD44780::writeDMR(unsigned int slotNo, unsigned int srcId, bool group, uns
{ {
assert(type != NULL); assert(type != NULL);
::lcdClear(m_fd);
if (m_rows > 2U) {
::lcdPosition(m_fd, 0, 0);
::lcdPuts(m_fd, "DMR");
}
if (!m_dmr) { if (!m_dmr) {
::lcdClear(m_fd);
if (m_rows > 2U) {
::lcdPosition(m_fd, 0, 0);
::lcdPuts(m_fd, "DMR");
}
if (slotNo == 1U) { if (slotNo == 1U) {
::lcdPosition(m_fd, 0, m_rows > 2U ? 2 : 1); ::lcdPosition(m_fd, 0, m_rows > 2U ? 2 : 1);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, LISTENING); ::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, LISTENING);

1
Nextion.cpp
View File

@@ -98,6 +98,7 @@ void CNextion::writeDStar(const char* my1, const char* my2, const char* your, co
assert(my1 != NULL); assert(my1 != NULL);
assert(my2 != NULL); assert(my2 != NULL);
assert(your != NULL); assert(your != NULL);
assert(type != NULL);
if (m_mode != MODE_DSTAR) if (m_mode != MODE_DSTAR)
sendCommand("page DStar"); sendCommand("page DStar");

1
TFTSerial.cpp
View File

@@ -147,6 +147,7 @@ void CTFTSerial::writeDStar(const char* my1, const char* my2, const char* your,
assert(my1 != NULL); assert(my1 != NULL);
assert(my2 != NULL); assert(my2 != NULL);
assert(your != NULL); assert(your != NULL);
assert(type != NULL);
if (m_mode != MODE_DSTAR) { if (m_mode != MODE_DSTAR) {
// Clear the screen // Clear the screen