From 01d40782caa6a8117a51b5fbf4b3385c1ec97c3c Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Wed, 22 Jun 2016 20:51:35 +0100
Subject: [PATCH] Use symbolic names instead of magic numbers.

---
 DMRTX.cpp   | 4 ++--
 DMRTX.h     | 8 ++++----
 DStarTX.cpp | 4 ++--
 DStarTX.h   | 4 ++--
 YSFTX.cpp   | 4 ++--
 YSFTX.h     | 8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/DMRTX.cpp b/DMRTX.cpp
index af6173f..e73d6d6 100644
--- a/DMRTX.cpp
+++ b/DMRTX.cpp
@@ -80,7 +80,7 @@ m_count(0U)
   ::memcpy(m_newShortLC, EMPTY_SHORT_LC, 12U);
   ::memcpy(m_shortLC,    EMPTY_SHORT_LC, 12U);
 
-  for (uint8_t i = 0U; i < 5U; i++) {
+  for (uint8_t i = 0U; i < DMR_RADIO_SYMBOL_LENGTH; i++) {
     m_levelA[i] =  DMR_LEVEL3;
     m_levelB[i] =  DMR_LEVEL1;
     m_levelC[i] = -DMR_LEVEL1;
@@ -403,7 +403,7 @@ void CDMRTX::setLevels(int8_t percent1, int8_t percent3)
   q15_t level1 = res1 / 1000;
   q15_t level3 = res3 / 1000;
 
-  for (uint8_t i = 0U; i < 5U; i++) {
+  for (uint8_t i = 0U; i < DMR_RADIO_SYMBOL_LENGTH; i++) {
     m_levelA[i] =  level3;
     m_levelB[i] =  level1;
     m_levelC[i] = -level1;
diff --git a/DMRTX.h b/DMRTX.h
index 7cb3c0b..a42c850 100644
--- a/DMRTX.h
+++ b/DMRTX.h
@@ -57,10 +57,10 @@ public:
 
 private:
   CSerialRB            m_fifo[2U];
-  q15_t                m_levelA[5U];
-  q15_t                m_levelB[5U];
-  q15_t                m_levelC[5U];
-  q15_t                m_levelD[5U];
+  q15_t                m_levelA[DMR_RADIO_SYMBOL_LENGTH];
+  q15_t                m_levelB[DMR_RADIO_SYMBOL_LENGTH];
+  q15_t                m_levelC[DMR_RADIO_SYMBOL_LENGTH];
+  q15_t                m_levelD[DMR_RADIO_SYMBOL_LENGTH];
   arm_fir_instance_q15 m_modFilter;
   q15_t                m_modState[70U];    // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
   DMRTXSTATE           m_state;
diff --git a/DStarTX.cpp b/DStarTX.cpp
index 14bd713..b80c4be 100644
--- a/DStarTX.cpp
+++ b/DStarTX.cpp
@@ -205,7 +205,7 @@ m_count(0U)
   m_modFilter.pState  = m_modState;
   m_modFilter.pCoeffs = DSTAR_GMSK_FILTER;
 
-  for (uint8_t i = 0U; i < 5U; i++) {
+  for (uint8_t i = 0U; i < DSTAR_RADIO_BIT_LENGTH; i++) {
     m_level0[i] = -DSTAR_LEVEL;
     m_level1[i] =  DSTAR_LEVEL;
   }
@@ -479,7 +479,7 @@ void CDStarTX::setLevels(int8_t percent)
 
   q15_t level = res / 1000;
 
-  for (uint8_t i = 0U; i < 5U; i++) {
+  for (uint8_t i = 0U; i < DSTAR_RADIO_BIT_LENGTH; i++) {
     m_level0[i] = -level;
     m_level1[i] =  level;
   }
diff --git a/DStarTX.h b/DStarTX.h
index c3cb177..ab9ae17 100644
--- a/DStarTX.h
+++ b/DStarTX.h
@@ -40,8 +40,8 @@ public:
 
 private:
   CSerialRB            m_buffer;
-  q15_t                m_level0[5U];
-  q15_t                m_level1[5U];
+  q15_t                m_level0[DSTAR_RADIO_BIT_LENGTH];
+  q15_t                m_level1[DSTAR_RADIO_BIT_LENGTH];
   arm_fir_instance_q15 m_modFilter;
   q15_t                m_modState[60U];    // NoTaps + BlockSize - 1, 12 + 40 - 1 plus some spare
   uint8_t              m_poBuffer[400U];
diff --git a/YSFTX.cpp b/YSFTX.cpp
index e433ab4..f2652dc 100644
--- a/YSFTX.cpp
+++ b/YSFTX.cpp
@@ -56,7 +56,7 @@ m_count(0U)
   m_modFilter.pState  = m_modState;
   m_modFilter.pCoeffs = YSF_C4FSK_FILTER;
 
-  for (uint8_t i = 0U; i < 5U; i++) {
+  for (uint8_t i = 0U; i < YSF_RADIO_SYMBOL_LENGTH; i++) {
     m_levelA[i] =  YSF_LEVEL3;
     m_levelB[i] =  YSF_LEVEL1;
     m_levelC[i] = -YSF_LEVEL1;
@@ -200,7 +200,7 @@ void CYSFTX::setLevels(int8_t percent1, int8_t percent3)
   q15_t level1 = res1 / 1000;
   q15_t level3 = res3 / 1000;
 
-  for (uint8_t i = 0U; i < 5U; i++) {
+  for (uint8_t i = 0U; i < YSF_RADIO_SYMBOL_LENGTH; i++) {
     m_levelA[i] =  level3;
     m_levelB[i] =  level1;
     m_levelC[i] = -level1;
diff --git a/YSFTX.h b/YSFTX.h
index 9ae8cef..0e5cb18 100644
--- a/YSFTX.h
+++ b/YSFTX.h
@@ -38,10 +38,10 @@ public:
 
 private:
   CSerialRB            m_buffer;
-  q15_t                m_levelA[5U];
-  q15_t                m_levelB[5U];
-  q15_t                m_levelC[5U];
-  q15_t                m_levelD[5U];
+  q15_t                m_levelA[YSF_RADIO_SYMBOL_LENGTH];
+  q15_t                m_levelB[YSF_RADIO_SYMBOL_LENGTH];
+  q15_t                m_levelC[YSF_RADIO_SYMBOL_LENGTH];
+  q15_t                m_levelD[YSF_RADIO_SYMBOL_LENGTH];
   arm_fir_instance_q15 m_modFilter;
   q15_t                m_modState[70U];    // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
   uint8_t              m_poBuffer[720U];