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

Changed type of callsign variable for HD44780

Browse source
This commit is contained in:
phl0 2016-04-21 12:03:55 +02:00
parent 0cd1225d66
commit f6c7ee79c6
No known key found for this signature in database
GPG key ID: 48EA1E640798CA9A
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
HD44780.cpp
View file

@ -28,7 +28,7 @@
const char* LISTENING = "Listening ";
CHD44780::CHD44780(unsigned int rows, unsigned int cols, const char* callsign, unsigned int dmrid, const std::vector<unsigned int>& pins) :
CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins) :
m_rows(rows),
m_cols(cols),
m_callsign(callsign),
@ -44,7 +44,7 @@ m_dmr(false)
{
assert(rows > 1U);
assert(cols > 15U);
assert(callsign != NULL);
assert(callsign.c_str() != NULL);
}
CHD44780::~CHD44780()
@ -93,7 +93,7 @@ void CHD44780::setIdle()
::lcdClear(m_fd);
::lcdPosition(m_fd, 0, 0);
::lcdPrintf(m_fd, "%-6s / %u", m_callsign, m_dmrid);
::lcdPrintf(m_fd, "%-6s / %u", m_callsign.c_str(), m_dmrid);
::lcdPosition(m_fd, 0, 1);
::lcdPuts(m_fd, "MMDVM Idle");

4
HD44780.h
View file

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

2
MMDVMHost.cpp
View file

@ -602,7 +602,7 @@ void CMMDVMHost::createDisplay()
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));
m_display = new CHD44780(rows, columns, callsign.c_str(), dmrid, pins);
m_display = new CHD44780(rows, columns, callsign, dmrid, pins);
}
#endif
} else {