Fixed merge.

This commit is contained in:
Jonathan Naylor 2026-02-19 16:02:48 +00:00
parent d9d6846751
commit cb96c08f9c

View file

@ -44,7 +44,7 @@ Time=24
[Modem]
# Valid values are "null", "uart", "udp", and (on Linux) "i2c"
Protocol=uart
Protocol=null
# The port and speed used for a UART connection
# UARTPort=\\.\COM4
# UARTPort=/dev/ttyACM0
@ -206,7 +206,7 @@ ExtAudioBoost=1
# ModeHang=10
[AX.25]
Enable=1
Enable=0
TXDelay=300
RXTwist=6
SlotTime=30
@ -214,7 +214,7 @@ PPersist=128
Trace=1
[D-Star Network]
Enable=1
Enable=0
LocalAddress=127.0.0.1
LocalPort=20011
GatewayAddress=127.0.0.1
@ -223,10 +223,7 @@ GatewayPort=20010
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
Enable=0
LocalAddress=127.0.0.1
LocalPort=62032
RemoteAddress=127.0.0.1
@ -240,7 +237,7 @@ Slot2=1
Debug=0
[System Fusion Network]
Enable=1
Enable=0
LocalAddress=127.0.0.1
LocalPort=3200
GatewayAddress=127.0.0.1
@ -249,7 +246,7 @@ GatewayPort=4200
Debug=0
[P25 Network]
Enable=1
Enable=0
LocalAddress=127.0.0.1
LocalPort=32010
GatewayAddress=127.0.0.1
@ -258,7 +255,7 @@ GatewayPort=42020
Debug=0
[NXDN Network]
Enable=1
Enable=0
Protocol=Icom
LocalAddress=127.0.0.1
LocalPort=14021
@ -268,7 +265,7 @@ GatewayPort=14020
Debug=0
[M17 Network]
Enable=1
Enable=0
LocalAddress=127.0.0.1
LocalPort=17011
GatewayAddress=127.0.0.1
@ -277,7 +274,7 @@ GatewayPort=17010
Debug=0
[POCSAG Network]
Enable=1
Enable=0
LocalAddress=127.0.0.1
LocalPort=3800
GatewayAddress=127.0.0.1
@ -286,13 +283,7 @@ GatewayPort=4800
Debug=0
[FM Network]
Enable=1
# Protocol may be USRP or RAW
Protocol=USRP
# SampleRate is only used in RAW mode
SampleRate=48000
# The squelch file is optional and only used in RAW mode
SquelchFile=/tmp/sql
Enable=0
LocalAddress=127.0.0.1
LocalPort=3810
GatewayAddress=127.0.0.1
@ -305,9 +296,7 @@ RXAudioGain=1.0
Debug=0
[AX.25 Network]
Enable=1
Port=/dev/ttyp7
Speed=9600
Enable=0
Debug=0
[TFT Serial]