Revert "Merge branch 'M17_AX25_FM'"

This reverts commit e1427e3e37, reversing
changes made to bcdba292eb.

MMDVM.ini

@@ -44,10 +44,9 @@ Time=24
 
 [Modem]
 # Port=/dev/ttyACM0
-Port=/dev/ttyAMA0
-# Port=\\.\COM4
+# Port=/dev/ttyAMA0
+Port=\\.\COM4
 Protocol=uart
-Speed=460800
 # Address=0x22
 TXInvert=1
 RXInvert=0
@@ -67,10 +66,8 @@ RFLevel=100
 # YSFTXLevel=50
 # P25TXLevel=50
 # NXDNTXLevel=50
-# M17TXLevel-50
 # POCSAGTXLevel=50
 # FMTXLevel=50
-# AX25TXLevel=50
 RSSIMappingFile=RSSI.dat
 UseCOSAsLockout=0
 Trace=0
@@ -83,6 +80,11 @@ RemotePort=40094
 LocalPort=40095
 # SendFrameType=0
 
+[UMP]
+Enable=0
+# Port=\\.\COM4
+Port=/dev/ttyACM1
+
 [D-Star]
 Enable=1
 Module=C
@@ -138,13 +140,6 @@ RemoteGateway=0
 TXHang=5
 # ModeHang=10
 
-[M17]
-Enable=1
-ColorCode=3
-SelfOnly=0
-TXHang=5
-# ModeHang=10
-
 [POCSAG]
 Enable=1
 Frequency=439987500
@@ -179,22 +174,9 @@ KerchunkTime=0
 HangTime=7
 AccessMode=1
 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
@@ -247,14 +229,6 @@ GatewayPort=14020
 # ModeHang=3
 Debug=0
 
-[M17 Network]
-Enable=1
-GatewayAddress=127.0.0.1
-GatewayPort=17010
-LocalPort=17011
-# ModeHang=3
-Debug=0
-
 [POCSAG Network]
 Enable=1
 LocalAddress=127.0.0.1
@@ -264,22 +238,6 @@ GatewayPort=4800
 # ModeHang=3
 Debug=0
 
-[FM Network]
-Enable=1
-LocalAddress=127.0.0.1
-LocalPort=3810
-GatewayAddress=127.0.0.1
-GatewayPort=4810
-SampleRate=8000
-# ModeHang=3
-Debug=0
-
-[AX.25 Network]
-Enable=1
-Port=/dev/ttyp7
-Speed=9600
-Debug=0
-
 [TFT Serial]
 # Port=modem
 Port=/dev/ttyAMA0