diff --git a/Images/POCSAG.bmp b/Images/POCSAG.bmp index 72d7550..bd80cdd 100644 Binary files a/Images/POCSAG.bmp and b/Images/POCSAG.bmp differ diff --git a/Nextion.cpp b/Nextion.cpp index 9aeab7b..a22df03 100644 --- a/Nextion.cpp +++ b/Nextion.cpp @@ -616,7 +616,7 @@ void CNextion::writeNXDNInt(const char* source, bool group, unsigned int dest, c if (m_mode != MODE_NXDN) { sendCommand("page NXDN"); - sendCommandAction(7U); + sendCommandAction(6U); } char text[30U]; @@ -683,7 +683,7 @@ void CNextion::writePOCSAGInt(uint32_t ric, const std::string& message) { if (m_mode != MODE_POCSAG) { sendCommand("page POCSAG"); - sendCommandAction(6U); + sendCommandAction(7U); } char text[200U]; diff --git a/Nextion_G4KLX/NX4024K032.HMI b/Nextion_G4KLX/NX4024K032.HMI index a4efcc8..ddb0a92 100644 Binary files a/Nextion_G4KLX/NX4024K032.HMI and b/Nextion_G4KLX/NX4024K032.HMI differ diff --git a/Nextion_G4KLX/NX4024K032.tft b/Nextion_G4KLX/NX4024K032.tft index f6045d0..ff6d570 100644 Binary files a/Nextion_G4KLX/NX4024K032.tft and b/Nextion_G4KLX/NX4024K032.tft differ diff --git a/Nextion_G4KLX/NX4024T032.HMI b/Nextion_G4KLX/NX4024T032.HMI index 69a606f..af7564b 100644 Binary files a/Nextion_G4KLX/NX4024T032.HMI and b/Nextion_G4KLX/NX4024T032.HMI differ diff --git a/Nextion_G4KLX/NX4024T032.tft b/Nextion_G4KLX/NX4024T032.tft index e1454a4..ac8fd65 100644 Binary files a/Nextion_G4KLX/NX4024T032.tft and b/Nextion_G4KLX/NX4024T032.tft differ diff --git a/Nextion_G4KLX/NX4832K035.HMI b/Nextion_G4KLX/NX4832K035.HMI index 4e40112..68a0933 100644 Binary files a/Nextion_G4KLX/NX4832K035.HMI and b/Nextion_G4KLX/NX4832K035.HMI differ diff --git a/Nextion_G4KLX/NX4832K035.tft b/Nextion_G4KLX/NX4832K035.tft index d67383d..151e5e8 100644 Binary files a/Nextion_G4KLX/NX4832K035.tft and b/Nextion_G4KLX/NX4832K035.tft differ diff --git a/Nextion_G4KLX/NX4832T035.HMI b/Nextion_G4KLX/NX4832T035.HMI index 2997111..eb726a7 100644 Binary files a/Nextion_G4KLX/NX4832T035.HMI and b/Nextion_G4KLX/NX4832T035.HMI differ diff --git a/Nextion_G4KLX/NX4832T035.tft b/Nextion_G4KLX/NX4832T035.tft index a2abe90..37f2c79 100644 Binary files a/Nextion_G4KLX/NX4832T035.tft and b/Nextion_G4KLX/NX4832T035.tft differ diff --git a/Nextion_ON7LDS/NX3224T024-L2.HMI b/Nextion_ON7LDS/NX3224T024-L2.HMI index 8e056b3..d3dd338 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 dcb50a5..31761dc 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 a04f875..93fd1dc 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 5cca7ec..1815a2e 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 6578e91..96c02a2 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 d106d5a..9e41c6d 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 b12e0cd..2dbd311 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 bece9c3..7d18455 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 fc43738..81e65e9 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 3f96e77..3e9f72f 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 9f40b32..e7580c2 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 e016a1c..b1bc254 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 e5490de..af7bfb3 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 513bb04..88b2d1c 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 1bf6b98..692d3c6 100644 --- a/Nextion_ON7LDS/README-L3 +++ b/Nextion_ON7LDS/README-L3 @@ -15,8 +15,8 @@ are activated. 0 = auto (future use, for now it's G4KLX layout) 1 = G4KLX layout 2 = ON7LDS layout (see README-L2) - 3 = ON7LDS DIY layout (this README file) - 4 = ON7LDS DIY layout High Speed (this README file) + 3 = ON7LDS DIY layout (this README file) + 4 = ON7LDS DIY layout High Speed (this README file) screenLayout 3 and 4 are the same, but selecting 3, MMDVMHost will communicate at 9600bps with the display and selecting 4 will set the baudrate to 115200. @@ -69,7 +69,7 @@ Check the NextionDriver program and the display layouts there to see NOTE: it might be good to *not* remove fields from the display when you do not need them, but make them small (i.e. 10 x 10 pixels) and put them aside: - Give them the same font color and background color as where you put them + Give them the same font colour and background colour as where you put them OR Put them behind some picture: put them on top of the picture, then select the picture and click the 'Bring Top' button to put it on top of all those fields @@ -94,6 +94,7 @@ changed field. 4 : page YSF 5 : page P25 6 : page NXDN + 7 : page POCSAG 11 : IDLE 12 : CW @@ -147,6 +148,9 @@ changed field. 124 : RSSI 125 : ber +132 : RIC +133 : message text +134 : waiting Fields (and their numbers) on the pages, used by MMDVMHost @@ -154,7 +158,7 @@ Fields (and their numbers) on the pages, used by MMDVMHost MMDVM t0 : owner call & ID / errortext LOCKOUT -t1 : status / ERROR +t1 : status / ERROR t2 : date & time screenLayout >1 : @@ -211,3 +215,6 @@ t1 : dst t2 : rssi t3 : ber +POCSAG +t0 : waiting / RIC +t1 : message diff --git a/Nextion_ON7LDS/README.md b/Nextion_ON7LDS/README.md index 83a8990..bae6a56 100644 --- a/Nextion_ON7LDS/README.md +++ b/Nextion_ON7LDS/README.md @@ -16,8 +16,8 @@ Layout 2 is a no-nonsense layout. It is the original (G4KLX) layout with the Tal Layout 3 (as is 4) is a layout without any predefined layout options (color, fonts). It sends the fields **and** information about what was sent to the display, so all layout processing can and should be done in the display itself. More information about the layouts can be found in - * README-L2 for the screenLayout 2 setting - * README-L2 for the screenLayout 3 and 4 settings + * README-L2 for the screenLayout 2 setting (list of field names : see README-L3) + * README-L3 for the screenLayout 3 and 4 settings When you want extra control over what has to be sent to the Nextion display, you could consider the program 'NextionDriver' at https://github.com/on7lds/NextionDriver as a companion to MMDVMHost.