Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests 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
Show stats 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 "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"
#if defined(HD44780)
#include "HD44780.h"
#endif
#if defined(OLED)
#include "OLED.h"
#endif
#include <cstdio>
#include <cassert>
#include <cstring>
@ -432,26 +449,8 @@ void CDisplay::writeNXDNBERInt(float ber)
}
/* Factory method extracted from MMDVMHost.cpp - BG5HHP */
#include "SerialController.h"
#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* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
{
CDisplay *display = NULL;
std::string type = conf.getDisplay();
@ -601,5 +600,6 @@ CDisplay* CDisplay::createDisplay(const CConf &conf, CUMP *ump, CModem *modem){
delete display;
display = new CNullDisplay;
}
return display;
}
return display;
}

2
Display.h
View file

@ -76,7 +76,7 @@ public:
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:
virtual void setIdleInt() = 0;