remove unused variables from OLED class

sojubox · May 14, 2019 · 814059f · 814059f
1 parent ffd5cd1
commit 814059f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/Conf.h b/Conf.h
@@ -477,7 +477,6 @@ class CConf
   bool          m_oledInvert;
   bool          m_oledScroll;
   bool          m_oledRotate;
-  bool          m_oledCast;
 
   std::string  m_lcdprocAddress;
   unsigned int m_lcdprocPort;

diff --git a/Display.cpp b/Display.cpp
@@ -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);

diff --git a/OLED.cpp b/OLED.cpp
@@ -169,15 +169,14 @@ 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),
 m_displayScroll(displayScroll),
 m_displayRotate(displayRotate),
 m_slot1Enabled(slot1Enabled),
 m_slot2Enabled(slot2Enabled),
-m_modem(modem),
 m_ipaddress(),
 m_display()
 {

diff --git a/OLED.h b/OLED.h
@@ -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 @@ class COLED : public CDisplay
   bool          m_displayRotate;
   bool          m_slot1Enabled;
   bool          m_slot2Enabled;
-  CModem*       m_modem;
   std::string   m_ipaddress;
   ArduiPi_OLED  m_display;