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

Add callsign/DMRid support to Nextion TFT displays

Browse source
This commit is contained in:
phl0 2016-04-07 22:51:57 +02:00
parent 9fb57309a1
commit 72d081c158
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MMDVMHost.cpp
View file

@ -588,7 +588,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 CNextion(port, brightness); m_display = new CNextion(callsign.c_str(), dmrid, port, brightness);
#if defined(HD44780) #if defined(HD44780)
} else if (type == "HD44780") { } else if (type == "HD44780") {
unsigned int rows = m_conf.getHD44780Rows(); unsigned int rows = m_conf.getHD44780Rows();

10
Nextion.cpp
View file

@ -23,7 +23,9 @@
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
CNextion::CNextion(const std::string& port, unsigned int brightness) : CNextion::CNextion(const char* callsign, unsigned int dmrid, const std::string& port, unsigned int brightness) :
m_callsign(callsign),
m_dmrid(dmrid),
m_serial(port, SERIAL_9600), m_serial(port, SERIAL_9600),
m_brightness(brightness) m_brightness(brightness)
{ {
@ -57,7 +59,11 @@ void CNextion::setIdle()
{ {
sendCommand("page MMDVM"); sendCommand("page MMDVM");
sendCommand("t0.txt=\"IDLE\""); char command[20];
::sprintf(command, "t0.txt=\"%-6s / %u\"", m_callsign, m_dmrid);
sendCommand(command);
sendCommand("t1.txt=\"MMDVM IDLE\"");
} }
void CNextion::setError(const char* text) void CNextion::setError(const char* text)

4
Nextion.h
View file

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