diff --git a/DMRTX.cpp b/DMRTX.cpp index 6228879..e6c5327 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -34,10 +34,10 @@ static q15_t DMR_C4FSK_FILTER[] = {283, 198, 73, -78, -240, -393, -517, -590, const uint16_t DMR_C4FSK_FILTER_LEN = 82U; #endif -q15_t DMR_A[] = { 1280, 1280, 1280, 1280, 1280, 1280, 1280, 1280, 1280, 1280}; -q15_t DMR_B[] = { 427, 427, 427, 427, 427, 427, 427, 427, 427, 427}; -q15_t DMR_C[] = { -427, -427, -427, -427, -427, -427, -427, -427, -427, -427}; -q15_t DMR_D[] = {-1280, -1280, -1280, -1280, -1280, -1280, -1280, -1280, -1280, -1280}; +q15_t DMR_A[] = { 912, 912, 912, 912, 912, 912, 912, 912, 912, 912}; +q15_t DMR_B[] = { 304, 304, 304, 304, 304, 304, 304, 304, 304, 304}; +q15_t DMR_C[] = {-304, -304, -304, -304, -304, -304, -304, -304, -304, -304}; +q15_t DMR_D[] = {-912, -912, -912, -912, -912, -912, -912, -912, -912, -912}; // The PR FILL and Data Sync pattern. const uint8_t IDLE_DATA[] = diff --git a/DStarTX.cpp b/DStarTX.cpp index a357cac..c3a9528 100644 --- a/DStarTX.cpp +++ b/DStarTX.cpp @@ -30,8 +30,8 @@ const uint8_t FRAME_SYNC[] = {0xEAU, 0xA6U, 0x00U}; static q15_t DSTAR_GMSK_FILTER[] = {1, 4, 15, 52, 151, 380, 832, 1579, 2599, 3710, 4594, 4933, 4594, 3710, 2599, 1579, 832, 380, 151, 52, 15, 4, 1, 0}; const uint16_t DSTAR_GMSK_FILTER_LEN = 24U; -q15_t DSTAR_1[] = { 1600, 1600, 1600, 1600, 1600, 1600, 1600, 1600, 1600, 1600}; -q15_t DSTAR_0[] = {-1600, -1600, -1600, -1600, -1600, -1600, -1600, -1600, -1600, -1600}; +q15_t DSTAR_1[] = { 1615, 1615, 1615, 1615, 1615, 1615, 1615, 1615, 1615, 1615}; +q15_t DSTAR_0[] = {-1615, -1615, -1615, -1615, -1615, -1615, -1615, -1615, -1615, -1615}; const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; diff --git a/YSFTX.cpp b/YSFTX.cpp index fd5f6ac..ab79963 100644 --- a/YSFTX.cpp +++ b/YSFTX.cpp @@ -39,10 +39,10 @@ const uint16_t YSF_C4FSK_FILTER_LEN = 82U; const uint8_t YSF_START_SYNC = 0x77U; const uint8_t YSF_END_SYNC = 0xFFU; -q15_t YSF_A[] = { 1408, 1408, 1408, 1408, 1408, 1408, 1408, 1408, 1408, 1408}; -q15_t YSF_B[] = { 470, 470, 470, 470, 470, 470, 470, 470, 470, 470}; -q15_t YSF_C[] = { -470, -470, -470, -470, -470, -470, -470, -470, -470, -470}; -q15_t YSF_D[] = {-1408, -1408, -1408, -1408, -1408, -1408, -1408, -1408, -1408, -1408}; +q15_t YSF_A[] = { 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004, 1004}; +q15_t YSF_B[] = { 335, 335, 335, 335, 335, 335, 335, 335, 335, 335}; +q15_t YSF_C[] = { -335, -335, -335, -335, -335, -335, -335, -335, -335, -335}; +q15_t YSF_D[] = {-1004, -1004, -1004, -1004, -1004, -1004, -1004, -1004, -1004, -1004}; CYSFTX::CYSFTX() :