Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12 from phl0/add_source_identifier

Browse source 
Add source identifier
This commit is contained in:
Jonathan Naylor 2016-04-12 09:32:26 +01:00
commit 469fd8623b
10 changed files with 16 additions and 16 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; 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;

6
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);
@ -130,7 +130,7 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your)
::lcdPrintf(m_fd, "%.*s", m_cols, buffer); ::lcdPrintf(m_fd, "%.*s", m_cols, buffer);
} else { } else {
char buffer[40U]; char buffer[40U];
::sprintf(buffer, "%.8s/%.4s > %.8s", my1, my2, your); ::sprintf(buffer, "%s %.8s/%.4s > %.8s", type, my1, my2, your);
::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);

4
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);
@ -103,7 +103,7 @@ void CNextion::writeDStar(const char* my1, const char* my2, const char* your)
sendCommand("page DStar"); sendCommand("page DStar");
char text[30U]; char text[30U];
::sprintf(text, "t0.txt=\"%.8s/%4.4s\"", my1, my2); ::sprintf(text, "t0.txt=\"%s %.8s/%4.4s\"", type, my1, my2);
sendCommand(text); sendCommand(text);
::sprintf(text, "t1.txt=\"%.8s\"", your); ::sprintf(text, "t1.txt=\"%.8s\"", your);

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

4
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);
@ -159,7 +159,7 @@ void CTFTSerial::writeDStar(const char* my1, const char* my2, const char* your)
} }
char text[30U]; char text[30U];
::sprintf(text, "%.8s/%4.4s", my1, my2); ::sprintf(text, "%s %.8s/%4.4s", type, my1, my2);
gotoPosPixel(5U, 80U); gotoPosPixel(5U, 80U);
displayText(text); displayText(text);

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