g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-04 14:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update the display and logging on incoming YSF network data.

Browse source
This commit is contained in:
Jonathan Naylor 2016-05-19 19:08:48 +01:00
parent d5310f1983
commit 14f36a175d
15 changed files with 158 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Nextion.cpp
View file

@ -181,11 +181,12 @@ void CNextion::clearDMRInt(unsigned int slotNo)
}
}
void CNextion::writeFusionInt(const char* source, const char* dest, const char* type)
void CNextion::writeFusionInt(const char* source, const char* dest, const char* type, const char* origin)
{
assert(source != NULL);
assert(dest != NULL);
assert(type != NULL);
assert(origin != NULL);
if (m_mode != MODE_YSF)
sendCommand("page YSF");
@ -194,8 +195,20 @@ void CNextion::writeFusionInt(const char* source, const char* dest, const char*
::sprintf(text, "t0.txt=\"%s %.10s\"", type, source);
sendCommand(text);
::sprintf(text, "t1.txt=\" %.10s\"", dest);
sendCommand(text);
if (m_size == "2.4" || m_size == "3.2") {
::sprintf(text, "t1.txt=\"%.10s\"", dest);
sendCommand(text);
if (::strcmp(origin, " ") != 0) {
::sprintf(text, "t2.txt=\"via %.10s\"", origin);
sendCommand(text);
}
} else if (m_size == "3.5") {
if (::strcmp(origin, " ") == 0)
::sprintf(text, "t1.txt=\"%.10s\"", dest);
else
::sprintf(text, "t1.txt=\"%.10s <- %-10s\"", dest, origin);
sendCommand(text);
}
m_mode = MODE_YSF;
}
@ -204,6 +217,8 @@ void CNextion::clearFusionInt()
{
sendCommand("t0.txt=\"Listening\"");
sendCommand("t1.txt=\"\"");
if (m_size == "2.4" || m_size == "3.2")
sendCommand("t2.txt=\"\"");
}
void CNextion::close()