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

Add the optional DMR network options command.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-11-03 19:27:52 +00:00
parent 2a5162d194
commit 34538d8b3f
6 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DMRNetwork.cpp
View File

@@ -52,6 +52,7 @@ m_buffer(NULL),
m_salt(NULL),
m_streamId(NULL),
m_rxData(1000U, "DMR Network"),
m_options(),
m_callsign(),
m_rxFrequency(0U),
m_txFrequency(0U),
@@ -97,6 +98,11 @@ CDMRNetwork::~CDMRNetwork()
delete[] m_id;
}
void CDMRNetwork::setOptions(const std::string& options)
{
m_options = options;
}
void CDMRNetwork::setConfig(const std::string& callsign, unsigned int rxFrequency, unsigned int txFrequency, unsigned int power, unsigned int colorCode, float latitude, float longitude, int height, const std::string& location, const std::string& description, const std::string& url)
{
m_callsign = callsign;
@@ -362,6 +368,17 @@ void CDMRNetwork::clock(unsigned int ms)
m_retryTimer.start();
break;
case WAITING_AUTHORISATION:
if (m_options.empty()) {
writeConfig();
m_status = WAITING_CONFIG;
} else {
writeOptions();
m_status = WAITING_OPTIONS;
}
m_timeoutTimer.start();
m_retryTimer.start();
break;
case WAITING_OPTIONS:
writeConfig();
m_status = WAITING_CONFIG;
m_timeoutTimer.start();
@@ -398,6 +415,9 @@ void CDMRNetwork::clock(unsigned int ms)
case WAITING_AUTHORISATION:
writeAuthorisation();
break;
case WAITING_OPTIONS:
writeOptions();
break;
case WAITING_CONFIG:
writeConfig();
break;
@@ -450,6 +470,14 @@ bool CDMRNetwork::writeAuthorisation()
return write(out, 40U);
}
bool CDMRNetwork::writeOptions()
{
char buffer[300U];
::sprintf(buffer, "RPTO%s", m_options.c_str());
return write((unsigned char*)buffer, (unsigned int)::strlen(buffer));
}
bool CDMRNetwork::writeConfig()
{
const char* software = "MMDVM";