MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged branch master into develop

Browse Source
This commit is contained in:
Tony Corbett G0WFV
2016-05-12 09:55:40 +01:00
parent 74eb55ae7e 73ceca706c
commit 2e7d305049
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AMBEFEC.cpp
View File

@@ -645,7 +645,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c0data = CGolay24128::decode23127(g1); unsigned int c0data = CGolay24128::decode23127(g1);
unsigned int g2 = CGolay24128::encode23127(c0data); unsigned int g2 = CGolay24128::encode23127(c0data);
for (int i = 23; i >= 0; i--) { for (int i = 22; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }
@@ -670,7 +670,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c1data = CGolay24128::decode23127(g1); unsigned int c1data = CGolay24128::decode23127(g1);
g2 = CGolay24128::encode23127(c1data); g2 = CGolay24128::encode23127(c1data);
for (int i = 23; i >= 0; i--) { for (int i = 22; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }
@@ -682,7 +682,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c2data = CGolay24128::decode23127(g1); unsigned int c2data = CGolay24128::decode23127(g1);
g2 = CGolay24128::encode23127(c2data); g2 = CGolay24128::encode23127(c2data);
for (int i = 23; i >= 0; i--) { for (int i = 22; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }
@@ -694,7 +694,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c3data = CGolay24128::decode23127(g1); unsigned int c3data = CGolay24128::decode23127(g1);
g2 = CGolay24128::encode23127(c3data); g2 = CGolay24128::encode23127(c3data);
for (int i = 23; i >= 0; i--) { for (int i = 22; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }

2
YSFFICH.cpp
View File

@@ -193,7 +193,7 @@ void CYSFFICH::setFI(unsigned char fi)
void CYSFFICH::setMR(unsigned char mr) void CYSFFICH::setMR(unsigned char mr)
{ {
m_fich[2U] &= 0xC7U; m_fich[2U] &= 0xC7U;
m_fich[2U] |= mr; m_fich[2U] |= (mr << 3) & 0x38U;
} }
void CYSFFICH::setVoIP(bool on) void CYSFFICH::setVoIP(bool on)