From 2e6bb0ab6856d6168db07ad53ed41f42118133c2 Mon Sep 17 00:00:00 2001 From: mndza Date: Fri, 11 Jul 2025 12:29:11 +0200 Subject: [PATCH 50/75] firmware: rffc5071 synth configuration accepts Hz instead of MHz --- firmware/common/mixer.c | 6 +++--- firmware/common/mixer.h | 4 ++-- firmware/common/rffc5071.c | 25 ++++++++++++------------- firmware/common/rffc5071.h | 4 ++-- firmware/common/tuning.c | 17 +++++++---------- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/firmware/common/mixer.c b/firmware/common/mixer.c index 9aa556bf..e2747317 100644 --- a/firmware/common/mixer.c +++ b/firmware/common/mixer.c @@ -95,13 +95,13 @@ void mixer_setup(mixer_driver_t* const mixer) #endif } -uint64_t mixer_set_frequency(mixer_driver_t* const mixer, uint16_t mhz) +uint64_t mixer_set_frequency(mixer_driver_t* const mixer, uint64_t hz) { #if (defined JAWBREAKER || defined HACKRF_ONE) - return rffc5071_set_frequency(mixer, mhz); + return rffc5071_set_frequency(mixer, hz); #endif #ifdef RAD1O - return max2871_set_frequency(mixer, mhz); + return max2871_set_frequency(mixer, hz / 1000000); #endif } diff --git a/firmware/common/mixer.h b/firmware/common/mixer.h index fd7203c7..c882e898 100644 --- a/firmware/common/mixer.h +++ b/firmware/common/mixer.h @@ -37,8 +37,8 @@ typedef max2871_driver_t mixer_driver_t; extern void mixer_bus_setup(mixer_driver_t* const mixer); extern void mixer_setup(mixer_driver_t* const mixer); -/* Set frequency (MHz). */ -extern uint64_t mixer_set_frequency(mixer_driver_t* const mixer, uint16_t mhz); +/* Set frequency (Hz). */ +extern uint64_t mixer_set_frequency(mixer_driver_t* const mixer, uint64_t hz); /* Set up rx only, tx only, or full duplex. Chip should be disabled * before _tx, _rx, or _rxtx are called. */ diff --git a/firmware/common/rffc5071.c b/firmware/common/rffc5071.c index 2598754b..09686ee6 100644 --- a/firmware/common/rffc5071.c +++ b/firmware/common/rffc5071.c @@ -216,14 +216,14 @@ void rffc5071_enable(rffc5071_driver_t* const drv) rffc5071_regs_commit(drv); } -#define LO_MAX 5400 -#define REF_FREQ 40 -#define FREQ_ONE_MHZ (1000 * 1000) +#define FREQ_ONE_MHZ (1000ULL * 1000ULL) +#define REF_FREQ (40 * FREQ_ONE_MHZ) +#define LO_MAX (5400 * FREQ_ONE_MHZ) -/* configure frequency synthesizer (lo in MHz) */ -uint64_t rffc5071_config_synth(rffc5071_driver_t* const drv, uint16_t lo) +/* configure frequency synthesizer (lo in Hz) */ +uint64_t rffc5071_config_synth(rffc5071_driver_t* const drv, uint64_t lo) { - uint16_t fvco; + uint64_t fvco; uint8_t fbkdivlog; uint16_t n; uint64_t tune_freq_hz; @@ -232,7 +232,7 @@ uint64_t rffc5071_config_synth(rffc5071_driver_t* const drv, uint16_t lo) /* Calculate n_lo (no division) */ uint8_t n_lo = 0; - uint16_t x = LO_MAX >> 1; + uint64_t x = LO_MAX >> 1; while ((x >= lo) && (n_lo < 5)) { n_lo++; x >>= 1; @@ -245,7 +245,7 @@ uint64_t rffc5071_config_synth(rffc5071_driver_t* const drv, uint16_t lo) * maybe pump?) can be changed back after enable in order to * improve phase noise, since the VCO will already be stable * and will be unaffected. */ - if (fvco > 3200) { + if (fvco > (3200 * FREQ_ONE_MHZ)) { fbkdivlog = 2; set_RFFC5071_PLLCPL(drv, 3); } else { @@ -253,12 +253,12 @@ uint64_t rffc5071_config_synth(rffc5071_driver_t* const drv, uint16_t lo) set_RFFC5071_PLLCPL(drv, 2); } - uint64_t tmp_n = ((uint64_t) fvco << (24ULL - fbkdivlog)) / REF_FREQ; + uint64_t tmp_n = (fvco << (24ULL - fbkdivlog)) / REF_FREQ; n = tmp_n >> 24ULL; p1nmsb = (tmp_n >> 8ULL) & 0xffff; p1nlsb = tmp_n & 0xff; - tune_freq_hz = (tmp_n * REF_FREQ * FREQ_ONE_MHZ) >> (24 - fbkdivlog + n_lo); + tune_freq_hz = (tmp_n * REF_FREQ) >> (24 - fbkdivlog + n_lo); /* Path 2 */ set_RFFC5071_P2LODIV(drv, n_lo); @@ -272,13 +272,12 @@ uint64_t rffc5071_config_synth(rffc5071_driver_t* const drv, uint16_t lo) return tune_freq_hz; } -/* !!!!!!!!!!! hz is currently ignored !!!!!!!!!!! */ -uint64_t rffc5071_set_frequency(rffc5071_driver_t* const drv, uint16_t mhz) +uint64_t rffc5071_set_frequency(rffc5071_driver_t* const drv, uint64_t hz) { uint32_t tune_freq; rffc5071_disable(drv); - tune_freq = rffc5071_config_synth(drv, mhz); + tune_freq = rffc5071_config_synth(drv, hz); rffc5071_enable(drv); return tune_freq; diff --git a/firmware/common/rffc5071.h b/firmware/common/rffc5071.h index aa30183f..94904245 100644 --- a/firmware/common/rffc5071.h +++ b/firmware/common/rffc5071.h @@ -55,8 +55,8 @@ extern void rffc5071_reg_write(rffc5071_driver_t* const drv, uint8_t r, uint16_t * provided routines for those operations. */ extern void rffc5071_regs_commit(rffc5071_driver_t* const drv); -/* Set frequency (MHz). */ -extern uint64_t rffc5071_set_frequency(rffc5071_driver_t* const drv, uint16_t mhz); +/* Set frequency (Hz). */ +extern uint64_t rffc5071_set_frequency(rffc5071_driver_t* const drv, uint64_t hz); /* Set up rx only, tx only, or full duplex. Chip should be disabled * before _tx, _rx, or _rxtx are called. */ diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c index 120831c4..08432ad9 100644 --- a/firmware/common/tuning.c +++ b/firmware/common/tuning.c @@ -61,12 +61,10 @@ uint64_t freq_cache = 100000000; bool set_freq(const uint64_t freq) { bool success; - uint32_t mixer_freq_mhz; - uint32_t MAX2837_freq_hz; + uint64_t mixer_freq_hz; uint64_t real_mixer_freq_hz; const uint32_t freq_mhz = freq / FREQ_ONE_MHZ; - const uint32_t freq_hz = freq % FREQ_ONE_MHZ; success = true; @@ -80,16 +78,15 @@ bool set_freq(const uint64_t freq) /* IF is graduated from 2650 MHz to 2340 MHz */ max2837_freq_nominal_hz = (2650 * FREQ_ONE_MHZ) - (freq / 7); #endif - mixer_freq_mhz = (max2837_freq_nominal_hz / FREQ_ONE_MHZ) + freq_mhz; + mixer_freq_hz = max2837_freq_nominal_hz + freq; /* Set Freq and read real freq */ - real_mixer_freq_hz = mixer_set_frequency(&mixer, mixer_freq_mhz); + real_mixer_freq_hz = mixer_set_frequency(&mixer, mixer_freq_hz); max283x_set_frequency(&max283x, real_mixer_freq_hz - freq); sgpio_cpld_set_mixer_invert(&sgpio_config, 1); } else if ((freq_mhz >= MIN_BYPASS_FREQ_MHZ) && (freq_mhz < MAX_BYPASS_FREQ_MHZ)) { rf_path_set_filter(&rf_path, RF_PATH_FILTER_BYPASS); - MAX2837_freq_hz = (freq_mhz * FREQ_ONE_MHZ) + freq_hz; /* mixer_freq_mhz <= not used in Bypass mode */ - max283x_set_frequency(&max283x, MAX2837_freq_hz); + max283x_set_frequency(&max283x, freq); sgpio_cpld_set_mixer_invert(&sgpio_config, 0); } else if ((freq_mhz >= MIN_HP_FREQ_MHZ) && (freq_mhz <= MAX_HP_FREQ_MHZ)) { if (freq_mhz < MID1_HP_FREQ_MHZ) { @@ -107,9 +104,9 @@ bool set_freq(const uint64_t freq) ((freq - (MID2_HP_FREQ_MHZ * FREQ_ONE_MHZ)) / 9); } rf_path_set_filter(&rf_path, RF_PATH_FILTER_HIGH_PASS); - mixer_freq_mhz = freq_mhz - (max2837_freq_nominal_hz / FREQ_ONE_MHZ); + mixer_freq_hz = freq - max2837_freq_nominal_hz; /* Set Freq and read real freq */ - real_mixer_freq_hz = mixer_set_frequency(&mixer, mixer_freq_mhz); + real_mixer_freq_hz = mixer_set_frequency(&mixer, mixer_freq_hz); max283x_set_frequency(&max283x, freq - real_mixer_freq_hz); sgpio_cpld_set_mixer_invert(&sgpio_config, 0); } else { @@ -154,7 +151,7 @@ bool set_freq_explicit( sgpio_cpld_set_mixer_invert(&sgpio_config, 0); } if (path != RF_PATH_FILTER_BYPASS) { - (void) mixer_set_frequency(&mixer, lo_freq_hz / FREQ_ONE_MHZ); + (void) mixer_set_frequency(&mixer, lo_freq_hz); } return true; } -- 2.47.3