From b4f883595f9cb1c6d5c3a83192e249c77f0f8042 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sat, 21 Sep 2013 20:27:27 -0700 Subject: [PATCH] Remove MAX2837_FREQ_NOMINAL_MHZ #define -- it must be updated now that IF is adjustable. So I pushed the calculation directly into the two places it was used. --- firmware/common/tuning.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c index a73c2f0d..bab3b7f1 100644 --- a/firmware/common/tuning.c +++ b/firmware/common/tuning.c @@ -38,8 +38,7 @@ #define MIN_HP_FREQ_MHZ (2700) #define MAX_HP_FREQ_MHZ (6800) -static uint32_t max2837_freq_nominal_hz=2600000000; -#define MAX2837_FREQ_NOMINAL_MHZ (max2837_freq_nominal_hz / FREQ_ONE_MHZ) +static uint32_t max2837_freq_nominal_hz=2560000000; uint32_t freq_mhz_cache=100, freq_hz_cache=0; /* @@ -64,7 +63,7 @@ bool set_freq(uint32_t freq_mhz, uint32_t freq_hz) if(freq_mhz < MAX_LP_FREQ_MHZ) { rf_path_set_filter(RF_PATH_FILTER_LOW_PASS); - RFFC5071_freq_mhz = MAX2837_FREQ_NOMINAL_MHZ - freq_mhz; + RFFC5071_freq_mhz = (max2837_freq_nominal_hz / FREQ_ONE_MHZ) - freq_mhz; /* Set Freq and read real freq */ real_RFFC5071_freq_hz = rffc5071_set_frequency(RFFC5071_freq_mhz); if(real_RFFC5071_freq_hz < RFFC5071_freq_mhz * FREQ_ONE_MHZ) @@ -85,7 +84,7 @@ bool set_freq(uint32_t freq_mhz, uint32_t freq_hz) }else if( (freq_mhz >= MIN_HP_FREQ_MHZ) && (freq_mhz < MAX_HP_FREQ_MHZ) ) { rf_path_set_filter(RF_PATH_FILTER_HIGH_PASS); - RFFC5071_freq_mhz = freq_mhz - MAX2837_FREQ_NOMINAL_MHZ; + RFFC5071_freq_mhz = freq_mhz - (max2837_freq_nominal_hz / FREQ_ONE_MHZ); /* Set Freq and read real freq */ real_RFFC5071_freq_hz = rffc5071_set_frequency(RFFC5071_freq_mhz); if(real_RFFC5071_freq_hz < RFFC5071_freq_mhz * FREQ_ONE_MHZ)