Skip to content

Commit

Permalink
Merge pull request g4klx#726 from on7lds/master
Browse files Browse the repository at this point in the history
 Add M17 to the ON7LDS layouts and documentation
  • Loading branch information
g4klx authored Nov 23, 2021
2 parents b1d5973 + bcc73d8 commit 9498166
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Nextion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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();

Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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=\"\"");
Expand Down
Binary file modified Nextion_ON7LDS/NX3224T024-L2.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T024-L2.tft
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T024-L3.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T024-L3.tft
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T028-L2.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T028-L2.tft
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T028-L3.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX3224T028-L3.tft
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX4024T032-L2.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX4024T032-L2.tft
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX4832T035-L2.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX4832T035-L2.tft
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX4832T035-L3.HMI
Binary file not shown.
Binary file modified Nextion_ON7LDS/NX4832T035-L3.tft
Binary file not shown.
26 changes: 23 additions & 3 deletions Nextion_ON7LDS/README-L3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -109,13 +111,15 @@ changed field.
22 : Temperature
23 : Location

DSTAR
41 : D-Star listening
42 : type/my1/my2
45 : your
46 : reflector
47 : RSSI
48 : ber

DMR
61 : DMR listening1
62 : ID1
63 : TA1
Expand All @@ -133,29 +137,39 @@ changed field.
76 : GPS1 (t8,t9,t12)
77 : GPS2 (t10,t11,t13)

YSF
81 : YSF listening
82 : src
83 : dest
84 : origin
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
----------------------------------------------------------
Expand Down Expand Up @@ -227,3 +241,9 @@ t3 : ber
POCSAG
t0 : waiting / RIC
t1 : message

M17
t0 : source
t1 : dst
t2 : rssi
t3 : ber
9 changes: 9 additions & 0 deletions Nextion_ON7LDS/README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 9498166

Please sign in to comment.