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

remove unused variables from OLED class

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
Conf.h
View File

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

2
Display.cpp
View File

@@ -570,7 +570,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
bool scroll = conf.getOLEDScroll(); bool scroll = conf.getOLEDScroll();
bool rotate = conf.getOLEDRotate(); 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 #endif
} else if (type == "CAST") { } else if (type == "CAST") {
display = new CCASTInfo(modem); display = new CCASTInfo(modem);

3
OLED.cpp
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 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_displayType(displayType),
m_displayBrightness(displayBrightness), m_displayBrightness(displayBrightness),
m_displayInvert(displayInvert), m_displayInvert(displayInvert),
@@ -177,7 +177,6 @@ m_displayScroll(displayScroll),
m_displayRotate(displayRotate), m_displayRotate(displayRotate),
m_slot1Enabled(slot1Enabled), m_slot1Enabled(slot1Enabled),
m_slot2Enabled(slot2Enabled), m_slot2Enabled(slot2Enabled),
m_modem(modem),
m_ipaddress(), m_ipaddress(),
m_display() m_display()
{ {

2
OLED.h
View File

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