mirror of https://github.com/ShaYmez/MMDVM_CM.git
Remove hard coded reflector module
This commit is contained in:
parent
e5836a4614
commit
7d6140cbe0
|
@ -252,6 +252,7 @@ int CDMR2M17::run()
|
||||||
|
|
||||||
m_callsign = m_conf.getCallsign();
|
m_callsign = m_conf.getCallsign();
|
||||||
m_m17Ref = m_conf.getM17DstName();
|
m_m17Ref = m_conf.getM17DstName();
|
||||||
|
char module = m_m17Ref.c_str()[m_m17Ref.find(' ')+1];
|
||||||
|
|
||||||
std::string m17_dstAddress = m_conf.getM17DstAddress();
|
std::string m17_dstAddress = m_conf.getM17DstAddress();
|
||||||
unsigned int m17_dstPort = m_conf.getM17DstPort();
|
unsigned int m17_dstPort = m_conf.getM17DstPort();
|
||||||
|
@ -324,7 +325,7 @@ int CDMR2M17::run()
|
||||||
unsigned short m17_cnt = 0;
|
unsigned short m17_cnt = 0;
|
||||||
unsigned char dmr_cnt = 0;
|
unsigned char dmr_cnt = 0;
|
||||||
|
|
||||||
m_m17Network->writeLink();
|
m_m17Network->writeLink(module);
|
||||||
|
|
||||||
LogMessage("Starting DMR2M17-%s", VERSION);
|
LogMessage("Starting DMR2M17-%s", VERSION);
|
||||||
|
|
||||||
|
|
|
@ -71,17 +71,17 @@ bool CM17Network::writePoll()
|
||||||
return m_socket.write(data, 10U, m_address, m_port);
|
return m_socket.write(data, 10U, m_address, m_port);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CM17Network::writeLink()
|
bool CM17Network::writeLink(char m)
|
||||||
{
|
{
|
||||||
unsigned char data[11U];
|
unsigned char data[11U];
|
||||||
|
|
||||||
memcpy(data, "CONN", 4);
|
memcpy(data, "CONN", 4);
|
||||||
memcpy(data+4, m_callsign, 6);
|
memcpy(data+4, m_callsign, 6);
|
||||||
data[10U] = 'A';
|
data[10U] = m;
|
||||||
if (m_debug)
|
if (m_debug)
|
||||||
CUtils::dump(1U, "M17 Network Link Sent", data, 11U);
|
CUtils::dump(1U, "M17 Network Link Sent", data, 11U);
|
||||||
|
|
||||||
LogInfo("writeLink add:port == %x, %x", m_address.s_addr, m_port);
|
//LogInfo("writeLink add:port == %x, %x", m_address.s_addr, m_port);
|
||||||
return m_socket.write(data, 11U, m_address, m_port);
|
return m_socket.write(data, 11U, m_address, m_port);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
bool writeData(const unsigned char* data, unsigned int length);
|
bool writeData(const unsigned char* data, unsigned int length);
|
||||||
unsigned int readData(unsigned char* data, unsigned int length);
|
unsigned int readData(unsigned char* data, unsigned int length);
|
||||||
bool writePoll();
|
bool writePoll();
|
||||||
bool writeLink();
|
bool writeLink(char m);
|
||||||
bool writeUnlink();
|
bool writeUnlink();
|
||||||
void close();
|
void close();
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue