Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements to prevent corruption with OLED scrolling #497

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improvements to prevent corruption with OLED scrolling #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
124 changes: 80 additions & 44 deletions OLED.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,28 +220,28 @@ bool COLED::open()
m_display.clearDisplay(); // clears the screen buffer
m_display.display(); // display it (clear display)

OLED_statusbar();
drawStatusBar();
m_display.setCursor(0,OLED_LINE3);
m_display.print("Startup");
m_display.display();
drawDisplay();

return true;
}

void COLED::setIdleInt()
{
m_mode = MODE_IDLE;

m_display.stopscroll();
m_display.clearDisplay();
OLED_statusbar();
drawStatusBar();
m_displayScrollMode = SCROLL_FULL_DISPLAY;

// m_display.setCursor(0,30);
// m_display.setTextSize(3);
// m_display.print("Idle");

// m_display.setTextSize(1);
m_display.startscrolldiagright(0x00,0x0f); //the MMDVM logo scrolls the whole screen
m_display.display();

drawDisplay();

unsigned char info[100U];
CNetworkInfo* m_network;
Expand Down Expand Up @@ -270,50 +270,57 @@ void COLED::setErrorInt(const char* text)
{
m_mode = MODE_ERROR;

m_display.stopscroll();
m_display.clearDisplay();
OLED_statusbar();
drawStatusBar();

m_display.setCursor(0,OLED_LINE1);
m_display.printf("%s\n",text);

m_display.display();
drawDisplay();
}

void COLED::setLockoutInt()
{
m_mode = MODE_LOCKOUT;

m_display.stopscroll();
m_display.clearDisplay();
OLED_statusbar();
drawStatusBar();

m_display.setCursor(0,30);
m_display.setTextSize(3);
m_display.print("Lockout");

m_display.setTextSize(1);
m_display.display();

drawDisplay();
}

void COLED::setQuitInt()
{
m_mode = MODE_QUIT;

m_display.stopscroll();
m_display.clearDisplay();
OLED_statusbar();
drawStatusBar();

m_display.setCursor(0,30);
m_display.setTextSize(3);
m_display.print("Stopped");

m_display.setTextSize(1);
m_display.display();
drawDisplay();
}

void COLED::writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector)
{
m_mode = MODE_DSTAR;

m_display.stopscroll();
m_display.clearDisplay();
drawStatusBar();

m_display.fillRect(0,OLED_LINE3,m_display.width(),m_display.height(),BLACK); //clear everything beneath logo

m_display.setCursor(0,OLED_LINE3);
Expand All @@ -328,15 +335,15 @@ void COLED::writeDStarInt(const char* my1, const char* my2, const char* your, co
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());

OLED_statusbar();
m_display.display();
drawDisplay();

if (m_modem != NULL)
m_modem->writeDStarInfo(my1, my2, your, type, reflector);
}

void COLED::clearDStarInt()
{
m_display.stopscroll();
m_display.fillRect(0,OLED_LINE3, m_display.width(),m_display.height(),BLACK); //clear everything beneath the logo

m_display.setCursor(40,OLED_LINE3);
Expand All @@ -345,17 +352,20 @@ void COLED::clearDStarInt()
m_display.setCursor(0,OLED_LINE5);
m_display.printf("%s",m_ipaddress.c_str());

m_display.display();
drawDisplay();
}

void COLED::writeDMRInt(unsigned int slotNo,const std::string& src,bool group,const std::string& dst,const char* type)
{
m_display.stopscroll();

if (m_mode != MODE_DMR) {
m_display.clearDisplay();
m_mode = MODE_DMR;
clearDMRInt(slotNo);
drawStatusBar();
}

// if both slots, use lines 2-3 for slot 1, lines 4-5 for slot 2
// if single slot, use lines 3-4
if ( m_slot1Enabled && m_slot2Enabled ) {
Expand Down Expand Up @@ -390,8 +400,7 @@ void COLED::writeDMRInt(unsigned int slotNo,const std::string& src,bool group,co
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());

OLED_statusbar();
m_display.display();
drawDisplay();

if (m_modem != NULL)
m_modem->writeDMRInfo(slotNo, src, group, dst, type);
Expand Down Expand Up @@ -422,15 +431,16 @@ void COLED::clearDMRInt(unsigned int slotNo)
m_display.fillRect(0, OLED_LINE6, m_display.width(), 20, BLACK);
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());
m_display.display();
}

void COLED::writeFusionInt(const char* source, const char* dest, const char* type, const char* origin)
{

m_mode = MODE_YSF;


m_display.stopscroll();
m_display.clearDisplay();
drawStatusBar();

m_display.fillRect(0,OLED_LINE2,m_display.width(),m_display.height(),BLACK);

m_display.setCursor(0,OLED_LINE4);
Expand All @@ -439,15 +449,16 @@ void COLED::writeFusionInt(const char* source, const char* dest, const char* typ
m_display.setCursor(0,OLED_LINE5);
m_display.printf(" %.10s", dest);

OLED_statusbar();
m_display.display();

drawDisplay();

if (m_modem != NULL)
m_modem->writeYSFInfo(source, dest, type, origin);
}

void COLED::clearFusionInt()
{
m_display.stopscroll();
m_display.fillRect(0, OLED_LINE2, m_display.width(), m_display.height(), BLACK);

m_display.setCursor(40,OLED_LINE4);
Expand All @@ -456,31 +467,34 @@ void COLED::clearFusionInt()
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());

m_display.display();
drawDisplay();
}

void COLED::writeP25Int(const char* source, bool group, unsigned int dest, const char* type)
{
m_mode = MODE_P25;

m_display.stopscroll();
m_display.clearDisplay();
m_display.fillRect(0, OLED_LINE2, m_display.width(), m_display.height(), BLACK);
drawStatusBar();

m_display.setCursor(0,OLED_LINE3);
m_display.printf("%s %.10s", type, source);

m_display.setCursor(0,OLED_LINE4);
m_display.printf(" %s%u", group ? "TG" : "", dest);

OLED_statusbar();
m_display.display();

drawDisplay();

if (m_modem != NULL)
m_modem->writeP25Info(source, group, dest, type);
}

void COLED::clearP25Int()
{
m_display.stopscroll();
m_display.fillRect(0, OLED_LINE2, m_display.width(), m_display.height(), BLACK);

m_display.setCursor(40,OLED_LINE4);
Expand All @@ -489,14 +503,17 @@ void COLED::clearP25Int()
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());

m_display.display();
drawDisplay();
}

void COLED::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type)
{
m_mode = MODE_NXDN;

m_display.stopscroll();
m_display.clearDisplay();
drawStatusBar();

m_display.fillRect(0, OLED_LINE2, m_display.width(), m_display.height(), BLACK);

m_display.setCursor(0,OLED_LINE3);
Expand All @@ -505,15 +522,16 @@ void COLED::writeNXDNInt(const char* source, bool group, unsigned int dest, cons
m_display.setCursor(0,OLED_LINE5);
m_display.printf(" %s%u", group ? "TG" : "", dest);

OLED_statusbar();
m_display.display();
drawDisplay();

if (m_modem != NULL)
m_modem->writeNXDNInfo(source, group, dest, type);
}

void COLED::clearNXDNInt()
{
m_display.stopscroll();

m_display.fillRect(0, OLED_LINE2, m_display.width(), m_display.height(), BLACK);

m_display.setCursor(40,OLED_LINE4);
Expand All @@ -522,14 +540,16 @@ void COLED::clearNXDNInt()
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());

m_display.display();
drawDisplay();
}

void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
{
m_mode = MODE_POCSAG;


m_display.stopscroll();
m_display.clearDisplay();
drawStatusBar();
m_display.fillRect(0, OLED_LINE1, m_display.width(), m_display.height(), BLACK);

m_display.setCursor(0,OLED_LINE3);
Expand All @@ -538,15 +558,17 @@ void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
m_display.setCursor(0,OLED_LINE5);
m_display.printf("MSG: %s", message.c_str());

OLED_statusbar();
m_display.display();

drawDisplay();

if (m_modem != NULL)
m_modem->writePOCSAGInfo(ric, message);
}

void COLED::clearPOCSAGInt()
{
m_display.stopscroll();

m_display.fillRect(0, OLED_LINE1, m_display.width(), m_display.height(), BLACK);

m_display.setCursor(40,OLED_LINE4);
Expand All @@ -555,51 +577,55 @@ void COLED::clearPOCSAGInt()
m_display.setCursor(0,OLED_LINE6);
m_display.printf("%s",m_ipaddress.c_str());

m_display.display();
drawDisplay();
}

void COLED::writeCWInt()
{
m_display.stopscroll();
m_display.clearDisplay();

m_display.setCursor(0,30);
m_display.setTextSize(3);
m_display.print("CW TX");

m_display.setTextSize(1);
m_display.display();
m_display.startscrollright(0x02,0x0f);

m_displayScrollMode = SCROLL_BOTTOM_DISPLAY;
drawDisplay();
}

void COLED::clearCWInt()
{
m_display.stopscroll();
m_display.clearDisplay();

m_display.setCursor(0,30);
m_display.setTextSize(3);
m_display.print("Idle");

m_display.setTextSize(1);
m_display.display();
m_display.startscrollleft(0x02,0x0f);

m_displayScrollMode = SCROLL_BOTTOM_DISPLAY;
drawDisplay();
}

void COLED::close()
{
m_display.stopscroll();
m_display.clearDisplay();
m_display.fillRect(0, 0, m_display.width(), 16, BLACK);
m_display.startscrollright(0x00,0x01);
m_display.setCursor(0,00);
m_display.setTextSize(2);
m_display.print("-CLOSE-");
m_display.display();
m_displayScrollMode = SCROLL_STATUS_BAR;
drawDisplay();

m_display.close();
}

void COLED::OLED_statusbar()
void COLED::drawStatusBar()
{
m_display.stopscroll();
m_display.fillRect(0, 0, m_display.width(), 16, BLACK);
m_display.setTextColor(WHITE);

Expand All @@ -619,6 +645,16 @@ void COLED::OLED_statusbar()
else
m_display.drawBitmap(0, 0, logo_glcd_bmp, 128, 16, WHITE);

if (m_displayScroll)
m_display.startscrollright(0x00,0x01);
m_displayScrollMode = SCROLL_STATUS_BAR;
}

void COLED::drawDisplay()
{
m_display.display();
if (m_displayScrollMode == SCROLL_STATUS_BAR)
m_display.startscrollright(0x00,0x01); // Just the title bar scrolls.
else if (m_displayScrollMode == SCROLL_FULL_DISPLAY)
m_display.startscrolldiagright(0x00,0x0f); //the MMDVM logo scrolls the whole screen
else if (m_displayScrollMode == SCROLL_BOTTOM_DISPLAY)
m_display.startscrollright(0x02,0x0f);
}