Merge remote-tracking branch 'g4klx/master' into c4fmdemod

c4fmdemod
Andy CA6JAU 2017-04-09 15:02:57 -03:00
commit 9efe38d825
2 changed files with 10 additions and 10 deletions

View File

@ -72,9 +72,9 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#if defined(EXTERNAL_OSC) #if defined(EXTERNAL_OSC)
#define DESCRIPTION "MMDVM 20170303 TCXO (D-Star/DMR/System Fusion/P25/RSSI/CW Id)" #define DESCRIPTION "MMDVM 20170406 TCXO (D-Star/DMR/System Fusion/P25/RSSI/CW Id)"
#else #else
#define DESCRIPTION "MMDVM 20170303 (D-Star/DMR/System Fusion/P25/RSSI/CW Id)" #define DESCRIPTION "MMDVM 20170406 (D-Star/DMR/System Fusion/P25/RSSI/CW Id)"
#endif #endif
#define concat(a, b, c) a " (Build: " b " " c ")" #define concat(a, b, c) a " (Build: " b " " c ")"
const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__); const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);

View File

@ -37,15 +37,15 @@ static q15_t YSF_C4FSK_FILTER[] = {0, 0, 0, 0, 401, 104, -340, -731, -847, -553,
const uint16_t YSF_C4FSK_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L const uint16_t YSF_C4FSK_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L
#endif #endif
const q15_t YSF_LEVELA_HI = 3510; const q15_t YSF_LEVELA_HI = 3900;
const q15_t YSF_LEVELB_HI = 1170; const q15_t YSF_LEVELB_HI = 1300;
const q15_t YSF_LEVELC_HI = -1170; const q15_t YSF_LEVELC_HI = -1300;
const q15_t YSF_LEVELD_HI = -3510; const q15_t YSF_LEVELD_HI = -3900;
const q15_t YSF_LEVELA_LO = 1755; const q15_t YSF_LEVELA_LO = 1950;
const q15_t YSF_LEVELB_LO = 585; const q15_t YSF_LEVELB_LO = 650;
const q15_t YSF_LEVELC_LO = -585; const q15_t YSF_LEVELC_LO = -650;
const q15_t YSF_LEVELD_LO = -1755; const q15_t YSF_LEVELD_LO = -1950;
const uint8_t YSF_START_SYNC = 0x77U; const uint8_t YSF_START_SYNC = 0x77U;
const uint8_t YSF_END_SYNC = 0xFFU; const uint8_t YSF_END_SYNC = 0xFFU;