MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 16:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed type of callsign variable for TFTSerial

Browse Source
This commit is contained in:
phl0
2016-04-21 12:09:54 +02:00
parent f6c7ee79c6
commit a2413f30db
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MMDVMHost.cpp
View File

@@ -582,7 +582,7 @@ void CMMDVMHost::createDisplay()
LogInfo(" Port: %s", port.c_str()); LogInfo(" Port: %s", port.c_str());
LogInfo(" Brightness: %u", brightness); LogInfo(" Brightness: %u", brightness);
m_display = new CTFTSerial(callsign.c_str(), dmrid, port, brightness); m_display = new CTFTSerial(callsign, dmrid, port, brightness);
} else if (type == "Nextion") { } else if (type == "Nextion") {
std::string port = m_conf.getNextionPort(); std::string port = m_conf.getNextionPort();
unsigned int brightness = m_conf.getNextionBrightness(); unsigned int brightness = m_conf.getNextionBrightness();

6
TFTSerial.cpp
View File

@@ -44,14 +44,14 @@ const unsigned char FONT_LARGE = 3U;
// x = 0 to 159, y = 0 to 127 - Landscape // x = 0 to 159, y = 0 to 127 - Landscape
// x = 0 to 127, y = 0 to 159 - Portrait // x = 0 to 127, y = 0 to 159 - Portrait
CTFTSerial::CTFTSerial(const char* callsign, unsigned int dmrid, const std::string& port, unsigned int brightness) : CTFTSerial::CTFTSerial(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness) :
m_callsign(callsign), m_callsign(callsign),
m_dmrid(dmrid), m_dmrid(dmrid),
m_serial(port, SERIAL_9600), m_serial(port, SERIAL_9600),
m_brightness(brightness), m_brightness(brightness),
m_mode(MODE_IDLE) m_mode(MODE_IDLE)
{ {
assert(callsign != NULL); assert(callsign.c_str() != NULL);
assert(brightness >= 0U && brightness <= 100U); assert(brightness >= 0U && brightness <= 100U);
} }
@@ -91,7 +91,7 @@ void CTFTSerial::setIdle()
displayBitmap(0U, 0U, "MMDVM_sm.bmp"); displayBitmap(0U, 0U, "MMDVM_sm.bmp");
char text[30]; char text[30];
::sprintf(text, "%-6s / %u", m_callsign, m_dmrid); ::sprintf(text, "%-6s / %u", m_callsign.c_str(), m_dmrid);
gotoPosPixel(18U, 55U); gotoPosPixel(18U, 55U);
displayText(text); displayText(text);

4
TFTSerial.h
View File

@@ -28,7 +28,7 @@
class CTFTSerial : public IDisplay class CTFTSerial : public IDisplay
{ {
public: public:
CTFTSerial(const char* callsign, unsigned int dmrid, const std::string& port, unsigned int brightness); CTFTSerial(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness);
virtual ~CTFTSerial(); virtual ~CTFTSerial();
virtual bool open(); virtual bool open();
@@ -50,7 +50,7 @@ public:
virtual void close(); virtual void close();
private: private:
const char* m_callsign; std::string m_callsign;
unsigned int m_dmrid; unsigned int m_dmrid;
CSerialController m_serial; CSerialController m_serial;
unsigned int m_brightness; unsigned int m_brightness;