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

IMD multi band

Browse Source
save_scan
erikkaashoek 3 years ago
parent 129f57ec46
commit 13d1e65576
4 changed files with 109 additions and 55 deletions
Show Stats Download Patch File Download Diff File

45
main.c
Unescape View File

@ -1341,32 +1341,38 @@ static freq_t _f_delta;
static freq_t _f_error; static freq_t _f_error;
static uint16_t _f_count; static uint16_t _f_count;
static void
set_frequencies(freq_t start, freq_t stop, uint16_t points)
{
#ifdef __BANDS__ #ifdef __BANDS__
if (setting.multi_band && !setting.multi_trace) { int getBand(uint16_t idx) {
if (setting.multi_band && !setting.multi_trace)
return _f_band_index[idx];
return 0;
}
void update_bands(void)
{
if (!setting.multi_band)
return;
freq_t span = 0; freq_t span = 0;
for (int i=0; i<BANDS_MAX; i++) { for (int i=0; i<BANDS_MAX; i++) {
if (setting.bands[i].enabled) { if (setting.bands[i].enabled) {
span += setting.bands[i].end - setting.bands[i].start; span += setting.bands[i].end - setting.bands[i].start;
} }
} }
float _f_delta_float = span/(float)points; float _f_delta_float = span/(float)sweep_points;
setting.frequency_step = (freq_t)_f_delta_float; setting.frequency_step = (freq_t)_f_delta_float;
int b=0; int b=0;
int idx = 0; int idx = 0;
do { do {
if (!setting.bands[b].enabled) { b++; continue; } if (!setting.bands[b].enabled) { b++; continue; }
setting.bands[b].start_index = idx; setting.bands[b].start_index = idx;
while (idx < points) { while (idx < sweep_points) {
freq_t f = (idx - setting.bands[b].start_index)* _f_delta_float + setting.bands[b].start; freq_t f = (idx - setting.bands[b].start_index)* _f_delta_float + setting.bands[b].start;
if (f <= setting.bands[b].end) { if (f < setting.bands[b].end) {
_f_band_index[idx] = b; _f_band_index[idx] = b;
setting.bands[b].stop_index = idx; setting.bands[b].stop_index = idx;
idx++; idx++;
if (idx >= points) if (idx >= sweep_points)
return; return;
} }
else { else {
@ -1375,6 +1381,18 @@ set_frequencies(freq_t start, freq_t stop, uint16_t points)
} }
} }
} while (b < BANDS_MAX); } while (b < BANDS_MAX);
update_rbw();
dirty = true;
}
#endif
static void
set_frequencies(freq_t start, freq_t stop, uint16_t points)
{
#ifdef __BANDS__
if (setting.multi_band && !setting.multi_trace) {
update_bands();
return; return;
} }
#endif #endif
@ -1393,22 +1411,13 @@ freq_t getFrequency(uint16_t idx) {
idx = POINTS_COUNT-1; idx = POINTS_COUNT-1;
int b = _f_band_index[idx]; int b = _f_band_index[idx];
band_t *bp = &setting.bands[b]; band_t *bp = &setting.bands[b];
freq_t f = bp->start + ((bp->end- bp->start) * (idx - bp->start_index)) / (bp->stop_index - bp->start_index) ; volatile freq_t f = bp->start + ((bp->end- bp->start) * (idx - bp->start_index)) / (bp->stop_index - bp->start_index) ;
return f; return f;
} else } else
#endif #endif
return _f_start + _f_delta * idx + (_f_count / 2 + _f_error * idx) / _f_count;} return _f_start + _f_delta * idx + (_f_count / 2 + _f_error * idx) / _f_count;}
#endif #endif
#ifdef __BANDS__
int getBand(uint16_t idx) {
if (setting.multi_band && !setting.multi_trace)
return _f_band_index[idx];
return 0;
}
#endif
void void
update_frequencies(void) update_frequencies(void)
{ {

1
nanovna.h
Unescape View File

@ -255,6 +255,7 @@ enum stimulus_type {
void set_sweep_points(uint16_t points); void set_sweep_points(uint16_t points);
void update_frequencies(void); void update_frequencies(void);
void update_bands(void);
void set_sweep_frequency(int type, freq_t frequency); void set_sweep_frequency(int type, freq_t frequency);
freq_t get_sweep_frequency(int type); freq_t get_sweep_frequency(int type);
void my_microsecond_delay(int t); void my_microsecond_delay(int t);

39
sa_core.c
Unescape View File

@ -558,6 +558,16 @@ void reset_settings(int m)
disable_waterfall(); disable_waterfall();
setting.level_meter = false; setting.level_meter = false;
setting.pulse = false; setting.pulse = false;
#ifdef __BANDS__
setting.multi_band = false;
setting.multi_trace = false;
for (int i = 0; i<BANDS_MAX;i++) {
setting.bands[i].start = 0;
setting.bands[i].end = 0;
setting.bands[i].enabled = false;
setting.bands[i].level = 0;
}
#endif
#ifdef __ULTRA__ #ifdef __ULTRA__
ultra_start = (config.ultra_start == ULTRA_AUTO ? DEFAULT_ULTRA_THRESHOLD : config.ultra_start); ultra_start = (config.ultra_start == ULTRA_AUTO ? DEFAULT_ULTRA_THRESHOLD : config.ultra_start);
#endif #endif
@ -2760,6 +2770,19 @@ int binary_search_frequency(freq_t f) // Search which index in the frequenc
int index_of_frequency(freq_t f) // Search which index in the frequency tabled matches with frequency f using actual_rbw int index_of_frequency(freq_t f) // Search which index in the frequency tabled matches with frequency f using actual_rbw
{ {
#ifdef __BANDS__
if (setting.multi_band && !setting.multi_trace) {
for (int i=0;i<BANDS_MAX; i++) {
band_t *b = &setting.bands[i];
if (b->enabled && b->start <= f && f <b->end) {
freq_t f_step = (b->end - b->start)/(b->stop_index - b->start_index);
int i = ((f - b->start ) + (f_step >> 1)) / f_step + b->start_index;
return i;
}
}
return 0;
}
#endif
freq_t f_step = getFrequency(1) - getFrequency(0); freq_t f_step = getFrequency(1) - getFrequency(0);
if (f_step == 0) if (f_step == 0)
return 0; return 0;
@ -3308,7 +3331,7 @@ static int modulation_steps = 8;
#define MAX_MODULATION_STEPS 128 #define MAX_MODULATION_STEPS 128
// Max = 10000 / 28.8 // Max = 10000 / 28.8
static const int sinus[MAX_MODULATION_STEPS/4+1] = {0, 17, 34, 51, 68, 84, 101, 117, 133, 148, 164, 179, 193, 207, 220, 233, 246, 257, 268, 279, 289, 298, 306, 314, 321, 327, 332, 337, 341, 343, 346, 347, 347 }; static const int sine_wave[MAX_MODULATION_STEPS/4+1] = {0, 17, 34, 51, 68, 84, 101, 117, 133, 148, 164, 179, 193, 207, 220, 233, 246, 257, 268, 279, 289, 298, 306, 314, 321, 327, 332, 337, 341, 343, 346, 347, 347 };
// //
// Offset is 14.4Hz when below 600MHz and 28.8 when above. // Offset is 14.4Hz when below 600MHz and 28.8 when above.
// //
@ -3532,18 +3555,18 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
#ifdef TINYSA4 // Calculate AM/FM modulation #ifdef TINYSA4 // Calculate AM/FM modulation
if (setting.modulation == MO_AM) { if (setting.modulation == MO_AM) {
int sinus_index = 1; int sine_wave_index = 1;
config.cor_am = INITIAL_MODULATION_CORRECTION; // Initialize with some spare config.cor_am = INITIAL_MODULATION_CORRECTION; // Initialize with some spare
modulation_steps = MAX_MODULATION_STEPS; // Search modulation steps that fit frequency modulation_steps = MAX_MODULATION_STEPS; // Search modulation steps that fit frequency
while ( (modulation_delay = (8000000/ modulation_steps ) / setting.modulation_frequency + config.cor_am) < 20 && modulation_steps > 4) { while ( (modulation_delay = (8000000/ modulation_steps ) / setting.modulation_frequency + config.cor_am) < 20 && modulation_steps > 4) {
sinus_index <<= 1; sine_wave_index <<= 1;
modulation_steps >>= 1; modulation_steps >>= 1;
} }
int offset347 = (setting.modulation_depth_x100 < 100 ? setting.modulation_depth_x100 - 6: setting.modulation_depth_x100) * 347 / 100; int offset347 = (setting.modulation_depth_x100 < 100 ? setting.modulation_depth_x100 - 6: setting.modulation_depth_x100) * 347 / 100;
for (int i = 0; i < modulation_steps/4+1; i++) { for (int i = 0; i < modulation_steps/4+1; i++) {
fm_modulation[i] = offset347 * sinus[i*sinus_index]/347; fm_modulation[i] = offset347 * sine_wave[i*sine_wave_index]/347;
fm_modulation[modulation_steps/2 - i] = fm_modulation[i]; fm_modulation[modulation_steps/2 - i] = fm_modulation[i];
fm_modulation[modulation_steps/2 + i] = - offset347 * sinus[i*sinus_index]/347; fm_modulation[modulation_steps/2 + i] = - offset347 * sine_wave[i*sine_wave_index]/347;
fm_modulation[modulation_steps - i] = fm_modulation[modulation_steps/2 + i]; fm_modulation[modulation_steps - i] = fm_modulation[modulation_steps/2 + i];
} }
for (int i=0; i < modulation_steps; i++) { for (int i=0; i < modulation_steps; i++) {
@ -3555,17 +3578,17 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
} }
} }
if (setting.modulation == MO_WFM) { if (setting.modulation == MO_WFM) {
int sinus_index = 1; int sine_wave_index = 1;
config.cor_am = INITIAL_MODULATION_CORRECTION; // Initialize with some spare config.cor_am = INITIAL_MODULATION_CORRECTION; // Initialize with some spare
modulation_steps = MAX_MODULATION_STEPS; // Search modulation steps that fit frequency modulation_steps = MAX_MODULATION_STEPS; // Search modulation steps that fit frequency
//modulation_steps = 8; // <-----------------TEMP!!!!! //modulation_steps = 8; // <-----------------TEMP!!!!!
while ( ((modulation_delay = (8000000/ modulation_steps ) / setting.modulation_frequency + config.cor_am)) < 100 && modulation_steps > 4) { while ( ((modulation_delay = (8000000/ modulation_steps ) / setting.modulation_frequency + config.cor_am)) < 100 && modulation_steps > 4) {
sinus_index <<= 1; sine_wave_index <<= 1;
modulation_steps >>= 1; modulation_steps >>= 1;
} }
if (modulation_steps > 8) { if (modulation_steps > 8) {
for (int i = 0; i < modulation_steps/4+1; i++) { for (int i = 0; i < modulation_steps/4+1; i++) {
fm_modulation[i] = setting.modulation_deviation_div100 * sinus[i*sinus_index]/100; fm_modulation[i] = setting.modulation_deviation_div100 * sine_wave[i*sine_wave_index]/100;
fm_modulation[modulation_steps/2 - i] = fm_modulation[i]; fm_modulation[modulation_steps/2 - i] = fm_modulation[i];
fm_modulation[modulation_steps/2 + i] = -fm_modulation[i]; fm_modulation[modulation_steps/2 + i] = -fm_modulation[i];
fm_modulation[modulation_steps - i] = -fm_modulation[i]; fm_modulation[modulation_steps - i] = -fm_modulation[i];

33
ui.c
Unescape View File

@ -1067,7 +1067,7 @@ const uint8_t right_icons [] =
_BMP16(0b0111111111111111), _BMP16(0b0111111111111111),
_BMP16(0b0000000000000000), _BMP16(0b0000000000000000),
#define I_SINUS 3 #define I_SINE 3
_BMP16(0b0000000000000000), _BMP16(0b0000000000000000),
_BMP16(0b0111111111111111), // 1 _BMP16(0b0111111111111111), // 1
_BMP16(0b0100000000000001), // 2 _BMP16(0b0100000000000001), // 2
@ -2208,7 +2208,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_lowoutput_settings_acb)
if (data == 255) { if (data == 255) {
plot_printf(mode_string, sizeof mode_string, "%s %s %s %s", plot_printf(mode_string, sizeof mode_string, "%s %s %s %s",
(!force_signal_path ? "" : path_text[test_path]), (!force_signal_path ? "" : path_text[test_path]),
(get_sweep_frequency(ST_START) < MINIMUM_DIRECT_FREQ ? "SINUS" : "" ), (get_sweep_frequency(ST_START) < MINIMUM_DIRECT_FREQ ? "SINE" : "" ),
(get_sweep_frequency(ST_STOP) >= MINIMUM_DIRECT_FREQ ? "SQUARE WAVE" : ""), (get_sweep_frequency(ST_STOP) >= MINIMUM_DIRECT_FREQ ? "SQUARE WAVE" : ""),
(get_sweep_frequency(ST_STOP) > MAX_LOW_OUTPUT_FREQ && setting.mixer_output ? "MIXER" : "")); (get_sweep_frequency(ST_STOP) > MAX_LOW_OUTPUT_FREQ && setting.mixer_output ? "MIXER" : ""));
b->param_1.text = mode_string; b->param_1.text = mode_string;
@ -2647,8 +2647,29 @@ static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb)
} }
kp_help_text = "Frequency of fundamental"; kp_help_text = "Frequency of fundamental";
ui_mode_keypad(KM_CENTER); ui_mode_keypad(KM_CENTER);
freq_t fundamental = uistat.value;
#ifdef __BANDS__
kp_help_text = "Span (0=full span)";
ui_mode_keypad(KM_CENTER);
freq_t half_span = uistat.value/2;
if (half_span > fundamental/2)
half_span = fundamental/2;
if (half_span != 0) {
for (int i = 0; i< BANDS_MAX; i++) {
setting.bands[i].start = fundamental*(i+1) - half_span;
setting.bands[i].end = fundamental*(i+1) + half_span;
setting.bands[i].enabled = true;
}
setting.multi_band = true;
setting.multi_trace = false;
update_bands();
}
else
#endif
{
set_sweep_frequency(ST_START, 0); set_sweep_frequency(ST_START, 0);
set_sweep_frequency(ST_STOP, uistat.value*(MARKERS_MAX+1)); set_sweep_frequency(ST_STOP, fundamental*(MARKERS_MAX+1));
}
set_average(0,AV_4); set_average(0,AV_4);
// set_measurement(M_IMD); // set_measurement(M_IMD);
break; break;
@ -4201,7 +4222,7 @@ static const menuitem_t menu_band_modify[] =
static const menuitem_t menu_band_select[] = { static const menuitem_t menu_band_select[] = {
{ MT_ADV_CALLBACK | MT_REPEATS, DATA_STARTS_REPEATS(0,BANDS_MAX), MT_CUSTOM_LABEL, menu_band_select_acb }, { MT_ADV_CALLBACK | MT_REPEATS, DATA_STARTS_REPEATS(0,BANDS_MAX), MT_CUSTOM_LABEL, menu_band_select_acb },
{ MT_ADV_CALLBACK, 0 , "MULTI\nTRACE", menu_multi_trace_acb }, { MT_ADV_CALLBACK, 0 , "ALTERNATE", menu_multi_trace_acb },
#ifdef __USE_SD_CARD__ #ifdef __USE_SD_CARD__
{ MT_CALLBACK, FMT_BND_FILE, "BANDS"S_RARROW"\nSD", menu_sdcard_cb}, { MT_CALLBACK, FMT_BND_FILE, "BANDS"S_RARROW"\nSD", menu_sdcard_cb},
#ifdef __SD_FILE_BROWSER__ #ifdef __SD_FILE_BROWSER__
@ -4836,7 +4857,7 @@ static const menuitem_t menu_storage[] = {
const menuitem_t menu_mode[] = { const menuitem_t menu_mode[] = {
// { MT_FORM | MT_TITLE, 0, "tinySA MODE", NULL}, // { MT_FORM | MT_TITLE, 0, "tinySA MODE", NULL},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "Spectrum Analyzer", menu_mode_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "Spectrum Analyzer", menu_mode_acb},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_OUTPUT+I_SINUS, "Signal Generator", menu_mode_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_OUTPUT+I_SINE, "Signal Generator", menu_mode_acb},
// { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_HIGH_OUTPUT+I_GEN, "%s to HIGH out", menu_mode_acb}, // { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_HIGH_OUTPUT+I_GEN, "%s to HIGH out", menu_mode_acb},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_CONNECT+I_GEN, "Calibration Output: %s", menu_sreffer_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_CONNECT+I_GEN, "Calibration Output: %s", menu_sreffer_acb},
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
@ -4846,7 +4867,7 @@ const menuitem_t menu_mode[] = {
// { MT_FORM | MT_TITLE, 0, "tinySA MODE", NULL}, // { MT_FORM | MT_TITLE, 0, "tinySA MODE", NULL},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "%s to LOW in", menu_mode_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "%s to LOW in", menu_mode_acb},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_HIGH_INPUT+I_SA, "%s to HIGH in", menu_mode_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_HIGH_INPUT+I_SA, "%s to HIGH in", menu_mode_acb},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_OUTPUT+I_SINUS, "%s to LOW out", menu_mode_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_LOW_OUTPUT+I_SINE, "%s to LOW out", menu_mode_acb},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_HIGH_OUTPUT+I_GEN, "%s to HIGH out", menu_mode_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_HIGH_OUTPUT+I_GEN, "%s to HIGH out", menu_mode_acb},
{ MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_CONNECT+I_GEN, "Cal. output: %s", menu_sreffer_acb}, { MT_FORM | MT_ADV_CALLBACK | MT_ICON, I_CONNECT+I_GEN, "Cal. output: %s", menu_sreffer_acb},
// { MT_SUBMENU, 0, "EXPERT\nCONFIG", menu_settings3}, // { MT_SUBMENU, 0, "EXPERT\nCONFIG", menu_settings3},

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.