g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-04 22:17:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #364 from on7lds/dev

Browse source 
New Nextion Display Layouts
This commit is contained in:
Jonathan Naylor 2018-01-08 18:27:40 +00:00 • committed by GitHub
commit d83c17dccc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 350 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
MMDVMHost.cpp
View file

@ -1117,6 +1117,12 @@ void CMMDVMHost::createDisplay()
case 2U:
LogInfo(" Screen Layout: ON7LDS");
break;
case 3U:
LogInfo(" Screen Layout: DIY by ON7LDS");
break;
case 4U:
LogInfo(" Screen Layout: DIY by ON7LDS (High speed)");
break;
default:
LogInfo(" Screen Layout: %u (Unknown)", screenLayout);
break;
@ -1129,7 +1135,10 @@ void CMMDVMHost::createDisplay()
if (m_ump != NULL)
m_display = new CNextion(m_callsign, dmrid, m_ump, brightness, displayClock, utc, idleBrightness, screenLayout);
} else {
ISerialPort* serial = new CSerialController(port, SERIAL_9600);
SERIAL_SPEED baudrate = SERIAL_9600;
if (screenLayout==4U)
baudrate = SERIAL_115200;
ISerialPort* serial = new CSerialController(port, baudrate);
m_display = new CNextion(m_callsign, dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout);
}
} else if (type == "LCDproc") {