Mirrors/hackrf
2
0
Fork 0
mirror of https://github.com/greatscottgadgets/hackrf.git synced 2026-03-03 14:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Call a sample rate a sample rate

Browse Source 
Previously we used "sample rate" to mean a rate that is twice the sample
rate in several places in firmware.
This commit is contained in:
Michael Ossmann
2026-01-13 19:28:42 -05:00
parent 4a12f4ffd0
commit 26c20f5762
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/common/fpga_selftest.c
View File

@@ -189,7 +189,7 @@ bool fpga_if_xcvr_selftest()
max2831_set_frequency(&max283x, 2500000000);
// Capture 1: 4 Msps, tone at 0.5 MHz, narrowband filter OFF
sample_rate_frac_set(4000000 * 2, 1);
sample_rate_frac_set(4000000, 1);
delay_us_at_mhz(1000, 204);
if (rx_samples(num_samples, 2000000) == -1) {
timeout = true;
@@ -212,7 +212,7 @@ bool fpga_if_xcvr_selftest()
// Capture 3: 20 Msps, tone at 5 MHz, narrowband filter OFF
fpga_set_tx_nco_pstep(&fpga, 255);
sample_rate_frac_set(20000000 * 2, 1);
sample_rate_frac_set(20000000, 1);
narrowband_filter_set(0);
delay_us_at_mhz(1000, 204);
if (rx_samples(num_samples, 2000000) == -1) {

12
firmware/common/hackrf_core.c
View File

@@ -505,7 +505,17 @@ bool sample_rate_frac_set(uint32_t rate_num, uint32_t rate_denom)
uint32_t a, b, c;
uint32_t rem;
hackrf_ui()->set_sample_rate(rate_num / 2);
/* Round to the nearest Hz for display. */
uint32_t rate_hz = (rate_num + (rate_denom >> 1)) / rate_denom;
hackrf_ui()->set_sample_rate(rate_hz);
/*
* First double the sample rate so that we can produce a clock at twice
* the intended sample rate. The 2x clock is sometimes used directly,
* and it is divided by two in an output divider to produce the actual
* AFE clock.
*/
rate_num *= 2;
/* Find best config */
a = (VCO_FREQ * rate_denom) / rate_num;

8
firmware/common/radio.c
View File

@@ -59,7 +59,7 @@ radio_error_t radio_set_sample_rate(
if ((config->mode == TRANSCEIVER_MODE_RX) ||
(config->mode == TRANSCEIVER_MODE_RX_SWEEP)) {
n = 1;
uint32_t afe_rate_x2 = 2 * sample_rate.hz;
uint32_t afe_rate_x2 = 4 * sample_rate.hz;
while ((afe_rate_x2 <= MAX_AFE_RATE) && (n < MAX_N)) {
afe_rate_x2 <<= 1;
n++;
@@ -120,12 +120,12 @@ radio_error_t radio_set_filter(
max283x_set_lpf_bandwidth(&max283x, filter.hz);
#else
uint32_t lpf_bandwidth =
(config->sample_rate[RADIO_SAMPLE_RATE_CLOCKGEN].hz * 3) / 8;
(config->sample_rate[RADIO_SAMPLE_RATE_CLOCKGEN].hz * 3) / 4;
uint32_t offset = 0;
if (config->shift != FPGA_QUARTER_SHIFT_MODE_NONE) {
offset = (config->sample_rate[RADIO_SAMPLE_RATE_CLOCKGEN].hz
<< config->resampling_n) /
8;
4;
}
lpf_bandwidth += offset * 2;
max2831_set_lpf_bandwidth(&max283x, lpf_bandwidth);
@@ -306,7 +306,7 @@ radio_error_t radio_set_frequency(
config->shift = tune_config->shift;
uint32_t offset = (config->sample_rate[RADIO_SAMPLE_RATE_CLOCKGEN].hz
<< config->resampling_n) /
8;
4;
ok = tuning_set_frequency(tune_config, frequency.hz, offset);
if (ok) {
radio_channel_t* channel = &radio->channel[chan_id];

2
firmware/hackrf_usb/usb_api_transceiver.c
View File

@@ -177,7 +177,7 @@ usb_request_status_t usb_vendor_request_set_sample_rate_frac(
RADIO_CHANNEL0,
RADIO_SAMPLE_RATE_CLOCKGEN,
(radio_sample_rate_t){
.num = set_sample_r_params.freq_hz * 2,
.num = set_sample_r_params.freq_hz,
.div = set_sample_r_params.divider,
});
if (result == RADIO_OK) {