diff --git a/Conf.cpp b/Conf.cpp
index ca2a347..eae0db6 100644
--- a/Conf.cpp
+++ b/Conf.cpp
@@ -28,38 +28,38 @@
 const int BUFFER_SIZE = 500;
 
 enum SECTION {
-  SECTION_NONE,
-  SECTION_GENERAL,
-  SECTION_INFO,
-  SECTION_LOG,
-  SECTION_CWID,
-  SECTION_DMRID_LOOKUP,
-  SECTION_NXDNID_LOOKUP,
-  SECTION_MODEM,
-  SECTION_TRANSPARENT,
-  SECTION_UMP,
-  SECTION_DSTAR,
-  SECTION_DMR,
-  SECTION_FUSION,
-  SECTION_P25,
-  SECTION_NXDN,
-  SECTION_POCSAG,
-  SECTION_FM,
-  SECTION_DSTAR_NETWORK,
-  SECTION_DMR_NETWORK,
-  SECTION_FUSION_NETWORK,
-  SECTION_P25_NETWORK,
-  SECTION_NXDN_NETWORK,
-  SECTION_POCSAG_NETWORK,
-  SECTION_FM_NETWORK,
-  SECTION_TFTSERIAL,
-  SECTION_HD44780,
-  SECTION_NEXTION,
-  SECTION_OLED,
-  SECTION_LCDPROC,
-  SECTION_LOCK_FILE,
-  SECTION_MOBILE_GPS,
-  SECTION_REMOTE_CONTROL
+	SECTION_NONE,
+	SECTION_GENERAL,
+	SECTION_INFO,
+	SECTION_LOG,
+	SECTION_CWID,
+	SECTION_DMRID_LOOKUP,
+	SECTION_NXDNID_LOOKUP,
+	SECTION_MODEM,
+	SECTION_TRANSPARENT,
+	SECTION_UMP,
+	SECTION_DSTAR,
+	SECTION_DMR,
+	SECTION_FUSION,
+	SECTION_P25,
+	SECTION_NXDN,
+	SECTION_POCSAG,
+	SECTION_FM,
+	SECTION_DSTAR_NETWORK,
+	SECTION_DMR_NETWORK,
+	SECTION_FUSION_NETWORK,
+	SECTION_P25_NETWORK,
+	SECTION_NXDN_NETWORK,
+	SECTION_POCSAG_NETWORK,
+	SECTION_FM_NETWORK,
+	SECTION_TFTSERIAL,
+	SECTION_HD44780,
+	SECTION_NEXTION,
+	SECTION_OLED,
+	SECTION_LCDPROC,
+	SECTION_LOCK_FILE,
+	SECTION_MOBILE_GPS,
+	SECTION_REMOTE_CONTROL
 };
 
 CConf::CConf(const std::string& file) :
@@ -92,6 +92,7 @@ m_nxdnIdLookupFile(),
 m_nxdnIdLookupTime(0U),
 m_modemPort(),
 m_modemProtocol("uart"),
+m_modemSpeed(115200U),
 m_modemAddress(0x22),
 m_modemRXInvert(false),
 m_modemTXInvert(false),
@@ -305,346 +306,348 @@ CConf::~CConf()
 
 bool CConf::read()
 {
-  FILE* fp = ::fopen(m_file.c_str(), "rt");
-  if (fp == NULL) {
-    ::fprintf(stderr, "Couldn't open the .ini file - %s\n", m_file.c_str());
-    return false;
-  }
+	FILE* fp = ::fopen(m_file.c_str(), "rt");
+	if (fp == NULL) {
+		::fprintf(stderr, "Couldn't open the .ini file - %s\n", m_file.c_str());
+		return false;
+	}
 
-  SECTION section = SECTION_NONE;
+	SECTION section = SECTION_NONE;
 
-  char buffer[BUFFER_SIZE];
-  while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) {
-    if (buffer[0U] == '#')
-      continue;
+	char buffer[BUFFER_SIZE];
+	while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) {
+		if (buffer[0U] == '#')
+			continue;
 
-    if (buffer[0U] == '[') {
-      if (::strncmp(buffer, "[General]", 9U) == 0)
-          section = SECTION_GENERAL;
-	  else if (::strncmp(buffer, "[Info]", 6U) == 0)
-		  section = SECTION_INFO;
-	  else if (::strncmp(buffer, "[Log]", 5U) == 0)
-		  section = SECTION_LOG;
-	  else if (::strncmp(buffer, "[CW Id]", 7U) == 0)
-		  section = SECTION_CWID;
-	  else if (::strncmp(buffer, "[DMR Id Lookup]", 15U) == 0)
-		  section = SECTION_DMRID_LOOKUP;
-	  else if (::strncmp(buffer, "[NXDN Id Lookup]", 16U) == 0)
-		  section = SECTION_NXDNID_LOOKUP;
-	  else if (::strncmp(buffer, "[Modem]", 7U) == 0)
-		  section = SECTION_MODEM;
-	  else if (::strncmp(buffer, "[Transparent Data]", 18U) == 0)
-		  section = SECTION_TRANSPARENT;
-	  else if (::strncmp(buffer, "[UMP]", 5U) == 0)
-		  section = SECTION_UMP;
-	  else if (::strncmp(buffer, "[D-Star]", 8U) == 0)
-		  section = SECTION_DSTAR;
-	  else if (::strncmp(buffer, "[DMR]", 5U) == 0)
-		  section = SECTION_DMR;
-	  else if (::strncmp(buffer, "[System Fusion]", 15U) == 0)
-		  section = SECTION_FUSION;
-	  else if (::strncmp(buffer, "[P25]", 5U) == 0)
-		  section = SECTION_P25;
-	  else if (::strncmp(buffer, "[NXDN]", 6U) == 0)
-		  section = SECTION_NXDN;
-	  else if (::strncmp(buffer, "[POCSAG]", 8U) == 0)
-		  section = SECTION_POCSAG;
-	  else if (::strncmp(buffer, "[FM]", 4U) == 0)
-		  section = SECTION_FM;
-	  else if (::strncmp(buffer, "[D-Star Network]", 16U) == 0)
-		  section = SECTION_DSTAR_NETWORK;
-	  else if (::strncmp(buffer, "[DMR Network]", 13U) == 0)
-		  section = SECTION_DMR_NETWORK;
-	  else if (::strncmp(buffer, "[System Fusion Network]", 23U) == 0)
-		  section = SECTION_FUSION_NETWORK;
-	  else if (::strncmp(buffer, "[P25 Network]", 13U) == 0)
-		  section = SECTION_P25_NETWORK;
-	  else if (::strncmp(buffer, "[NXDN Network]", 14U) == 0)
-		  section = SECTION_NXDN_NETWORK;
-	  else if (::strncmp(buffer, "[POCSAG Network]", 16U) == 0)
-		  section = SECTION_POCSAG_NETWORK;
-	  else if (::strncmp(buffer, "[FM Network]", 12U) == 0)
-		  section = SECTION_FM_NETWORK;
-	  else if (::strncmp(buffer, "[TFT Serial]", 12U) == 0)
-		  section = SECTION_TFTSERIAL;
-	  else if (::strncmp(buffer, "[HD44780]", 9U) == 0)
-		  section = SECTION_HD44780;
-	  else if (::strncmp(buffer, "[Nextion]", 9U) == 0)
-		  section = SECTION_NEXTION;
-	  else if (::strncmp(buffer, "[OLED]", 6U) == 0)
-		  section = SECTION_OLED;
-	  else if (::strncmp(buffer, "[LCDproc]", 9U) == 0)
-		  section = SECTION_LCDPROC;
-	  else if (::strncmp(buffer, "[Lock File]", 11U) == 0)
-		  section = SECTION_LOCK_FILE;
-	  else if (::strncmp(buffer, "[Mobile GPS]", 12U) == 0)
-		  section = SECTION_MOBILE_GPS;
-	  else if (::strncmp(buffer, "[Remote Control]", 16U) == 0)
-		  section = SECTION_REMOTE_CONTROL;
-	  else
-		  section = SECTION_NONE;
+		if (buffer[0U] == '[') {
+			if (::strncmp(buffer, "[General]", 9U) == 0)
+				section = SECTION_GENERAL;
+			else if (::strncmp(buffer, "[Info]", 6U) == 0)
+				section = SECTION_INFO;
+			else if (::strncmp(buffer, "[Log]", 5U) == 0)
+				section = SECTION_LOG;
+			else if (::strncmp(buffer, "[CW Id]", 7U) == 0)
+				section = SECTION_CWID;
+			else if (::strncmp(buffer, "[DMR Id Lookup]", 15U) == 0)
+				section = SECTION_DMRID_LOOKUP;
+			else if (::strncmp(buffer, "[NXDN Id Lookup]", 16U) == 0)
+				section = SECTION_NXDNID_LOOKUP;
+			else if (::strncmp(buffer, "[Modem]", 7U) == 0)
+				section = SECTION_MODEM;
+			else if (::strncmp(buffer, "[Transparent Data]", 18U) == 0)
+				section = SECTION_TRANSPARENT;
+			else if (::strncmp(buffer, "[UMP]", 5U) == 0)
+				section = SECTION_UMP;
+			else if (::strncmp(buffer, "[D-Star]", 8U) == 0)
+				section = SECTION_DSTAR;
+			else if (::strncmp(buffer, "[DMR]", 5U) == 0)
+				section = SECTION_DMR;
+			else if (::strncmp(buffer, "[System Fusion]", 15U) == 0)
+				section = SECTION_FUSION;
+			else if (::strncmp(buffer, "[P25]", 5U) == 0)
+				section = SECTION_P25;
+			else if (::strncmp(buffer, "[NXDN]", 6U) == 0)
+				section = SECTION_NXDN;
+			else if (::strncmp(buffer, "[POCSAG]", 8U) == 0)
+				section = SECTION_POCSAG;
+			else if (::strncmp(buffer, "[FM]", 4U) == 0)
+				section = SECTION_FM;
+			else if (::strncmp(buffer, "[D-Star Network]", 16U) == 0)
+				section = SECTION_DSTAR_NETWORK;
+			else if (::strncmp(buffer, "[DMR Network]", 13U) == 0)
+				section = SECTION_DMR_NETWORK;
+			else if (::strncmp(buffer, "[System Fusion Network]", 23U) == 0)
+				section = SECTION_FUSION_NETWORK;
+			else if (::strncmp(buffer, "[P25 Network]", 13U) == 0)
+				section = SECTION_P25_NETWORK;
+			else if (::strncmp(buffer, "[NXDN Network]", 14U) == 0)
+				section = SECTION_NXDN_NETWORK;
+			else if (::strncmp(buffer, "[POCSAG Network]", 16U) == 0)
+				section = SECTION_POCSAG_NETWORK;
+			else if (::strncmp(buffer, "[FM Network]", 12U) == 0)
+				section = SECTION_FM_NETWORK;
+			else if (::strncmp(buffer, "[TFT Serial]", 12U) == 0)
+				section = SECTION_TFTSERIAL;
+			else if (::strncmp(buffer, "[HD44780]", 9U) == 0)
+				section = SECTION_HD44780;
+			else if (::strncmp(buffer, "[Nextion]", 9U) == 0)
+				section = SECTION_NEXTION;
+			else if (::strncmp(buffer, "[OLED]", 6U) == 0)
+				section = SECTION_OLED;
+			else if (::strncmp(buffer, "[LCDproc]", 9U) == 0)
+				section = SECTION_LCDPROC;
+			else if (::strncmp(buffer, "[Lock File]", 11U) == 0)
+				section = SECTION_LOCK_FILE;
+			else if (::strncmp(buffer, "[Mobile GPS]", 12U) == 0)
+				section = SECTION_MOBILE_GPS;
+			else if (::strncmp(buffer, "[Remote Control]", 16U) == 0)
+				section = SECTION_REMOTE_CONTROL;
+			else
+				section = SECTION_NONE;
 
-	  continue;
-  }
-
-  char* key   = ::strtok(buffer, " \t=\r\n");
-  if (key == NULL)
-    continue;
-
-  char* value = ::strtok(NULL, "\r\n");
-  if (value == NULL)
-    continue;
-
-  // Remove quotes from the value
-  size_t len = ::strlen(value);
-  if (len > 1U && *value == '"' && value[len - 1U] == '"') {
-	  value[len - 1U] = '\0';
-	  value++;
-  }
-
-  if (section == SECTION_GENERAL) {
-		if (::strcmp(key, "Callsign") == 0) {
-			// Convert the callsign to upper case
-			for (unsigned int i = 0U; value[i] != 0; i++)
-				value[i] = ::toupper(value[i]);
-			m_fmCallsign = m_cwIdCallsign = m_callsign = value;
-		} else if (::strcmp(key, "Id") == 0)
-			m_id = m_p25Id = m_dmrId = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Timeout") == 0)
-			m_fmTimeout = m_timeout = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Duplex") == 0)
-			m_duplex = ::atoi(value) == 1;
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = m_nxdnNetworkModeHang = m_pocsagNetworkModeHang = m_fmNetworkModeHang =
-			m_dstarModeHang        = m_dmrModeHang        = m_fusionModeHang        = m_p25ModeHang        = m_nxdnModeHang = m_fmModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "RFModeHang") == 0)
-			m_dstarModeHang = m_dmrModeHang = m_fusionModeHang = m_p25ModeHang = m_nxdnModeHang = m_fmModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "NetModeHang") == 0)
-			m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = m_nxdnNetworkModeHang = m_pocsagNetworkModeHang = m_fmNetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Display") == 0)
-			m_display = value;
-		else if (::strcmp(key, "Daemon") == 0)
-			m_daemon = ::atoi(value) == 1;
-	} else if (section == SECTION_INFO) {
-		if (::strcmp(key, "TXFrequency") == 0)
-			m_pocsagFrequency = m_txFrequency = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "RXFrequency") == 0)
-			m_rxFrequency = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Power") == 0)
-			m_power = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Latitude") == 0)
-			m_latitude = float(::atof(value));
-		else if (::strcmp(key, "Longitude") == 0)
-			m_longitude = float(::atof(value));
-		else if (::strcmp(key, "Height") == 0)
-			m_height = ::atoi(value);
-		else if (::strcmp(key, "Location") == 0)
-			m_location = value;
-		else if (::strcmp(key, "Description") == 0)
-			m_description = value;
-		else if (::strcmp(key, "URL") == 0)
-			m_url = value;
-	} else if (section == SECTION_LOG) {
-		if (::strcmp(key, "FilePath") == 0)
-			m_logFilePath = value;
-		else if (::strcmp(key, "FileRoot") == 0)
-			m_logFileRoot = value;
-		else if (::strcmp(key, "FileLevel") == 0)
-			m_logFileLevel = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "DisplayLevel") == 0)
-			m_logDisplayLevel = (unsigned int)::atoi(value);
-	} else if (section == SECTION_CWID) {
-		if (::strcmp(key, "Enable") == 0)
-			m_cwIdEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Time") == 0)
-			m_cwIdTime = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Callsign") == 0) {
-			// Convert the callsign to upper case
-			for (unsigned int i = 0U; value[i] != 0; i++)
-				value[i] = ::toupper(value[i]);
-			m_cwIdCallsign = value;
+			continue;
 		}
-	} else if (section == SECTION_DMRID_LOOKUP) {
-		if (::strcmp(key, "File") == 0)
-			m_dmrIdLookupFile = value;
-		else if (::strcmp(key, "Time") == 0)
-			m_dmrIdLookupTime = (unsigned int)::atoi(value);
-	} else if (section == SECTION_NXDNID_LOOKUP) {
-		if (::strcmp(key, "File") == 0)
-			m_nxdnIdLookupFile = value;
-		else if (::strcmp(key, "Time") == 0)
-			m_nxdnIdLookupTime = (unsigned int)::atoi(value);
-	} else if (section == SECTION_MODEM) {
-		if (::strcmp(key, "Port") == 0)
-			m_modemPort = value;
-        else if (::strcmp(key, "Protocol") == 0)
-            m_modemProtocol = value;
-        else if (::strcmp(key, "Address") == 0)
-            m_modemAddress = (unsigned int)::strtoul(value, NULL, 16);
-		else if (::strcmp(key, "RXInvert") == 0)
-			m_modemRXInvert = ::atoi(value) == 1;
-		else if (::strcmp(key, "TXInvert") == 0)
-			m_modemTXInvert = ::atoi(value) == 1;
-		else if (::strcmp(key, "PTTInvert") == 0)
-			m_modemPTTInvert = ::atoi(value) == 1;
-		else if (::strcmp(key, "TXDelay") == 0)
-			m_modemTXDelay = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "DMRDelay") == 0)
-			m_modemDMRDelay = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "RXOffset") == 0)
-			m_modemRXOffset = ::atoi(value);
-		else if (::strcmp(key, "TXOffset") == 0)
-			m_modemTXOffset = ::atoi(value);
-		else if (::strcmp(key, "RXDCOffset") == 0)
-			m_modemRXDCOffset = ::atoi(value);
-		else if (::strcmp(key, "TXDCOffset") == 0)
-			m_modemTXDCOffset = ::atoi(value);
-		else if (::strcmp(key, "RFLevel") == 0)
-			m_modemRFLevel = float(::atof(value));
-		else if (::strcmp(key, "RXLevel") == 0)
-			m_modemRXLevel = float(::atof(value));
-		else if (::strcmp(key, "TXLevel") == 0)
-			m_modemFMTXLevel = m_modemCWIdTXLevel = m_modemDStarTXLevel = m_modemDMRTXLevel = m_modemYSFTXLevel = m_modemP25TXLevel = m_modemNXDNTXLevel = float(::atof(value));
-		else if (::strcmp(key, "CWIdTXLevel") == 0)
-			m_modemCWIdTXLevel = float(::atof(value));
-		else if (::strcmp(key, "D-StarTXLevel") == 0)
-			m_modemDStarTXLevel = float(::atof(value));
-		else if (::strcmp(key, "DMRTXLevel") == 0)
-			m_modemDMRTXLevel = float(::atof(value));
-		else if (::strcmp(key, "YSFTXLevel") == 0)
-			m_modemYSFTXLevel = float(::atof(value));
-		else if (::strcmp(key, "P25TXLevel") == 0)
-			m_modemP25TXLevel = float(::atof(value));
-		else if (::strcmp(key, "NXDNTXLevel") == 0)
-			m_modemNXDNTXLevel = float(::atof(value));
-		else if (::strcmp(key, "POCSAGTXLevel") == 0)
-			m_modemPOCSAGTXLevel = float(::atof(value));
-		else if (::strcmp(key, "FMTXLevel") == 0)
-			m_modemFMTXLevel = float(::atof(value));
-		else if (::strcmp(key, "RSSIMappingFile") == 0)
-			m_modemRSSIMappingFile = value;
-		else if (::strcmp(key, "Trace") == 0)
-			m_modemTrace = ::atoi(value) == 1;
-		else if (::strcmp(key, "Debug") == 0)
-			m_modemDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_TRANSPARENT) {
-		if (::strcmp(key, "Enable") == 0)
-			m_transparentEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "RemoteAddress") == 0)
-			m_transparentRemoteAddress = value;
-		else if (::strcmp(key, "RemotePort") == 0)
-			m_transparentRemotePort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_transparentLocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "SendFrameType") == 0)
-			m_transparentSendFrameType = (unsigned int)::atoi(value);
-	} else if (section == SECTION_UMP) {
-		if (::strcmp(key, "Enable") == 0)
-			m_umpEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Port") == 0)
-			m_umpPort = value;
-	} else if (section == SECTION_DSTAR) {
-		if (::strcmp(key, "Enable") == 0)
-			m_dstarEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Module") == 0) {
-			// Convert the module to upper case
-			for (unsigned int i = 0U; value[i] != 0; i++)
-				value[i] = ::toupper(value[i]);
-			m_dstarModule = value;
-		} else if (::strcmp(key, "SelfOnly") == 0)
-			m_dstarSelfOnly = ::atoi(value) == 1;
-		else if (::strcmp(key, "BlackList") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				if (::strlen(p) > 0U) {
-					for (unsigned int i = 0U; p[i] != 0; i++)
-						p[i] = ::toupper(p[i]);
-					std::string callsign = std::string(p);
-					callsign.resize(DSTAR_LONG_CALLSIGN_LENGTH, ' ');
-					m_dstarBlackList.push_back(callsign);
+
+		char* key   = ::strtok(buffer, " \t=\r\n");
+		if (key == NULL)
+			continue;
+
+		char* value = ::strtok(NULL, "\r\n");
+		if (value == NULL)
+			continue;
+
+		// Remove quotes from the value
+		size_t len = ::strlen(value);
+		if (len > 1U && *value == '"' && value[len - 1U] == '"') {
+			value[len - 1U] = '\0';
+			value++;
+		}
+
+		if (section == SECTION_GENERAL) {
+			if (::strcmp(key, "Callsign") == 0) {
+				// Convert the callsign to upper case
+				for (unsigned int i = 0U; value[i] != 0; i++)
+					value[i] = ::toupper(value[i]);
+				m_fmCallsign = m_cwIdCallsign = m_callsign = value;
+			} else if (::strcmp(key, "Id") == 0)
+				m_id = m_p25Id = m_dmrId = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Timeout") == 0)
+				m_fmTimeout = m_timeout = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Duplex") == 0)
+				m_duplex = ::atoi(value) == 1;
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = m_nxdnNetworkModeHang = m_pocsagNetworkModeHang = m_fmNetworkModeHang =
+				m_dstarModeHang        = m_dmrModeHang        = m_fusionModeHang        = m_p25ModeHang        = m_nxdnModeHang = m_fmModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "RFModeHang") == 0)
+				m_dstarModeHang = m_dmrModeHang = m_fusionModeHang = m_p25ModeHang = m_nxdnModeHang = m_fmModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "NetModeHang") == 0)
+				m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = m_nxdnNetworkModeHang = m_pocsagNetworkModeHang = m_fmNetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Display") == 0)
+				m_display = value;
+			else if (::strcmp(key, "Daemon") == 0)
+				m_daemon = ::atoi(value) == 1;
+		} else if (section == SECTION_INFO) {
+			if (::strcmp(key, "TXFrequency") == 0)
+				m_pocsagFrequency = m_txFrequency = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "RXFrequency") == 0)
+				m_rxFrequency = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Power") == 0)
+				m_power = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Latitude") == 0)
+				m_latitude = float(::atof(value));
+			else if (::strcmp(key, "Longitude") == 0)
+				m_longitude = float(::atof(value));
+			else if (::strcmp(key, "Height") == 0)
+				m_height = ::atoi(value);
+			else if (::strcmp(key, "Location") == 0)
+				m_location = value;
+			else if (::strcmp(key, "Description") == 0)
+				m_description = value;
+			else if (::strcmp(key, "URL") == 0)
+				m_url = value;
+		} else if (section == SECTION_LOG) {
+			if (::strcmp(key, "FilePath") == 0)
+				m_logFilePath = value;
+			else if (::strcmp(key, "FileRoot") == 0)
+				m_logFileRoot = value;
+			else if (::strcmp(key, "FileLevel") == 0)
+				m_logFileLevel = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "DisplayLevel") == 0)
+				m_logDisplayLevel = (unsigned int)::atoi(value);
+		} else if (section == SECTION_CWID) {
+			if (::strcmp(key, "Enable") == 0)
+				m_cwIdEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Time") == 0)
+				m_cwIdTime = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Callsign") == 0) {
+				// Convert the callsign to upper case
+				for (unsigned int i = 0U; value[i] != 0; i++)
+					value[i] = ::toupper(value[i]);
+				m_cwIdCallsign = value;
+			}
+		} else if (section == SECTION_DMRID_LOOKUP) {
+			if (::strcmp(key, "File") == 0)
+				m_dmrIdLookupFile = value;
+			else if (::strcmp(key, "Time") == 0)
+				m_dmrIdLookupTime = (unsigned int)::atoi(value);
+		} else if (section == SECTION_NXDNID_LOOKUP) {
+			if (::strcmp(key, "File") == 0)
+				m_nxdnIdLookupFile = value;
+			else if (::strcmp(key, "Time") == 0)
+				m_nxdnIdLookupTime = (unsigned int)::atoi(value);
+		} else if (section == SECTION_MODEM) {
+			if (::strcmp(key, "Port") == 0)
+				m_modemPort = value;
+			else if (::strcmp(key, "Protocol") == 0)
+				m_modemProtocol = value;
+			else if (::strcmp(key, "Speed") == 0)
+				m_modemSpeed = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Address") == 0)
+				m_modemAddress = (unsigned int)::strtoul(value, NULL, 16);
+			else if (::strcmp(key, "RXInvert") == 0)
+				m_modemRXInvert = ::atoi(value) == 1;
+			else if (::strcmp(key, "TXInvert") == 0)
+				m_modemTXInvert = ::atoi(value) == 1;
+			else if (::strcmp(key, "PTTInvert") == 0)
+				m_modemPTTInvert = ::atoi(value) == 1;
+			else if (::strcmp(key, "TXDelay") == 0)
+				m_modemTXDelay = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "DMRDelay") == 0)
+				m_modemDMRDelay = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "RXOffset") == 0)
+				m_modemRXOffset = ::atoi(value);
+			else if (::strcmp(key, "TXOffset") == 0)
+				m_modemTXOffset = ::atoi(value);
+			else if (::strcmp(key, "RXDCOffset") == 0)
+				m_modemRXDCOffset = ::atoi(value);
+			else if (::strcmp(key, "TXDCOffset") == 0)
+				m_modemTXDCOffset = ::atoi(value);
+			else if (::strcmp(key, "RFLevel") == 0)
+				m_modemRFLevel = float(::atof(value));
+			else if (::strcmp(key, "RXLevel") == 0)
+				m_modemRXLevel = float(::atof(value));
+			else if (::strcmp(key, "TXLevel") == 0)
+				m_modemFMTXLevel = m_modemCWIdTXLevel = m_modemDStarTXLevel = m_modemDMRTXLevel = m_modemYSFTXLevel = m_modemP25TXLevel = m_modemNXDNTXLevel = float(::atof(value));
+			else if (::strcmp(key, "CWIdTXLevel") == 0)
+				m_modemCWIdTXLevel = float(::atof(value));
+			else if (::strcmp(key, "D-StarTXLevel") == 0)
+				m_modemDStarTXLevel = float(::atof(value));
+			else if (::strcmp(key, "DMRTXLevel") == 0)
+				m_modemDMRTXLevel = float(::atof(value));
+			else if (::strcmp(key, "YSFTXLevel") == 0)
+				m_modemYSFTXLevel = float(::atof(value));
+			else if (::strcmp(key, "P25TXLevel") == 0)
+				m_modemP25TXLevel = float(::atof(value));
+			else if (::strcmp(key, "NXDNTXLevel") == 0)
+				m_modemNXDNTXLevel = float(::atof(value));
+			else if (::strcmp(key, "POCSAGTXLevel") == 0)
+				m_modemPOCSAGTXLevel = float(::atof(value));
+			else if (::strcmp(key, "FMTXLevel") == 0)
+				m_modemFMTXLevel = float(::atof(value));
+			else if (::strcmp(key, "RSSIMappingFile") == 0)
+				m_modemRSSIMappingFile = value;
+			else if (::strcmp(key, "Trace") == 0)
+				m_modemTrace = ::atoi(value) == 1;
+			else if (::strcmp(key, "Debug") == 0)
+				m_modemDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_TRANSPARENT) {
+			if (::strcmp(key, "Enable") == 0)
+				m_transparentEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "RemoteAddress") == 0)
+				m_transparentRemoteAddress = value;
+			else if (::strcmp(key, "RemotePort") == 0)
+				m_transparentRemotePort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_transparentLocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "SendFrameType") == 0)
+				m_transparentSendFrameType = (unsigned int)::atoi(value);
+		} else if (section == SECTION_UMP) {
+			if (::strcmp(key, "Enable") == 0)
+				m_umpEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Port") == 0)
+				m_umpPort = value;
+		} else if (section == SECTION_DSTAR) {
+			if (::strcmp(key, "Enable") == 0)
+				m_dstarEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Module") == 0) {
+				// Convert the module to upper case
+				for (unsigned int i = 0U; value[i] != 0; i++)
+					value[i] = ::toupper(value[i]);
+				m_dstarModule = value;
+			} else if (::strcmp(key, "SelfOnly") == 0)
+				m_dstarSelfOnly = ::atoi(value) == 1;
+			else if (::strcmp(key, "BlackList") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					if (::strlen(p) > 0U) {
+						for (unsigned int i = 0U; p[i] != 0; i++)
+							p[i] = ::toupper(p[i]);
+						std::string callsign = std::string(p);
+						callsign.resize(DSTAR_LONG_CALLSIGN_LENGTH, ' ');
+						m_dstarBlackList.push_back(callsign);
+					}
+					p = ::strtok(NULL, ",\r\n");
 				}
-				p = ::strtok(NULL, ",\r\n");
-			}
-		} else if (::strcmp(key, "AckReply") == 0)
-			m_dstarAckReply = ::atoi(value) == 1;
-		else if (::strcmp(key, "AckTime") == 0)
-			m_dstarAckTime = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "AckMessage") == 0)
-			m_dstarAckMessage = ::atoi(value) == 1;
-		else if (::strcmp(key, "ErrorReply") == 0)
-			m_dstarErrorReply = ::atoi(value) == 1;
-		else if (::strcmp(key, "RemoteGateway") == 0)
-			m_dstarRemoteGateway = ::atoi(value) == 1;
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_dstarModeHang = (unsigned int)::atoi(value);
-	} else if (section == SECTION_DMR) {
-		if (::strcmp(key, "Enable") == 0)
-			m_dmrEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Beacons") == 0)
-			m_dmrBeacons = ::atoi(value) == 1 ? DMR_BEACONS_NETWORK : DMR_BEACONS_OFF;
-		else if (::strcmp(key, "BeaconInterval") == 0) {
-			m_dmrBeacons = m_dmrBeacons != DMR_BEACONS_OFF ? DMR_BEACONS_TIMED : DMR_BEACONS_OFF;
-			m_dmrBeaconInterval = (unsigned int)::atoi(value);
-		} else if (::strcmp(key, "BeaconDuration") == 0)
-			m_dmrBeaconDuration = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Id") == 0)
-			m_dmrId = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ColorCode") == 0)
-			m_dmrColorCode = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "SelfOnly") == 0)
-			m_dmrSelfOnly = ::atoi(value) == 1;
-		else if (::strcmp(key, "EmbeddedLCOnly") == 0)
-			m_dmrEmbeddedLCOnly = ::atoi(value) == 1;
-		else if (::strcmp(key, "DumpTAData") == 0)
-			m_dmrDumpTAData = ::atoi(value) == 1;
-		else if (::strcmp(key, "Prefixes") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				unsigned int prefix = (unsigned int)::atoi(p);
-				if (prefix > 0U && prefix <= 999U)
-					m_dmrPrefixes.push_back(prefix);
-				p = ::strtok(NULL, ",\r\n");
-			}
-		} else if (::strcmp(key, "BlackList") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				unsigned int id = (unsigned int)::atoi(p);
-				if (id > 0U)
-					m_dmrBlackList.push_back(id);
-				p = ::strtok(NULL, ",\r\n");
-			}
-		} else if (::strcmp(key, "WhiteList") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				unsigned int id = (unsigned int)::atoi(p);
-				if (id > 0U)
-					m_dmrWhiteList.push_back(id);
-				p = ::strtok(NULL, ",\r\n");
-			}
-		} else if (::strcmp(key, "Slot1TGWhiteList") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				unsigned int id = (unsigned int)::atoi(p);
-				if (id > 0U)
-					m_dmrSlot1TGWhiteList.push_back(id);
-				p = ::strtok(NULL, ",\r\n");
-			}
-		} else if (::strcmp(key, "Slot2TGWhiteList") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				unsigned int id = (unsigned int)::atoi(p);
-				if (id > 0U)
-					m_dmrSlot2TGWhiteList.push_back(id);
-				p = ::strtok(NULL, ",\r\n");
-			}
-		} else if (::strcmp(key, "TXHang") == 0)
-			m_dmrTXHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "CallHang") == 0)
-			m_dmrCallHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_dmrModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "OVCM") == 0)
-			switch(::atoi(value)) {
+			} else if (::strcmp(key, "AckReply") == 0)
+				m_dstarAckReply = ::atoi(value) == 1;
+			else if (::strcmp(key, "AckTime") == 0)
+				m_dstarAckTime = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "AckMessage") == 0)
+				m_dstarAckMessage = ::atoi(value) == 1;
+			else if (::strcmp(key, "ErrorReply") == 0)
+				m_dstarErrorReply = ::atoi(value) == 1;
+			else if (::strcmp(key, "RemoteGateway") == 0)
+				m_dstarRemoteGateway = ::atoi(value) == 1;
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_dstarModeHang = (unsigned int)::atoi(value);
+		} else if (section == SECTION_DMR) {
+			if (::strcmp(key, "Enable") == 0)
+				m_dmrEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Beacons") == 0)
+				m_dmrBeacons = ::atoi(value) == 1 ? DMR_BEACONS_NETWORK : DMR_BEACONS_OFF;
+			else if (::strcmp(key, "BeaconInterval") == 0) {
+				m_dmrBeacons = m_dmrBeacons != DMR_BEACONS_OFF ? DMR_BEACONS_TIMED : DMR_BEACONS_OFF;
+				m_dmrBeaconInterval = (unsigned int)::atoi(value);
+			} else if (::strcmp(key, "BeaconDuration") == 0)
+				m_dmrBeaconDuration = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Id") == 0)
+				m_dmrId = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ColorCode") == 0)
+				m_dmrColorCode = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "SelfOnly") == 0)
+				m_dmrSelfOnly = ::atoi(value) == 1;
+			else if (::strcmp(key, "EmbeddedLCOnly") == 0)
+				m_dmrEmbeddedLCOnly = ::atoi(value) == 1;
+			else if (::strcmp(key, "DumpTAData") == 0)
+				m_dmrDumpTAData = ::atoi(value) == 1;
+			else if (::strcmp(key, "Prefixes") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					unsigned int prefix = (unsigned int)::atoi(p);
+					if (prefix > 0U && prefix <= 999U)
+						m_dmrPrefixes.push_back(prefix);
+					p = ::strtok(NULL, ",\r\n");
+				}
+			} else if (::strcmp(key, "BlackList") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					unsigned int id = (unsigned int)::atoi(p);
+					if (id > 0U)
+						m_dmrBlackList.push_back(id);
+					p = ::strtok(NULL, ",\r\n");
+				}
+			} else if (::strcmp(key, "WhiteList") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					unsigned int id = (unsigned int)::atoi(p);
+					if (id > 0U)
+						m_dmrWhiteList.push_back(id);
+					p = ::strtok(NULL, ",\r\n");
+				}
+			} else if (::strcmp(key, "Slot1TGWhiteList") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					unsigned int id = (unsigned int)::atoi(p);
+					if (id > 0U)
+						m_dmrSlot1TGWhiteList.push_back(id);
+					p = ::strtok(NULL, ",\r\n");
+				}
+			} else if (::strcmp(key, "Slot2TGWhiteList") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					unsigned int id = (unsigned int)::atoi(p);
+					if (id > 0U)
+						m_dmrSlot2TGWhiteList.push_back(id);
+					p = ::strtok(NULL, ",\r\n");
+				}
+			} else if (::strcmp(key, "TXHang") == 0)
+				m_dmrTXHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CallHang") == 0)
+				m_dmrCallHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_dmrModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "OVCM") == 0) {
+				switch (::atoi(value)) {
 				case 1:
 					m_dmrOVCM = DMR_OVCM_RX_ON;
 					break;
@@ -657,342 +660,342 @@ bool CConf::read()
 				default:
 					m_dmrOVCM = DMR_OVCM_OFF;
 					break;
+				}
 			}
-    } else if (section == SECTION_FUSION) {
-		if (::strcmp(key, "Enable") == 0)
-			m_fusionEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "LowDeviation") == 0)
-			m_fusionLowDeviation = ::atoi(value) == 1;
-		else if (::strcmp(key, "DGID") == 0) {
-			m_fusionDGIdEnabled = true;
-			m_fusionDGId        = (unsigned int)::atoi(value);
-		} else if (::strcmp(key, "RemoteGateway") == 0)
-			m_fusionRemoteGateway = ::atoi(value) == 1;
-		else if (::strcmp(key, "SelfOnly") == 0)
-			m_fusionSelfOnly = ::atoi(value) == 1;
-		else if (::strcmp(key, "TXHang") == 0)
-			m_fusionTXHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_fusionModeHang = (unsigned int)::atoi(value);
-	} else if (section == SECTION_P25) {
-		if (::strcmp(key, "Enable") == 0)
-			m_p25Enabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Id") == 0)
-			m_p25Id = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "NAC") == 0)
-			m_p25NAC = (unsigned int)::strtoul(value, NULL, 16);
-		else if (::strcmp(key, "OverrideUIDCheck") == 0)
-			m_p25OverrideUID = ::atoi(value) == 1;
-		else if (::strcmp(key, "SelfOnly") == 0)
-			m_p25SelfOnly = ::atoi(value) == 1;
-		else if (::strcmp(key, "RemoteGateway") == 0)
-			m_p25RemoteGateway = ::atoi(value) == 1;
-		else if (::strcmp(key, "TXHang") == 0)
-			m_p25TXHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_p25ModeHang = (unsigned int)::atoi(value);
-	} else if (section == SECTION_NXDN) {
-		if (::strcmp(key, "Enable") == 0)
-			m_nxdnEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Id") == 0)
-			m_nxdnId = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "RAN") == 0)
-			m_nxdnRAN = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "SelfOnly") == 0)
-			m_nxdnSelfOnly = ::atoi(value) == 1;
-		else if (::strcmp(key, "RemoteGateway") == 0)
-			m_nxdnRemoteGateway = ::atoi(value) == 1;
-		else if (::strcmp(key, "TXHang") == 0)
-			m_nxdnTXHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_nxdnModeHang = (unsigned int)::atoi(value);
-	} else if (section == SECTION_POCSAG) {
-	  if (::strcmp(key, "Enable") == 0)
-		  m_pocsagEnabled = ::atoi(value) == 1;
-	  else if (::strcmp(key, "Frequency") == 0)
-		  m_pocsagFrequency = (unsigned int)::atoi(value);
-	}
-	else if (section == SECTION_FM) {
-		if (::strcmp(key, "Enable") == 0)
-			m_fmEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Callsign") == 0) {
-			// Convert the callsign to upper case
-			for (unsigned int i = 0U; value[i] != 0; i++)
-				value[i] = ::toupper(value[i]);
-			m_fmCallsign = value;
-		} else if (::strcmp(key, "CallsignSpeed") == 0)
-		  m_fmCallsignSpeed = (unsigned int)::atoi(value);
-	  else if (::strcmp(key, "CallsignFrequency") == 0)
-		  m_fmCallsignFrequency = (unsigned int)::atoi(value);
-	  else if (::strcmp(key, "CallsignTime") == 0)
-		  m_fmCallsignTime = (unsigned int)::atoi(value);
-	  else if (::strcmp(key, "CallsignHoldoff") == 0)
-		  m_fmCallsignHoldoff = (unsigned int)::atoi(value);
-	  else if (::strcmp(key, "CallsignHighLevel") == 0)
-		  m_fmCallsignHighLevel = float(::atof(value));
-	  else if (::strcmp(key, "CallsignLowLevel") == 0)
-		  m_fmCallsignLowLevel = float(::atof(value));
-	  else if (::strcmp(key, "CallsignAtStart") == 0)
-		  m_fmCallsignAtStart = ::atoi(value) == 1;
-	  else if (::strcmp(key, "CallsignAtEnd") == 0)
-		  m_fmCallsignAtEnd = ::atoi(value) == 1;
-	  else if (::strcmp(key, "CallsignAtLatch") == 0)
-		  m_fmCallsignAtLatch = ::atoi(value) == 1;
-	  else if (::strcmp(key, "RFAck") == 0) {
-			// Convert the ack to upper case
-			for (unsigned int i = 0U; value[i] != 0; i++)
-				value[i] = ::toupper(value[i]);
-			m_fmRFAck = value;
-	  } else if (::strcmp(key, "ExtAck") == 0) {
-			// Convert the ack to upper case
-			for (unsigned int i = 0U; value[i] != 0; i++)
-				value[i] = ::toupper(value[i]);
-			m_fmExtAck = value;
-		}	else if (::strcmp(key, "AckSpeed") == 0)
-			m_fmAckSpeed = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "AckFrequency") == 0)
-			m_fmAckFrequency = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "AckMinTime") == 0)
-			m_fmAckMinTime = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "AckDelay") == 0)
-			m_fmAckDelay = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "AckLevel") == 0)
-			m_fmAckLevel = float(::atof(value));
-		else if (::strcmp(key, "Timeout") == 0)
-			m_fmTimeout = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "TimeoutLevel") == 0)
-			m_fmTimeoutLevel = float(::atof(value));
-		else if (::strcmp(key, "CTCSSFrequency") == 0)
-			m_fmCTCSSFrequency = float(::atof(value));
-		else if (::strcmp(key, "CTCSSThreshold") == 0)
-			m_fmCTCSSHighThreshold = m_fmCTCSSLowThreshold = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "CTCSSHighThreshold") == 0)
-			m_fmCTCSSHighThreshold = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "CTCSSLowThreshold") == 0)
-			m_fmCTCSSLowThreshold = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "CTCSSLevel") == 0)
-			m_fmCTCSSLevel = float(::atof(value));
-		else if (::strcmp(key, "KerchunkTime") == 0)
-			m_fmKerchunkTime = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "HangTime") == 0)
-			m_fmHangTime = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "UseCOS") == 0)
-			m_fmUseCOS = ::atoi(value) == 1;
-		else if (::strcmp(key, "COSInvert") == 0)
-			m_fmCOSInvert = ::atoi(value) == 1;
-		else if (::strcmp(key, "RFAudioBoost") == 0)
-			m_fmRFAudioBoost = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "MaxDevLevel") == 0)
-			m_fmMaxDevLevel = float(::atof(value));
-		else if (::strcmp(key, "ExtAudioBoost") == 0)
-			m_fmExtAudioBoost = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_fmModeHang = (unsigned int)::atoi(value);
-	} else if (section == SECTION_DSTAR_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_dstarNetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "GatewayAddress") == 0)
-			m_dstarGatewayAddress = value;
-		else if (::strcmp(key, "GatewayPort") == 0)
-			m_dstarGatewayPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_dstarLocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_dstarNetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Debug") == 0)
-			m_dstarNetworkDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_DMR_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_dmrNetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Address") == 0)
-			m_dmrNetworkAddress = value;
-		else if (::strcmp(key, "Port") == 0)
-			m_dmrNetworkPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Local") == 0)
-			m_dmrNetworkLocal = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Password") == 0)
-			m_dmrNetworkPassword = value;
-		else if (::strcmp(key, "Options") == 0)
-			m_dmrNetworkOptions = value;
-		else if (::strcmp(key, "Debug") == 0)
-			m_dmrNetworkDebug = ::atoi(value) == 1;
-		else if (::strcmp(key, "Jitter") == 0)
-			m_dmrNetworkJitter = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Slot1") == 0)
-			m_dmrNetworkSlot1 = ::atoi(value) == 1;
-		else if (::strcmp(key, "Slot2") == 0)
-			m_dmrNetworkSlot2 = ::atoi(value) == 1;
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_dmrNetworkModeHang = (unsigned int)::atoi(value);
-	} else if (section == SECTION_FUSION_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_fusionNetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "LocalAddress") == 0)
-			m_fusionNetworkMyAddress = value;
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_fusionNetworkMyPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "GatewayAddress") == 0)
-			m_fusionNetworkGatewayAddress = value;
-		else if (::strcmp(key, "GatewayPort") == 0)
-			m_fusionNetworkGatewayPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_fusionNetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Debug") == 0)
-			m_fusionNetworkDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_P25_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_p25NetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "GatewayAddress") == 0)
-			m_p25GatewayAddress = value;
-		else if (::strcmp(key, "GatewayPort") == 0)
-			m_p25GatewayPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_p25LocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_p25NetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Debug") == 0)
-			m_p25NetworkDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_NXDN_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_nxdnNetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "LocalAddress") == 0)
-			m_nxdnLocalAddress = value;
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_nxdnLocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "GatewayAddress") == 0)
-			m_nxdnGatewayAddress = value;
-		else if (::strcmp(key, "GatewayPort") == 0)
-			m_nxdnGatewayPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_nxdnNetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Debug") == 0)
-			m_nxdnNetworkDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_POCSAG_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_pocsagNetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "LocalAddress") == 0)
-			m_pocsagLocalAddress = value;
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_pocsagLocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "GatewayAddress") == 0)
-			m_pocsagGatewayAddress = value;
-		else if (::strcmp(key, "GatewayPort") == 0)
-			m_pocsagGatewayPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_pocsagNetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Debug") == 0)
-			m_pocsagNetworkDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_FM_NETWORK) {
-		if (::strcmp(key, "Enable") == 0)
-			m_fmNetworkEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "LocalAddress") == 0)
-			m_fmLocalAddress = value;
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_fmLocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "GatewayAddress") == 0)
-			m_fmGatewayAddress = value;
-		else if (::strcmp(key, "GatewayPort") == 0)
-			m_fmGatewayPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ModeHang") == 0)
-			m_fmNetworkModeHang = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Debug") == 0)
-			m_fmNetworkDebug = ::atoi(value) == 1;
-	} else if (section == SECTION_TFTSERIAL) {
-		if (::strcmp(key, "Port") == 0)
-			m_tftSerialPort = value;
-		else if (::strcmp(key, "Brightness") == 0)
-			m_tftSerialBrightness = (unsigned int)::atoi(value);
-	} else if (section == SECTION_HD44780) {
-		if (::strcmp(key, "Rows") == 0)
-			m_hd44780Rows = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "Columns") == 0)
-			m_hd44780Columns = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "I2CAddress") == 0)
-			m_hd44780i2cAddress = (unsigned int)::strtoul(value, NULL, 16);
-		else if (::strcmp(key, "PWM") == 0)
-			m_hd44780PWM = ::atoi(value) == 1;
-		else if (::strcmp(key, "PWMPin") == 0)
-			m_hd44780PWMPin = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "PWMBright") == 0)
-			m_hd44780PWMBright = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "PWMDim") == 0)
-			m_hd44780PWMDim = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "DisplayClock") == 0)
-			m_hd44780DisplayClock = ::atoi(value) == 1;
-		else if (::strcmp(key, "UTC") == 0)
-			m_hd44780UTC = ::atoi(value) == 1;
-		else if (::strcmp(key, "Pins") == 0) {
-			char* p = ::strtok(value, ",\r\n");
-			while (p != NULL) {
-				unsigned int pin = (unsigned int)::atoi(p);
-				m_hd44780Pins.push_back(pin);
-				p = ::strtok(NULL, ",\r\n");
+		} else if (section == SECTION_FUSION) {
+			if (::strcmp(key, "Enable") == 0)
+				m_fusionEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "LowDeviation") == 0)
+				m_fusionLowDeviation = ::atoi(value) == 1;
+			else if (::strcmp(key, "DGID") == 0) {
+				m_fusionDGIdEnabled = true;
+				m_fusionDGId        = (unsigned int)::atoi(value);
+			} else if (::strcmp(key, "RemoteGateway") == 0)
+				m_fusionRemoteGateway = ::atoi(value) == 1;
+			else if (::strcmp(key, "SelfOnly") == 0)
+				m_fusionSelfOnly = ::atoi(value) == 1;
+			else if (::strcmp(key, "TXHang") == 0)
+				m_fusionTXHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_fusionModeHang = (unsigned int)::atoi(value);
+		} else if (section == SECTION_P25) {
+			if (::strcmp(key, "Enable") == 0)
+				m_p25Enabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Id") == 0)
+				m_p25Id = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "NAC") == 0)
+				m_p25NAC = (unsigned int)::strtoul(value, NULL, 16);
+			else if (::strcmp(key, "OverrideUIDCheck") == 0)
+				m_p25OverrideUID = ::atoi(value) == 1;
+			else if (::strcmp(key, "SelfOnly") == 0)
+				m_p25SelfOnly = ::atoi(value) == 1;
+			else if (::strcmp(key, "RemoteGateway") == 0)
+				m_p25RemoteGateway = ::atoi(value) == 1;
+			else if (::strcmp(key, "TXHang") == 0)
+				m_p25TXHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_p25ModeHang = (unsigned int)::atoi(value);
+		} else if (section == SECTION_NXDN) {
+			if (::strcmp(key, "Enable") == 0)
+				m_nxdnEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Id") == 0)
+				m_nxdnId = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "RAN") == 0)
+				m_nxdnRAN = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "SelfOnly") == 0)
+				m_nxdnSelfOnly = ::atoi(value) == 1;
+			else if (::strcmp(key, "RemoteGateway") == 0)
+				m_nxdnRemoteGateway = ::atoi(value) == 1;
+			else if (::strcmp(key, "TXHang") == 0)
+				m_nxdnTXHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_nxdnModeHang = (unsigned int)::atoi(value);
+		} else if (section == SECTION_POCSAG) {
+			if (::strcmp(key, "Enable") == 0)
+				m_pocsagEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Frequency") == 0)
+				m_pocsagFrequency = (unsigned int)::atoi(value);
+		} else if (section == SECTION_FM) {
+			if (::strcmp(key, "Enable") == 0)
+				m_fmEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Callsign") == 0) {
+				// Convert the callsign to upper case
+				for (unsigned int i = 0U; value[i] != 0; i++)
+					value[i] = ::toupper(value[i]);
+				m_fmCallsign = value;
+			} else if (::strcmp(key, "CallsignSpeed") == 0)
+				m_fmCallsignSpeed = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CallsignFrequency") == 0)
+				m_fmCallsignFrequency = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CallsignTime") == 0)
+				m_fmCallsignTime = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CallsignHoldoff") == 0)
+				m_fmCallsignHoldoff = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CallsignHighLevel") == 0)
+				m_fmCallsignHighLevel = float(::atof(value));
+			else if (::strcmp(key, "CallsignLowLevel") == 0)
+				m_fmCallsignLowLevel = float(::atof(value));
+			else if (::strcmp(key, "CallsignAtStart") == 0)
+				m_fmCallsignAtStart = ::atoi(value) == 1;
+			else if (::strcmp(key, "CallsignAtEnd") == 0)
+				m_fmCallsignAtEnd = ::atoi(value) == 1;
+			else if (::strcmp(key, "CallsignAtLatch") == 0)
+				m_fmCallsignAtLatch = ::atoi(value) == 1;
+			else if (::strcmp(key, "RFAck") == 0) {
+				// Convert the ack to upper case
+				for (unsigned int i = 0U; value[i] != 0; i++)
+					value[i] = ::toupper(value[i]);
+				m_fmRFAck = value;
+			} else if (::strcmp(key, "ExtAck") == 0) {
+				// Convert the ack to upper case
+				for (unsigned int i = 0U; value[i] != 0; i++)
+					value[i] = ::toupper(value[i]);
+				m_fmExtAck = value;
+			} else if (::strcmp(key, "AckSpeed") == 0)
+				m_fmAckSpeed = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "AckFrequency") == 0)
+				m_fmAckFrequency = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "AckMinTime") == 0)
+				m_fmAckMinTime = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "AckDelay") == 0)
+				m_fmAckDelay = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "AckLevel") == 0)
+				m_fmAckLevel = float(::atof(value));
+			else if (::strcmp(key, "Timeout") == 0)
+				m_fmTimeout = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "TimeoutLevel") == 0)
+				m_fmTimeoutLevel = float(::atof(value));
+			else if (::strcmp(key, "CTCSSFrequency") == 0)
+				m_fmCTCSSFrequency = float(::atof(value));
+			else if (::strcmp(key, "CTCSSThreshold") == 0)
+				m_fmCTCSSHighThreshold = m_fmCTCSSLowThreshold = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CTCSSHighThreshold") == 0)
+				m_fmCTCSSHighThreshold = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CTCSSLowThreshold") == 0)
+				m_fmCTCSSLowThreshold = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "CTCSSLevel") == 0)
+				m_fmCTCSSLevel = float(::atof(value));
+			else if (::strcmp(key, "KerchunkTime") == 0)
+				m_fmKerchunkTime = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "HangTime") == 0)
+				m_fmHangTime = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "UseCOS") == 0)
+				m_fmUseCOS = ::atoi(value) == 1;
+			else if (::strcmp(key, "COSInvert") == 0)
+				m_fmCOSInvert = ::atoi(value) == 1;
+			else if (::strcmp(key, "RFAudioBoost") == 0)
+				m_fmRFAudioBoost = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "MaxDevLevel") == 0)
+				m_fmMaxDevLevel = float(::atof(value));
+			else if (::strcmp(key, "ExtAudioBoost") == 0)
+				m_fmExtAudioBoost = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_fmModeHang = (unsigned int)::atoi(value);
+		} else if (section == SECTION_DSTAR_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_dstarNetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "GatewayAddress") == 0)
+				m_dstarGatewayAddress = value;
+			else if (::strcmp(key, "GatewayPort") == 0)
+				m_dstarGatewayPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_dstarLocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_dstarNetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Debug") == 0)
+				m_dstarNetworkDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_DMR_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_dmrNetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Address") == 0)
+				m_dmrNetworkAddress = value;
+			else if (::strcmp(key, "Port") == 0)
+				m_dmrNetworkPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Local") == 0)
+				m_dmrNetworkLocal = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Password") == 0)
+				m_dmrNetworkPassword = value;
+			else if (::strcmp(key, "Options") == 0)
+				m_dmrNetworkOptions = value;
+			else if (::strcmp(key, "Debug") == 0)
+				m_dmrNetworkDebug = ::atoi(value) == 1;
+			else if (::strcmp(key, "Jitter") == 0)
+				m_dmrNetworkJitter = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Slot1") == 0)
+				m_dmrNetworkSlot1 = ::atoi(value) == 1;
+			else if (::strcmp(key, "Slot2") == 0)
+				m_dmrNetworkSlot2 = ::atoi(value) == 1;
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_dmrNetworkModeHang = (unsigned int)::atoi(value);
+		} else if (section == SECTION_FUSION_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_fusionNetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "LocalAddress") == 0)
+				m_fusionNetworkMyAddress = value;
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_fusionNetworkMyPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "GatewayAddress") == 0)
+				m_fusionNetworkGatewayAddress = value;
+			else if (::strcmp(key, "GatewayPort") == 0)
+				m_fusionNetworkGatewayPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_fusionNetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Debug") == 0)
+				m_fusionNetworkDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_P25_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_p25NetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "GatewayAddress") == 0)
+				m_p25GatewayAddress = value;
+			else if (::strcmp(key, "GatewayPort") == 0)
+				m_p25GatewayPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_p25LocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_p25NetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Debug") == 0)
+				m_p25NetworkDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_NXDN_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_nxdnNetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "LocalAddress") == 0)
+				m_nxdnLocalAddress = value;
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_nxdnLocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "GatewayAddress") == 0)
+				m_nxdnGatewayAddress = value;
+			else if (::strcmp(key, "GatewayPort") == 0)
+				m_nxdnGatewayPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_nxdnNetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Debug") == 0)
+				m_nxdnNetworkDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_POCSAG_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_pocsagNetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "LocalAddress") == 0)
+				m_pocsagLocalAddress = value;
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_pocsagLocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "GatewayAddress") == 0)
+				m_pocsagGatewayAddress = value;
+			else if (::strcmp(key, "GatewayPort") == 0)
+				m_pocsagGatewayPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_pocsagNetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Debug") == 0)
+				m_pocsagNetworkDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_FM_NETWORK) {
+			if (::strcmp(key, "Enable") == 0)
+				m_fmNetworkEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "LocalAddress") == 0)
+				m_fmLocalAddress = value;
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_fmLocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "GatewayAddress") == 0)
+				m_fmGatewayAddress = value;
+			else if (::strcmp(key, "GatewayPort") == 0)
+				m_fmGatewayPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ModeHang") == 0)
+				m_fmNetworkModeHang = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Debug") == 0)
+				m_fmNetworkDebug = ::atoi(value) == 1;
+		} else if (section == SECTION_TFTSERIAL) {
+			if (::strcmp(key, "Port") == 0)
+				m_tftSerialPort = value;
+			else if (::strcmp(key, "Brightness") == 0)
+				m_tftSerialBrightness = (unsigned int)::atoi(value);
+		} else if (section == SECTION_HD44780) {
+			if (::strcmp(key, "Rows") == 0)
+				m_hd44780Rows = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "Columns") == 0)
+				m_hd44780Columns = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "I2CAddress") == 0)
+				m_hd44780i2cAddress = (unsigned int)::strtoul(value, NULL, 16);
+			else if (::strcmp(key, "PWM") == 0)
+				m_hd44780PWM = ::atoi(value) == 1;
+			else if (::strcmp(key, "PWMPin") == 0)
+				m_hd44780PWMPin = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "PWMBright") == 0)
+				m_hd44780PWMBright = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "PWMDim") == 0)
+				m_hd44780PWMDim = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "DisplayClock") == 0)
+				m_hd44780DisplayClock = ::atoi(value) == 1;
+			else if (::strcmp(key, "UTC") == 0)
+				m_hd44780UTC = ::atoi(value) == 1;
+			else if (::strcmp(key, "Pins") == 0) {
+				char* p = ::strtok(value, ",\r\n");
+				while (p != NULL) {
+					unsigned int pin = (unsigned int)::atoi(p);
+					m_hd44780Pins.push_back(pin);
+					p = ::strtok(NULL, ",\r\n");
+				}
 			}
+		} else if (section == SECTION_NEXTION) {
+			if (::strcmp(key, "Port") == 0)
+				m_nextionPort = value;
+			else if (::strcmp(key, "Brightness") == 0)
+				m_nextionIdleBrightness = m_nextionBrightness = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "DisplayClock") == 0)
+				m_nextionDisplayClock = ::atoi(value) == 1;
+			else if (::strcmp(key, "UTC") == 0)
+				m_nextionUTC = ::atoi(value) == 1;
+			else if (::strcmp(key, "IdleBrightness") == 0)
+				m_nextionIdleBrightness = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "ScreenLayout") == 0)
+				m_nextionScreenLayout = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "DisplayTempInFahrenheit") == 0)
+				m_nextionTempInFahrenheit = ::atoi(value) == 1;
+		} else if (section == SECTION_OLED) {
+			if (::strcmp(key, "Type") == 0)
+				m_oledType = (unsigned char)::atoi(value);
+			else if (::strcmp(key, "Brightness") == 0)
+				m_oledBrightness = (unsigned char)::atoi(value);
+			else if (::strcmp(key, "Invert") == 0)
+				m_oledInvert = ::atoi(value) == 1;
+			else if (::strcmp(key, "Scroll") == 0)
+				m_oledScroll = ::atoi(value) == 1;
+			else if (::strcmp(key, "Rotate") == 0)
+				m_oledRotate = ::atoi(value) == 1;
+			else if (::strcmp(key, "LogoScreensaver") == 0)
+				m_oledLogoScreensaver = ::atoi(value) == 1;
+		} else if (section == SECTION_LCDPROC) {
+			if (::strcmp(key, "Address") == 0)
+				m_lcdprocAddress = value;
+			else if (::strcmp(key, "Port") == 0)
+				m_lcdprocPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "LocalPort") == 0)
+				m_lcdprocLocalPort = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "DisplayClock") == 0)
+				m_lcdprocDisplayClock = ::atoi(value) == 1;
+			else if (::strcmp(key, "UTC") == 0)
+				m_lcdprocUTC = ::atoi(value) == 1;
+			else if (::strcmp(key, "DimOnIdle") == 0)
+				m_lcdprocDimOnIdle = ::atoi(value) == 1;
+		} else if (section == SECTION_LOCK_FILE) {
+			if (::strcmp(key, "Enable") == 0)
+				m_lockFileEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "File") == 0)
+				m_lockFileName = value;
+		} else if (section == SECTION_MOBILE_GPS) {
+			if (::strcmp(key, "Enable") == 0)
+				m_mobileGPSEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Address") == 0)
+				m_mobileGPSAddress = value;
+			else if (::strcmp(key, "Port") == 0)
+				m_mobileGPSPort = (unsigned int)::atoi(value);
+		} else if (section == SECTION_REMOTE_CONTROL) {
+			if (::strcmp(key, "Enable") == 0)
+				m_remoteControlEnabled = ::atoi(value) == 1;
+			else if (::strcmp(key, "Port") == 0)
+				m_remoteControlPort = (unsigned int)::atoi(value);
 		}
-	} else if (section == SECTION_NEXTION) {
-		if (::strcmp(key, "Port") == 0)
-			m_nextionPort = value;
-		else if (::strcmp(key, "Brightness") == 0)
-			m_nextionIdleBrightness = m_nextionBrightness = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "DisplayClock") == 0)
-			m_nextionDisplayClock = ::atoi(value) == 1;
-		else if (::strcmp(key, "UTC") == 0)
-			m_nextionUTC = ::atoi(value) == 1;
-		else if (::strcmp(key, "IdleBrightness") == 0)
-			m_nextionIdleBrightness = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "ScreenLayout") == 0)
-			m_nextionScreenLayout = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "DisplayTempInFahrenheit") == 0)
-			m_nextionTempInFahrenheit = ::atoi(value) == 1;
-	} else if (section == SECTION_OLED) {
-		if (::strcmp(key, "Type") == 0)
-			m_oledType = (unsigned char)::atoi(value);
-		else if (::strcmp(key, "Brightness") == 0)
-			m_oledBrightness = (unsigned char)::atoi(value);
-		else if (::strcmp(key, "Invert") == 0)
-			m_oledInvert = ::atoi(value) == 1;
-		else if (::strcmp(key, "Scroll") == 0)
-			m_oledScroll = ::atoi(value) == 1;
-		else if (::strcmp(key, "Rotate") == 0)
-			m_oledRotate = ::atoi(value) == 1;
-		else if (::strcmp(key, "LogoScreensaver") == 0)
-			m_oledLogoScreensaver = ::atoi(value) == 1;
-	} else if (section == SECTION_LCDPROC) {
-		if (::strcmp(key, "Address") == 0)
-			m_lcdprocAddress = value;
-		else if (::strcmp(key, "Port") == 0)
-			m_lcdprocPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "LocalPort") == 0)
-			m_lcdprocLocalPort = (unsigned int)::atoi(value);
-		else if (::strcmp(key, "DisplayClock") == 0)
-			m_lcdprocDisplayClock = ::atoi(value) == 1;
-		else if (::strcmp(key, "UTC") == 0)
-			m_lcdprocUTC = ::atoi(value) == 1;
-		else if (::strcmp(key, "DimOnIdle") == 0)
-			m_lcdprocDimOnIdle = ::atoi(value) == 1;
-	} else if (section == SECTION_LOCK_FILE) {
-		if (::strcmp(key, "Enable") == 0)
-			m_lockFileEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "File") == 0)
-			m_lockFileName = value;
-	} else if (section == SECTION_MOBILE_GPS) {
-		if (::strcmp(key, "Enable") == 0)
-			m_mobileGPSEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Address") == 0)
-			m_mobileGPSAddress = value;
-		else if (::strcmp(key, "Port") == 0)
-			m_mobileGPSPort = (unsigned int)::atoi(value);
-	} else if (section == SECTION_REMOTE_CONTROL) {
-		if (::strcmp(key, "Enable") == 0)
-			m_remoteControlEnabled = ::atoi(value) == 1;
-		else if (::strcmp(key, "Port") == 0)
-			m_remoteControlPort = (unsigned int)::atoi(value);
 	}
-  }
 
-  ::fclose(fp);
+	::fclose(fp);
 
-  return true;
+	return true;
 }
 
 std::string CConf::getCallsign() const
@@ -1135,6 +1138,11 @@ std::string CConf::getModemProtocol() const
 	return m_modemProtocol;
 }
 
+unsigned int CConf::getModemSpeed() const
+{
+	return m_modemSpeed;
+}
+
 unsigned int CConf::getModemAddress() const
 {
 	return m_modemAddress;
diff --git a/Conf.h b/Conf.h
index da8cdfc..b455a55 100644
--- a/Conf.h
+++ b/Conf.h
@@ -71,6 +71,7 @@ public:
   // The Modem section
   std::string  getModemPort() const;
   std::string  getModemProtocol() const;
+  unsigned int getModemSpeed() const;
   unsigned int getModemAddress() const;
   bool         getModemRXInvert() const;
   bool         getModemTXInvert() const;
@@ -360,6 +361,7 @@ private:
 
   std::string  m_modemPort;
   std::string  m_modemProtocol;
+  unsigned int m_modemSpeed;
   unsigned int m_modemAddress;
   bool         m_modemRXInvert;
   bool         m_modemTXInvert;
diff --git a/Display.cpp b/Display.cpp
index 0b47b64..22bc953 100644
--- a/Display.cpp
+++ b/Display.cpp
@@ -511,7 +511,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
 		if (port == "modem")
 			serial = new CModemSerialPort(modem);
 		else
-			serial = new CSerialController(port, (type == "TFT Serial") ? SERIAL_9600 : SERIAL_115200);
+			serial = new CSerialController(port, (type == "TFT Serial") ? 9600U : 115200U);
 
 		if (type == "TFT Surenoo")
 			display = new CTFTSurenoo(conf.getCallsign(), dmrid, serial, brightness, conf.getDuplex());
@@ -565,11 +565,11 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
                 		display = new CNullDisplay;
                         }
 		} else {
-			SERIAL_SPEED baudrate = SERIAL_9600;
-			if (screenLayout==4U)
-				baudrate = SERIAL_115200;
+			unsigned int baudrate = 9600U;
+			if (screenLayout == 4U)
+				baudrate = 115200U;
 			
-			LogInfo("    Display baudrate: %u ",baudrate);
+			LogInfo("    Display baudrate: %u ", baudrate);
 			ISerialPort* serial = new CSerialController(port, baudrate);
 			display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF, conf.getLocation());
 		}
diff --git a/I2CController.cpp b/I2CController.cpp
index 247129c..c6b7c77 100644
--- a/I2CController.cpp
+++ b/I2CController.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2002-2004,2007-2011,2013,2014-2017 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2002-2004,2007-2011,2013,2014-2017,2020 by Jonathan Naylor G4KLX
  *   Copyright (C) 1999-2001 by Thomas Sailor HB9JNX
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <setupapi.h>
 #include <winioctl.h>
 
-CI2CController::CI2CController(const std::string& device, SERIAL_SPEED speed, unsigned int address, bool assertRTS) :
+CI2CController::CI2CController(const std::string& device, unsigned int speed, unsigned int address, bool assertRTS) :
 CSerialController(device, speed, assertRTS),
 m_address(address)
 {
@@ -67,7 +67,7 @@ int CI2CController::write(const unsigned char* buffer, unsigned int length)
 #include <linux/i2c-dev.h>
 #endif
 
-CI2CController::CI2CController(const std::string& device, SERIAL_SPEED speed, unsigned int address, bool assertRTS) :
+CI2CController::CI2CController(const std::string& device, unsigned int speed, unsigned int address, bool assertRTS) :
 CSerialController(device, speed, assertRTS),
 m_address(address)
 {
@@ -89,13 +89,13 @@ bool CI2CController::open()
 	}
 
 	if (::ioctl(m_fd, I2C_TENBIT, 0) < 0) {
-		LogError("CI2C: failed to set 7bitaddress");
+		LogError("I2C: failed to set 7bitaddress");
 		::close(m_fd);
 		return false;
 	}
 
 	if (::ioctl(m_fd, I2C_SLAVE, m_address) < 0) {
-		LogError("CI2C: Failed to acquire bus access/talk to slave 0x%02X", m_address);
+		LogError("I2C: Failed to acquire bus access/talk to slave 0x%02X", m_address);
 		::close(m_fd);
 		return false;
 	}
diff --git a/I2CController.h b/I2CController.h
index 6e59672..a67db85 100644
--- a/I2CController.h
+++ b/I2CController.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2002-2004,2007-2009,2011-2013,2015-2017 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2002-2004,2007-2009,2011-2013,2015-2017,2020 by Jonathan Naylor G4KLX
  *   Copyright (C) 1999-2001 by Thomas Sailor HB9JNX
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 
 class CI2CController : public CSerialController {
 public:
-	CI2CController(const std::string& device, SERIAL_SPEED speed, unsigned int address = 0x22U, bool assertRTS = false);
+	CI2CController(const std::string& device, unsigned int speed, unsigned int address = 0x22U, bool assertRTS = false);
 	virtual ~CI2CController();
 
 	virtual bool open();
diff --git a/MMDVM.ini b/MMDVM.ini
index 60bdff4..c031c49 100644
--- a/MMDVM.ini
+++ b/MMDVM.ini
@@ -45,6 +45,7 @@ Time=24
 # Port=/dev/ttyAMA0
 Port=\\.\COM4
 Protocol=uart
+Speed=115200
 # Address=0x22
 TXInvert=1
 RXInvert=0
diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
index 8957c29..9d9a01e 100644
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@@ -1204,6 +1204,7 @@ bool CMMDVMHost::createModem()
 {
 	std::string port             = m_conf.getModemPort();
 	std::string protocol	     = m_conf.getModemProtocol();
+	unsigned int speed           = m_conf.getModemSpeed();
 	unsigned int address	     = m_conf.getModemAddress();
 	bool rxInvert                = m_conf.getModemRXInvert();
 	bool txInvert                = m_conf.getModemTXInvert();
@@ -1239,7 +1240,8 @@ bool CMMDVMHost::createModem()
 	LogInfo("    Port: %s", port.c_str());
 	LogInfo("    Protocol: %s", protocol.c_str());
 	if (protocol == "i2c")
-		LogInfo("    i2c Address: %02X", address);
+		LogInfo("    I2C Address: %02X", address);
+	LogInfo("    Speed: %u", speed);
 	LogInfo("    RX Invert: %s", rxInvert ? "yes" : "no");
 	LogInfo("    TX Invert: %s", txInvert ? "yes" : "no");
 	LogInfo("    PTT Invert: %s", pttInvert ? "yes" : "no");
@@ -1262,7 +1264,7 @@ bool CMMDVMHost::createModem()
 	LogInfo("    TX Frequency: %uHz (%uHz)", txFrequency, txFrequency + txOffset);
 
 	m_modem = CModem::createModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug);
-	m_modem->setSerialParams(protocol,address);
+	m_modem->setSerialParams(protocol, address, speed);
 	m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled, m_p25Enabled, m_nxdnEnabled, m_pocsagEnabled, m_fmEnabled);
 	m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel);
 	m_modem->setRFParams(rxFrequency, rxOffset, txFrequency, txOffset, txDCOffset, rxDCOffset, rfLevel, pocsagFrequency);
diff --git a/Modem.cpp b/Modem.cpp
index 4d5aaab..f648d22 100644
--- a/Modem.cpp
+++ b/Modem.cpp
@@ -221,13 +221,13 @@ CModem::~CModem()
 	delete[] m_buffer;
 }
 
-void CModem::setSerialParams(const std::string& protocol, unsigned int address)
+void CModem::setSerialParams(const std::string& protocol, unsigned int address, unsigned int speed)
 {
 	// Create the serial controller instance according the protocol specified in conf.
 	if (protocol == "i2c")
-		m_serial = new CI2CController(m_port, SERIAL_115200, address, true);
+		m_serial = new CI2CController(m_port, speed, address, true);
 	else
-		m_serial = new CSerialController(m_port, SERIAL_115200, true);
+		m_serial = new CSerialController(m_port, speed, true);
 }
 
 void CModem::setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency)
diff --git a/Modem.h b/Modem.h
index c6bd0c6..48d59b4 100644
--- a/Modem.h
+++ b/Modem.h
@@ -37,7 +37,7 @@ public:
 	CModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool trace, bool debug);
 	virtual ~CModem();
 
-	virtual void setSerialParams(const std::string& protocol, unsigned int address);
+	virtual void setSerialParams(const std::string& protocol, unsigned int address, unsigned int speed);
 	virtual void setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency);
 	virtual void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool pocsagEnabled, bool fmEnabled);
 	virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel, float fmTXLevel);
diff --git a/SerialController.cpp b/SerialController.cpp
index cfb448d..aacc6c6 100644
--- a/SerialController.cpp
+++ b/SerialController.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2002-2004,2007-2011,2013,2014-2017,2019 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2002-2004,2007-2011,2013,2014-2017,2019,2020 by Jonathan Naylor G4KLX
  *   Copyright (C) 1999-2001 by Thomas Sailor HB9JNX
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -23,12 +23,11 @@
 #include <cstring>
 #include <cassert>
 
-#include <sys/types.h>
-
 #if defined(_WIN32) || defined(_WIN64)
 #include <setupapi.h>
 #include <winioctl.h>
 #else
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <cerrno>
@@ -40,7 +39,7 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 
-CSerialController::CSerialController(const std::string& device, SERIAL_SPEED speed, bool assertRTS) :
+CSerialController::CSerialController(const std::string& device, unsigned int speed, bool assertRTS) :
 m_device(device),
 m_speed(speed),
 m_assertRTS(assertRTS),
@@ -221,7 +220,7 @@ void CSerialController::close()
 
 #else
 
-CSerialController::CSerialController(const std::string& device, SERIAL_SPEED speed, bool assertRTS) :
+CSerialController::CSerialController(const std::string& device, unsigned int speed, bool assertRTS) :
 m_device(device),
 m_speed(speed),
 m_assertRTS(assertRTS),
@@ -273,40 +272,40 @@ bool CSerialController::open()
 #endif
 
 		switch (m_speed) {
-			case SERIAL_1200:
+			case 1200U:
 				::cfsetospeed(&termios, B1200);
 				::cfsetispeed(&termios, B1200);
 				break;
-			case SERIAL_2400:
+			case 2400U:
 				::cfsetospeed(&termios, B2400);
 				::cfsetispeed(&termios, B2400);
 				break;
-			case SERIAL_4800:
+			case 4800U:
 				::cfsetospeed(&termios, B4800);
 				::cfsetispeed(&termios, B4800);
 				break;
-			case SERIAL_9600:
+			case 9600U:
 				::cfsetospeed(&termios, B9600);
 				::cfsetispeed(&termios, B9600);
 				break;
-			case SERIAL_19200:
+			case 19200U:
 				::cfsetospeed(&termios, B19200);
 				::cfsetispeed(&termios, B19200);
 				break;
-			case SERIAL_38400:
+			case 38400U:
 				::cfsetospeed(&termios, B38400);
 				::cfsetispeed(&termios, B38400);
 				break;
-			case SERIAL_115200:
+			case 115200U:
 				::cfsetospeed(&termios, B115200);
 				::cfsetispeed(&termios, B115200);
 				break;
-			case SERIAL_230400:
+			case 230400U:
 				::cfsetospeed(&termios, B230400);
 				::cfsetispeed(&termios, B230400);
 				break;
 			default:
-				LogError("Unsupported serial port speed - %d", int(m_speed));
+				LogError("Unsupported serial port speed - %u", m_speed);
 				::close(m_fd);
 				return false;
 		}
diff --git a/SerialController.h b/SerialController.h
index 6dfc461..c7f97eb 100644
--- a/SerialController.h
+++ b/SerialController.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2002-2004,2007-2009,2011-2013,2015-2017 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2002-2004,2007-2009,2011-2013,2015-2017,2020 by Jonathan Naylor G4KLX
  *   Copyright (C) 1999-2001 by Thomas Sailor HB9JNX
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -28,21 +28,9 @@
 #include <windows.h>
 #endif
 
-enum SERIAL_SPEED {
-	SERIAL_1200   = 1200,
-	SERIAL_2400   = 2400,
-	SERIAL_4800   = 4800,
-	SERIAL_9600   = 9600,
-	SERIAL_19200  = 19200,
-	SERIAL_38400  = 38400,
-	SERIAL_76800  = 76800,
-	SERIAL_115200 = 115200,
-	SERIAL_230400 = 230400
-};
-
 class CSerialController : public ISerialPort {
 public:
-	CSerialController(const std::string& device, SERIAL_SPEED speed, bool assertRTS = false);
+	CSerialController(const std::string& device, unsigned int speed, bool assertRTS = false);
 	virtual ~CSerialController();
 
 	virtual bool open();
@@ -59,7 +47,7 @@ public:
 
 protected:
 	std::string    m_device;
-	SERIAL_SPEED   m_speed;
+	unsigned int   m_speed;
 	bool           m_assertRTS;
 #if defined(_WIN32) || defined(_WIN64)
 	HANDLE         m_handle;
diff --git a/UMP.cpp b/UMP.cpp
index f843322..4aca606 100644
--- a/UMP.cpp
+++ b/UMP.cpp
@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2020 by Jonathan Naylor G4KLX
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ const unsigned char UMP_STATUS       = 0x50U;
 const unsigned int BUFFER_LENGTH = 255U;
 
 CUMP::CUMP(const std::string& port) :
-m_serial(port, SERIAL_115200),
+m_serial(port, 115200U),
 m_open(false),
 m_buffer(NULL),
 m_length(0U),
diff --git a/Version.h b/Version.h
index c48a90e..46f5c4f 100644
--- a/Version.h
+++ b/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200512";
+const char* VERSION = "20200523";
 
 #endif