Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests 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
Show stats 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;
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) {

2
Display.h
View file

@ -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;

4
HD44780.cpp
View file

@ -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);

2
HD44780.h
View file

@ -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);

2
Nextion.cpp
View file

@ -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);

2
Nextion.h
View file

@ -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);

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 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);

2
TFTSerial.cpp
View file

@ -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);

2
TFTSerial.h
View file

@ -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);