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

Merge pull request #24 from phl0/NextionFormatting

Browse source 
callsign variable now as reference
This commit is contained in:
Jonathan Naylor 2016-04-21 10:18:01 +01:00
parent 6e4a7f5e9b 86aeaffd4c
commit 0cd1225d66
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DStarControl.cpp
View file

@ -489,15 +489,13 @@ void CDStarControl::writeNetwork()
LINK_STATUS status = LS_NONE;
unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH];
if (m_network != NULL)
m_network->getStatus(status, reflector);
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector);
if (strcmp((char*) reflector, " ") == 0) {
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} else {
m_network->getStatus(status, reflector);
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) {
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector);
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s via %8.8s", my1, my2, your, reflector);
} else {
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) " ");
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
}
} else if (type == TAG_EOT) {
if (m_netState != RS_NET_AUDIO)

2
MMDVMHost.cpp
View file

@ -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();

6
Nextion.cpp
View file

@ -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\"");

4
Nextion.h
View file

@ -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;