public/AutoPatch
4
Fork 0
Code Activity

Merge branch 'master' of https://code.brandmeister.network/r3abm/AutoPatch

Browse source
This commit is contained in:
Artem Prilutskiy 2019-02-28 21:52:19 +03:00
commit 58cd24f9aa
2 changed files with 11 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SVXLink/README.md
View file

@ -1,6 +1,6 @@
# SVXLink patch to bridge with BrandMeister # SVXLink patch to bridge with BrandMeister
Copyright 2015-2018 by Artem Prilutskiy Copyright 2015-2019 by Artem Prilutskiy
The main purpose for this patch is to pass a callsign and talker alias between echolink and DMR. The main purpose for this patch is to pass a callsign and talker alias between echolink and DMR.
@ -55,6 +55,10 @@ And then put next lines:
{ {
bridge.setDefaultConfiguration(value.c_str()); bridge.setDefaultConfiguration(value.c_str());
} }
if (cfg().getValue(cfgName(), "BRIDGE_ENCODING", value))
{
bridge.setEncodingConfiguration(value.c_str());
}
if (cfg().getValue(cfgName(), "BRIDGE_PROXY", value)) if (cfg().getValue(cfgName(), "BRIDGE_PROXY", value))
{ {
bridge.setProxyConfiguration(value.c_str()); bridge.setProxyConfiguration(value.c_str());
@ -69,7 +73,7 @@ And add this ***BEFORE***:
``` ```
bridge.handleChatMessage(escaped.c_str()); bridge.handleChatMessage(escaped.c_str());
``` ```
This code will pass chat messages of conference server to bridge to find talker of transmission on conference call. This code responds to pass a chat message emitted by conference server to the bridge, required to find a talker of transmission in case of conference call.
Find this line (*void ModuleEchoLink::broadcastTalkerStatus(void)*): Find this line (*void ModuleEchoLink::broadcastTalkerStatus(void)*):
@ -80,7 +84,7 @@ And add this ***BEFORE***:
``` ```
const char* sysop_name = bridge.getTalker(); const char* sysop_name = bridge.getTalker();
``` ```
This code will pass call of transmisson to bridge on call of direct link. This code responds to pass a talker of transmisson to the bridge in case of call on direct link.
Find this text (*void ModuleEchoLink::broadcastTalkerStatus(void)*): Find this text (*void ModuleEchoLink::broadcastTalkerStatus(void)*):
@ -91,7 +95,7 @@ And add this ***AFTER***:
``` ```
bridge.setTalker(talker->remoteCallsign().c_str(), talker->remoteName().c_str()); bridge.setTalker(talker->remoteCallsign().c_str(), talker->remoteName().c_str());
``` ```
This code will pass call of transmisson from bridge to echolink. This code responds to pass a talker of transmisson from the bridge to echolink.
## How to configure: ## How to configure:
@ -101,9 +105,11 @@ Add folowing lines to your *ModuleEchoLink.conf*
``` ```
BRIDGE_DEFAULT=9504 BRIDGE_DEFAULT=9504
BRIDGE_PROXY=2501:10 BRIDGE_PROXY=2501:10
BRIDGE_ENCODING=cp1251
``` ```
Where: Where:
* *BRIDGE_DEFAULT* is a default ID of callee that will be passed when ID cannot be resolved by callsign (most possible this callsign has not been registred in DMR database) * *BRIDGE_DEFAULT* is a default ID of callee that will be passed when ID cannot be resolved by callsign (most possible this callsign has not been registred in DMR database)
* *BRIDGE_PROXY* should correspond to Network ID of BrandMeister Server and Cord ID connected to. * *BRIDGE_PROXY* should correspond to Network ID of BrandMeister Server and Cord ID connected to
* *BRIDGE_ENCODING* should contain national encoding name used for text messages and descriptions at EchoLink (please google iconv for available encoding names)

51
Scripts/asound.conf
View file

@ -1,51 +0,0 @@
# Record device for SVXLink
pcm.convert1 {
type rate
slave {
pcm "hw:Loopback,1,2"
rate 8000
}
}
pcm.dsp0 {
type plug
slave {
pcm "convert1"
rate 16000
}
}
# Playback device for SVXLink
pcm.convert2 {
type rate
slave {
pcm "hw:Loopback,0,0"
rate 8000
}
}
pcm.dsp1 {
type plug
slave {
pcm "convert2"
rate 16000
}
}
# Record device for AlterFRN
pcm.dsp2 {
type plug
slave.pcm "hw:Loopback,1,6"
}
# Playback device for AlterFRN
pcm.dsp3 {
type plug
slave.pcm "hw:Loopback,0,4"
}