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

Reformat the Display factory method slightly.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-07-31 07:54:27 +01:00
parent b194598f2a
commit 69f1a2154c
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Display.cpp
View File

@@ -18,8 +18,25 @@
#include "Display.h" #include "Display.h"
#include "Defines.h" #include "Defines.h"
#include "SerialController.h"
#include "ModemSerialPort.h"
#include "NullDisplay.h"
#include "TFTSerial.h"
#include "LCDproc.h"
#include "Nextion.h"
#include "Conf.h"
#include "Modem.h"
#include "UMP.h"
#include "Log.h" #include "Log.h"
#if defined(HD44780)
#include "HD44780.h"
#endif
#if defined(OLED)
#include "OLED.h"
#endif
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
@@ -432,26 +449,8 @@ void CDisplay::writeNXDNBERInt(float ber)
} }
/* Factory method extracted from MMDVMHost.cpp - BG5HHP */ /* Factory method extracted from MMDVMHost.cpp - BG5HHP */
#include "SerialController.h" CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
#include "ModemSerialPort.h" {
#include "TFTSerial.h"
#include "LCDproc.h"
#include "Nextion.h"
#include "NullDisplay.h"
#include "Conf.h"
#include "Modem.h"
#include "UMP.h"
#if defined(HD44780)
#include "HD44780.h"
#endif
#if defined(OLED)
#include "OLED.h"
#endif
CDisplay* CDisplay::createDisplay(const CConf &conf, CUMP *ump, CModem *modem){
CDisplay *display = NULL; CDisplay *display = NULL;
std::string type = conf.getDisplay(); std::string type = conf.getDisplay();
@@ -601,5 +600,6 @@ CDisplay* CDisplay::createDisplay(const CConf &conf, CUMP *ump, CModem *modem){
delete display; delete display;
display = new CNullDisplay; display = new CNullDisplay;
} }
return display;
} return display;
}

2
Display.h
View File

@@ -76,7 +76,7 @@ public:
void clock(unsigned int ms); void clock(unsigned int ms);
static CDisplay* createDisplay(const CConf &conf, CUMP *ump, CModem *modem); static CDisplay* createDisplay(const CConf& conf, CUMP* ump, CModem* modem);
protected: protected:
virtual void setIdleInt() = 0; virtual void setIdleInt() = 0;