MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-27 12:55:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'M17_AX25_FM' into I2C

Browse Source
This commit is contained in:
Jonathan Naylor
2021-02-17 22:17:06 +00:00
parent a39e5e328f e291096d22
commit 8931f9ed3c
45 changed files with 3694 additions and 3538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Display.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017,2018,2020,2021 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
#include "Display.h"
#include "Defines.h"
#include "SerialController.h"
#include "UARTController.h"
#include "ModemSerialPort.h"
#include "NullDisplay.h"
#include "TFTSurenoo.h"
@@ -538,7 +538,7 @@ int CDisplay::writeNXDNIntEx(const class CUserDBentry& source, bool group, unsig
/* Factory method extracted from MMDVMHost.cpp - BG5HHP */
CDisplay* CDisplay::createDisplay(const CConf& conf, IModem* modem)
CDisplay* CDisplay::createDisplay(const CConf& conf, CModem* modem)
{
CDisplay *display = NULL;
@@ -559,7 +559,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, IModem* modem)
if (port == "modem")
serial = new IModemSerialPort(modem);
else
serial = new CSerialController(port, 115200U);
serial = new CUARTController(port, 115200U);
display = new CTFTSurenoo(conf.getCallsign(), dmrid, serial, brightness, conf.getDuplex());
} else if (type == "Nextion") {
@@ -608,7 +608,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, IModem* modem)
baudrate = 115200U;
LogInfo(" Display baudrate: %u ", baudrate);
ISerialPort* serial = new CSerialController(port, baudrate);
ISerialPort* serial = new CUARTController(port, baudrate);
display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF);
}
} else if (type == "LCDproc") {