MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-22 22:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the rewritten slot for checking if it is free.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-09-22 20:49:12 +01:00
parent 409135abef
commit c62c5fe061
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DMRGateway.cpp
View File

@@ -721,8 +721,7 @@ int CDMRGateway::run()
m_repeater->write(data); m_repeater->write(data);
status[m_xlx2Slot] = DMRGWS_XLXREFLECTOR2; status[m_xlx2Slot] = DMRGWS_XLXREFLECTOR2;
timer[m_xlx2Slot]->start(); timer[m_xlx2Slot]->start();
} } else {
else {
unsigned int slotNo = data.getSlotNo(); unsigned int slotNo = data.getSlotNo();
unsigned int dstId = data.getDstId(); unsigned int dstId = data.getDstId();
FLCO flco = data.getFLCO(); FLCO flco = data.getFLCO();
@@ -761,6 +760,8 @@ int CDMRGateway::run()
} }
if (rewritten) { if (rewritten) {
// Check that the rewritten slot is free to use.
slotNo = data.getSlotNo();
if (status[slotNo] == DMRGWS_NONE || status[slotNo] == DMRGWS_DMRNETWORK1) { if (status[slotNo] == DMRGWS_NONE || status[slotNo] == DMRGWS_DMRNETWORK1) {
m_repeater->write(data); m_repeater->write(data);
status[slotNo] = DMRGWS_DMRNETWORK1; status[slotNo] = DMRGWS_DMRNETWORK1;
@@ -806,6 +807,8 @@ int CDMRGateway::run()
} }
if (rewritten) { if (rewritten) {
// Check that the rewritten slot is free to use.
slotNo = data.getSlotNo();
if (status[slotNo] == DMRGWS_NONE || status[slotNo] == DMRGWS_DMRNETWORK2) { if (status[slotNo] == DMRGWS_NONE || status[slotNo] == DMRGWS_DMRNETWORK2) {
m_repeater->write(data); m_repeater->write(data);
status[slotNo] = DMRGWS_DMRNETWORK2; status[slotNo] = DMRGWS_DMRNETWORK2;