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

Add callsign from config file to idle screen

Browse source
This commit is contained in:
phl0 2016-04-07 13:11:22 +02:00
parent 09a16a37a6
commit aae5060f80
10 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Display.h
View file

@ -28,7 +28,7 @@ public:
virtual bool open() = 0; virtual bool open() = 0;
virtual void setIdle() = 0; virtual void setIdle(const char* callsign) = 0;
virtual void setLockout() = 0; virtual void setLockout() = 0;
virtual void setError(const char* text) = 0; virtual void setError(const char* text) = 0;

4
HD44780.cpp
View file

@ -63,12 +63,12 @@ bool CHD44780::open()
return true; return true;
} }
void CHD44780::setIdle() void CHD44780::setIdle(const char* callsign)
{ {
::lcdClear(m_fd); ::lcdClear(m_fd);
::lcdPosition(m_fd, 0, 0); ::lcdPosition(m_fd, 0, 0);
::lcdPuts(m_fd, "MMDVM"); ::lcdPrintf(m_fd, "MMDVM %s", callsign);
::lcdPosition(m_fd, 0, 1); ::lcdPosition(m_fd, 0, 1);
::lcdPuts(m_fd, "Idle"); ::lcdPuts(m_fd, "Idle");

2
HD44780.h
View file

@ -32,7 +32,7 @@ public:
virtual bool open(); virtual bool open();
virtual void setIdle(); virtual void setIdle(const char* callsign);
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); virtual void setLockout();

3
MMDVMHost.cpp
View file

@ -692,7 +692,8 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
if (m_mode == MODE_DMR && m_duplex) if (m_mode == MODE_DMR && m_duplex)
m_modem->writeDMRStart(false); m_modem->writeDMRStart(false);
m_modem->setMode(MODE_IDLE); m_modem->setMode(MODE_IDLE);
m_display->setIdle(); std::string callsign = m_conf.getCallsign();
m_display->setIdle(callsign.c_str());
m_mode = MODE_IDLE; m_mode = MODE_IDLE;
m_modeTimer.stop(); m_modeTimer.stop();
break; break;

4
Nextion.cpp
View file

@ -48,12 +48,12 @@ bool CNextion::open()
::sprintf(command, "dim=%u", m_brightness); ::sprintf(command, "dim=%u", m_brightness);
sendCommand(command); sendCommand(command);
setIdle(); setIdle("");
return true; return true;
} }
void CNextion::setIdle() void CNextion::setIdle(const char* callsign)
{ {
sendCommand("page MMDVM"); sendCommand("page MMDVM");

2
Nextion.h
View file

@ -32,7 +32,7 @@ public:
virtual bool open(); virtual bool open();
virtual void setIdle(); virtual void setIdle(const char* callsign);
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); virtual void setLockout();

2
NullDisplay.cpp
View file

@ -31,7 +31,7 @@ bool CNullDisplay::open()
return true; return true;
} }
void CNullDisplay::setIdle() void CNullDisplay::setIdle(const char* callsign)
{ {
} }

2
NullDisplay.h
View file

@ -31,7 +31,7 @@ public:
virtual bool open(); virtual bool open();
virtual void setIdle(); virtual void setIdle(const char* callsign);
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); virtual void setLockout();

4
TFTSerial.cpp
View file

@ -71,12 +71,12 @@ bool CTFTSerial::open()
setForeground(COLOUR_BLACK); setForeground(COLOUR_BLACK);
setIdle(); setIdle("");
return true; return true;
} }
void CTFTSerial::setIdle() void CTFTSerial::setIdle(const char* callsign)
{ {
// Clear the screen // Clear the screen
clearScreen(); clearScreen();

2
TFTSerial.h
View file

@ -32,7 +32,7 @@ public:
virtual bool open(); virtual bool open();
virtual void setIdle(); virtual void setIdle(const char* callsign);
virtual void setError(const char* text); virtual void setError(const char* text);
virtual void setLockout(); virtual void setLockout();