Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use symbolic names instead of magic numbers.

This commit is contained in:
Jonathan Naylor 2016-06-22 20:51:35 +01:00
parent 2d656b0126
commit 01d40782ca
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DMRTX.cpp
View File

@ -80,7 +80,7 @@ m_count(0U)
::memcpy(m_newShortLC, EMPTY_SHORT_LC, 12U); ::memcpy(m_newShortLC, EMPTY_SHORT_LC, 12U);
::memcpy(m_shortLC, 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_levelA[i] = DMR_LEVEL3;
m_levelB[i] = DMR_LEVEL1; m_levelB[i] = DMR_LEVEL1;
m_levelC[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 level1 = res1 / 1000;
q15_t level3 = res3 / 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_levelA[i] = level3;
m_levelB[i] = level1; m_levelB[i] = level1;
m_levelC[i] = -level1; m_levelC[i] = -level1;

8
DMRTX.h
View File

@ -57,10 +57,10 @@ public:
private: private:
CSerialRB m_fifo[2U]; CSerialRB m_fifo[2U];
q15_t m_levelA[5U]; q15_t m_levelA[DMR_RADIO_SYMBOL_LENGTH];
q15_t m_levelB[5U]; q15_t m_levelB[DMR_RADIO_SYMBOL_LENGTH];
q15_t m_levelC[5U]; q15_t m_levelC[DMR_RADIO_SYMBOL_LENGTH];
q15_t m_levelD[5U]; q15_t m_levelD[DMR_RADIO_SYMBOL_LENGTH];
arm_fir_instance_q15 m_modFilter; arm_fir_instance_q15 m_modFilter;
q15_t m_modState[70U]; // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare q15_t m_modState[70U]; // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
DMRTXSTATE m_state; DMRTXSTATE m_state;

4
DStarTX.cpp
View File

@ -205,7 +205,7 @@ m_count(0U)
m_modFilter.pState = m_modState; m_modFilter.pState = m_modState;
m_modFilter.pCoeffs = DSTAR_GMSK_FILTER; 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_level0[i] = -DSTAR_LEVEL;
m_level1[i] = DSTAR_LEVEL; m_level1[i] = DSTAR_LEVEL;
} }
@ -479,7 +479,7 @@ void CDStarTX::setLevels(int8_t percent)
q15_t level = res / 1000; 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_level0[i] = -level;
m_level1[i] = level; m_level1[i] = level;
} }

4
DStarTX.h
View File

@ -40,8 +40,8 @@ public:
private: private:
CSerialRB m_buffer; CSerialRB m_buffer;
q15_t m_level0[5U]; q15_t m_level0[DSTAR_RADIO_BIT_LENGTH];
q15_t m_level1[5U]; q15_t m_level1[DSTAR_RADIO_BIT_LENGTH];
arm_fir_instance_q15 m_modFilter; arm_fir_instance_q15 m_modFilter;
q15_t m_modState[60U]; // NoTaps + BlockSize - 1, 12 + 40 - 1 plus some spare q15_t m_modState[60U]; // NoTaps + BlockSize - 1, 12 + 40 - 1 plus some spare
uint8_t m_poBuffer[400U]; uint8_t m_poBuffer[400U];

4
YSFTX.cpp
View File

@ -56,7 +56,7 @@ m_count(0U)
m_modFilter.pState = m_modState; m_modFilter.pState = m_modState;
m_modFilter.pCoeffs = YSF_C4FSK_FILTER; 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_levelA[i] = YSF_LEVEL3;
m_levelB[i] = YSF_LEVEL1; m_levelB[i] = YSF_LEVEL1;
m_levelC[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 level1 = res1 / 1000;
q15_t level3 = res3 / 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_levelA[i] = level3;
m_levelB[i] = level1; m_levelB[i] = level1;
m_levelC[i] = -level1; m_levelC[i] = -level1;

8
YSFTX.h
View File

@ -38,10 +38,10 @@ public:
private: private:
CSerialRB m_buffer; CSerialRB m_buffer;
q15_t m_levelA[5U]; q15_t m_levelA[YSF_RADIO_SYMBOL_LENGTH];
q15_t m_levelB[5U]; q15_t m_levelB[YSF_RADIO_SYMBOL_LENGTH];
q15_t m_levelC[5U]; q15_t m_levelC[YSF_RADIO_SYMBOL_LENGTH];
q15_t m_levelD[5U]; q15_t m_levelD[YSF_RADIO_SYMBOL_LENGTH];
arm_fir_instance_q15 m_modFilter; arm_fir_instance_q15 m_modFilter;
q15_t m_modState[70U]; // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare q15_t m_modState[70U]; // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
uint8_t m_poBuffer[720U]; uint8_t m_poBuffer[720U];