Integrate the new messages into the OLED display driver.

This commit is contained in:
Jonathan Naylor
2018-10-31 16:54:57 +00:00
parent 1a971e3986
commit 4bf15438d5
8 changed files with 144 additions and 80 deletions

13
OLED.h
View File

@@ -36,11 +36,12 @@
#include "Adafruit_GFX.h"
#include "ArduiPi_OLED.h"
#include "NetworkInfo.h"
#include "Modem.h"
class COLED : public CDisplay
{
public:
COLED(unsigned char displayType, unsigned char displayBrighness, bool displayInvert, bool displayScroll, bool displayRotate, bool slot1Enabled, bool slot2Enabled);
COLED(unsigned char displayType, unsigned char displayBrighness, bool displayInvert, bool displayScroll, bool displayRotate, bool slot1Enabled, bool slot2Enabled, CModem* modem);
virtual ~COLED();
virtual bool open();
@@ -51,7 +52,6 @@ public:
virtual void setLockoutInt();
virtual void setQuitInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void clearDStarInt();
@@ -84,11 +84,12 @@ private:
bool m_displayInvert;
bool m_displayScroll;
bool m_displayRotate;
bool m_slot1Enabled;
bool m_slot2Enabled;
bool m_slot1Enabled;
bool m_slot2Enabled;
CModem* m_modem;
std::string m_ipaddress;
ArduiPi_OLED display;
ArduiPi_OLED m_display;
void OLED_statusbar();
};