diff --git a/DStarControl.cpp b/DStarControl.cpp index 5a96c8a..a95100d 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -203,7 +203,7 @@ bool CDStarControl::writeModem(unsigned char *data) m_rfState = RS_RF_AUDIO; if (m_netState == RS_NET_IDLE) - m_display->writeDStar((char*)my1, (char*)my2, (char*)your); + m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R"); LogMessage("D-Star, received RF header from %8.8s/%4.4s to %8.8s", my1, my2, your); } else if (type == TAG_EOT) { @@ -374,7 +374,7 @@ bool CDStarControl::writeModem(unsigned char *data) m_rfN = (m_rfN + 1U) % 21U; if (m_netState == RS_NET_IDLE) - m_display->writeDStar((char*)my1, (char*)my2, (char*)your); + m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R"); LogMessage("D-Star, received RF late entry from %8.8s/%4.4s to %8.8s", my1, my2, your); } @@ -491,7 +491,7 @@ void CDStarControl::writeNetwork() #endif m_netState = RS_NET_AUDIO; - m_display->writeDStar((char*)my1, (char*)my2, (char*)your); + m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N"); LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your); } else if (type == TAG_EOT) { diff --git a/Display.h b/Display.h index 5f19f7f..a161796 100644 --- a/Display.h +++ b/Display.h @@ -33,7 +33,7 @@ public: virtual void setLockout() = 0; virtual void setError(const char* text) = 0; - virtual void writeDStar(const char* my1, const char* my2, const char* your) = 0; + virtual void writeDStar(const char* my1, const char* my2, const char* your, const char* type) = 0; virtual void clearDStar() = 0; virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type) = 0; diff --git a/HD44780.cpp b/HD44780.cpp index fd3635f..3ee0483 100644 --- a/HD44780.cpp +++ b/HD44780.cpp @@ -107,7 +107,7 @@ void CHD44780::setLockout() m_dmr = false; } -void CHD44780::writeDStar(const char* my1, const char* my2, const char* your) +void CHD44780::writeDStar(const char* my1, const char* my2, const char* your, const char* type) { assert(my1 != NULL); assert(my2 != NULL); @@ -121,7 +121,7 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your) if (m_rows > 2U) { char buffer[40U]; - ::sprintf(buffer, "%.8s/%.4s >", my1, my2); + ::sprintf(buffer, "%s %.8s/%.4s >", type, my1, my2); ::lcdPosition(m_fd, 0, 1); ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); diff --git a/HD44780.h b/HD44780.h index fe5bed2..bd20d47 100644 --- a/HD44780.h +++ b/HD44780.h @@ -37,7 +37,7 @@ public: virtual void setError(const char* text); virtual void setLockout(); - virtual void writeDStar(const char* my1, const char* my2, const char* your); + virtual void writeDStar(const char* my1, const char* my2, const char* your, const char* type); virtual void clearDStar(); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); diff --git a/Nextion.cpp b/Nextion.cpp index 2dcbfe8..9aa3be3 100644 --- a/Nextion.cpp +++ b/Nextion.cpp @@ -93,7 +93,7 @@ void CNextion::setLockout() m_mode = MODE_LOCKOUT; } -void CNextion::writeDStar(const char* my1, const char* my2, const char* your) +void CNextion::writeDStar(const char* my1, const char* my2, const char* your, const char* type) { assert(my1 != NULL); assert(my2 != NULL); diff --git a/Nextion.h b/Nextion.h index 3f9c1f6..f13b633 100644 --- a/Nextion.h +++ b/Nextion.h @@ -38,7 +38,7 @@ public: virtual void setError(const char* text); virtual void setLockout(); - virtual void writeDStar(const char* my1, const char* my2, const char* your); + virtual void writeDStar(const char* my1, const char* my2, const char* your, const char* type); virtual void clearDStar(); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); diff --git a/NullDisplay.cpp b/NullDisplay.cpp index 46786cd..e6f31f4 100644 --- a/NullDisplay.cpp +++ b/NullDisplay.cpp @@ -43,7 +43,7 @@ void CNullDisplay::setLockout() { } -void CNullDisplay::writeDStar(const char* my1, const char* my2, const char* your) +void CNullDisplay::writeDStar(const char* my1, const char* my2, const char* your, const char* type) { } diff --git a/NullDisplay.h b/NullDisplay.h index f30721b..bdcb8d0 100644 --- a/NullDisplay.h +++ b/NullDisplay.h @@ -36,7 +36,7 @@ public: virtual void setError(const char* text); virtual void setLockout(); - virtual void writeDStar(const char* my1, const char* my2, const char* your); + virtual void writeDStar(const char* my1, const char* my2, const char* your, const char* type); virtual void clearDStar(); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); diff --git a/TFTSerial.cpp b/TFTSerial.cpp index c767708..fdb30c6 100644 --- a/TFTSerial.cpp +++ b/TFTSerial.cpp @@ -142,7 +142,7 @@ void CTFTSerial::setLockout() m_mode = MODE_LOCKOUT; } -void CTFTSerial::writeDStar(const char* my1, const char* my2, const char* your) +void CTFTSerial::writeDStar(const char* my1, const char* my2, const char* your, const char* type) { assert(my1 != NULL); assert(my2 != NULL); diff --git a/TFTSerial.h b/TFTSerial.h index 987e4f4..84f5075 100644 --- a/TFTSerial.h +++ b/TFTSerial.h @@ -38,7 +38,7 @@ public: virtual void setError(const char* text); virtual void setLockout(); - virtual void writeDStar(const char* my1, const char* my2, const char* your); + virtual void writeDStar(const char* my1, const char* my2, const char* your, const char* type); virtual void clearDStar(); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type);