From 9e7186b9bd4d95bf52877f360fb010a424a90ab2 Mon Sep 17 00:00:00 2001 From: Carsten Schmiemann Date: Fri, 29 Jul 2022 19:24:39 +0200 Subject: [PATCH] Set fixed mode --- MMDVM.ini | 207 ++------------------------------------------------ MMDVMHost.cpp | 4 +- 2 files changed, 7 insertions(+), 204 deletions(-) diff --git a/MMDVM.ini b/MMDVM.ini index 649572a..cd61a9e 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -1,6 +1,6 @@ [General] -Callsign=G9BF -Id=123456 +Callsign=MUTRPT +Id=1337 Timeout=180 Duplex=1 # ModeHang=10 @@ -13,13 +13,6 @@ Daemon=0 RXFrequency=435000000 TXFrequency=435000000 Power=1 -# The following lines are only needed if a direct connection to a DMR master is being used -Latitude=0.0 -Longitude=0.0 -Height=0 -Location=Nowhere -Description=Multi-Mode Repeater -URL=www.google.co.uk [Log] # Logging levels, 0=No logging @@ -38,10 +31,6 @@ Time=10 File=DMRIds.dat Time=24 -[NXDN Id Lookup] -File=NXDN.csv -Time=24 - [Modem] # Valid values are "null", "uart", "udp", and (on Linux) "i2c" Protocol=uart @@ -71,16 +60,7 @@ TXLevel=50 RXDCOffset=0 TXDCOffset=0 RFLevel=100 -# CWIdTXLevel=50 -# D-StarTXLevel=50 -# DMRTXLevel=50 -# YSFTXLevel=50 -# P25TXLevel=50 -# NXDNTXLevel=50 -# M17TXLevel=50 -# POCSAGTXLevel=50 -# FMTXLevel=50 -# AX25TXLevel=50 +DMRTXLevel=50 RSSIMappingFile=RSSI.dat UseCOSAsLockout=0 Trace=0 @@ -93,24 +73,12 @@ RemotePort=40094 LocalPort=40095 # SendFrameType=0 -[D-Star] -Enable=1 -Module=C -SelfOnly=0 -AckReply=1 -AckTime=750 -AckMessage=0 -ErrorReply=1 -RemoteGateway=0 -# ModeHang=10 -WhiteList= - [DMR] Enable=1 Beacons=0 BeaconInterval=60 BeaconDuration=3 -ColorCode=1 +ColorCode=7 SelfOnly=0 EmbeddedLCOnly=0 DumpTAData=1 @@ -123,110 +91,11 @@ TXHang=4 # OVCM Values, 0=off, 1=rx_on, 2=tx_on, 3=both_on, 4=force off # OVCM=0 -[System Fusion] -Enable=1 -LowDeviation=0 -SelfOnly=0 -TXHang=4 -RemoteGateway=0 -# ModeHang=10 - -[P25] -Enable=1 -NAC=293 -SelfOnly=0 -OverrideUIDCheck=0 -RemoteGateway=0 -TXHang=5 -# ModeHang=10 - -[NXDN] -Enable=1 -RAN=1 -SelfOnly=0 -RemoteGateway=0 -TXHang=5 -# ModeHang=10 - -[M17] -Enable=1 -CAN=0 -SelfOnly=0 -TXHang=5 -# ModeHang=10 - -[POCSAG] -Enable=1 -Frequency=439987500 - -[FM] -Enable=1 -# Callsign=G4KLX -CallsignSpeed=20 -CallsignFrequency=1000 -CallsignTime=10 -CallsignHoldoff=0 -CallsignHighLevel=50 -CallsignLowLevel=20 -CallsignAtStart=1 -CallsignAtEnd=1 -CallsignAtLatch=0 -RFAck=K -ExtAck=N -AckSpeed=20 -AckFrequency=1750 -AckMinTime=4 -AckDelay=1000 -AckLevel=50 -# Timeout=180 -TimeoutLevel=80 -CTCSSFrequency=88.4 -CTCSSThreshold=30 -# CTCSSHighThreshold=30 -# CTCSSLowThreshold=20 -CTCSSLevel=20 -KerchunkTime=0 -HangTime=7 -# AccessMode values are: -# 0 - Carrier access with COS -# 1 - CTCSS only access without COS -# 2 - CTCSS only access with COS -# 3 - CTCSS only access with COS to start, then carrier access with COS -AccessMode=1 -# LinkMode=1 to remove almost all of the logic control -LinkMode=0 -COSInvert=0 -NoiseSquelch=0 -SquelchThreshold=30 -# SquelchHighThreshold=30 -# SquelchLowThreshold=20 -RFAudioBoost=1 -MaxDevLevel=90 -ExtAudioBoost=1 -# ModeHang=10 - -[AX.25] -Enable=1 -TXDelay=300 -RXTwist=6 -SlotTime=30 -PPersist=128 -Trace=1 - -[D-Star Network] -Enable=1 -LocalAddress=127.0.0.1 -LocalPort=20011 -GatewayAddress=127.0.0.1 -GatewayPort=20010 -# ModeHang=3 -Debug=0 - [DMR Network] Enable=1 # Type may be either 'Direct' or 'Gateway'. When Direct you must provide the Master's # address as well as the Password, and for DMR+, Options also. -Type=Gateway +Type=Direct LocalAddress=127.0.0.1 LocalPort=62032 RemoteAddress=127.0.0.1 @@ -239,72 +108,6 @@ Slot2=1 # ModeHang=3 Debug=0 -[System Fusion Network] -Enable=1 -LocalAddress=127.0.0.1 -LocalPort=3200 -GatewayAddress=127.0.0.1 -GatewayPort=4200 -# ModeHang=3 -Debug=0 - -[P25 Network] -Enable=1 -LocalAddress=127.0.0.1 -LocalPort=32010 -GatewayAddress=127.0.0.1 -GatewayPort=42020 -# ModeHang=3 -Debug=0 - -[NXDN Network] -Enable=1 -Protocol=Icom -LocalAddress=127.0.0.1 -LocalPort=14021 -GatewayAddress=127.0.0.1 -GatewayPort=14020 -# ModeHang=3 -Debug=0 - -[M17 Network] -Enable=1 -LocalAddress=127.0.0.1 -LocalPort=17011 -GatewayAddress=127.0.0.1 -GatewayPort=17010 -# ModeHang=3 -Debug=0 - -[POCSAG Network] -Enable=1 -LocalAddress=127.0.0.1 -LocalPort=3800 -GatewayAddress=127.0.0.1 -GatewayPort=4800 -# ModeHang=3 -Debug=0 - -[FM Network] -Enable=1 -# Protocol=USRP -LocalAddress=127.0.0.1 -LocalPort=3810 -GatewayAddress=127.0.0.1 -GatewayPort=4810 -PreEmphasis=1 -DeEmphasis=1 -TXAudioGain=1.0 -RXAudioGain=1.0 -# ModeHang=3 -Debug=0 - -[AX.25 Network] -Enable=1 -Port=/dev/ttyp7 -Speed=9600 -Debug=0 - [TFT Serial] # Port=modem Port=/dev/ttyAMA0 diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index a144d9a..006925f 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -168,7 +168,7 @@ m_cwCallsign(), m_lockFileEnabled(false), m_lockFileName(), m_remoteControl(NULL), -m_fixedMode(false) +m_fixedMode(true) { CUDPSocket::startup(); } @@ -358,7 +358,7 @@ int CMMDVMHost::run() } // For DMR and P25 we try to map IDs to callsigns - if (m_dmrEnabled || m_p25Enabled) { + if (m_dmrEnabled) { std::string lookupFile = m_conf.getDMRIdLookupFile(); unsigned int reloadTime = m_conf.getDMRIdLookupTime();