ShaYmez
/
MMDVM_CM
mirror of https://github.com/ShaYmez/MMDVM_CM.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removing busyTimer, no needed for YSF2XX

This commit is contained in:
Andy CA6JAU 2019-02-04 10:43:21 -03:00
parent c063b2455f
commit 09f2c80578
6 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
YSF2DMR/WiresX.cpp
View File

@ -70,8 +70,6 @@ m_start(0U),
m_search(), m_search(),
m_category(), m_category(),
m_makeUpper(makeUpper), m_makeUpper(makeUpper),
m_busy(false),
m_busyTimer(3000U, 1U),
m_bufferTX(10000U, "YSF Wires-X TX Buffer") m_bufferTX(10000U, "YSF Wires-X TX Buffer")
{ {
assert(network != NULL); assert(network != NULL);
@ -382,9 +380,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
{ {
//::LogDebug("Received Connect to %6.6s from %10.10s", data, source); //::LogDebug("Received Connect to %6.6s from %10.10s", data, source);
m_busy = true;
m_busyTimer.start();
std::string id = std::string((char*)data, 6U); std::string id = std::string((char*)data, 6U);
m_dstID = atoi(id.c_str()); m_dstID = atoi(id.c_str());
@ -399,9 +394,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
void CWiresX::processConnect(int dstID) void CWiresX::processConnect(int dstID)
{ {
m_busy = true;
m_busyTimer.start();
m_dstID = dstID; m_dstID = dstID;
m_status = WXSI_CONNECT; m_status = WXSI_CONNECT;
@ -460,12 +452,6 @@ void CWiresX::clock(unsigned int ms)
} }
m_txWatch.start(); m_txWatch.start();
} }
m_busyTimer.clock(ms);
if (m_busyTimer.isRunning() && m_busyTimer.hasExpired()) {
m_busy = false;
m_busyTimer.stop();
}
} }
void CWiresX::createReply(const unsigned char* data, unsigned int length) void CWiresX::createReply(const unsigned char* data, unsigned int length)
@ -1125,8 +1111,3 @@ void CWiresX::sendCategoryReply()
m_seqNo++; m_seqNo++;
} }
bool CWiresX::isBusy() const
{
return m_busy;
}

3
YSF2DMR/WiresX.h
View File

@ -72,7 +72,6 @@ public:
~CWiresX(); ~CWiresX();
bool start(); bool start();
bool isBusy() const;
WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft);
@ -114,8 +113,6 @@ private:
std::vector<CTGReg*> m_TGSearch; std::vector<CTGReg*> m_TGSearch;
std::vector<CTGReg*> m_category; std::vector<CTGReg*> m_category;
bool m_makeUpper; bool m_makeUpper;
bool m_busy;
CTimer m_busyTimer;
CStopWatch m_txWatch; CStopWatch m_txWatch;
CRingBuffer<unsigned char> m_bufferTX; CRingBuffer<unsigned char> m_bufferTX;

19
YSF2NXDN/WiresX.cpp
View File

@ -70,8 +70,6 @@ m_start(0U),
m_search(), m_search(),
m_category(), m_category(),
m_makeUpper(makeUpper), m_makeUpper(makeUpper),
m_busy(false),
m_busyTimer(3000U, 1U),
m_bufferTX(10000U, "YSF Wires-X TX Buffer") m_bufferTX(10000U, "YSF Wires-X TX Buffer")
{ {
assert(network != NULL); assert(network != NULL);
@ -353,9 +351,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
{ {
//::LogDebug("Received Connect to %6.6s from %10.10s", data, source); //::LogDebug("Received Connect to %6.6s from %10.10s", data, source);
m_busy = true;
m_busyTimer.start();
std::string id = std::string((char*)data, 6U); std::string id = std::string((char*)data, 6U);
m_dstID = atoi(id.c_str()); m_dstID = atoi(id.c_str());
@ -370,9 +365,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
void CWiresX::processConnect(int dstID) void CWiresX::processConnect(int dstID)
{ {
m_busy = true;
m_busyTimer.start();
m_dstID = dstID; m_dstID = dstID;
m_status = WXSI_CONNECT; m_status = WXSI_CONNECT;
@ -432,12 +424,6 @@ void CWiresX::clock(unsigned int ms)
} }
m_txWatch.start(); m_txWatch.start();
} }
m_busyTimer.clock(ms);
if (m_busyTimer.isRunning() && m_busyTimer.hasExpired()) {
m_busy = false;
m_busyTimer.stop();
}
} }
void CWiresX::createReply(const unsigned char* data, unsigned int length) void CWiresX::createReply(const unsigned char* data, unsigned int length)
@ -1076,8 +1062,3 @@ void CWiresX::sendCategoryReply()
m_seqNo++; m_seqNo++;
} }
bool CWiresX::isBusy() const
{
return m_busy;
}

3
YSF2NXDN/WiresX.h
View File

@ -69,7 +69,6 @@ public:
~CWiresX(); ~CWiresX();
bool start(); bool start();
bool isBusy() const;
WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft);
@ -108,8 +107,6 @@ private:
std::vector<CTGReg*> m_TGSearch; std::vector<CTGReg*> m_TGSearch;
std::vector<CTGReg*> m_category; std::vector<CTGReg*> m_category;
bool m_makeUpper; bool m_makeUpper;
bool m_busy;
CTimer m_busyTimer;
CStopWatch m_txWatch; CStopWatch m_txWatch;
CRingBuffer<unsigned char> m_bufferTX; CRingBuffer<unsigned char> m_bufferTX;

19
YSF2P25/WiresX.cpp
View File

@ -70,8 +70,6 @@ m_start(0U),
m_search(), m_search(),
m_category(), m_category(),
m_makeUpper(makeUpper), m_makeUpper(makeUpper),
m_busy(false),
m_busyTimer(3000U, 1U),
m_bufferTX(10000U, "YSF Wires-X TX Buffer") m_bufferTX(10000U, "YSF Wires-X TX Buffer")
{ {
assert(network != NULL); assert(network != NULL);
@ -353,9 +351,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
{ {
//::LogDebug("Received Connect to %6.6s from %10.10s", data, source); //::LogDebug("Received Connect to %6.6s from %10.10s", data, source);
m_busy = true;
m_busyTimer.start();
std::string id = std::string((char*)data, 6U); std::string id = std::string((char*)data, 6U);
m_dstID = atoi(id.c_str()); m_dstID = atoi(id.c_str());
@ -370,9 +365,6 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
void CWiresX::processConnect(int dstID) void CWiresX::processConnect(int dstID)
{ {
m_busy = true;
m_busyTimer.start();
m_dstID = dstID; m_dstID = dstID;
m_status = WXSI_CONNECT; m_status = WXSI_CONNECT;
@ -432,12 +424,6 @@ void CWiresX::clock(unsigned int ms)
} }
m_txWatch.start(); m_txWatch.start();
} }
m_busyTimer.clock(ms);
if (m_busyTimer.isRunning() && m_busyTimer.hasExpired()) {
m_busy = false;
m_busyTimer.stop();
}
} }
void CWiresX::createReply(const unsigned char* data, unsigned int length) void CWiresX::createReply(const unsigned char* data, unsigned int length)
@ -1076,8 +1062,3 @@ void CWiresX::sendCategoryReply()
m_seqNo++; m_seqNo++;
} }
bool CWiresX::isBusy() const
{
return m_busy;
}

3
YSF2P25/WiresX.h
View File

@ -69,7 +69,6 @@ public:
~CWiresX(); ~CWiresX();
bool start(); bool start();
bool isBusy() const;
WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft);
@ -108,8 +107,6 @@ private:
std::vector<CTGReg*> m_TGSearch; std::vector<CTGReg*> m_TGSearch;
std::vector<CTGReg*> m_category; std::vector<CTGReg*> m_category;
bool m_makeUpper; bool m_makeUpper;
bool m_busy;
CTimer m_busyTimer;
CStopWatch m_txWatch; CStopWatch m_txWatch;
CRingBuffer<unsigned char> m_bufferTX; CRingBuffer<unsigned char> m_bufferTX;