Add M17 to the ON7LDS layouts and documentation files
Send unique status codes for M17 to the Nextion display
This commit is contained in:
parent
b1d5973bb0
commit
8ecc41b0bb
12
Nextion.cpp
12
Nextion.cpp
|
@ -832,7 +832,7 @@ void CNextion::writeM17Int(const char* source, const char* dest, const char* typ
|
||||||
|
|
||||||
if (m_mode != MODE_M17) {
|
if (m_mode != MODE_M17) {
|
||||||
sendCommand("page M17");
|
sendCommand("page M17");
|
||||||
sendCommandAction(6U);
|
sendCommandAction(8U);
|
||||||
}
|
}
|
||||||
|
|
||||||
char text[30U];
|
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);
|
::sprintf(text, "t0.txt=\"%s %.10s\"", type, source);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
sendCommandAction(122U);
|
sendCommandAction(142U);
|
||||||
|
|
||||||
::sprintf(text, "t1.txt=\"%s\"", dest);
|
::sprintf(text, "t1.txt=\"%s\"", dest);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
sendCommandAction(123U);
|
sendCommandAction(143U);
|
||||||
|
|
||||||
m_clockDisplayTimer.stop();
|
m_clockDisplayTimer.stop();
|
||||||
|
|
||||||
|
@ -867,7 +867,7 @@ void CNextion::writeM17RSSIInt(unsigned char rssi)
|
||||||
char text[25U];
|
char text[25U];
|
||||||
::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / M17_RSSI_COUNT);
|
::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / M17_RSSI_COUNT);
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
sendCommandAction(124U);
|
sendCommandAction(144U);
|
||||||
m_rssiAccum1 = 0U;
|
m_rssiAccum1 = 0U;
|
||||||
m_rssiCount1 = 0U;
|
m_rssiCount1 = 0U;
|
||||||
}
|
}
|
||||||
|
@ -882,7 +882,7 @@ void CNextion::writeM17BERInt(float ber)
|
||||||
char text[25U];
|
char text[25U];
|
||||||
::sprintf(text, "t3.txt=\"%.1f%%\"", m_berAccum1 / float(M17_BER_COUNT));
|
::sprintf(text, "t3.txt=\"%.1f%%\"", m_berAccum1 / float(M17_BER_COUNT));
|
||||||
sendCommand(text);
|
sendCommand(text);
|
||||||
sendCommandAction(125U);
|
sendCommandAction(145U);
|
||||||
m_berAccum1 = 0.0F;
|
m_berAccum1 = 0.0F;
|
||||||
m_berCount1 = 0U;
|
m_berCount1 = 0U;
|
||||||
}
|
}
|
||||||
|
@ -891,7 +891,7 @@ void CNextion::writeM17BERInt(float ber)
|
||||||
void CNextion::clearM17Int()
|
void CNextion::clearM17Int()
|
||||||
{
|
{
|
||||||
sendCommand("t0.txt=\"Listening\"");
|
sendCommand("t0.txt=\"Listening\"");
|
||||||
sendCommandAction(121U);
|
sendCommandAction(141U);
|
||||||
sendCommand("t1.txt=\"\"");
|
sendCommand("t1.txt=\"\"");
|
||||||
sendCommand("t2.txt=\"\"");
|
sendCommand("t2.txt=\"\"");
|
||||||
sendCommand("t3.txt=\"\"");
|
sendCommand("t3.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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -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:
|
Status codes that will be sent:
|
||||||
-------------------------------
|
-------------------------------
|
||||||
The status code gives more information about what was sent in the
|
The status code gives more information about which type of information
|
||||||
changed field.
|
was sent to the display.
|
||||||
|
|
||||||
1 : page MMDVM
|
1 : page MMDVM
|
||||||
2 : page D-Star
|
2 : page D-Star
|
||||||
|
@ -95,7 +95,9 @@ changed field.
|
||||||
5 : page P25
|
5 : page P25
|
||||||
6 : page NXDN
|
6 : page NXDN
|
||||||
7 : page POCSAG
|
7 : page POCSAG
|
||||||
|
8 : page M17
|
||||||
|
|
||||||
|
MMDVMHOST
|
||||||
11 : IDLE
|
11 : IDLE
|
||||||
12 : CW
|
12 : CW
|
||||||
13 : ERROR text
|
13 : ERROR text
|
||||||
|
@ -109,6 +111,7 @@ changed field.
|
||||||
22 : Temperature
|
22 : Temperature
|
||||||
23 : Location
|
23 : Location
|
||||||
|
|
||||||
|
DSTAR
|
||||||
41 : D-Star listening
|
41 : D-Star listening
|
||||||
42 : type/my1/my2
|
42 : type/my1/my2
|
||||||
45 : your
|
45 : your
|
||||||
|
@ -116,6 +119,7 @@ changed field.
|
||||||
47 : RSSI
|
47 : RSSI
|
||||||
48 : ber
|
48 : ber
|
||||||
|
|
||||||
|
DMR
|
||||||
61 : DMR listening1
|
61 : DMR listening1
|
||||||
62 : ID1
|
62 : ID1
|
||||||
63 : TA1
|
63 : TA1
|
||||||
|
@ -133,6 +137,7 @@ changed field.
|
||||||
76 : GPS1 (t8,t9,t12)
|
76 : GPS1 (t8,t9,t12)
|
||||||
77 : GPS2 (t10,t11,t13)
|
77 : GPS2 (t10,t11,t13)
|
||||||
|
|
||||||
|
YSF
|
||||||
81 : YSF listening
|
81 : YSF listening
|
||||||
82 : src
|
82 : src
|
||||||
83 : dest
|
83 : dest
|
||||||
|
@ -140,22 +145,31 @@ changed field.
|
||||||
85 : RSSI
|
85 : RSSI
|
||||||
86 : ber
|
86 : ber
|
||||||
|
|
||||||
|
P25
|
||||||
101 : P25 listening
|
101 : P25 listening
|
||||||
102 : source
|
102 : source
|
||||||
103 : dest
|
103 : dest
|
||||||
104 : RSSI
|
104 : RSSI
|
||||||
105 : ber
|
105 : ber
|
||||||
|
|
||||||
|
NXDN
|
||||||
121 : NXDN listening
|
121 : NXDN listening
|
||||||
122 : source
|
122 : source
|
||||||
123 : dest
|
123 : dest
|
||||||
124 : RSSI
|
124 : RSSI
|
||||||
125 : ber
|
125 : ber
|
||||||
|
|
||||||
|
POCSAG
|
||||||
132 : RIC
|
132 : RIC
|
||||||
133 : message text
|
133 : message text
|
||||||
134 : waiting
|
134 : waiting
|
||||||
|
|
||||||
|
M17
|
||||||
|
121 : M17 listening
|
||||||
|
122 : source
|
||||||
|
123 : dest
|
||||||
|
124 : RSSI
|
||||||
|
125 : ber
|
||||||
|
|
||||||
Fields (and their numbers) on the pages, used by MMDVMHost
|
Fields (and their numbers) on the pages, used by MMDVMHost
|
||||||
----------------------------------------------------------
|
----------------------------------------------------------
|
||||||
|
|
|
@ -1,6 +1,15 @@
|
||||||
Nextion Display Layouts by ON7LDS (for MMDVMHost)
|
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
|
The screenlayout has to be selected with the parameter **ScreenLayout** in the
|
||||||
MMDVM.ini file under the Nextion section. This way, the extra functions
|
MMDVM.ini file under the Nextion section. This way, the extra functions
|
||||||
are activated.
|
are activated.
|
||||||
|
|
Loading…
Reference in New Issue