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

Merge branch 'DiSlord_test_branch'

Browse Source
pull/4/head
erikkaashoek 6 years ago
parent 73737e2947 2387c78ef6
commit 5c0388ce89
5 changed files with 100 additions and 85 deletions
Show Stats Download Patch File Download Diff File

15
main.c
Unescape View File

@ -980,6 +980,14 @@ bool sweep(bool break_on_operation)
}
#endif
void set_sweep_points(uint16_t points){
if (points == sweep_points || points > POINTS_COUNT)
return;
sweep_points = points;
update_frequencies();
}
VNA_SHELL_FUNCTION(cmd_scan)
{
uint32_t start, stop;
@ -1074,7 +1082,7 @@ set_frequencies(uint32_t start, uint32_t stop, uint16_t points)
for (; i < POINTS_COUNT; i++)
frequencies[i] = 0;
setting.frequency_step = delta;
update_rbw();
dirty = true;
}
void
@ -2697,10 +2705,7 @@ int main(void)
dacStart(&DACD2, &dac1cfg1);
#endif
setupSA();
sweep_points = POINTS_COUNT;
/* initial frequencies */
update_frequencies();
set_sweep_points(POINTS_COUNT);
#ifdef __VNA__
/*

3
nanovna.h
Unescape View File

@ -123,6 +123,7 @@ enum stimulus_type {
ST_START=0, ST_STOP, ST_CENTER, ST_SPAN, ST_CW
};
void set_sweep_points(uint16_t points);
void update_frequencies(void);
void set_sweep_frequency(int type, uint32_t frequency);
uint32_t get_sweep_frequency(int type);
@ -592,7 +593,7 @@ typedef struct setting
int tracking;
int modulation;
int step_delay;
int frequency_step;
uint32_t frequency_step;
int test;
int harmonic;
int decay;

8
sa_cmd.c
Unescape View File

@ -549,10 +549,10 @@ VNA_SHELL_FUNCTION(cmd_scanraw)
if (argc == 3) {
points = my_atoi(argv[2]);
}
int old_step = setting.frequency_step;
uint32_t old_step = setting.frequency_step;
float f_step = (stop-start)/ points;
setting.frequency_step = (int32_t)f_step;
update_rbw();
setting.frequency_step = (uint32_t)f_step;
streamPut(shell_stream, '{');
static uint32_t old_start=0, old_stop=0, old_points=0;
if (old_start != start || old_stop != stop || old_points != points) {
@ -565,7 +565,7 @@ VNA_SHELL_FUNCTION(cmd_scanraw)
for (uint32_t i = 0; i<points; i++) {
if (operation_requested)
break;
float val = perform(false, i, start +(int32_t)(f_step * i), false);
float val = perform(false, i, start +(uint32_t)(f_step * i), false);
streamPut(shell_stream, 'x');
int v = val*2 + 256;
streamPut(shell_stream, (uint8_t)(v & 0xFF));

137
sa_core.c
Unescape View File

@ -350,6 +350,16 @@ float get_attenuation(void)
return(setting.attenuate);
}
static float get_signal_path_loss(void){
#ifdef __ULTRA__
if (setting.mode == M_ULTRA)
return -15; // Loss in dB, -9.5 for v0.1, -12.5 for v0.2
#endif
if (setting.mode == M_LOW)
return -5.5; // Loss in dB, -9.5 for v0.1, -12.5 for v0.2
return +7; // Loss in dB (+ is gain)
}
static const int drive_dBm [16] = {-38,-35,-33,-30,-27,-24,-21,-19,-7,-4,-2, 1, 4, 7, 10, 13};
void set_level(float v) // Set the drive level of the LO
@ -787,7 +797,7 @@ void calculate_step_delay(void)
SI4432_offset_delay = setting.offset_delay;
} else {
SI4432_offset_delay = 0;
if (setting.frequency_step == 0.0) { // zero span mode, not dependent on selected RBW
if (setting.frequency_step == 0) { // zero span mode, not dependent on selected RBW
SI4432_step_delay = 0;
} else {
if (actual_rbw_x10 >= 1910) { SI4432_step_delay = 280; SI4432_offset_delay = 100; }
@ -890,7 +900,7 @@ void setupSA(void)
RESTART_PROFILE // measure 290 points to get real added time for 200 points
SI4432_Fill(0,0);
int t2 = DELTA_TIME;
int t = (t2 - t1) * 100 * POINTS_COUNT / 200; // And calculate real time excluding overhead for all points
int t = (t2 - t1) * 100 * (sweep_points) / 200; // And calculate real time excluding overhead for all points
#endif
}
extern int SI4432_frequency_changed;
@ -1084,7 +1094,6 @@ void update_rbw(void) // calculate the actual_rbw and the vbwSteps (#
setting.vbw_x10 = actual_rbw_x10;
vbwSteps = 1; // only one vbwSteps
}
dirty = true;
}
int binary_search_frequency(int f) // Search which index in the frequency tabled matches with frequency f using actual_rbw
@ -1279,6 +1288,38 @@ float perform(bool break_on_operation, int i, uint32_t f, int tracking) // M
dirty = false;
if (setting.spur) // if in spur avoidance mode
setting.spur = 1; // resync spur in case of previous abort
// Set for actual time pre calculated value (update after sweep)
setting.actual_sweep_time_us = calc_min_sweep_time_us();
// Change actual sweep time as user input if it greater minimum
// And set start delays for 1 run
if (setting.sweep_time_us > setting.actual_sweep_time_us){
setting.additional_step_delay_us = (setting.sweep_time_us - setting.actual_sweep_time_us)/(sweep_points);
setting.actual_sweep_time_us = setting.sweep_time_us;
}
else{ // not add additional correction, apply recommend time
setting.additional_step_delay_us = 0;
// setting.sweep_time_us = setting.actual_sweep_time_us;
}
#if 0
// manually set delay, for better sync
if (setting.sweep_time_us < 2.5 * ONE_MS_TIME){
setting.additional_step_delay_us = 0;
setting.sweep_time_us = 0;
}
else if (setting.sweep_time_us <= 3 * ONE_MS_TIME){
setting.additional_step_delay_us = 1;
setting.sweep_time_us = 3000;
}
#endif
// 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;
// Update grid and status after
if (break_on_operation && MODE_INPUT(setting.mode)) { // during normal operation
redraw_request |= REDRAW_CAL_STATUS;
if (FREQ_IS_CW()) { // if zero span mode
update_grid(); // and update grid and frequency
}
}
}
if (setting.mode == M_GENLOW && setting.level_sweep != 0.0) { // if in low output mode and level sweep is active
@ -1485,13 +1526,11 @@ float perform(bool break_on_operation, int i, uint32_t f, int tracking) // M
// ------------------------- end of processing when in output mode ------------------------------------------------
float signal_path_loss;
skip_LO_setting:
if (i == 0 && t == 0) // if first point in scan (here is get 1 point data)
start_of_sweep_timestamp = chVTGetSystemTimeX(); // initialize start sweep time
if (MODE_OUTPUT(setting.mode)) { // No substepping and no RSSI in output mode
if (i == 0 && t == 0) // if first point in scan (here is get 1 point data)
start_of_sweep_timestamp = chVTGetSystemTimeX();
return(0);
}
// ---------------- Prepare RSSI ----------------------
@ -1504,28 +1543,15 @@ float perform(bool break_on_operation, int i, uint32_t f, int tracking) // M
SI4432_Fill(MODE_SELECT(setting.mode), 0);
}
#endif
#ifdef __ULTRA__
if (setting.mode == M_ULTRA)
signal_path_loss = -15; // Loss in dB, -9.5 for v0.1, -12.5 for v0.2
else
#endif
if (setting.mode == M_LOW)
signal_path_loss = -5.5; // Loss in dB, -9.5 for v0.1, -12.5 for v0.2
else
signal_path_loss = +7; // Loss in dB (+ is gain)
static float correct_RSSI; // This is re-used between calls
if (i == 0 || setting.frequency_step != 0 ) // only cases where the value can change
if (i == 0 || setting.frequency_step != 0 ){ // only cases where the value can change
correct_RSSI = get_level_offset()
+ get_attenuation()
- signal_path_loss
- get_signal_path_loss()
- setting.offset
+ get_frequency_correction(f)
+ getSI4432_RSSI_correction(); // calcuate the RSSI correction for later use
if (i == 0 && t == 0) // if first point in scan (here is get 1 point data)
start_of_sweep_timestamp = chVTGetSystemTimeX(); // initialize start sweep time
}
int16_t pureRSSI;
// if ( i < 3)
// shell_printf("%d %.3f %.3f %.1f\r\n", i, local_IF/1000000.0, lf/1000000.0, subRSSI);
@ -1622,43 +1648,8 @@ static bool sweep(bool break_on_operation)
// if (sweep_counter > 5000 && setting.average == AV_OFF) // refresh HW after 5000 sweeps
// dirty = true;
if (dirty) { // Calculate new scanning solution
update_rbw();
calculate_step_delay();
// Set for actual time pre calculated value (update after sweep)
setting.actual_sweep_time_us = calc_min_sweep_time_us();
// Change actual sweep time as user input if it greater minimum
// And set start delays for 1 run
if (setting.sweep_time_us > setting.actual_sweep_time_us){
setting.additional_step_delay_us = (setting.sweep_time_us - setting.actual_sweep_time_us)/(sweep_points);
setting.actual_sweep_time_us = setting.sweep_time_us;
}
else{ // not add additional correction, apply recommend time
setting.additional_step_delay_us = 0;
// setting.sweep_time_us = setting.actual_sweep_time_us;
}
#if 0
// manually set delay, for better sync
if (setting.sweep_time_us < 2.5 * ONE_MS_TIME){
setting.additional_step_delay_us = 0;
setting.sweep_time_us = 0;
}
else if (setting.sweep_time_us <= 3 * ONE_MS_TIME){
setting.additional_step_delay_us = 1;
setting.sweep_time_us = 3000;
}
#endif
// 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;
// Update grid and status after
if (break_on_operation && MODE_INPUT(setting.mode)) { // during normal operation
redraw_request |= REDRAW_CAL_STATUS;
if (FREQ_IS_CW()) { // if zero span mode
update_grid(); // and update grid and frequency
}
}
if (dirty) // Calculate new scanning solution
sweep_counter = 0;
}
else
sweep_counter++;
@ -1673,6 +1664,13 @@ sweep_again: // stay in sweep loop when output mo
// --------------------- measure -------------------------
RSSI = perform(break_on_operation, i, frequencies[i], setting.tracking); // Measure RSSI for one of the frequencies
// if break back to top level to handle ui operation
if (break_on_operation && operation_requested) { // break loop if needed
if (setting.actual_sweep_time_us > ONE_SECOND_TIME && MODE_INPUT(setting.mode)) {
ili9341_fill(OFFSETX, HEIGHT_NOSCROLL+1, WIDTH, 1, 0); // Erase progress bar
}
return false;
}
// Delay between points if needed, (all delays can apply in SI4432 fill)
if (setting.measure_sweep_time_us == 0){ // If not already in buffer
@ -1684,19 +1682,12 @@ sweep_again: // stay in sweep loop when output mo
}
}
// if break back to top level to handle ui operation
if (break_on_operation && operation_requested) { // break loop if needed
if (setting.actual_sweep_time_us > ONE_SECOND_TIME && MODE_INPUT(setting.mode)) {
ili9341_fill(OFFSETX, HEIGHT_NOSCROLL+1, WIDTH, 1, 0); // Erase progress bar
}
return false;
}
if (MODE_INPUT(setting.mode)) {
if (setting.actual_sweep_time_us > ONE_SECOND_TIME && (i & 0x07) == 0) { // if required
ili9341_fill(OFFSETX, HEIGHT_NOSCROLL+1, i, 1, BRIGHT_COLOR_GREEN); // update sweep progress bar
ili9341_fill(OFFSETX+i, HEIGHT_NOSCROLL+1, WIDTH-i, 1, 0);
int pos = i * (WIDTH+1) / sweep_points;
ili9341_fill(OFFSETX, HEIGHT_NOSCROLL+1, pos, 1, BRIGHT_COLOR_GREEN); // update sweep progress bar
ili9341_fill(OFFSETX+pos, HEIGHT_NOSCROLL+1, WIDTH-pos, 1, 0);
}
// ------------------------ do all RSSI calculations from CALC menu -------------------
@ -2035,8 +2026,8 @@ sweep_again: // stay in sweep loop when output mo
//---------------- in Linearity measurement the attenuation has to be adapted ------------------
if (setting.measurement == M_LINEARITY && setting.linearity_step < setting._sweep_points) {
setting.attenuate = 29.0 - setting.linearity_step * 30.0 / POINTS_COUNT;
if (setting.measurement == M_LINEARITY && setting.linearity_step < sweep_points) {
setting.attenuate = 29.0 - setting.linearity_step * 30.0 / (sweep_points);
dirty = true;
stored_t[setting.linearity_step] = peakLevel;
setting.linearity_step++;
@ -2379,10 +2370,8 @@ void draw_cal_status(void)
ili9341_drawstring(buf, x, y);
#if 1
y += YSTEP;
int old_dirty = dirty;
update_rbw(); // To ensure the calc_min_sweep time shown takes the latest delay into account
calculate_step_delay();
dirty = old_dirty; // restore as update_rbw sets dirty
uint32_t t = calc_min_sweep_time_us();
// if (t < setting.sweep_time_us)
// t = setting.sweep_time_us;
@ -3018,7 +3007,7 @@ do_again:
#endif
setting.offset_delay = 1600;
test_value = saved_peakLevel;
if ((uint32_t)(setting.rbw_x10 * 1000) / 290 < 8000) { // fast mode possible
if ((uint32_t)(setting.rbw_x10 * 1000) / (sweep_points) < 8000) { // fast mode possible
while (setting.offset_delay > 0 && test_value != 0 && test_value > saved_peakLevel - 1.5) {
test_prepare(i);
setting.step_delay_mode = SD_FAST;

22
ui_sa.c
Unescape View File

@ -1077,6 +1077,13 @@ static void menu_outputmode_cb(int item, uint8_t data)
draw_menu();
}
static const uint16_t points_setting[] = {145, 290, -1};
static void menu_points_cb(int item, uint8_t data){
(void)item;
set_sweep_points(points_setting[data]);
draw_menu();
}
//const int menu_drive_value[]={5,10,15,20};
const char *menu_drive_text[]={"-38dBm","-35dBm","-33dBm","-30dBm","-27dBm","-24dBm","-21dBm"," -19dBm", " -7dBm"," -4dBm"," -2dBm"," 1dBm"," 4dBm"," 7dBm"," 10dBm"," 13dBm"};
@ -1392,12 +1399,20 @@ static const menuitem_t menu_scanning_speed[] =
{ MT_NONE, 0, NULL, NULL } // sentinel
};
const menuitem_t menu_sweep_points[] = {
{ MT_CALLBACK, 0, "145p", menu_points_cb },
{ MT_CALLBACK, 1, "290p", menu_points_cb },
{ MT_CANCEL, -1, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
static const menuitem_t menu_sweep_speed[] =
{
{ MT_CALLBACK, SD_NORMAL, "NORMAL", menu_scanning_speed_cb}, // order must match definition of enum
{ MT_CALLBACK, SD_PRECISE, "PRECISE", menu_scanning_speed_cb},
{ MT_CALLBACK, SD_FAST, "FAST", menu_scanning_speed_cb},
{ MT_KEYPAD, KM_SWEEP_TIME, "MANUAL", "0..600s"},
{ MT_SUBMENU, 0, "\2SWEEP\0POINTS", menu_sweep_points},
{ MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
@ -1691,7 +1706,12 @@ static void menu_item_modify_attribute(
if (item == setting.step_delay_mode){
mark = true;
}
} else if (menu == menu_sweep_speed) {
} else if (menu == menu_sweep_points) {
if (points_setting[data] == sweep_points){
mark = true;
}
}
else if (menu == menu_sweep_speed) {
if (item == 3 && setting.sweep_time_us != 0){
mark = true;
}

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.