diff --git a/Config.h b/Config.h
index 5d7fc5f..124b793 100644
--- a/Config.h
+++ b/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
diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp
index 87f851d..9e10c0a 100644
--- a/DMRDMOTX.cpp
+++ b/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++)
- m_poBuffer[i] = m_fifo.get();
+ for (unsigned int i = 0U; i < 72U; i++)
+ m_poBuffer[i] = DMR_SYNC;
- for (unsigned int i = 0U; i < 39U; i++)
- m_poBuffer[i + DMR_FRAME_LENGTH_BYTES] = PR_FILL[i];
+ for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
+ m_poBuffer[i + 39U] = m_fifo.get();
m_poLen = 72U;
}
diff --git a/MMDVM_STM32F4xx.coproj b/MMDVM_STM32F4xx.coproj
index b502368..d3d976c 100644
--- a/MMDVM_STM32F4xx.coproj
+++ b/MMDVM_STM32F4xx.coproj
@@ -247,9 +247,9 @@
-
+
@@ -275,24 +275,24 @@
-
+
-
+
-
+
-
+
@@ -340,8 +340,8 @@
-
+
diff --git a/SerialPort.cpp b/SerialPort.cpp
index aa342bb..433a176 100644
--- a/SerialPort.cpp
+++ b/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 defined(EXTERNAL_OSC)
-#define DESCRIPTION "MMDVM 20180517 TCXO 48Khz (D-Star/DMR/System Fusion/P25/NXDN)"
-#else
-#define DESCRIPTION "MMDVM 20180517 48Khz (D-Star/DMR/System Fusion/P25/NXDN)"
+#if EXTERNAL_OSC == 12000000
+#define TCXO "12.0000"
+#elif EXTERNAL_OSC == 12288000
+#define TCXO "12.2880"
+#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 ""
-const char HARDWARE[] = concat(DESCRIPTION, GITVERSION);
+#define concat(a, b, c) a " " b "MHz GitID #" c ""
+const char HARDWARE[] = concat(DESCRIPTION, TCXO, GITVERSION);
#else
-#define concat(a, b, c) a " (Build: " b " " c ")"
-const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);
+#define concat(a, b, c, d) a " " b "MHz (Build: " c " " d ")"
+const char HARDWARE[] = concat(DESCRIPTION, TCXO, __TIME__, __DATE__);
#endif
const uint8_t PROTOCOL_VERSION = 1U;