-
Notifications
You must be signed in to change notification settings - Fork 177
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Svxlink usrp #547
Open
dl1hrc
wants to merge
77
commits into
sm0svx:master
Choose a base branch
from
dl1hrc:svxlink-usrp
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Svxlink usrp #547
Changes from 64 commits
Commits
Show all changes
77 commits
Select commit
Hold shift + click to select a range
127208e
1st version
dl1hrc 55b3ade
Reasonably running version with errors, currently not usable in a mea…
dl1hrc a697dc3
Added std::array to message packing framework (in AsyncMsg.h) with mu…
dl1hrc 033e0c2
Added new class for USRP stopmessage, Bugfix with audiostream data (b…
dl1hrc bf25eed
Added meta Usrp-message (USRP_TYPE_TEXT)
dl1hrc bb72918
Added Decimator/Interpolator, changed byteorder for network transmiss…
dl1hrc d09f71b
Fixed: Metamessage buf. Handling incoming stream to create (audio-,me…
dl1hrc 21b25fa
Some adjustments regarding host / network byte order, tnx to Waldek /…
dl1hrc d493e2d
Documentation added. Setting option for outgoing/incoming audio. Unus…
dl1hrc 5d5a6fa
Tcl-event support added, rebuilt UsrpLogic.tcl, Usrp documentation fr…
dl1hrc c138847
Removed some default parameter that not used yet
dl1hrc 1b06a7c
Removed unused variables
dl1hrc 58d450e
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc 503818a
Added filters for incoming/outgoing audio
dl1hrc c54e349
Bugfix: Dmrid was not issued, if 0 then the output is suppressed now
dl1hrc 660e320
Small change in UsrpLogic.tcl, usrp protocol description added
dl1hrc ea067b6
Doc changed, changed TG that is given out
dl1hrc 9714a20
Intermediate commit for the evaluation of the metadata. Documentation…
dl1hrc 98e8b62
Changed handling of meta data. Changed USRP_HOST default entry.
dl1hrc 2191a9c
Fixed: Handling of (Tlv) meta data, mni tnx to Waldek/SP2ONG for supp…
dl1hrc 9470642
merged with master
dl1hrc c8f3808
Documentation added, take a look into CONFIG.adoc for a short informa…
dl1hrc b151754
Wrong git link in INSTALL.adoc, tnx to Waldek/SP2ONG
dl1hrc 2b1d538
Fixed another small error in doc (INSTALL.adoc), mni tnx to Waldek/SP…
dl1hrc 40d1e41
Documentation updated, added info regarding required libraries
dl1hrc b50982b
More data exchange between SvxLink node and SvxRflector, like Tetra e…
dl1hrc 4f49497
Bugfix: wrong path in svxlink.conf.in
dl1hrc 9770209
Update Usrp protocol documentation. Tnx to Waldek/SP2ONG
dl1hrc 93a7a15
Added missing config-params EVENT_HANDLER and JITTER_BUFFER_DELAY in …
dl1hrc 4ba0fce
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc ca06c9b
Merged with upstream
dl1hrc 46140a0
Fixed and merged
dl1hrc 02d609e
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc 083bb87
Merged with upstream/master
dl1hrc a3d92d6
Added AudioClipper and AudioCompressor
dl1hrc eda0dd6
Merge branch 'svxlink-usrp' of https://github.com/dl1hrc/svxlink into…
dl1hrc 6098965
MErged
dl1hrc 98bd2ef
Removed unnecessary spaces
dl1hrc a4f59aa
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc 2025258
Merged with master
dl1hrc 04b43dc
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc abb72ab
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc 148c2f9
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc da2731a
Parameters of the audio filters changed to improve the quality of DV-…
dl1hrc 255a05a
filter improvement
ffa09e4
Merge pull request #3 from dl1bz/svxlink-usrp
dl1hrc 5689486
Adapted usrp to the new logic structure to make implementations easier.
dl1hrc cafb011
Moved usrp files to the new contrib structure
dl1hrc d78d881
Small typo, tnx to Waldek/SP2ONG
dl1hrc 03b2931
Readme updated
dl1hrc 443976e
Added debug output for USRP_RX_PORT, USRP_TX_PORT and USRP_HOST. Hint…
dl1hrc e56a8f1
Documentation changed to README.adoc
dl1hrc 8b549d6
Merged
dl1hrc 5f75990
Bugfix in jsonToString method.
dl1hrc 7637f1e
Merge remote-tracking branch 'upstream/master' into svxlink-usrp
dl1hrc 7180d3b
Documentation updated, mni tnx to Waldek/SP2ONG
dl1hrc c5087cb
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc b479ca0
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc 41f8c44
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc 00ded04
Merged
dl1hrc dd0dda0
Merge remote-tracking branch 'sm0svx/master' into svxlink-usrp
dl1hrc af87430
Improved implementation for Async::Msg
sm0svx 0c6fd13
Merge branch 'master' into svxlink-usrp
sm0svx 629e171
Remove duplicate dependency after merge
sm0svx de0be7e
version info changed
dl1hrc ba58f9f
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc 87a1f80
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc b8e97fb
Call/talkerstate forward from EchoLink to Usrp
dl1hrc d5d3c35
Merge branch 'sm0svx:master' into svxlink-usrp
dl1hrc 0db5d06
Merged with master
dl1hrc 31fe022
Bugfix: Segfault when activating ModuleEchoLink. Reported by Volodymy…
dl1hrc 1b6afb2
Version info updated
dl1hrc 738c129
Bugfix: json get method asInt() has not been handled correctly in Usr…
dl1hrc 0cb7715
Extension transfers more info from EchoLink to UsrpLogic
dl1hrc 17efaef
Merged with SM0SVX/Master
dl1hrc 52a6aee
Small bugfix (wrong default value to boolgit^Cin method onPublishStat…
dl1hrc 00cc391
Preperation for call/id forward from EchoLink to Usrp
dl1hrc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,211 @@ | ||
Configuration svxlink-usrp with SvxReflector, Analoge_Bridge and MMDVM_Bridge | ||
============================================================================= | ||
|
||
1.) Basic structure | ||
|
||
|.-................. SvxLink ......................| |........... MMDVM stuff ..........| |.. freeDMR ..> | ||
|
||
|----------| |---------------| |--------------| |-----------| |---------------| |--------------| |-------------| | ||
| Radio | | SimplexLogic | | LogicLinking | | UsrpLogic | | Analog_Bridge | | MMDVM_Bridge | | DMR-Network | | ||
| 2m/70cm |<->| RepeaterLogic |<->| |<->| |<->| |<->| |<->| | | ||
|----------| |---------------| |--------------| |-----------| |---------------| |--------------| |-------------| | ||
| | | ||
| | | ||
|----------| |---------------| |--------------| |---------------| | ||
| Analogue | | SvxReflector- | | Reflector- | | md380- | | ||
| Network |<->| Server |<->| Logic | | emulator | | ||
|----------| |---------------| |--------------| |---------------| | ||
|
||
|
||
2.) Configuration | ||
2.1.) svxLink.conf | ||
Usually located in /etc/svxlink/svxlink.conf | ||
|
||
Below is an example configuration for the svxlink.conf file. Only the most important parameters and | ||
configuration sections are given | ||
|
||
--- | ||
[GLOBAL] | ||
LOGICS=RepeaterLogic,ReflectorLogic,UsrpLogic | ||
LINKS=UsrpLink | ||
|
||
[RepeaterLogic] | ||
TYPE=Repeater | ||
RX=Rx1 | ||
TX=Tx1 | ||
MODULES=ModuleParrot,ModuleTclVoiceMail,ModulePropagationMonitor,ModuleMetarInfo | ||
CALLSIGN=DB0ABC | ||
SHORT_IDENT_INTERVAL=30 | ||
LONG_IDENT_INTERVAL=60 | ||
EVENT_HANDLER=/usr/share/svxlink/events.tcl | ||
DEFAULT_LANG=de_DE | ||
RGR_SOUND_DELAY=200 | ||
TX_CTCSS=SQL_OPEN,ANNOUNCEMENT | ||
FX_GAIN_NORMAL=0 | ||
FX_GAIN_LOW=-12 | ||
#NO_REPEAT=1 | ||
IDLE_TIMEOUT=6 | ||
OPEN_ON_DTMF=* | ||
OPEN_ON_SQL=1000 | ||
OPEN_SQL_FLANK=OPEN | ||
|
||
[UsrpLogic] | ||
TYPE=Usrp | ||
USRP_HOST=127.0.0.1 | ||
USRP_TX_PORT=44442 <------------------------------------------------- | ||
USRP_RX_PORT=44441 <---------------------------------------------- | | ||
CALL=DB0ABC | | | ||
DMRID=262123 | | | ||
RPTID= | | | ||
DEFAULT_CC=1 | | | ||
DEFAULT_TG=2629 | | | ||
DEFAULT_TS=2 | | | ||
#PREAMP=3 | | | ||
#FILTER_FROM_USRP=HsBq2/0.01/-18/4000 | | | ||
FILTER_TO_USRP=BpBu1/650-3800 | | | ||
#NET_PREAMP=3 | | | ||
JITTER_BUFFER_DELAY=100 | | | ||
EVENT_HANDLER=/usr/share/svxlink/events.tcl | | | ||
| | | ||
[ReflectorLogic] | | | ||
TYPE=Reflector | | | ||
HOST=10.8.0.1 ---------> to Analogue network, usually a | | | ||
PORT=5302 --------------> SvxReflector server | | | ||
AUTH_KEY="secret" | | | ||
CALLSIGN="DB0ABC | | | ||
#JITTER_BUFFER_DELAY=0 | | | ||
DEFAULT_TG=9 | | | ||
MONITOR_TGS=9 | | | ||
ANNOUNCE_REMOTE_MIN_INTERVAL=300 | | | ||
EVENT_HANDLER=/usr/share/svxlink/events.tcl | | | ||
NODE_INFO_FILE=/etc/svxlink/node_info.json | | | ||
MUTE_FIRST_TX_LOC=0 | | | ||
MUTE_FIRST_TX_REM=0 | | | ||
| | | ||
[UsrpLink] | | | ||
NAME=Usrp | | | ||
CONNECT_LOGICS=RepeaterLogic,UsrpLogic,ReflectorLogic | | | ||
DEFAULT_ACTIVE=1 | | | ||
---EOF | | | ||
| | | ||
| | | ||
2.2.) Analog_Bridge | | | ||
Here we have an example for the Analog_Bridge.ini, | | | ||
usually located in /opt/Analog_Bridge/Analog_Bridge.ini | | | ||
For details regarding the configuration paramaters | | | ||
refer to Analog_Bridge manual page. | | | ||
| | | ||
--- | | | ||
include = dvsm.macro | | | ||
| | | ||
[GENERAL] | | | ||
logLevel = 2 | | | ||
exportMetadata = true | | | ||
transferRootDir = /tmp | | | ||
subscriberFile = /var/lib/dvswitch/subscriber_ids.csv | | | ||
decoderFallBack = true | | | ||
useEmulator = false | | | ||
emulatorAddress = 127.0.0.1:2460 | | | ||
pcmPort = 2222 | | | ||
| | | ||
[USRP] | | | ||
address = 127.0.0.1 | | | ||
txPort = 44441 <-------------------------------------------------- | | ||
rxPort = 44442 <----------------------------------------------------- | ||
usrpAudio = AUDIO_UNITY | ||
usrpGain = 1.10 | ||
usrpAGC = -20,10,100 | ||
tlvAudio = AUDIO_UNITY | ||
tlvGain = 0.35 | ||
|
||
[AMBE_AUDIO] | ||
address = 127.0.0.1 | ||
txPort = 31103 <----------------------------------------------------- | ||
rxPort = 31100 <-------------------------------------------------- | | ||
ambeMode = DMR | | | ||
minTxTimeMS = 2500 | | | ||
gatewayDmrId = 262123 | | | ||
repeaterID = 26200123 | | | ||
txTg = 2629 | | | ||
txTs = 2 | | | ||
colorCode = 1 | | | ||
| | | ||
[MACROS] | | | ||
| | | ||
[DV3000] | | | ||
;address = 127.0.0.1 -------------------> To | | | ||
;rxPort = 2460 -------------------------> AMBEServer | | | ||
| | | ||
address = /dev/ttyUSB4 -----------------> To | | | ||
baud = 460800 --------------------------> DV3k-stick | | | ||
serial = true | | | ||
---EOF | | | ||
| | | ||
| | | ||
2.3.) MMDVM_Bridge | | | ||
Usually located in /opt/MMDVM_Bridge/MMDVM_Bridge.ini | | | ||
Here is an example for the MMDVM_Bridge.ini | | | ||
Only the most important parameters and configuration | | | ||
sections are given | | | ||
| | | ||
--- | | | ||
[General] | | | ||
Callsign=DB0ABC | | | ||
Id=262123 | | | ||
Timeout=180 | | | ||
Duplex=1 | | | ||
| | | ||
[Info] | | | ||
RXFrequency=431025000 | | | ||
TXFrequency=438625000 | | | ||
Power=15 | | | ||
Latitude=51.000 | | | ||
Longitude=12.000 | | | ||
Height=123 | | | ||
Location=somewhere | | | ||
Description=FreeDMR_Germany | | | ||
URL=https://svxreflector.org | | | ||
| | | ||
[Log] | | | ||
DisplayLevel=1 | | | ||
FileLevel=2 | | | ||
FilePath=/var/log/mmdvm | | | ||
FileRoot=MMDVM_Bridge | | | ||
| | | ||
[DMR Id Lookup] | | | ||
File=/var/lib/mmdvm/DMRIds.dat | | | ||
Time=24 | | | ||
| | | ||
[DMR] | | | ||
Enable=1 | | | ||
ColorCode=1 | | | ||
EmbeddedLCOnly=1 | | | ||
DumpTAData=0 | | | ||
| | | ||
[DMR Network] | | | ||
Enable=1 | | | ||
Address=svxreflector.org ---------------> To DMR master server | | | ||
Port=62031 -----------------------------> e.g. freeDMR | | | ||
Jitter=360 | | | ||
Local=62032 | | | ||
Password=passw0rd | | | ||
Slot1=0 | | | ||
Slot2=1 | | | ||
Debug=1 | | | ||
---EOF | | | ||
| | | ||
| | | ||
2.4.) DV-Switch | | | ||
Uually located in /opt/MMDVM_Bridge/DVSwitch.ini | | | ||
Example of DVSwitch.ini | | | ||
| | | ||
--- | | | ||
[DMR] | | | ||
address = 127.0.0.1 | | | ||
txPort = 31100 <-------------------------------------------------- | | ||
rxPort = 31103 <----------------------------------------------------- | ||
slot = 2 | ||
exportTG = 2629 | ||
hangTimerInFrames = 0 | ||
talkerAlias = %callsign %location %description | ||
---EOF |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove/move changes to the UsrpLogic subdirectory. The missing dependencies have been committed to master. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move to UsrpLogic specific manual page. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be moved to the UsrpLogic directory