Rework the Nextion laouts with the latest editor.

This commit is contained in:
Jonathan Naylor
2016-05-21 12:52:56 +01:00
parent e600cf36bb
commit c3ff1cc43a
7 changed files with 5 additions and 14 deletions

View File

@@ -195,20 +195,12 @@ void CNextion::writeFusionInt(const char* source, const char* dest, const char*
::sprintf(text, "t0.txt=\"%s %.10s\"", type, source); ::sprintf(text, "t0.txt=\"%s %.10s\"", type, source);
sendCommand(text); sendCommand(text);
if (m_size == "2.4" || m_size == "3.2") {
::sprintf(text, "t1.txt=\"%.10s\"", dest); ::sprintf(text, "t1.txt=\"%.10s\"", dest);
sendCommand(text); sendCommand(text);
if (::strcmp(origin, " ") != 0) { if (::strcmp(origin, " ") != 0) {
::sprintf(text, "t2.txt=\"via %.10s\"", origin); ::sprintf(text, "t2.txt=\"via %.10s\"", origin);
sendCommand(text); 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; m_mode = MODE_YSF;
} }
@@ -217,7 +209,6 @@ void CNextion::clearFusionInt()
{ {
sendCommand("t0.txt=\"Listening\""); sendCommand("t0.txt=\"Listening\"");
sendCommand("t1.txt=\"\""); sendCommand("t1.txt=\"\"");
if (m_size == "2.4" || m_size == "3.2")
sendCommand("t2.txt=\"\""); sendCommand("t2.txt=\"\"");
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.