Refactored some class names.

g4klx · Feb 16, 2021 · ff9712b · ff9712b
1 parent 6344f8b
commit ff9712b
Show file tree

Hide file tree

Showing 18 changed files with 184 additions and 186 deletions.
diff --git a/AX25Network.h b/AX25Network.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2020,2021 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
@@ -20,7 +20,7 @@
 #define	AX25Network_H
 
 #if defined(_WIN32) || defined(_WIN64)
-#include "SerialController.h"
+#include "UARTController.h"
 #else
 #include "PseudoTTYController.h"
 #endif
@@ -47,7 +47,7 @@ class CAX25Network {
 
 private:
 #if defined(_WIN32) || defined(_WIN64)
-	CSerialController    m_serial;
+	CUARTController      m_serial;
 #else
 	CPseudoTTYController m_serial;
 #endif

diff --git a/Display.cpp b/Display.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017,2018,2020,2021 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
@@ -18,7 +18,7 @@
 
 #include "Display.h"
 #include "Defines.h"
-#include "SerialController.h"
+#include "UARTController.h"
 #include "ModemSerialPort.h"
 #include "NullDisplay.h"
 #include "TFTSurenoo.h"
@@ -556,7 +556,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, IModem* modem)
 		if (port == "modem")
 			serial = new IModemSerialPort(modem);
 		else
-			serial = new CSerialController(port, 115200U);
+			serial = new CUARTController(port, 115200U);
 
 		display = new CTFTSurenoo(conf.getCallsign(), dmrid, serial, brightness, conf.getDuplex());
 	} else if (type == "Nextion") {
@@ -605,7 +605,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, IModem* modem)
 				baudrate = 115200U;
 
 			LogInfo("    Display baudrate: %u ", baudrate);
-			ISerialPort* serial = new CSerialController(port, baudrate);
+			ISerialPort* serial = new CUARTController(port, baudrate);
 			display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF);
 		}
 	} else if (type == "LCDproc") {

diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
@@ -22,8 +22,8 @@
 #include "NXDNKenwoodNetwork.h"
 #include "NXDNIcomNetwork.h"
 #include "RSSIInterpolator.h"
-#include "SerialController.h"
-#include "SerialModem.h"
+#include "UARTController.h"
+#include "MMDVMModem.h"
 #include "NullModem.h"
 #include "Version.h"
 #include "StopWatch.h"
@@ -1393,7 +1393,7 @@ bool CMMDVMHost::createModem()
 	if (port == "NullModem")
 		m_modem = new CNullModem;
 	else
-		m_modem = new CSerialModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, useCOSAsLockout, trace, debug);
+		m_modem = new CMMDVMModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, useCOSAsLockout, trace, debug);
 	m_modem->setSerialParams(protocol, address, speed);
 	m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled, m_p25Enabled, m_nxdnEnabled, m_m17Enabled, m_pocsagEnabled, m_fmEnabled, m_ax25Enabled);
 	m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, m17TXLevel, pocsagTXLevel, fmTXLevel, ax25TXLevel);

diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj
@@ -243,8 +243,8 @@
     <ClInclude Include="RS241213.h" />
     <ClInclude Include="RSSIInterpolator.h" />
     <ClInclude Include="NXDNSACCH.h" />
-    <ClInclude Include="SerialController.h" />
-    <ClInclude Include="SerialModem.h" />
+    <ClInclude Include="UARTController.h" />
+    <ClInclude Include="MMDVMModem.h" />
     <ClInclude Include="SerialPort.h" />
     <ClInclude Include="SHA256.h" />
     <ClInclude Include="StopWatch.h" />
@@ -347,8 +347,8 @@
     <ClCompile Include="RS129.cpp" />
     <ClCompile Include="RS241213.cpp" />
     <ClCompile Include="RSSIInterpolator.cpp" />
-    <ClCompile Include="SerialController.cpp" />
-    <ClCompile Include="SerialModem.cpp" />
+    <ClCompile Include="UARTController.cpp" />
+    <ClCompile Include="MMDVMModem.cpp" />
     <ClCompile Include="SerialPort.cpp" />
     <ClCompile Include="SHA256.cpp" />
     <ClCompile Include="StopWatch.cpp" />

diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters
@@ -74,9 +74,6 @@
     <ClInclude Include="RS129.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SerialController.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="StopWatch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -332,9 +329,6 @@
     <ClInclude Include="PseudoTTYController.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SerialModem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="DMRDirectNetwork.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -344,6 +338,12 @@
     <ClInclude Include="SHA256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="MMDVMModem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UARTController.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BPTC19696.cpp">
@@ -397,9 +397,6 @@
     <ClCompile Include="RS129.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SerialController.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="StopWatch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -634,9 +631,6 @@
     <ClCompile Include="PseudoTTYController.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SerialModem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DMRDirectNetwork.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -646,5 +640,11 @@
     <ClCompile Include="SHA256.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="MMDVMModem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UARTController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>