Commit graph

95 commits

Author SHA1 Message Date
Jonathan Naylor
135fd04e0d Revert "Merge branch 'M17_AX25_FM'"
This reverts commit e1427e3e37, reversing
changes made to bcdba292eb.
2020-12-15 15:52:27 +00:00
Jonathan Naylor
e0f4928db5 Handle M17 in the display code. 2020-10-15 14:32:56 +01:00
Jonathan Naylor
2349520964 Remove the location information from the new config message. 2020-08-27 10:13:02 +01:00
Jonathan Naylor
98879b5c14 Reinstated the location field. 2020-08-26 12:13:34 +01:00
Jonathan Naylor
66a17f4849 Simplify the Host to DMR Gateway protocol. 2020-08-26 09:29:11 +01:00
ON7LDS
70d596fea4 change tx and rx frequency display precision (to reflect ini file significant figures) 2020-08-13 21:23:42 +02:00
Jonathan Naylor
c7fbeecc50 Change the displays to show the DG-ID instead of the TO field for YSF. 2020-08-09 19:23:18 +01:00
Jonathan Naylor
f070410f7e Display and log the DG-ID in the Fusion mode. 2020-08-09 15:09:08 +01:00
SASANO Takayoshi
36a852b38b change ScreenLayout definition for Nextion
to add new feature easily, the definition of ScreenLayout in [Nextion]
has changed like this.

ScreenLayout < 8: compatibile setting for old config file

	0: G4KLX @ 9600bps
	1: (reserved)
	2: ON7LDS @ 9600bps
	3: ON7LDS-DIY @ 9600bps
	4: ON7LDS-DIY @ 115200bps

ScreenLayout >= 8: new world, set the bit to enable each feature

	bit3 (8)	use 115200bps
	bit4 (16)	Display DMR Talker Alias
	bit5 (32)	Colour change when displaying TA
	bit6 (64)	Font size change when displaying long TA text
	bit7 (128)	Display DIY status when MMDVM IDLE

old settings are same as:

	0 -> 0
	2 -> 112 (16+32+64)
	3 -> 144 (16+128)
	4 -> 152 (8+16+128)
2020-06-14 16:00:20 +09:00
Jonathan Naylor
dcdfca39d7 Add FM mode display. 2020-04-11 20:42:05 +01:00
root
574343c439 Process data from display to MMDVMHost (serial pass-through & transparent data)
also taking into account the sendFrameType parameter
Do not control Nextion backlight when active brightness is zero
2018-09-13 20:35:12 +02:00
Jonathan Naylor
131d87c830 Clean up the code to remove warnings. 2018-09-06 17:10:58 +01:00
KD4Z
ca35121b44 Add more dynamic variables and fix command manging
Add variables for TX Freq (t30), RX Freq (t32), CPU Temp (t20), and
Location (t31) to Base MMDVM page.   These variables are available with
Layout ON7LDS L3 or higher.  This allows more dynamic info to be
displayed without having to use the optional NextionDriver.  Note, this
doesn't add touch support. For that, use the NextionDriver.
Fixed command mangling occuring during serial writes to Nextion due to
no ready-state monitoring of display readiness.   Added simple thread
sleep to pace the commands as they are sent.  Allows the display a
chance to process the command before another one is blasted in.
Prevents mangling of commands sent before display is ready to accept
them.   Hardwired to 10 msec--let's see if that's enough.
Added setting in mmdvm conf file, Section: [Nextion]  Setting:
DisplayTempInFahrenheit   Value= 0 (default) for C.  1=Fahrenheit  This
controls the value sent to t20.
2018-09-05 16:12:12 -04:00
root
64e3ae6d30 Better way to send to display that MMDVMHost is quitting 2018-08-15 18:17:42 +02:00
root
df2b27f585 Fix buffer overflow when writing ipaddress info that became too long to Nextion display
(i.e. when using Predictable Network Interface Names in linux)
2018-08-15 15:59:53 +00:00
root
b69db45cb0 Added POCSAG to ON7LDS layouts, Readme files update
Higher resolution POCSAG image for >320px
2018-07-28 10:57:35 +02:00
Jonathan Naylor
7ed8c9a214 Fix Nextion screen for long POCSAG messages. 2018-06-20 19:58:35 +01:00
Jonathan Naylor
e57326aeef Clear the POCSAG screen properly. 2018-06-12 21:14:33 +01:00
Jonathan Naylor
babb7a3adc Increase the Nextion POCSAG buffer size again. 2018-06-12 20:02:56 +01:00
Jonathan Naylor
a084e14fdf Convert POCSAG text to be multi-line. 2018-06-12 19:23:38 +01:00
Jonathan Naylor
84dd3bf887 POCSAG bug fixing. 2018-06-12 19:14:22 +01:00
Jonathan Naylor
b398bba1ea Add POCSAG processing and display code. 2018-06-11 21:30:49 +01:00
g0wfv
758d5b0007 Nextion.cpp: Change char buffer length to prevent buffer overflow
This affected Nextion screen in DMR mode when a station had a long name associated with their callsign ...

Eg: G4BMW CHRISTOPHER

... was causing the 30 char text buffer to overflow.

Text buffer increased to 50 chars.
2018-05-10 20:24:16 +01:00
ON7LDS
9ee9b4f6d6 Changes of Nextion related files to reflect the addition of NXDN 2018-03-18 16:32:27 +01:00
Jonathan Naylor
0ed7972ee7 Merge branch 'master' into nxdn 2018-02-06 07:14:26 +00:00
Jonathan Naylor
ddb3206a30 Fix LCDProc and buffer sizes for the Nextion. Thanks to Tony G0WFV. 2018-02-06 07:11:00 +00:00
Jonathan Naylor
d1ae3b0c18 Merge branch 'master' into nxdn 2018-02-05 20:05:39 +00:00
Jonathan Naylor
14a06e7182 Calculate the RSSI and BER correctly on the Nextion. 2018-02-05 19:07:23 +00:00
Jonathan Naylor
c3990c36ed Add NXDN to the display code. 2018-01-17 19:04:00 +00:00
Jonathan Naylor
51e0bf0315 Remove compiler warnings. 2018-01-09 07:43:22 +00:00
ON7LDS
eb14aeb861 Removed code to display DMR inband GPS data 2017-12-30 19:30:05 +01:00
ON7LDS
eb787d89d3 removed GPS form Layout 2
changed status codes and ommitted cmd code
new example display layouts
2017-12-28 10:01:52 +01:00
ON7LDS
4b97e879f3 minor changes at Layout 3/4 output 2017-12-19 21:02:51 +01:00
ON7LDS
f930a7fb9f added separate call / ID info to rest screen for DIY layouts 2017-12-17 19:09:28 +01:00
ON7LDS
54b6f5a648 corrected GPS DMS field for Nextion 2017-12-12 22:05:51 +01:00
ON7LDS
1ad3c67070 Added Layout 3 & 4, displaying GPS data, README files and HMI examples 2017-12-10 21:50:47 +01:00
ON7LDS
59c4ce47f0 New Nextion display layouts (3 and 4) which let you do all layout processing in the display itsself. 2017-12-05 20:50:56 +01:00
Jonathan Naylor
711bcbf745 Reformat code and make small alterations. 2017-11-15 10:47:56 +00:00
ON7LDS
ec19b7dfab Add README file to the Nextion_ON7LDS directory
Nextion displays: Do not change colors or show TA when ScreenLayout is not ON7LDS
2017-11-14 19:46:29 +01:00
ON7LDS
3b62bd1666 New Nextion screen layout with better looking fonts
New parameter for selecting ON7LDS Nextion screen layout
The active ip address of the host is showed on main screen
Nextion DMR page:
* Talker alias (if available) will be decoded and displayed (in green to know it's the TA)
* Font will get smaller if TA is to long
GPS data will be decoded and logged
2017-11-13 21:48:47 +01:00
Jonathan Naylor
90e4794a3d Revert "Devel" 2017-10-24 21:55:58 +01:00
ON7LDS
ea5be21ed6 Nextion display is queried to know it's layout so the new binary can function with 'old' and 'new' layouts.
It is done in a way to acommodate future layout changes (the display sends it's 'layout version')
2017-10-22 14:03:02 +02:00
root
3a9c011dfa Refinements of the Nextion displays
* better looking fonts
* DMR talker alias is shown (in green) if received
* font is automaticly  adapted when TA would be too long for display
* DMR ID, call or TA (depending on what was shown) goes to gray at voice end
* "MMDVM stopped" at rest screen when MMDVMHost application is ended
* active network interface and IP address on rest screen so you know how to contact it
2017-10-02 21:04:46 +02:00
Jonathan Naylor
742d61fef1 Make RSSI and BER display immediately on Nextion screens. 2017-02-13 08:20:40 +00:00
Jonathan Naylor
f0387d25dd Add BER display to the Nextion and reduce Talker Id logging. 2017-02-12 18:37:00 +00:00
Jonathan Naylor
fc2d8e5ced Reduce the space needed for the RSSI information. 2017-01-06 08:46:06 +00:00
Jonathan Naylor
3c9666e780 Display the RSSI on the Nextion screen. 2017-01-05 19:44:52 +00:00
Jonathan Naylor
178e104d44 Allow the modem to host a serial display. 2016-10-06 18:38:16 +01:00
Jonathan Naylor
25cfff3ada Merge branch 'master' into P25 2016-09-27 19:47:07 +01:00
phl0
148b640397
Let the clock run on when transmitting CW 2016-09-15 16:57:10 +02:00