diff --git a/Nextion.cpp b/Nextion.cpp index 2029aeb..25b9d2b 100644 --- a/Nextion.cpp +++ b/Nextion.cpp @@ -832,7 +832,7 @@ void CNextion::writeM17Int(const char* source, const char* dest, const char* typ if (m_mode != MODE_M17) { sendCommand("page M17"); - sendCommandAction(6U); + sendCommandAction(8U); } char text[30U]; @@ -843,11 +843,11 @@ void CNextion::writeM17Int(const char* source, const char* dest, const char* typ ::sprintf(text, "t0.txt=\"%s %.10s\"", type, source); sendCommand(text); - sendCommandAction(122U); + sendCommandAction(142U); ::sprintf(text, "t1.txt=\"%s\"", dest); sendCommand(text); - sendCommandAction(123U); + sendCommandAction(143U); m_clockDisplayTimer.stop(); @@ -867,7 +867,7 @@ void CNextion::writeM17RSSIInt(unsigned char rssi) char text[25U]; ::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / M17_RSSI_COUNT); sendCommand(text); - sendCommandAction(124U); + sendCommandAction(144U); m_rssiAccum1 = 0U; m_rssiCount1 = 0U; } @@ -882,7 +882,7 @@ void CNextion::writeM17BERInt(float ber) char text[25U]; ::sprintf(text, "t3.txt=\"%.1f%%\"", m_berAccum1 / float(M17_BER_COUNT)); sendCommand(text); - sendCommandAction(125U); + sendCommandAction(145U); m_berAccum1 = 0.0F; m_berCount1 = 0U; } @@ -891,7 +891,7 @@ void CNextion::writeM17BERInt(float ber) void CNextion::clearM17Int() { sendCommand("t0.txt=\"Listening\""); - sendCommandAction(121U); + sendCommandAction(141U); sendCommand("t1.txt=\"\""); sendCommand("t2.txt=\"\""); sendCommand("t3.txt=\"\""); diff --git a/Nextion_ON7LDS/NX3224T024-L2.HMI b/Nextion_ON7LDS/NX3224T024-L2.HMI index e444afa..f4896dd 100644 Binary files a/Nextion_ON7LDS/NX3224T024-L2.HMI and b/Nextion_ON7LDS/NX3224T024-L2.HMI differ diff --git a/Nextion_ON7LDS/NX3224T024-L2.tft b/Nextion_ON7LDS/NX3224T024-L2.tft index 5ef6c18..c929092 100644 Binary files a/Nextion_ON7LDS/NX3224T024-L2.tft and b/Nextion_ON7LDS/NX3224T024-L2.tft differ diff --git a/Nextion_ON7LDS/NX3224T024-L3.HMI b/Nextion_ON7LDS/NX3224T024-L3.HMI index 36d0843..f2c1330 100644 Binary files a/Nextion_ON7LDS/NX3224T024-L3.HMI and b/Nextion_ON7LDS/NX3224T024-L3.HMI differ diff --git a/Nextion_ON7LDS/NX3224T024-L3.tft b/Nextion_ON7LDS/NX3224T024-L3.tft index df3405f..4ba4609 100644 Binary files a/Nextion_ON7LDS/NX3224T024-L3.tft and b/Nextion_ON7LDS/NX3224T024-L3.tft differ diff --git a/Nextion_ON7LDS/NX3224T028-L2.HMI b/Nextion_ON7LDS/NX3224T028-L2.HMI index 8fca48b..768ed56 100644 Binary files a/Nextion_ON7LDS/NX3224T028-L2.HMI and b/Nextion_ON7LDS/NX3224T028-L2.HMI differ diff --git a/Nextion_ON7LDS/NX3224T028-L2.tft b/Nextion_ON7LDS/NX3224T028-L2.tft index 610f8c9..2ffd4ce 100644 Binary files a/Nextion_ON7LDS/NX3224T028-L2.tft and b/Nextion_ON7LDS/NX3224T028-L2.tft differ diff --git a/Nextion_ON7LDS/NX3224T028-L3.HMI b/Nextion_ON7LDS/NX3224T028-L3.HMI index f19c866..31ca688 100644 Binary files a/Nextion_ON7LDS/NX3224T028-L3.HMI and b/Nextion_ON7LDS/NX3224T028-L3.HMI differ diff --git a/Nextion_ON7LDS/NX3224T028-L3.tft b/Nextion_ON7LDS/NX3224T028-L3.tft index cf5c831..99647e3 100644 Binary files a/Nextion_ON7LDS/NX3224T028-L3.tft and b/Nextion_ON7LDS/NX3224T028-L3.tft differ diff --git a/Nextion_ON7LDS/NX4024T032-L2.HMI b/Nextion_ON7LDS/NX4024T032-L2.HMI index 4585874..331aac6 100644 Binary files a/Nextion_ON7LDS/NX4024T032-L2.HMI and b/Nextion_ON7LDS/NX4024T032-L2.HMI differ diff --git a/Nextion_ON7LDS/NX4024T032-L2.tft b/Nextion_ON7LDS/NX4024T032-L2.tft index b310ce4..abec64c 100644 Binary files a/Nextion_ON7LDS/NX4024T032-L2.tft and b/Nextion_ON7LDS/NX4024T032-L2.tft differ diff --git a/Nextion_ON7LDS/NX4832T035-L2.HMI b/Nextion_ON7LDS/NX4832T035-L2.HMI index 1925206..9bb0de2 100644 Binary files a/Nextion_ON7LDS/NX4832T035-L2.HMI and b/Nextion_ON7LDS/NX4832T035-L2.HMI differ diff --git a/Nextion_ON7LDS/NX4832T035-L2.tft b/Nextion_ON7LDS/NX4832T035-L2.tft index e2317e2..960795c 100644 Binary files a/Nextion_ON7LDS/NX4832T035-L2.tft and b/Nextion_ON7LDS/NX4832T035-L2.tft differ diff --git a/Nextion_ON7LDS/NX4832T035-L3.HMI b/Nextion_ON7LDS/NX4832T035-L3.HMI index 4c809c8..c7ca2ed 100644 Binary files a/Nextion_ON7LDS/NX4832T035-L3.HMI and b/Nextion_ON7LDS/NX4832T035-L3.HMI differ diff --git a/Nextion_ON7LDS/NX4832T035-L3.tft b/Nextion_ON7LDS/NX4832T035-L3.tft index 1b93611..45ee468 100644 Binary files a/Nextion_ON7LDS/NX4832T035-L3.tft and b/Nextion_ON7LDS/NX4832T035-L3.tft differ diff --git a/Nextion_ON7LDS/README-L3 b/Nextion_ON7LDS/README-L3 index 325bf04..50e9030 100644 --- a/Nextion_ON7LDS/README-L3 +++ b/Nextion_ON7LDS/README-L3 @@ -85,8 +85,8 @@ NOTE: it might be good to *not* remove fields from the display when you do not Status codes that will be sent: ------------------------------- -The status code gives more information about what was sent in the -changed field. +The status code gives more information about which type of information +was sent to the display. 1 : page MMDVM 2 : page D-Star @@ -95,7 +95,9 @@ changed field. 5 : page P25 6 : page NXDN 7 : page POCSAG - + 8 : page M17 + +MMDVMHOST 11 : IDLE 12 : CW 13 : ERROR text @@ -109,6 +111,7 @@ changed field. 22 : Temperature 23 : Location +DSTAR 41 : D-Star listening 42 : type/my1/my2 45 : your @@ -116,6 +119,7 @@ changed field. 47 : RSSI 48 : ber +DMR 61 : DMR listening1 62 : ID1 63 : TA1 @@ -133,6 +137,7 @@ changed field. 76 : GPS1 (t8,t9,t12) 77 : GPS2 (t10,t11,t13) +YSF 81 : YSF listening 82 : src 83 : dest @@ -140,22 +145,31 @@ changed field. 85 : RSSI 86 : ber +P25 101 : P25 listening 102 : source 103 : dest 104 : RSSI 105 : ber +NXDN 121 : NXDN listening 122 : source 123 : dest 124 : RSSI 125 : ber +POCSAG 132 : RIC 133 : message text 134 : waiting +M17 +121 : M17 listening +122 : source +123 : dest +124 : RSSI +125 : ber Fields (and their numbers) on the pages, used by MMDVMHost ---------------------------------------------------------- diff --git a/Nextion_ON7LDS/README.md b/Nextion_ON7LDS/README.md index bae6a56..4cc5bb9 100644 --- a/Nextion_ON7LDS/README.md +++ b/Nextion_ON7LDS/README.md @@ -1,6 +1,15 @@ Nextion Display Layouts by ON7LDS (for MMDVMHost) ================================================= +##### WARNING +These layouts should be opened with Nextion Editor LTS (v0.53) +The fonts that are used are made by me at the time (with 'zi edit') and are (in my opinion) very good readable and compact to show as much as possible. +Nextion has changed a lot since then and sadly, these fonts seem not to be compatible with later versions of Nextion Editor. + + + +##### Use + The screenlayout has to be selected with the parameter **ScreenLayout** in the MMDVM.ini file under the Nextion section. This way, the extra functions are activated.