remove unused variables from OLED class

This commit is contained in:
Shawn Chain 2019-05-14 18:19:02 +08:00
parent ffd5cd1a0b
commit 814059ff35
4 changed files with 2 additions and 6 deletions

1
Conf.h
View file

@ -477,7 +477,6 @@ private:
bool m_oledInvert;
bool m_oledScroll;
bool m_oledRotate;
bool m_oledCast;
std::string m_lcdprocAddress;
unsigned int m_lcdprocPort;

View file

@ -570,7 +570,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
bool scroll = conf.getOLEDScroll();
bool rotate = conf.getOLEDRotate();
display = new COLED(type, brightness, invert, scroll, rotate, conf.getDMRNetworkSlot1(), conf.getDMRNetworkSlot2(), modem);
display = new COLED(type, brightness, invert, scroll, rotate, conf.getDMRNetworkSlot1(), conf.getDMRNetworkSlot2());
#endif
} else if (type == "CAST") {
display = new CCASTInfo(modem);

View file

@ -169,7 +169,7 @@ const unsigned char logo_POCSAG_bmp [] =
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
COLED::COLED(unsigned char displayType, unsigned char displayBrightness, bool displayInvert, bool displayScroll, bool displayRotate, bool slot1Enabled, bool slot2Enabled, CModem* modem) :
COLED::COLED(unsigned char displayType, unsigned char displayBrightness, bool displayInvert, bool displayScroll, bool displayRotate, bool slot1Enabled, bool slot2Enabled) :
m_displayType(displayType),
m_displayBrightness(displayBrightness),
m_displayInvert(displayInvert),
@ -177,7 +177,6 @@ m_displayScroll(displayScroll),
m_displayRotate(displayRotate),
m_slot1Enabled(slot1Enabled),
m_slot2Enabled(slot2Enabled),
m_modem(modem),
m_ipaddress(),
m_display()
{

2
OLED.h
View file

@ -36,7 +36,6 @@
#include "Adafruit_GFX.h"
#include "ArduiPi_OLED.h"
#include "NetworkInfo.h"
#include "Modem.h"
class COLED : public CDisplay
{
@ -86,7 +85,6 @@ private:
bool m_displayRotate;
bool m_slot1Enabled;
bool m_slot2Enabled;
CModem* m_modem;
std::string m_ipaddress;
ArduiPi_OLED m_display;