KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Freq calculation

Browse Source
pull/65/head
erikkaashoek 3 years ago
parent fff9bedf78
commit 35f77d5763
2 changed files with 60 additions and 23 deletions
Show Stats Download Patch File Download Diff File

21
sa_core.c
Unescape View File

@ -27,6 +27,12 @@
#pragma GCC optimize ("Os")
#endif
#if 0
#define TRACE(X) { DAC->DHR12R1 = (X*400); } // Enable for realtime tracing
#else
#define TRACE(X) // { DAC->DHR12R1 = (X*400); } // Enable for realtime tracing
#endif
#ifdef __FFT_DECONV__
void FFT(float *real, float *imag, int length, bool inverse);
float *real = (float *) &spi_buffer[0];
@ -89,7 +95,7 @@ static freq_t old_freq[5] = { 0, 0, 0, 0,0};
static freq_t real_old_freq[5] = { 0, 0, 0, 0,0};
static long real_offset = 0;
static float old_temp = 0.0;
static int LO_spur_shifted;
static int LO_mirrored;
static volatile int LO_shifting;
@ -424,6 +430,8 @@ void set_input_path(freq_t f)
enable_ADF_output(true, true);
else
enable_ADF_output(false, false);
TRACE(1);
goto common2;
case PATH_ULTRA:
enable_ultra(true);
@ -444,7 +452,6 @@ void set_input_path(freq_t f)
}
if (force_signal_path)
calculate_static_correction();
}
#endif
@ -3436,7 +3443,7 @@ static void calculate_static_correction(void) // Calculate the
- (S_STATE(setting.agc)? 0 : 33)
- (S_STATE(setting.lna)? 12 : 0)
+ (setting.extra_lna ? -26.5 : 0) // checked
+ (setting.mode == M_GENLOW ? (Si446x_get_temp() - 35.0) / 13.0 : (Si446x_get_temp() - 35.0) / 20.0) // About 7.7dB per 10 degrees C in output mode, 1 dB per 20 degrees in input mode
+ (setting.mode == M_GENLOW ? (old_temp - 35.0) / 13.0 : (old_temp - 35.0) / 20.0) // About 7.7dB per 10 degrees C in output mode, 1 dB per 20 degrees in input mode
#endif
- setting.external_gain);
}
@ -3486,11 +3493,8 @@ int test_output_attenuate = 0;
#ifdef TINYSA4
bool level_error = false;
bool depth_error = false;
static float old_temp = 0.0;
#endif
#define TRACE(X) // { DAC->DHR12R1 = (X*400); }
#endif
pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) // Measure the RSSI for one frequency, used from sweep and other measurement routines. Must do all HW setup
@ -3698,8 +3702,9 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
if (( setting.frequency_step != 0 || setting.level_sweep != 0.0 || (i == 0 && scandirty))) { // Initialize or adapt output levels
#ifdef TINYSA4
if (setting.mode == M_LOW)
if (setting.mode == M_LOW) {
set_input_path(f);
}
else
#endif
if (setting.mode == M_GENLOW) {// if in low output mode and level sweep or frequency weep is active or at start of sweep

62
si4468.c
Unescape View File

@ -24,7 +24,7 @@
#include "spi.h"
#pragma GCC push_options
#pragma GCC optimize ("O2")
#pragma GCC optimize ("Os")
//#define __USE_FRR_FOR_RSSI__
@ -382,7 +382,7 @@ void sendConfig(void) {
if (SI4432_SPI_SPEED != ADF_SPI_SPEED)
SPI_BR_SET(SI4432_SPI, ADF_SPI_SPEED);
if (max2871) {
pdwn = false; //Power down is no longer active.
// pdwn = false; //Power down is no longer active.
uint32_t reg;
const bool fractional = false;
const bool LDS = true;
@ -418,7 +418,7 @@ void sendConfig(void) {
/*if (reg!=reg_0)*/ {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg);/* reg_0 = reg;*/}
ADF4351_Latch();
} else {
pdwn = false; //Power down is no longer active.
// pdwn = false; //Power down is no longer active.
uint32_t reg;
#ifdef BOARD_DOUBLE_REF_MODE
uint32_t prescaler = (N > 75) ? 1 : 0;
@ -489,8 +489,6 @@ static uint32_t adf4350_get_O(uint64_t freqHz) {
}
uint64_t ADF4351_set_frequency(int channel, uint64_t freqHz) {
if (prev_actual_freq == freqHz)
return prev_actual_freq;
(void) channel;
// RFout = xtalFreqHz × (N + FRAC/MOD) = xtalFreqHz × (N * MOD + FRAC) / MOD
// step = xtalFreqHz / MOD; !!!! should get integer result, also this result should divided by 16
@ -499,23 +497,55 @@ uint64_t ADF4351_set_frequency(int channel, uint64_t freqHz) {
// N * 4000 + frac = Nx
// N = Nx / 4000
// frac = Nx % 4000
#if 1
out_div = adf4350_get_O(freqHz);
uint32_t xtal = (uint32_t)(config.setting_frequency_30mhz / 100ULL);
uint64_t xtal = (uint32_t)(config.setting_frequency_30mhz);
if (refDouble) {
xtal<<=1;
}
if (R > 1)
xtal /= R;
out_div = adf4350_get_O(freqHz);
#if 1
uint32_t modulus_x2 = modulus<<1;
uint32_t INTA_F = (((freqHz << out_div) * (uint64_t)(modulus_x2*FREQ_MULTIPLIER))/ xtal) + 1;
N = INTA_F / modulus_x2;
frac = (INTA_F - N * modulus_x2)>>1;
if (frac >= modulus) {
frac -= modulus;
N++;
}
freq_t actual_freq = (((uint64_t)xtal *(uint64_t)(N * modulus +frac)) >> out_div) / (modulus*FREQ_MULTIPLIER);
#else
uint32_t step = (xtal) / modulus;
uint32_t _N = (freqHz<<out_div)/step;
uint32_t _N = ((freqHz<<out_div) * (uint64_t)modulus) / xtal;
N = _N / modulus;
frac = _N % modulus;
#endif
#else
uint32_t MOD = ADF4350_modulo;
if (MOD == 0)
MOD = 60;
uint32_t MOD_X2 = MOD<<1;
uint32_t INTA_F = ((freq * (uint64_t)output_divider) * (uint64_t)MOD_X2/ PFDR) + 1;
uint32_t INTA = INTA_F / MOD_X2;
uint32_t FRAC = (INTA_F - INTA * MOD_X2)>>1;
if (FRAC >= MOD) {
FRAC -= MOD;
INTA++;
}
freq_t actual_freq = ((uint64_t)xtal *(N * modulus +frac))/ (1<<out_div) / modulus;
#endif
if (prev_actual_freq == actual_freq)
return prev_actual_freq;
prev_actual_freq = actual_freq;
ADF4351_frequency_changed = true;
sendConfig();
@ -648,13 +678,15 @@ void ADF4351_recalculate_PFDRFout(void) {
void ADF4351_Setup(void)
{
CS_ADF0_HIGH;
// ADF4351_fastlock(1); // Fastlock enabled
// ADF4351_csr(1); //Cycle slip enabled
// cpCurrent = 0;
// if (max2871)
if (max2871) {
// refDouble = true;
} else {
ADF4351_fastlock(1); // Fastlock enabled
ADF4351_csr(1); //Cycle slip enabled
cpCurrent = 0;
}
// R = 1;
ADF4351_set_frequency(0,200000000);
ADF4351_set_frequency(0,3000000000);
ADF4351_mux(0); // Tristate
}
@ -2646,7 +2678,7 @@ static int old_high = 2;
void enable_ADF_output(int f, int t)
{
(void) t;
ADF4351_enable(true);
ADF4351_enable(f);
ADF4351_enable_out(f);
// ADF4351_enable_aux_out(t);
}

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.