Merge pull request #173 from hacknix/master
Use private call (manual dial) to connect UA TG in the same way as reflectors (TGRewrite code)
This commit is contained in:
commit
49e0a1ae3a
2 changed files with 15 additions and 5 deletions
|
@ -234,7 +234,13 @@ unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid,
|
||||||
} else if (m_BMAutoRewrite && did == 9U && m_dstRewriteID != 9U && m_dstRewriteID != 0U && (m_time + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP ) {
|
} else if (m_BMAutoRewrite && did == 9U && m_dstRewriteID != 9U && m_dstRewriteID != 0U && (m_time + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP ) {
|
||||||
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID);
|
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID);
|
||||||
return(m_dstRewriteID);
|
return(m_dstRewriteID);
|
||||||
} else if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U) {
|
|
||||||
|
} else if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did < 99999U && dmrLC->getFLCO() == FLCO_USER_USER) {
|
||||||
|
m_dstRewriteID = did;
|
||||||
|
dmrLC->setFLCO(FLCO_GROUP);
|
||||||
|
LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)",slot,did);
|
||||||
|
return did;
|
||||||
|
} else if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did > 99999U) {
|
||||||
m_dstRewriteID = did;
|
m_dstRewriteID = did;
|
||||||
}
|
}
|
||||||
return 0U;
|
return 0U;
|
||||||
|
|
|
@ -12,8 +12,11 @@ which transparently maps back to the originating talkgroup. Rewrite is also
|
||||||
enabled if an outbound call is made to a talkgroup and then TG9 is activated
|
enabled if an outbound call is made to a talkgroup and then TG9 is activated
|
||||||
during the CallHang period.
|
during the CallHang period.
|
||||||
|
|
||||||
To use a User Activated talk-group, briefly key-up on that talk-group to
|
To use a User Activated talk-group, either briefly key-up on that talk-group to
|
||||||
activate it, then switch back to TG9 and talk as normal. If the CallHang period
|
activate it, then switch back to TG9 and talk as normal. Alternatively, and
|
||||||
|
perhaps more usefully, you can make a private call to the talk-group ID. This
|
||||||
|
enables you to manual-dial a talkgroup that is not in your codeplug, in the same
|
||||||
|
way that you can manual dial a reflector. If the CallHang period
|
||||||
expires, you may need to activate the talk-group again by keying up on that
|
expires, you may need to activate the talk-group again by keying up on that
|
||||||
talkgroup briefly, as before. Alternatively, you can wait for inbound audio to
|
talkgroup briefly, as before. Alternatively, you can wait for inbound audio to
|
||||||
re-activate the rewrite, then respond during the CallHang period.
|
re-activate the rewrite, then respond during the CallHang period.
|
||||||
|
@ -40,7 +43,8 @@ TGRewriteSlot2=[0|1]
|
||||||
BMAutoRewrite=[0|1]
|
BMAutoRewrite=[0|1]
|
||||||
BMRewriteReflectorVoicePrompts=[0|1]
|
BMRewriteReflectorVoicePrompts=[0|1]
|
||||||
|
|
||||||
Note at present, Auto rewrite is the only type of rewrite that is implemented so
|
Note at present, Auto rewrite is the only type of rewrite that is implemented
|
||||||
|
so
|
||||||
to do something useful, this option must be set.
|
to do something useful, this option must be set.
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue