C++ cleanups
This commit is contained in:
parent
3a967f70ef
commit
8b22dfabd1
20
Nextion.cpp
20
Nextion.cpp
|
@ -109,26 +109,25 @@ void CNextion::writeDStar(const char* my1, const char* my2, const char* your, co
|
||||||
::sprintf(text, "t0.txt=\"%s %.8s/%4.4s\"", type, my1, my2);
|
::sprintf(text, "t0.txt=\"%s %.8s/%4.4s\"", type, my1, my2);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
|
|
||||||
if (strcmp(m_size.c_str(), "2.4") == 0) {
|
if (m_size == "2.4") {
|
||||||
::sprintf(text, "t1.txt=\"%.8s\"", your);
|
::sprintf(text, "t1.txt=\"%.8s\"", your);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
if (strcmp(reflector, " ") != 0) {
|
if (::strcmp(reflector, " ") != 0) {
|
||||||
::sprintf(text, "t2.txt=\"via %.8s\"", reflector);
|
::sprintf(text, "t2.txt=\"via %.8s\"", reflector);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
}
|
}
|
||||||
} else if (strcmp(m_size.c_str(), "3.2") == 0) {
|
} else if (m_size == "3.2") {
|
||||||
::sprintf(text, "t1.txt=\"%.8s\"", your);
|
::sprintf(text, "t1.txt=\"%.8s\"", your);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
if (strcmp(reflector, " ") != 0) {
|
if (::strcmp(reflector, " ") != 0) {
|
||||||
::sprintf(text, "t2.txt=\"via %.8s\"", reflector);
|
::sprintf(text, "t2.txt=\"via %.8s\"", reflector);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
}
|
}
|
||||||
} else if (strcmp(m_size.c_str(), "3.5") == 0) {
|
} else if (m_size == "3.5") {
|
||||||
if (strcmp(reflector, " ") == 0) {
|
if (::strcmp(reflector, " ") == 0)
|
||||||
::sprintf(text, "t1.txt=\"%.8s\"", your);
|
::sprintf(text, "t1.txt=\"%.8s\"", your);
|
||||||
} else {
|
else
|
||||||
::sprintf(text, "t1.txt=\"%.8s <- %-8s\"", your, reflector);
|
::sprintf(text, "t1.txt=\"%.8s <- %-8s\"", your, reflector);
|
||||||
}
|
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -139,11 +138,8 @@ void CNextion::clearDStar()
|
||||||
{
|
{
|
||||||
sendCommand("t0.txt=\"Listening\"");
|
sendCommand("t0.txt=\"Listening\"");
|
||||||
sendCommand("t1.txt=\"\"");
|
sendCommand("t1.txt=\"\"");
|
||||||
if (strcmp(m_size.c_str(), "2.4") == 0) {
|
if (m_size == "2.4" || m_size == "3.2")
|
||||||
sendCommand("t2.txt=\"\"");
|
sendCommand("t2.txt=\"\"");
|
||||||
} else if (strcmp(m_size.c_str(), "3.2") == 0) {
|
|
||||||
sendCommand("t2.txt=\"\"");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CNextion::writeDMR(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type)
|
void CNextion::writeDMR(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type)
|
||||||
|
|
Loading…
Reference in a new issue