Merge branch 'master' into duplex

This commit is contained in:
Andy CA6JAU 2017-06-26 11:13:08 -04:00
commit cea661f533
16 changed files with 71 additions and 76 deletions

View file

@ -363,7 +363,11 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset)
ADF7021_REG2 = (uint32_t) 0b10 << 28; // invert data (and RC alpha = 0.5)
ADF7021_REG2 |= (uint32_t) (ADF7021_DEV_P25 / div2) << 19; // deviation
#if defined(ENABLE_P25_WIDE)
ADF7021_REG2 |= (uint32_t) 0b011 << 4; // modulation (4FSK)
#else
ADF7021_REG2 |= (uint32_t) 0b111 << 4; // modulation (RC 4FSK)
#endif
break;
default: