Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'M17_AX25_FM' of https://github.com/g4klx/MMDVMHost into M17_AX25_FM

Browse source
This commit is contained in:
Jonathan Naylor 2020-11-16 16:58:33 +00:00
parent 43733df7a4 302a23b6e6
commit 8e857edda2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OLED.cpp
View file

@ -148,8 +148,8 @@ const unsigned char logo_NXDN_bmp [] =
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
// XXX FIXME This is still the NXDN logo
// Logo M17_sm, 128x16px
// XXX FIXME This is the NXDN logo, it needs replacing with the M17 logo
const unsigned char logo_M17_bmp [] =
{
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@ -368,7 +368,6 @@ void COLED::writeDStarInt(const char* my1, const char* my2, const char* your, co
OLED_statusbar();
m_display.display();
}
void COLED::clearDStarInt()
@ -634,7 +633,6 @@ void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
OLED_statusbar();
m_display.display();
}
void COLED::clearPOCSAGInt()

3
OLED.h
View file

@ -73,6 +73,9 @@ public:
virtual int writeNXDNIntEx(const class CUserDBentry& source, bool group, unsigned int dest, const char* type);
virtual void clearNXDNInt();
virtual void writeM17Int(const char* source, const char* dest, const char* type);
virtual void clearM17Int();
virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
virtual void clearPOCSAGInt();