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

Changed to CORRECT FREQUENCY and set min/max frequency

Browse Source
pull/4/head
erikkaashoek 6 years ago
parent 2a8be7d6eb
commit dc46aa0ccb
3 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
main.c
Unescape View File

@ -36,8 +36,8 @@
#include <string.h>
#include <math.h>
extern float minFreq;
extern float maxFreq;
extern uint32_t minFreq;
extern uint32_t maxFreq;
float frequencyStart;
float frequencyStop;
int32_t frequencyExtra;

32
sa_core.c
Unescape View File

@ -30,8 +30,8 @@ uint32_t frequencies[POINTS_COUNT];
float actual_rbw = 0;
int vbwSteps = 1;
float minFreq = 0;
float maxFreq = 520000000;
uint32_t minFreq = 0;
uint32_t maxFreq = 520000000;
//int setting.refer = -1; // Off by default
int const reffer_freq[] = {30000000, 15000000, 10000000, 4000000, 3000000, 2000000, 1000000};
@ -122,7 +122,7 @@ void reset_settings(int m)
setting.drive=8;
minFreq = 0;
maxFreq = 520000000;
set_sweep_frequency(ST_CENTER, (int32_t) 10000000);
set_sweep_frequency(ST_CENTER, 10000000);
set_sweep_frequency(ST_SPAN, 0);
setting.sweep_time = 10000.0;
break;
@ -131,18 +131,18 @@ void reset_settings(int m)
minFreq = 00000000;
maxFreq = 2000000000;
#else
minFreq = 240000000;
maxFreq = 960000000;
minFreq = 24*setting_frequency_10mhz;
maxFreq = 96*setting_frequency_10mhz;
#endif
set_sweep_frequency(ST_START, (int32_t) minFreq);
set_sweep_frequency(ST_STOP, (int32_t) maxFreq);
set_sweep_frequency(ST_START, minFreq);
set_sweep_frequency(ST_STOP, maxFreq);
setting.sweep_time = 0;
break;
case M_GENHIGH:
setting.drive=8;
minFreq = 240000000;
maxFreq = 960000000;
set_sweep_frequency(ST_CENTER, (int32_t) 300000000);
set_sweep_frequency(ST_CENTER, 300000000);
set_sweep_frequency(ST_SPAN, 0);
setting.sweep_time = 10000.0;
break;
@ -499,18 +499,20 @@ void set_spur(int v)
}
#endif
#ifdef __ULTRA__
void set_harmonic(int h)
{
setting.harmonic = h;
minFreq = 684000000.0;
if (setting.harmonic * 240000000+434000000 > minFreq)
if ((uint32_t)(setting.harmonic * 240000000)+434000000 > minFreq)
minFreq = setting.harmonic * 240000000.0+434000000.0;
maxFreq = 4360000000;
if (setting.harmonic != 0 && (960000000.0 * setting.harmonic + 434000000.0 )< 4360000000.0)
maxFreq = (960000000.0 * setting.harmonic + 434000000.0 );
set_sweep_frequency(ST_START, (uint32_t) minFreq);
set_sweep_frequency(ST_STOP, (uint32_t) maxFreq);
set_sweep_frequency(ST_START, minFreq);
set_sweep_frequency(ST_STOP, maxFreq);
}
#endif
void set_step_delay(int d)
{
@ -2558,8 +2560,8 @@ common_silent:
}
trace[TRACE_STORED].enabled = true;
set_reflevel(test_case[i].pass+10);
set_sweep_frequency(ST_CENTER, (int32_t)(test_case[i].center * 1000000));
set_sweep_frequency(ST_SPAN, (int32_t)(test_case[i].span * 1000000));
set_sweep_frequency(ST_CENTER, (uint32_t)(test_case[i].center * 1000000));
set_sweep_frequency(ST_SPAN, (uint32_t)(test_case[i].span * 1000000));
draw_cal_status();
}
@ -2711,7 +2713,7 @@ void self_test(int test)
setting.step_delay = setting.step_delay * 5 / 4;
setting.rbw = SI4432_force_RBW(j);
shell_printf("RBW = %d, ",setting.rbw);
set_sweep_frequency(ST_SPAN, (int32_t)(setting.rbw * 10000));
set_sweep_frequency(ST_SPAN, (uint32_t)(setting.rbw * 10000));
setting.repeat = 10;
test_acquire(i); // Acquire test
test_validate(i); // Validate test
@ -2726,7 +2728,7 @@ void self_test(int test)
test_prepare(i);
setting.step_delay = setting.step_delay * 4 / 5;
// shell_printf("\n\rRBW = %f",SI4432_force_RBW(j));
set_sweep_frequency(ST_SPAN, (int32_t)(setting.rbw * 10000));
set_sweep_frequency(ST_SPAN, (uint32_t)(setting.rbw * 10000));
setting.repeat = 10;
test_acquire(i); // Acquire test
test_validate(i); // Validate test

18
ui_sa.c
Unescape View File

@ -1199,7 +1199,6 @@ const menuitem_t menu_lowoutputmode[] = {
{ MT_FORM | MT_KEYPAD, KM_SPAN, "SPAN: %s", "0..350MHz"},
{ MT_FORM | MT_KEYPAD | MT_LOW, KM_LEVELSWEEP,"LEVEL CHANGE: %s", "-70..70"},
{ MT_FORM | MT_KEYPAD, KM_SWEEP_TIME, "SWEEP TIME: %s", "0..600S"},
// { MT_FORM | MT_KEYPAD, KM_10MHZ, "10MHz: %s", NULL},
{ MT_FORM | MT_CANCEL, 0, "MODE", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
};
@ -1404,10 +1403,10 @@ static const menuitem_t menu_settings2[] =
{ MT_CALLBACK | MT_LOW, 4, "\2BELOW\0IF", menu_settings2_cb},
{ MT_KEYPAD, KM_DECAY, "\2HOLD\0SWEEPS", "1..1000"},
{ MT_KEYPAD, KM_NOISE, "\2NOISE\0LEVEL", "2..20"},
{ MT_KEYPAD, KM_10MHZ, "\2CORRECT\0FREQUENCY", "Enter actual l0MHz frequency"},
#ifdef __ULTRA__
{ MT_SUBMENU,0, "HARMONIC", menu_harmonic},
#endif
// { MT_KEYPAD, KM_10MHZ,"\00210MHz\0ACTUAL", NULL},
{ MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
@ -1861,20 +1860,20 @@ set_numeric_value(void)
{
switch (keypad_mode) {
case KM_START:
set_sweep_frequency(ST_START, uistat.value);
set_sweep_frequency(ST_START, (uint32_t)uistat.value);
break;
case KM_STOP:
set_sweep_frequency(ST_STOP, uistat.value);
set_sweep_frequency(ST_STOP, (uint32_t)uistat.value);
break;
case KM_CENTER:
set_sweep_frequency(ST_CENTER, uistat.value);
set_sweep_frequency(ST_CENTER, (uint32_t)uistat.value);
break;
case KM_SPAN:
setting.modulation = MO_NONE;
set_sweep_frequency(ST_SPAN, uistat.value);
set_sweep_frequency(ST_SPAN, (uint32_t)uistat.value);
break;
case KM_CW:
set_sweep_frequency(ST_CW, uistat.value);
set_sweep_frequency(ST_CW, (uint32_t)uistat.value);
break;
case KM_SCALE:
user_set_scale(uistat.value);
@ -1914,10 +1913,7 @@ set_numeric_value(void)
set_noise(uistat.value);
break;
case KM_10MHZ:
if (uistat.value < 9000000) {
set_10mhz(setting_frequency_10mhz + uistat.value);
} else
set_10mhz(uistat.value);
set_10mhz(uistat.value);
dirty = true;
break;
case KM_OFFSET:

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.