diff --git a/Nextion.cpp b/Nextion.cpp index 88371f4..1239689 100644 --- a/Nextion.cpp +++ b/Nextion.cpp @@ -195,18 +195,10 @@ void CNextion::writeFusionInt(const char* source, const char* dest, const char* ::sprintf(text, "t0.txt=\"%s %.10s\"", type, source); 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); + ::sprintf(text, "t1.txt=\"%.10s\"", dest); + sendCommand(text); + if (::strcmp(origin, " ") != 0) { + ::sprintf(text, "t2.txt=\"via %.10s\"", origin); sendCommand(text); } @@ -217,8 +209,7 @@ void CNextion::clearFusionInt() { sendCommand("t0.txt=\"Listening\""); sendCommand("t1.txt=\"\""); - if (m_size == "2.4" || m_size == "3.2") - sendCommand("t2.txt=\"\""); + sendCommand("t2.txt=\"\""); } void CNextion::close() diff --git a/Nextion/MMDVM_2.4.HMI b/Nextion/MMDVM_2.4.HMI index 8b7772e..3b33f0c 100644 Binary files a/Nextion/MMDVM_2.4.HMI and b/Nextion/MMDVM_2.4.HMI differ diff --git a/Nextion/MMDVM_2.4.tft b/Nextion/MMDVM_2.4.tft index 9816c51..b2faa39 100644 Binary files a/Nextion/MMDVM_2.4.tft and b/Nextion/MMDVM_2.4.tft differ diff --git a/Nextion/MMDVM_3.2.HMI b/Nextion/MMDVM_3.2.HMI index d71e020..2436267 100644 Binary files a/Nextion/MMDVM_3.2.HMI and b/Nextion/MMDVM_3.2.HMI differ diff --git a/Nextion/MMDVM_3.2.tft b/Nextion/MMDVM_3.2.tft index f38fc20..fd2752d 100644 Binary files a/Nextion/MMDVM_3.2.tft and b/Nextion/MMDVM_3.2.tft differ diff --git a/Nextion/MMDVM_3.5.HMI b/Nextion/MMDVM_3.5.HMI index 977b8ec..17d46af 100644 Binary files a/Nextion/MMDVM_3.5.HMI and b/Nextion/MMDVM_3.5.HMI differ diff --git a/Nextion/MMDVM_3.5.tft b/Nextion/MMDVM_3.5.tft index bf6b3cc..09b79af 100644 Binary files a/Nextion/MMDVM_3.5.tft and b/Nextion/MMDVM_3.5.tft differ