From 4580824866cde43a7d8d601f40ab7d5107affd92 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Tue, 30 Dec 2025 19:42:42 -0500 Subject: [PATCH] Don't commit to table-based tuning for non-praline --- firmware/common/radio.c | 2 +- firmware/common/tune_config.h | 5 +---- firmware/common/tuning.c | 15 --------------- firmware/common/tuning.h | 4 +++- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/firmware/common/radio.c b/firmware/common/radio.c index 1bd4af43..5cd95ad3 100644 --- a/firmware/common/radio.c +++ b/firmware/common/radio.c @@ -212,7 +212,7 @@ radio_error_t radio_set_frequency( case TRANSCEIVER_MODE_RX_SWEEP: case TRANSCEIVER_MODE_TX: // TODO return if, of components so we can support them in the getter - real_hz = tuning_set_frequency(max283x_tune_config, frequency.hz); + real_hz = set_freq(frequency.hz); break; default: return RADIO_ERR_INVALID_CONFIG; diff --git a/firmware/common/tune_config.h b/firmware/common/tune_config.h index cbbbe431..203473e7 100644 --- a/firmware/common/tune_config.h +++ b/firmware/common/tune_config.h @@ -22,16 +22,13 @@ #ifndef __TUNE_CONFIG_H__ #define __TUNE_CONFIG_H__ +#ifdef PRALINE typedef struct { uint16_t rf_range_end_mhz; uint16_t if_mhz; bool high_lo; } tune_config_t; -#ifndef PRALINE -// TODO maybe one day? -static const tune_config_t max283x_tune_config[] = {}; -#else // clang-format off /* tuning table optimized for TX */ static const tune_config_t max2831_tune_config_tx[] = { diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c index 72f54f3d..2f1d0cac 100644 --- a/firmware/common/tuning.c +++ b/firmware/common/tuning.c @@ -143,22 +143,7 @@ bool set_freq(const uint64_t freq) return success; } -uint64_t tuning_set_frequency(const tune_config_t* config, const uint64_t frequency_hz) -{ - (void) config; - - bool result = set_freq(frequency_hz); - if (!result) { - return 0; - } - - return frequency_hz; -} #else -bool set_freq(const uint64_t freq) -{ - return tuning_set_frequency(max2831_tune_config_rx_sweep, freq) != 0; -} uint64_t tuning_set_frequency(const tune_config_t* cfg, const uint64_t freq) { diff --git a/firmware/common/tuning.h b/firmware/common/tuning.h index 76bbb5b3..ef62cafb 100644 --- a/firmware/common/tuning.h +++ b/firmware/common/tuning.h @@ -30,12 +30,14 @@ #include #include -bool set_freq(const uint64_t freq); // TODO deprecate +bool set_freq(const uint64_t freq); bool set_freq_explicit( const uint64_t if_freq_hz, const uint64_t lo_freq_hz, const rf_path_filter_t path); +#ifdef PRALINE uint64_t tuning_set_frequency(const tune_config_t* config, const uint64_t frequency_hz); +#endif #endif /*__TUNING_H__*/