diff --git a/ADF7021.cpp b/ADF7021.cpp index a09fb64..fe8b6a7 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -413,7 +413,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; case STATE_NXDN: - // Dev: +1 symb 600 Hz, symb rate = 4800 + // Dev: +1 symb 350 Hz, symb rate = 2400 ADF7021_REG3 = ADF7021_REG3_NXDN; ADF7021_REG10 = ADF7021_REG10_NXDN; @@ -625,7 +625,7 @@ void CIO::ifConf2(MMDVM_STATE modemState) break; case STATE_NXDN: - // Dev: +1 symb 600 Hz, symb rate = 4800 + // Dev: +1 symb 350 Hz, symb rate = 2400 ADF7021_REG3 = ADF7021_REG3_NXDN; ADF7021_REG10 = ADF7021_REG10_NXDN; diff --git a/ADF7021.h b/ADF7021.h index 4e1881b..d6d7a1f 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -66,6 +66,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf // DEMOD_CLK = 2.4576 MHz (DSTAR) // DEMOD_CLK = 4.9152 MHz (DMR, YSF_L, P25) // DEMOD_CLK = 7.3728 MHz (YSF_H) +// DEMOD CLK = 3.6864 MHz (NXDN) #define ADF7021_PFD 3686400.0 // PLL (REG 01) @@ -84,7 +85,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #else #define ADF7021_DEV_P25 22U #endif -#define ADF7021_DEV_NXDN 22U +#define ADF7021_DEV_NXDN 13U // TX/RX CLOCK register (REG 03) #define ADF7021_REG3_DSTAR 0x2A4C4193 @@ -99,7 +100,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_L 0x2A4C80D3 #define ADF7021_REG3_YSF_H 0x2A4CC093 #define ADF7021_REG3_P25 0x2A4C80D3 -#define ADF7021_REG3_NXDN 0x2A4C80D3 +#define ADF7021_REG3_NXDN 0x2A4CC113 #endif // Discriminator bandwith, demodulator (REG 04) @@ -109,14 +110,14 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_L 393U // K=32 #define ADF7021_DISC_BW_YSF_H 516U // K=28 #define ADF7021_DISC_BW_P25 394U // K=32 -#define ADF7021_DISC_BW_NXDN 394U // K=32 +#define ADF7021_DISC_BW_NXDN 295U // K=32 // Post demodulator bandwith (REG 04) #define ADF7021_POST_BW_DSTAR 10U #define ADF7021_POST_BW_DMR 150U #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U -#define ADF7021_POST_BW_NXDN 6U +#define ADF7021_POST_BW_NXDN 7U // IF filter (REG 05) #define ADF7021_REG5 0x000024F5 @@ -258,7 +259,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_SLICER_TH_YSF_L 35U #define ADF7021_SLICER_TH_YSF_H 69U #define ADF7021_SLICER_TH_P25 43U -#define ADF7021_SLICER_TH_NXDN 43U +#define ADF7021_SLICER_TH_NXDN 26U #else @@ -267,7 +268,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_SLICER_TH_YSF_L 38U #define ADF7021_SLICER_TH_YSF_H 75U #define ADF7021_SLICER_TH_P25 47U -#define ADF7021_SLICER_TH_NXDN 47U +#define ADF7021_SLICER_TH_NXDN 26U #endif