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

Add callsign and DMR id to displays idle screen

Browse source
This commit is contained in:
phl0 2016-04-08 13:47:05 +02:00
parent b862797ca9
commit 41ffcc4cab
5 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
HD44780.cpp
View file

@ -27,9 +27,11 @@
const char* LISTENING = "Listening "; const char* LISTENING = "Listening ";
CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::vector<unsigned int>& pins) : CHD44780::CHD44780(unsigned int rows, unsigned int cols, const char* callsign, unsigned int dmrid, const std::vector<unsigned int>& pins) :
m_rows(rows), m_rows(rows),
m_cols(cols), m_cols(cols),
m_callsign(callsign),
m_dmrid(dmrid),
m_rb(pins.at(0U)), m_rb(pins.at(0U)),
m_strb(pins.at(1U)), m_strb(pins.at(1U)),
m_d0(pins.at(2U)), m_d0(pins.at(2U)),
@ -68,10 +70,10 @@ void CHD44780::setIdle()
::lcdClear(m_fd); ::lcdClear(m_fd);
::lcdPosition(m_fd, 0, 0); ::lcdPosition(m_fd, 0, 0);
::lcdPuts(m_fd, "MMDVM"); ::lcdPrintf(m_fd, "%-6s / %u", m_callsign, m_dmrid);
::lcdPosition(m_fd, 0, 1); ::lcdPosition(m_fd, 0, 1);
::lcdPuts(m_fd, "Idle"); ::lcdPuts(m_fd, "MMDVM Idle");
} }
void CHD44780::setError(const char* text) void CHD44780::setError(const char* text)

4
HD44780.h
View file

@ -27,7 +27,7 @@
class CHD44780 : public IDisplay class CHD44780 : public IDisplay
{ {
public: public:
CHD44780(unsigned int rows, unsigned int cols, const std::vector<unsigned int>& pins); CHD44780(unsigned int rows, unsigned int cols, const char* callsign, unsigned int dmrid, const std::vector<unsigned int>& pins);
virtual ~CHD44780(); virtual ~CHD44780();
virtual bool open(); virtual bool open();
@ -54,6 +54,8 @@ public:
private: private:
unsigned int m_rows; unsigned int m_rows;
unsigned int m_cols; unsigned int m_cols;
const char* m_callsign;
unsigned int m_dmrid;
unsigned int m_rb; unsigned int m_rb;
unsigned int m_strb; unsigned int m_strb;
unsigned int m_d0; unsigned int m_d0;

6
MMDVMHost.cpp
View file

@ -567,6 +567,8 @@ void CMMDVMHost::readParams()
void CMMDVMHost::createDisplay() void CMMDVMHost::createDisplay()
{ {
std::string type = m_conf.getDisplay(); std::string type = m_conf.getDisplay();
std::string callsign = m_conf.getCallsign();
unsigned int dmrid = m_conf.getDMRId();
LogInfo("Display Parameters"); LogInfo("Display Parameters");
LogInfo(" Type: %s", type.c_str()); LogInfo(" Type: %s", type.c_str());
@ -586,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();
@ -598,7 +600,7 @@ void CMMDVMHost::createDisplay()
LogInfo(" Columns: %u", columns); LogInfo(" Columns: %u", columns);
LogInfo(" Pins: %u,%u,%u,%u,%u,%u", pins.at(0U), pins.at(1U), pins.at(2U), pins.at(3U), pins.at(4U), pins.at(5U)); LogInfo(" Pins: %u,%u,%u,%u,%u,%u", pins.at(0U), pins.at(1U), pins.at(2U), pins.at(3U), pins.at(4U), pins.at(5U));
m_display = new CHD44780(rows, columns, pins); m_display = new CHD44780(rows, columns, callsign.c_str(), dmrid, pins);
} }
#endif #endif
} else { } else {

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[30];
::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;