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

MCU frequency shift

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 682dd8457d
commit 8affc33795
4 changed files with 82 additions and 49 deletions
Show Stats Download Patch File Download Diff File

4
chprintf.c
Unescape View File

@ -98,14 +98,14 @@ ulong_freq(char *p, uint64_t freq, uint32_t precision)
// Set format (every 3 digits add ' ' up to GHz) // Set format (every 3 digits add ' ' up to GHz)
uint32_t format = 0b00100100100; uint32_t format = 0b00100100100;
do { do {
#if 0 #if 1
uint8_t c = freq % 10; uint8_t c = freq % 10;
freq/= 10; freq/= 10;
#else #else
// Fast and compact division uint32_t on 10, using shifts, result: // Fast and compact division uint32_t on 10, using shifts, result:
// c = freq % 10 // c = freq % 10
// freq = freq / 10; // freq = freq / 10;
uint32_t c = freq; uint64_t c = freq;
freq >>= 1; freq >>= 1;
freq += freq >> 1; freq += freq >> 1;
freq += freq >> 4; freq += freq >> 4;

4
mcuconf_F303.h
Unescape View File

@ -39,7 +39,7 @@
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_PVD_ENABLE FALSE #define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0 #define STM32_PLS STM32_PLS_LEV0
#if 1 // 72MHz #if 0 // 72MHz
#define STM32_HSI_ENABLED FALSE #define STM32_HSI_ENABLED FALSE
#define STM32_HSE_ENABLED TRUE #define STM32_HSE_ENABLED TRUE
#define STM32_SW STM32_SW_PLL #define STM32_SW STM32_SW_PLL
@ -48,7 +48,7 @@
#define STM32_PLLMUL_VALUE 9 #define STM32_PLLMUL_VALUE 9
#define STM32_USBPRE STM32_USBPRE_DIV1P5 #define STM32_USBPRE STM32_USBPRE_DIV1P5
#else #else
#define STM32_HSI_ENABLED TRUE #define STM32_HSI_ENABLED TRUE // 48MHz
#define STM32_HSE_ENABLED FALSE #define STM32_HSE_ENABLED FALSE
#define STM32_SW STM32_SW_PLL #define STM32_SW STM32_SW_PLL
#define STM32_PLLSRC STM32_PLLSRC_HSI #define STM32_PLLSRC STM32_PLLSRC_HSI

10
sa_cmd.c
Unescape View File

@ -789,7 +789,17 @@ VNA_SHELL_FUNCTION(cmd_scanraw)
streamPut(shell_stream, 'x'); streamPut(shell_stream, 'x');
streamPut(shell_stream, (uint8_t)(val & 0xFF)); streamPut(shell_stream, (uint8_t)(val & 0xFF));
streamPut(shell_stream, (uint8_t)((val>>8) & 0xFF)); streamPut(shell_stream, (uint8_t)((val>>8) & 0xFF));
if ((i & 0x07) == 0) { // if required
int pos = i * (WIDTH+1) / points;
ili9341_set_background(LCD_SWEEP_LINE_COLOR);
ili9341_fill(OFFSETX, CHART_BOTTOM+1, pos, 1); // update sweep progress bar
ili9341_set_background(LCD_BG_COLOR);
ili9341_fill(OFFSETX+pos, CHART_BOTTOM+1, WIDTH-pos, 1);
} }
}
ili9341_set_background(LCD_BG_COLOR);
ili9341_fill(OFFSETX, CHART_BOTTOM+1, WIDTH, 1);
streamPut(shell_stream, '}'); streamPut(shell_stream, '}');
setting.frequency_step = old_step; setting.frequency_step = old_step;
dirty = true; dirty = true;

113
sa_core.c
Unescape View File

@ -1102,14 +1102,14 @@ void calculate_step_delay(void)
#endif #endif
#endif #endif
#ifdef __SI4463__ #ifdef __SI4463__
if (actual_rbw_x10 >= 6000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 60; } if (actual_rbw_x10 >= 6000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 400000; }
else if (actual_rbw_x10 >= 3000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 60; } else if (actual_rbw_x10 >= 3000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 200000; }
else if (actual_rbw_x10 >= 1000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 70; } else if (actual_rbw_x10 >= 1000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 100000; }
else if (actual_rbw_x10 >= 300) { SI4432_step_delay = 400; SI4432_offset_delay = 120; spur_gate = 200; } else if (actual_rbw_x10 >= 300) { SI4432_step_delay = 400; SI4432_offset_delay = 120; spur_gate = 100000; }
else if (actual_rbw_x10 >= 100) { SI4432_step_delay = 500; SI4432_offset_delay = 180; spur_gate = 300; } else if (actual_rbw_x10 >= 100) { SI4432_step_delay = 500; SI4432_offset_delay = 180; spur_gate = 100000; }
else if (actual_rbw_x10 >= 30) { SI4432_step_delay = 900; SI4432_offset_delay = 300; spur_gate = 1000; } else if (actual_rbw_x10 >= 30) { SI4432_step_delay = 900; SI4432_offset_delay = 300; spur_gate = 100000; }
else if (actual_rbw_x10 >= 10) { SI4432_step_delay = 3000; SI4432_offset_delay = 1000; spur_gate = 3000; } else if (actual_rbw_x10 >= 10) { SI4432_step_delay = 3000; SI4432_offset_delay = 1000; spur_gate = 100000; }
else { SI4432_step_delay = 9000; SI4432_offset_delay =3000; spur_gate = 10000; } else { SI4432_step_delay = 9000; SI4432_offset_delay =3000; spur_gate = 100000; }
#endif #endif
if (setting.step_delay_mode == SD_PRECISE) // In precise mode wait twice as long for RSSI to stabilize if (setting.step_delay_mode == SD_PRECISE) // In precise mode wait twice as long for RSSI to stabilize
SI4432_step_delay += (SI4432_step_delay>>2) ; SI4432_step_delay += (SI4432_step_delay>>2) ;
@ -1811,8 +1811,8 @@ int binary_search(freq_t f)
{ {
int L = 0; int L = 0;
int R = (sizeof spur_table)/sizeof(int) - 1; int R = (sizeof spur_table)/sizeof(int) - 1;
freq_t fmin = f - actual_rbw_x10 * spur_gate; freq_t fmin = f - spur_gate;
freq_t fplus = f + actual_rbw_x10 * spur_gate; freq_t fplus = f + spur_gate;
while (L <= R) { while (L <= R) {
int m = (L + R) / 2; int m = (L + R) / 2;
if (spur_table[m] < fmin) if (spur_table[m] < fmin)
@ -1920,6 +1920,7 @@ systime_t start_of_sweep_timestamp;
static systime_t sweep_elapsed = 0; // Time since first start of sweeping, used only for auto attenuate static systime_t sweep_elapsed = 0; // Time since first start of sweeping, used only for auto attenuate
uint8_t signal_is_AM = false; uint8_t signal_is_AM = false;
static uint8_t check_for_AM = false; static uint8_t check_for_AM = false;
static int is_below = false;
static void calculate_static_correction(void) // Calculate the static part of the RSSI correction static void calculate_static_correction(void) // Calculate the static part of the RSSI correction
{ {
@ -1940,6 +1941,31 @@ static void calculate_static_correction(void) // Calculate the
- setting.offset); - setting.offset);
} }
int hsical = -1;
void clock_above_48MHz(void)
{
if (hsical == -1)
hsical = (RCC->CR & 0xff00) >> 8;
if (hsical != -1) {
RCC->CR &= RCC_CR_HSICAL;
RCC->CR |= ( (hsical) << 8 );
RCC->CR &= RCC_CR_HSITRIM | RCC_CR_HSION; /* CR Reset value. */
RCC->CR |= RCC_CR_HSITRIM_4 | RCC_CR_HSITRIM_0 | RCC_CR_HSITRIM_1;
}
}
void clock_below_48MHz(void)
{
if (hsical == -1)
hsical = ( (RCC->CR & 0xff00) >> 8 );
if (hsical != -1) {
RCC->CR &= RCC_CR_HSICAL;
RCC->CR |= ( (hsical) << 8 );
RCC->CR &= RCC_CR_HSITRIM | RCC_CR_HSION; /* CR Reset value. */
RCC->CR |= RCC_CR_HSITRIM_2 | RCC_CR_HSITRIM_3;
}
}
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 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
{ {
int modulation_delay = 0; int modulation_delay = 0;
@ -1977,6 +2003,8 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
} }
if (MODE_INPUT(setting.mode)) { if (MODE_INPUT(setting.mode)) {
calculate_static_correction(); calculate_static_correction();
clock_above_48MHz();
is_below = false;
} }
// if (MODE_OUTPUT(setting.mode) && setting.additional_step_delay_us < 500) // Minimum wait time to prevent LO from lockup during output frequency sweep // if (MODE_OUTPUT(setting.mode) && setting.additional_step_delay_us < 500) // Minimum wait time to prevent LO from lockup during output frequency sweep
// setting.additional_step_delay_us = 500; // setting.additional_step_delay_us = 500;
@ -2303,39 +2331,30 @@ modulation_again:
else else
ADF4351_R_counter(setting.R); ADF4351_R_counter(setting.R);
#if 0 // No 72MHz spur avoidance yet #if 1 // No 72MHz spur avoidance yet
if (false) { // Avoid 72MHz spur if (setting.mode == M_LOW /* && !(SDU1.config->usbp->state == USB_ACTIVE) */ ) { // Avoid 72MHz spur
#define SPUR 2 * 72000000 int set_below = false;
freq_t tf = ((lf + actual_rbw_x10*100) / SPUR) * SPUR; if (lf < 40000000) {
#undef STM32_USBPRE uint32_t tf = lf;
int STM32_USBPRE; while (tf > 4000000) tf -= 4000000;
#undef STM32_PLLMUL if (tf < 2000000 )
int STM32_PLLMUL; set_below = true;
if (lf < 200000000 && lf >= SPUR && tf + actual_rbw_x10*400 >= lf && tf < lf + actual_rbw_x10*400) { } else {
uint32_t tf = lf;
RCC->CFGR |= STM32_SW_HSI; while (tf > 48000000) tf -= 48000000;
if (tf < 20000000 )
#if 0 set_below = true;
STM32_USBPRE = STM32_USBPRE_DIV1; // Switch to 48MHz clock (1 << 22) }
STM32_PLLMUL = ((6 - 2) << 18); if (set_below) { // If below 48MHz
uint32_t CFGR = STM32_MCOSEL | STM32_USBPRE | STM32_PLLMUL | if (!is_below) {
STM32_PLLSRC | STM32_PPRE1 | STM32_PPRE2 | clock_below_48MHz();
STM32_HPRE; is_below = true;
// old_CFGR = RCC->CFGR;
if (old_CFGR != CFGR) {
old_CFGR = CFGR;
RCC->CFGR = CFGR;
} }
#endif
} else { } else {
RCC->CFGR |= STM32_SW_PLL; if (is_below) {
#if 0 clock_above_48MHz();
STM32_USBPRE = STM32_USBPRE_DIV1P5; // Switch to 72MHz clock (0 << 22) is_below = false;
STM32_PLLMUL = ((9 - 2) << 18); }
orig_CFGR = STM32_MCOSEL | STM32_USBPRE | STM32_PLLMUL |
STM32_PLLSRC | STM32_PPRE1 | STM32_PPRE2 |
STM32_HPRE;
#endif
} }
} }
#endif #endif
@ -2531,7 +2550,7 @@ modulation_again:
pureRSSI = Si446x_RSSI(); pureRSSI = Si446x_RSSI();
#endif #endif
if (break_on_operation && operation_requested) // allow aborting a wait for trigger if (break_on_operation && operation_requested) // allow aborting a wait for trigger
return 0; // abort goto abort; //return 0; // abort
// Store data level bitfield (remember only last 2 states) // Store data level bitfield (remember only last 2 states)
// T_LEVEL_UNDEF mode bit drop after 2 shifts // T_LEVEL_UNDEF mode bit drop after 2 shifts
data_level = ((data_level<<1) | (pureRSSI < trigger_lvl ? T_LEVEL_BELOW : T_LEVEL_ABOVE))&(T_LEVEL_CLEAN); data_level = ((data_level<<1) | (pureRSSI < trigger_lvl ? T_LEVEL_BELOW : T_LEVEL_ABOVE))&(T_LEVEL_CLEAN);
@ -2603,8 +2622,12 @@ modulation_again:
RCC->CFGR = orig_CFGR; RCC->CFGR = orig_CFGR;
} }
pureRSSI_t rssi = RSSI + correct_RSSI + correct_RSSI_freq; // add correction
return RSSI + correct_RSSI + correct_RSSI_freq; // add correction if (false) {
abort:
rssi = 0;
}
return rssi;
} }
#define MAX_MAX 4 #define MAX_MAX 4
@ -2721,7 +2744,7 @@ sweep_again: // stay in sweep loop when output mo
if (MODE_INPUT(setting.mode)) { if (MODE_INPUT(setting.mode)) {
if (setting.actual_sweep_time_us > ONE_SECOND_TIME && (i & 0x07) == 0) { // if required if ((i & 0x07) == 0 && (setting.actual_sweep_time_us > ONE_SECOND_TIME || (chVTGetSystemTimeX() - start_of_sweep_timestamp) > ONE_SECOND_TIME / 100)) { // if required
int pos = i * (WIDTH+1) / sweep_points; int pos = i * (WIDTH+1) / sweep_points;
ili9341_set_background(LCD_SWEEP_LINE_COLOR); ili9341_set_background(LCD_SWEEP_LINE_COLOR);
ili9341_fill(OFFSETX, CHART_BOTTOM+1, pos, 1); // update sweep progress bar ili9341_fill(OFFSETX, CHART_BOTTOM+1, pos, 1); // update sweep progress bar

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.