Changed variable type for callsign
This commit is contained in:
parent
6e4a7f5e9b
commit
991065fb0c
|
@ -590,7 +590,7 @@ void CMMDVMHost::createDisplay()
|
|||
LogInfo(" Port: %s", port.c_str());
|
||||
LogInfo(" Brightness: %u", brightness);
|
||||
|
||||
m_display = new CNextion(callsign.c_str(), dmrid, port, brightness);
|
||||
m_display = new CNextion(callsign, dmrid, port, brightness);
|
||||
#if defined(HD44780)
|
||||
} else if (type == "HD44780") {
|
||||
unsigned int rows = m_conf.getHD44780Rows();
|
||||
|
|
|
@ -23,14 +23,14 @@
|
|||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
CNextion::CNextion(const char* callsign, unsigned int dmrid, const std::string& port, unsigned int brightness) :
|
||||
CNextion::CNextion(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness) :
|
||||
m_callsign(callsign),
|
||||
m_dmrid(dmrid),
|
||||
m_serial(port, SERIAL_9600),
|
||||
m_brightness(brightness),
|
||||
m_mode(MODE_IDLE)
|
||||
{
|
||||
assert(callsign != NULL);
|
||||
assert(callsign.c_str() != NULL);
|
||||
assert(brightness >= 0U && brightness <= 100U);
|
||||
}
|
||||
|
||||
|
@ -62,7 +62,7 @@ void CNextion::setIdle()
|
|||
sendCommand("page MMDVM");
|
||||
|
||||
char command[30];
|
||||
::sprintf(command, "t0.txt=\"%-6s / %u\"", m_callsign, m_dmrid);
|
||||
::sprintf(command, "t0.txt=\"%-6s / %u\"", m_callsign.c_str(), m_dmrid);
|
||||
|
||||
sendCommand(command);
|
||||
sendCommand("t1.txt=\"MMDVM IDLE\"");
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
class CNextion : public IDisplay
|
||||
{
|
||||
public:
|
||||
CNextion(const char* callsign, unsigned int dmrid, const std::string& port, unsigned int brightness);
|
||||
CNextion(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness);
|
||||
virtual ~CNextion();
|
||||
|
||||
virtual bool open();
|
||||
|
@ -50,7 +50,7 @@ public:
|
|||
virtual void close();
|
||||
|
||||
private:
|
||||
const char* m_callsign;
|
||||
std::string m_callsign;
|
||||
unsigned int m_dmrid;
|
||||
CSerialController m_serial;
|
||||
unsigned int m_brightness;
|
||||
|
|
Loading…
Reference in a new issue