MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into P25

Browse Source
This commit is contained in:
Jonathan Naylor
2016-09-27 19:47:07 +01:00
parent 1fd4ecbf9a 3a20b886d4
commit 25cfff3ada
26 changed files with 43736 additions and 42672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Nextion.cpp
View File

@@ -263,11 +263,25 @@ void CNextion::clearP25Int()
sendCommand("t2.txt=\"\"");
}
void CNextion::writeCWInt()
{
sendCommand("t1.txt=\"Sending CW Ident\"");
m_clockDisplayTimer.start();
m_mode = MODE_CW;
}
void CNextion::clearCWInt()
{
sendCommand("t1.txt=\"MMDVM IDLE\"");
}
void CNextion::clockInt(unsigned int ms)
{
// Update the clock display in IDLE mode every 400ms
m_clockDisplayTimer.clock(ms);
if (m_displayClock && m_mode == MODE_IDLE && m_clockDisplayTimer.isRunning() && m_clockDisplayTimer.hasExpired()) {
if (m_displayClock && (m_mode == MODE_IDLE || m_mode == MODE_CW) && m_clockDisplayTimer.isRunning() && m_clockDisplayTimer.hasExpired()) {
time_t currentTime;
struct tm *Time;
::time(&currentTime); // Get the current time