Update

Config.h

@@ -67,7 +67,7 @@
 // #define SERIAL_REPEATER
 
 // To reduce CPU load, you can remove the DC blocker by commenting out the next line
-// #define USE_DCBLOCKER
+#define USE_DCBLOCKER
 
 // Constant Service LED once repeater is running 
 // Do not use if employing an external hardware watchdog 

DMRDMOTX.cpp

@@ -44,13 +44,6 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
 #define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
 #define READ_BIT1(p,i)    (p[(i)>>3] & BIT_MASK_TABLE[(i)&7])
 
-// PR FILL pattern
-const uint8_t PR_FILL[] =
-        {0x63U, 0xEAU, 0x00U, 0x76U, 0x6CU, 0x76U, 0xC4U, 0x52U, 0xC8U, 0x78U,
-         0x09U, 0x2DU, 0xB8U, 0x79U, 0x27U, 0x57U, 0x9BU, 0x31U, 0xBCU, 0x3EU,
-         0xEAU, 0x45U, 0xC3U, 0x30U, 0x49U, 0x17U, 0x93U, 0xAEU, 0x8BU, 0x6DU,
-         0xA4U, 0xA5U, 0xADU, 0xA2U, 0xF1U, 0x35U, 0xB5U, 0x3CU, 0x1EU};
-
 const uint8_t DMR_SYNC = 0x5FU;
 
 CDMRDMOTX::CDMRDMOTX() :
@@ -79,11 +72,11 @@ void CDMRDMOTX::process()
 
       m_poLen = m_txDelay;
     } else {
-      for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
+      for (unsigned int i = 0U; i < 72U; i++)
-        m_poBuffer[i] = m_fifo.get();
+        m_poBuffer[i] = DMR_SYNC;
 
-      for (unsigned int i = 0U; i < 39U; i++)
+      for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
-        m_poBuffer[i + DMR_FRAME_LENGTH_BYTES] = PR_FILL[i];
+        m_poBuffer[i + 39U] = m_fifo.get();
 
       m_poLen = 72U;
     }

MMDVM_STM32F4xx.coproj

@@ -247,9 +247,9 @@
     <File name="CalNXDN.cpp" path="CalNXDN.cpp" type="1"/>
     <File name="NXDNTX.cpp" path="NXDNTX.cpp" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" path="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" type="1"/>
-    <File name="DMRSlotRX.h" path="DMRSlotRX.h" type="1"/>
     <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_tim.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_tim.c" type="1"/>
     <File name="YSFRX.h" path="YSFRX.h" type="1"/>
+    <File name="DMRSlotRX.h" path="DMRSlotRX.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Include" path="" type="2"/>
     <File name="NXDNRX.cpp" path="NXDNRX.cpp" type="1"/>
     <File name="DMRDMORX.cpp" path="DMRDMORX.cpp" type="1"/>
@@ -275,24 +275,24 @@
     <File name="DMRDMORX.h" path="DMRDMORX.h" type="1"/>
     <File name="SerialPort.h" path="SerialPort.h" type="1"/>
     <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" type="1"/>
-    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
     <File name="CWIdTX.h" path="CWIdTX.h" type="1"/>
     <File name="CalDStarTX.cpp" path="CalDStarTX.cpp" type="1"/>
     <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source" path="" type="2"/>
-    <File name="CalDMR.h" path="CalDMR.h" type="1"/>
     <File name="DMRDMOTX.h" path="DMRDMOTX.h" type="1"/>
     <File name="IODue.cpp" path="IODue.cpp" type="1"/>
+    <File name="CalDMR.h" path="CalDMR.h" type="1"/>
     <File name="DMRTX.cpp" path="DMRTX.cpp" type="1"/>
-    <File name="CalRSSI.h" path="CalRSSI.h" type="1"/>
     <File name="P25RX.cpp" path="P25RX.cpp" type="1"/>
+    <File name="CalRSSI.h" path="CalRSSI.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Lib/GCC" path="" type="2"/>
     <File name="STM32F4XX_Lib" path="" type="2"/>
     <File name="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" type="1"/>
     <File name="DMRTX.h" path="DMRTX.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/system_stm32f4xx.c" path="STM32F4XX_Lib/Device/system_stm32f4xx.c" type="1"/>
-    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" path="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" type="1"/>
+    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/startup" path="" type="2"/>
     <File name="SerialRB.h" path="SerialRB.h" type="1"/>
     <File name="NXDNDefines.h" path="NXDNDefines.h" type="1"/>
@@ -340,8 +340,8 @@
     <File name="P25TX.h" path="P25TX.h" type="1"/>
     <File name="RSSIRB.cpp" path="RSSIRB.cpp" type="1"/>
     <File name="DStarRX.cpp" path="DStarRX.cpp" type="1"/>
-    <File name="IOSTM.cpp" path="IOSTM.cpp" type="1"/>
     <File name="DMRSlotRX.cpp" path="DMRSlotRX.cpp" type="1"/>
+    <File name="IOSTM.cpp" path="IOSTM.cpp" type="1"/>
     <File name="P25TX.cpp" path="P25TX.cpp" type="1"/>
     <File name="SerialRB.cpp" path="SerialRB.cpp" type="1"/>
     <File name="CWIdTX.cpp" path="CWIdTX.cpp" type="1"/>

SerialPort.cpp

@@ -76,19 +76,24 @@ const uint8_t MMDVM_DEBUG3       = 0xF3U;
 const uint8_t MMDVM_DEBUG4       = 0xF4U;
 const uint8_t MMDVM_DEBUG5       = 0xF5U;
 
-
+#if EXTERNAL_OSC == 12000000
-#if defined(EXTERNAL_OSC)
+#define TCXO "12.0000"
-#define DESCRIPTION              "MMDVM 20180517 TCXO 48Khz (D-Star/DMR/System Fusion/P25/NXDN)"
+#elif EXTERNAL_OSC == 12288000
-#else
+#define TCXO "12.2880"
-#define DESCRIPTION              "MMDVM 20180517 48Khz (D-Star/DMR/System Fusion/P25/NXDN)"
+#elif EXTERNAL_OSC == 14400000
+#define TCXO "14.4000"
+#elif EXTERNAL_OSC == 19200000
+#define TCXO "19.2000"
 #endif
 
+#define DESCRIPTION              "MMDVM 20180607 (D-Star/DMR/System Fusion/P25/NXDN)"
+
 #if defined(GITVERSION)
-#define concat(a, b) a " GitID #" b ""
+#define concat(a, b, c) a " " b "MHz GitID #" c ""
-const char HARDWARE[] = concat(DESCRIPTION, GITVERSION);
+const char HARDWARE[] = concat(DESCRIPTION, TCXO, GITVERSION);
 #else
-#define concat(a, b, c) a " (Build: " b " " c ")"
+#define concat(a, b, c, d) a " " b "MHz (Build: " c " " d ")"
-const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);
+const char HARDWARE[] = concat(DESCRIPTION, TCXO, __TIME__, __DATE__);
 #endif
 
 const uint8_t PROTOCOL_VERSION   = 1U;