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

Fix the OLED driver.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-10-09 17:21:09 +01:00
parent 45821b1881
commit 45e651c678
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OLED.cpp
View File

@@ -247,7 +247,7 @@ bool COLED::open()
return true; return true;
} }
float COLED::readTemperature(const std::string& filePath) float COLED::readTemperature(const char* filePath)
{ {
std::ifstream file(filePath); std::ifstream file(filePath);
if (!file.is_open()) { if (!file.is_open()) {
@@ -454,7 +454,7 @@ void COLED::clearDStarInt()
void COLED::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) void COLED::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type)
{ {
CUserDB entry tmp; CUserDBentry tmp;
tmp.set(keyCALLSIGN, src); tmp.set(keyCALLSIGN, src);
@@ -479,13 +479,13 @@ int COLED::writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool grou
m_display.setCursor(0, OLED_LINE2); m_display.setCursor(0, OLED_LINE2);
m_display.printf("%s", CALLandNAME(src).c_str()); m_display.printf("%s", CALLandNAME(src).c_str());
m_display.setCursor(0, OLED_LINE3); m_display.setCursor(0, OLED_LINE3);
m_display.printf("Slot: %i %s %s%s", slotNo, type.c_str(), group ? "TG: " : "", dst.c_str()); m_display.printf("Slot: %i %s %s%s", slotNo, type, group ? "TG: " : "", dst.c_str());
} else { } else {
m_display.fillRect(0, OLED_LINE4, m_display.width(), 40, BLACK); m_display.fillRect(0, OLED_LINE4, m_display.width(), 40, BLACK);
m_display.setCursor(0, OLED_LINE4); m_display.setCursor(0, OLED_LINE4);
m_display.printf("%s", CALLandNAME(src).c_str()); m_display.printf("%s", CALLandNAME(src).c_str());
m_display.setCursor(0, OLED_LINE5); m_display.setCursor(0, OLED_LINE5);
m_display.printf("Slot: %i %s %s%s", slotNo, type.c_str(), group ? "TG: " : "", dst.c_str()); m_display.printf("Slot: %i %s %s%s", slotNo, type, group ? "TG: " : "", dst.c_str());
} }
m_display.fillRect(0, OLED_LINE6, m_display.width(), 20, BLACK); m_display.fillRect(0, OLED_LINE6, m_display.width(), 20, BLACK);
@@ -496,7 +496,7 @@ int COLED::writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool grou
m_display.setCursor(0, OLED_LINE2); m_display.setCursor(0, OLED_LINE2);
m_display.printf("%s", CALLandNAME(src).c_str()); m_display.printf("%s", CALLandNAME(src).c_str());
m_display.setCursor(0, OLED_LINE3); m_display.setCursor(0, OLED_LINE3);
m_display.printf("Slot: %i %s %s%s", slotNo, type.c_str(), group ? "TG: " : "", dst.c_str()); m_display.printf("Slot: %i %s %s%s", slotNo, type, group ? "TG: " : "", dst.c_str());
m_display.setCursor(0, OLED_LINE4); m_display.setCursor(0, OLED_LINE4);
m_display.printf("%s", src.get(keyCITY).c_str()); m_display.printf("%s", src.get(keyCITY).c_str());
m_display.setCursor(0, OLED_LINE5); m_display.setCursor(0, OLED_LINE5);

2
OLED.h
View File

@@ -45,7 +45,7 @@
class COLED : public CDisplay class COLED : public CDisplay
{ {
public: public:
COLED(char displayType, unsigned char displayBrighness, bool displayInvert, bool displayScroll, bool displayRotate, bool displayLogoScreensaver, bool duplex); COLED(unsigned char displayType, unsigned char displayBrighness, bool displayInvert, bool displayScroll, bool displayRotate, bool displayLogoScreensaver, bool duplex);
virtual ~COLED(); virtual ~COLED();
virtual bool open(); virtual bool open();