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

Add source identifier to D-Star output on HD44780

Browse Source
This commit is contained in:
phl0
2016-04-12 00:12:07 +02:00
parent e62ff87811
commit 975edd2dea
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DStarControl.cpp
View File

@@ -203,7 +203,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfState = RS_RF_AUDIO; m_rfState = RS_RF_AUDIO;
if (m_netState == RS_NET_IDLE) 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); LogMessage("D-Star, received RF header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} else if (type == TAG_EOT) { } else if (type == TAG_EOT) {
@@ -374,7 +374,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfN = (m_rfN + 1U) % 21U; m_rfN = (m_rfN + 1U) % 21U;
if (m_netState == RS_NET_IDLE) 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); 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 #endif
m_netState = RS_NET_AUDIO; 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); LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} else if (type == TAG_EOT) { } else if (type == TAG_EOT) {

2
Display.h
View File

@@ -33,7 +33,7 @@ public:
virtual void setLockout() = 0; virtual void setLockout() = 0;
virtual void setError(const char* text) = 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 clearDStar() = 0;
virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type) = 0; virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type) = 0;

4
HD44780.cpp
View File

@@ -107,7 +107,7 @@ void CHD44780::setLockout()
m_dmr = false; 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(my1 != NULL);
assert(my2 != NULL); assert(my2 != NULL);
@@ -121,7 +121,7 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your)
if (m_rows > 2U) { if (m_rows > 2U) {
char buffer[40U]; char buffer[40U];
::sprintf(buffer, "%.8s/%.4s >", my1, my2); ::sprintf(buffer, "%s %.8s/%.4s >", type, my1, my2);
::lcdPosition(m_fd, 0, 1); ::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "%.*s", m_cols, buffer); ::lcdPrintf(m_fd, "%.*s", m_cols, buffer);

2
HD44780.h
View File

@@ -37,7 +37,7 @@ public:
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); 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 clearDStar();
virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type);

2
Nextion.cpp
View File

@@ -93,7 +93,7 @@ void CNextion::setLockout()
m_mode = MODE_LOCKOUT; 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(my1 != NULL);
assert(my2 != NULL); assert(my2 != NULL);

2
Nextion.h
View File

@@ -38,7 +38,7 @@ public:
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); 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 clearDStar();
virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type);

2
NullDisplay.cpp
View File

@@ -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)
{ {
} }

2
NullDisplay.h
View File

@@ -36,7 +36,7 @@ public:
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); 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 clearDStar();
virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type);

2
TFTSerial.cpp
View File

@@ -142,7 +142,7 @@ void CTFTSerial::setLockout()
m_mode = MODE_LOCKOUT; 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(my1 != NULL);
assert(my2 != NULL); assert(my2 != NULL);

2
TFTSerial.h
View File

@@ -38,7 +38,7 @@ public:
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); 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 clearDStar();
virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type); virtual void writeDMR(unsigned int slotNo, unsigned int srdId, bool group, unsigned int dstId, const char* type);