g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Alter CW Id timing behaviour.

Browse source
This commit is contained in:
Jonathan Naylor 2016-10-17 18:01:38 +01:00
parent 9f65e2f4ef
commit 36ce3f18f4
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
MMDVMHost.cpp
View file

@ -138,6 +138,7 @@ m_dstarEnabled(false),
m_dmrEnabled(false), m_dmrEnabled(false),
m_ysfEnabled(false), m_ysfEnabled(false),
m_p25Enabled(false), m_p25Enabled(false),
m_cwIdTime(0U),
m_lookup(NULL), m_lookup(NULL),
m_callsign() m_callsign()
{ {
@ -270,7 +271,9 @@ int CMMDVMHost::run()
LogInfo("CW Id Parameters"); LogInfo("CW Id Parameters");
LogInfo(" Time: %u mins", time); LogInfo(" Time: %u mins", time);
m_cwIdTimer.setTimeout(time * 60U); m_cwIdTime = time * 60U;
m_cwIdTimer.setTimeout(m_cwIdTime / 4U);
m_cwIdTimer.start(); m_cwIdTimer.start();
} }
@ -698,7 +701,8 @@ int CMMDVMHost::run()
m_display->writeCW(); m_display->writeCW();
m_modem->sendCWId(m_callsign); m_modem->sendCWId(m_callsign);
m_cwIdTimer.start(); //reset only after sending ID, timer-overflow after 49 days doesnt matter m_cwIdTimer.setTimeout(m_cwIdTime);
m_cwIdTimer.start();
} }
} }
@ -1098,6 +1102,7 @@ void CMMDVMHost::setMode(unsigned char mode)
m_modem->setMode(MODE_DSTAR); m_modem->setMode(MODE_DSTAR);
m_mode = MODE_DSTAR; m_mode = MODE_DSTAR;
m_modeTimer.start(); m_modeTimer.start();
m_cwIdTimer.stop();
break; break;
case MODE_DMR: case MODE_DMR:
@ -1114,6 +1119,7 @@ void CMMDVMHost::setMode(unsigned char mode)
} }
m_mode = MODE_DMR; m_mode = MODE_DMR;
m_modeTimer.start(); m_modeTimer.start();
m_cwIdTimer.stop();
break; break;
case MODE_YSF: case MODE_YSF:
@ -1126,6 +1132,7 @@ void CMMDVMHost::setMode(unsigned char mode)
m_modem->setMode(MODE_YSF); m_modem->setMode(MODE_YSF);
m_mode = MODE_YSF; m_mode = MODE_YSF;
m_modeTimer.start(); m_modeTimer.start();
m_cwIdTimer.stop();
break; break;
case MODE_P25: case MODE_P25:
@ -1138,6 +1145,7 @@ void CMMDVMHost::setMode(unsigned char mode)
m_modem->setMode(MODE_P25); m_modem->setMode(MODE_P25);
m_mode = MODE_P25; m_mode = MODE_P25;
m_modeTimer.start(); m_modeTimer.start();
m_cwIdTimer.stop();
break; break;
case MODE_LOCKOUT: case MODE_LOCKOUT:
@ -1197,6 +1205,10 @@ void CMMDVMHost::setMode(unsigned char mode)
m_modem->setMode(MODE_IDLE); m_modem->setMode(MODE_IDLE);
if (m_mode == MODE_ERROR || m_mode == MODE_LOCKOUT) { if (m_mode == MODE_ERROR || m_mode == MODE_LOCKOUT) {
m_modem->sendCWId(m_callsign); m_modem->sendCWId(m_callsign);
m_cwIdTimer.setTimeout(m_cwIdTime);
m_cwIdTimer.start();
} else {
m_cwIdTimer.setTimeout(m_cwIdTime / 4U);
m_cwIdTimer.start(); m_cwIdTimer.start();
} }
m_display->setIdle(); m_display->setIdle();

1
MMDVMHost.h
View file

@ -59,6 +59,7 @@ private:
bool m_dmrEnabled; bool m_dmrEnabled;
bool m_ysfEnabled; bool m_ysfEnabled;
bool m_p25Enabled; bool m_p25Enabled;
unsigned int m_cwIdTime;
CDMRLookup* m_lookup; CDMRLookup* m_lookup;
std::string m_callsign; std::string m_callsign;