Merge pull request #43 from nostar/master

Adding missing Daemon variable, set correct ports in INI, update README
This commit is contained in:
Andy CA6JAU 2020-06-24 21:59:41 -04:00 committed by GitHub
commit 7c095b1a24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions

View File

@ -1,6 +1,6 @@
# Description
This is the source code of DMR2P25, a software for digital voice conversion from DMR to P25 Phase 1 digital mode, based on Jonathan G4KLX's [MMDVM](https://github.com/g4klx) software.
This is the source code of DMR2P25, a software for digital voice conversion from DMR to P25 Phase 1 digital mode, based on Jonathan G4KLX's [MMDVM](https://github.com/g4klx) software. Unlike the other cross mode utilities upon which this is based, this utility performs software transcoding between IMBE 4400x2800(P25) and AMBE+2 2450x1150(DMR).
You can use this software with MMDVMHost and P25Gateway, with the default UDP ports:
@ -9,3 +9,12 @@ MMDVMHost <-> DMR2P25 <-> P25Gateway
Program your DMR radio with P25 TG numbers.
This software is licenced under the GPL v2 and is intended for amateur and educational use only. Use of this software for commercial purposes is strictly forbidden.
# Building
This utility is not built with the other cross mode ulitities, and has 2 external dependencies:
imbe_vocoder https://github.com/nostar/imbe_vocoder
md380_vocoder https://github.com/nostar/md380_vocoder
With these dependencies installed, run 'make' from the source directory.

View File

@ -203,6 +203,8 @@ bool CConf::read()
m_p25LocalPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "TGListFile") == 0)
m_p25TGListFile = value;
else if (::strcmp(key, "Daemon") == 0)
m_daemon = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0)
m_p25NetworkDebug = ::atoi(value) == 1;
}

View File

@ -13,10 +13,11 @@ URL=www.google.co.uk
[P25 Network]
StartupDstId=10200
DstAddress=127.0.0.1
DstPort=41000
DstPort=42010
LocalAddress=127.0.0.1
LocalPort=41015
LocalPort=42012
TGListFile=TGList-P25.txt
Daemon=1
Debug=0
[DMR Network]