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

output default off, help text improved, use %.3F format

Browse Source
tinySA-v0.2
erikkaashoek 6 years ago
parent 879ae21538
commit c136d58853
6 changed files with 112 additions and 273 deletions
Show Stats Download Patch File Download Diff File

13
chprintf.c
Unescape View File

@ -52,7 +52,7 @@ static const uint32_t pow10[FLOAT_PRECISION+1] = {
static char bigPrefix[] = {' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 0}; static char bigPrefix[] = {' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 0};
// Prefixes for values less then 1.0 // Prefixes for values less then 1.0
// 1e-3, 1e-6, 1e-9, 1e-12, 1e-15, 1e-18, 1e-21, 1e-24 // 1e-3, 1e-6, 1e-9, 1e-12, 1e-15, 1e-18, 1e-21, 1e-24
static char smallPrefix[] = {'m', 0x1d, 'n', 'p', 'f', 'a', 'z', 'y', 0}; static char smallPrefix[] = {'m', 'u', 'n', 'p', 'f', 'a', 'z', 'y', 0};
#pragma pack(pop) #pragma pack(pop)
@ -195,12 +195,15 @@ static char *ftoaS(char *p, float num, uint32_t precision) {
; ;
prefix = num > 1e-3 ? ptr[-1] : 0; prefix = num > 1e-3 ? ptr[-1] : 0;
} }
if (prefix)
precision--;
// Auto set prescision // Auto set prescision
uint32_t l = num; uint32_t l = num;
if (l < 10) if (l > 100)
precision+=2; precision-=2;
else if (l < 100) else if (l > 10)
precision+=1; precision-=1;
p=ftoa(p, num, precision); p=ftoa(p, num, precision);
if (prefix) if (prefix)
*p++ = prefix; *p++ = prefix;

4
nanovna.h
Unescape View File

@ -820,9 +820,6 @@ void SI4432_SetReference(int freq);
#define define_to_STR(x) STR1(x) #define define_to_STR(x) STR1(x)
// sa_core.c // sa_core.c
int GetRBW(void);
int GetStorage(void);
int GetSubtractStorage(void);
int get_waterfall(void); int get_waterfall(void);
void toggle_tracking(void); void toggle_tracking(void);
void calibrate(void); void calibrate(void);
@ -841,6 +838,7 @@ void wait_user(void);
void calibrate(void); void calibrate(void);
float to_dBm(float); float to_dBm(float);
float calc_min_sweep_time(void); float calc_min_sweep_time(void);
extern float actual_rbw;
enum { enum {
M_OFF, M_IMD, M_OIP3, M_PHASE_NOISE, M_STOP_BAND, M_PASS_BAND, M_LINEARITY M_OFF, M_IMD, M_OIP3, M_PHASE_NOISE, M_STOP_BAND, M_PASS_BAND, M_LINEARITY

7
plot.c
Unescape View File

@ -888,18 +888,17 @@ static void trace_get_value_string(
// frequency_string(&buf2[1], sizeof(buf2) -1, dfreq); // frequency_string(&buf2[1], sizeof(buf2) -1, dfreq);
v = value(coeff[i]); v = value(coeff[i]);
if (mtype & M_NOISE) if (mtype & M_NOISE)
v = v - 10*log10(get_actual_RBW()*1000.0); v = v - 10*log10(actual_rbw*1000.0);
if (v == -INFINITY) if (v == -INFINITY)
plot_printf(buf, len, "-INF"); plot_printf(buf, len, "-INF");
else { else {
v = v - rlevel; v = v - rlevel;
if (UNIT_IS_LINEAR(setting.unit)) { if (UNIT_IS_LINEAR(setting.unit)) {
plot_printf(buf3, sizeof(buf3), "%4f", v/setting.unit_scale); plot_printf(buf3, sizeof(buf3), "%.3F", v); // 5 characters incl u,m,etc...
} else { } else {
plot_printf(buf3, sizeof(buf3), "%.1f", v); plot_printf(buf3, sizeof(buf3), "%.1f", v);
} }
buf3[5] = 0; plot_printf(buf, len, "%s %s%s%s", buf2, buf3, unit_string[setting.unit],(mtype & M_NOISE?"/Hz":""));
plot_printf(buf, len, "%s %s%s%s%s", buf2, buf3, unit_scale_text[setting.unit_scale_index], unit_string[setting.unit],(mtype & M_NOISE?"/Hz":""));
} }
} }

111
sa_core.c
Unescape View File

@ -59,7 +59,7 @@ void reset_settings(int m)
trace[TRACE_STORED].enabled = false; trace[TRACE_STORED].enabled = false;
trace[TRACE_TEMP].enabled = false; trace[TRACE_TEMP].enabled = false;
setting.refer = -1; setting.refer = -1;
setting.mute = false; setting.mute = true;
#ifdef __SPUR__ #ifdef __SPUR__
setting.spur = 0; setting.spur = 0;
#endif #endif
@ -142,11 +142,6 @@ void set_refer_output(int v)
dirty = true; dirty = true;
} }
int get_refer_output(void)
{
return(setting.refer);
}
void set_decay(int d) void set_decay(int d)
{ {
if (d < 0 || d > 200) if (d < 0 || d > 200)
@ -249,13 +244,6 @@ void set_IF(int f)
dirty = true; dirty = true;
} }
int GetMode(void)
{
return(setting.mode);
dirty = true;
}
#define POWER_STEP 0 // Should be 5 dB but appearently it is lower #define POWER_STEP 0 // Should be 5 dB but appearently it is lower
#define POWER_OFFSET 15 #define POWER_OFFSET 15
#define SWITCH_ATTENUATION 30 #define SWITCH_ATTENUATION 30
@ -339,11 +327,6 @@ void set_storage(void)
dirty = true; dirty = true;
} }
int GetStorage(void)
{
return(setting.show_stored);
}
void set_clear_storage(void) void set_clear_storage(void)
{ {
setting.show_stored = false; setting.show_stored = false;
@ -364,11 +347,6 @@ void set_subtract_storage(void)
dirty = true; dirty = true;
} }
int GetSubtractStorage(void)
{
return(setting.subtract_stored);
}
extern float peakLevel; extern float peakLevel;
void set_actual_power(float o) void set_actual_power(float o)
{ {
@ -417,16 +395,6 @@ void set_RBW(int v)
dirty = true; dirty = true;
} }
int GetRBW(void)
{
return(setting.rbw);
}
int get_actual_RBW(void)
{
return((int) actual_rbw);
}
#ifdef __SPUR__ #ifdef __SPUR__
void SetSpur(int v) void SetSpur(int v)
{ {
@ -466,11 +434,6 @@ void set_average(int v)
dirty = true; dirty = true;
} }
int GetAverage(void)
{
return(setting.average);
}
void toggle_LNA(void) void toggle_LNA(void)
{ {
if (S_IS_AUTO(setting.lna )) if (S_IS_AUTO(setting.lna ))
@ -495,16 +458,6 @@ void toggle_tracking(void)
dirty = true; dirty = true;
} }
int GetExtraVFO(void)
{
return(setting.tracking);
}
int GetLNA(void)
{
return(setting.lna);
}
void toggle_AGC(void) void toggle_AGC(void)
{ {
if (S_IS_AUTO(setting.agc )) if (S_IS_AUTO(setting.agc ))
@ -516,11 +469,6 @@ void toggle_AGC(void)
dirty = true; dirty = true;
} }
int GetAGC(void)
{
return(setting.agc);
}
void set_unit(int u) void set_unit(int u)
{ {
if (setting.unit == u) if (setting.unit == u)
@ -579,13 +527,6 @@ void set_reflevel(float level)
level = REFLEVEL_MIN; level = REFLEVEL_MIN;
if (level > REFLEVEL_MAX) if (level > REFLEVEL_MAX)
level = REFLEVEL_MAX; level = REFLEVEL_MAX;
#if 0
float s = setting.scale;
if (level < NGRIDY * s) { // Never negative bottom
set_scale(level/NGRIDY);
level = setting.scale * NGRIDY;
}
#endif
} }
setting.unit_scale_index = 0; setting.unit_scale_index = 0;
@ -660,20 +601,6 @@ void set_scale(float t) {
set_trace_scale(1, t); set_trace_scale(1, t);
set_trace_scale(2, t); set_trace_scale(2, t);
round_reflevel_to_scale(); round_reflevel_to_scale();
#if 0
if (UNIT_IS_LINEAR(setting.unit)) { // Never negative bottom
float r = setting.reflevel;
t = NGRIDY * t;
if (t > r) {
setting.reflevel = t;
set_trace_refpos(0, t);
set_trace_refpos(1, t);
set_trace_refpos(2, t);
}
}
#endif
// set_reflevel(setting.reflevel);
redraw_request |= REDRAW_AREA | REDRAW_CAL_STATUS; redraw_request |= REDRAW_AREA | REDRAW_CAL_STATUS;
} }
@ -739,12 +666,6 @@ void apply_settings(void)
PE4302_Write_Byte(40); // Ensure defined input impedance of low port when using high input mode (power calibration) PE4302_Write_Byte(40); // Ensure defined input impedance of low port when using high input mode (power calibration)
else else
PE4302_Write_Byte(setting.attenuate * 2); PE4302_Write_Byte(setting.attenuate * 2);
#if 0
if (setting.modulation == MO_NONE) {
SI4432_Write_Byte(0x73, 0); // Back to nominal offset
SI4432_Write_Byte(0x74, 0);
}
#endif
SI4432_SetReference(setting.refer); SI4432_SetReference(setting.refer);
update_rbw(); update_rbw();
if (setting.frequency_step == 0.0) { if (setting.frequency_step == 0.0) {
@ -1925,23 +1846,12 @@ void draw_cal_status(void)
ili9341_set_background(DEFAULT_BG_COLOR); ili9341_set_background(DEFAULT_BG_COLOR);
float yMax = setting.reflevel; // Determine unit scale letter ( ,m,u,n,p) float yMax = setting.reflevel; // Determine unit scale letter ( ,m,u,n,p)
#if 0 // moved to set_reflevel
setting.unit_scale_index = 0;
setting.unit_scale = 1.0;
while (UNIT_IS_LINEAR(setting.unit) && setting.unit_scale_index < sizeof(unit_scale_value)/sizeof(float) - 1) {
if (yMax > unit_scale_value[setting.unit_scale_index])
break;
setting.unit_scale_index++;
}
setting.unit_scale = unit_scale_value[setting.unit_scale_index];
#endif
// Top level // Top level
if (rounding) if (rounding)
plot_printf(buf, BLEN, "%4d", (int)yMax); plot_printf(buf, BLEN, "%4d", (int)yMax);
else else
plot_printf(buf, BLEN, "%4f", (yMax/setting.unit_scale)+0.00005); plot_printf(buf, BLEN, "%.3F", (yMax/setting.unit_scale));
buf[5]=0; // buf[5]=0;
if (level_is_calibrated()) { if (level_is_calibrated()) {
if (setting.auto_reflevel) if (setting.auto_reflevel)
color = DEFAULT_FG_COLOR; color = DEFAULT_FG_COLOR;
@ -1970,6 +1880,7 @@ void draw_cal_status(void)
color = DEFAULT_FG_COLOR; color = DEFAULT_FG_COLOR;
ili9341_set_foreground(color); ili9341_set_foreground(color);
y += YSTEP + YSTEP/2; y += YSTEP + YSTEP/2;
#if 1
unsigned int i = 0; unsigned int i = 0;
while (i < sizeof(scale_value)/sizeof(float)) { while (i < sizeof(scale_value)/sizeof(float)) {
float t = (setting.scale/setting.unit_scale) / scale_value[i];; float t = (setting.scale/setting.unit_scale) / scale_value[i];;
@ -1979,11 +1890,8 @@ void draw_cal_status(void)
} }
i++; i++;
} }
#if 0 #else
if (rounding) plot_printf(buf, BLEN, "%.2F/",setting.scale);
plot_printf(buf, BLEN, "%5d/",(int)setting.scale);
else
plot_printf(buf, BLEN, "%5f/",setting.scale);
#endif #endif
ili9341_drawstring(buf, x, y); ili9341_drawstring(buf, x, y);
@ -2132,7 +2040,8 @@ void draw_cal_status(void)
if (rounding) if (rounding)
plot_printf(buf, BLEN, "%4f", value(setting.trigger_level)); plot_printf(buf, BLEN, "%4f", value(setting.trigger_level));
else else
plot_printf(buf, BLEN, "%4f", value(setting.trigger_level)/setting.unit_scale); plot_printf(buf, BLEN, "%.4F", value(setting.trigger_level));
// plot_printf(buf, BLEN, "%4f", value(setting.trigger_level)/setting.unit_scale);
buf[6]=0; buf[6]=0;
ili9341_drawstring(buf, x, y); ili9341_drawstring(buf, x, y);
} }
@ -2193,8 +2102,8 @@ void draw_cal_status(void)
if (rounding) if (rounding)
plot_printf(buf, BLEN, "%4d", (int)(yMax - setting.scale * NGRIDY)); plot_printf(buf, BLEN, "%4d", (int)(yMax - setting.scale * NGRIDY));
else else
plot_printf(buf, BLEN, "%4f", ((yMax - setting.scale * NGRIDY)/setting.unit_scale)+0.0005); plot_printf(buf, BLEN, "%.3F", ((yMax - setting.scale * NGRIDY)/setting.unit_scale));
buf[5]=0; // buf[5]=0;
if (level_is_calibrated()) if (level_is_calibrated())
if (setting.auto_reflevel) if (setting.auto_reflevel)
color = DEFAULT_FG_COLOR; color = DEFAULT_FG_COLOR;

2
ui.c
Unescape View File

@ -1240,6 +1240,7 @@ menu_invoke(int item)
area_width = AREA_WIDTH_NORMAL - MENU_BUTTON_WIDTH; area_width = AREA_WIDTH_NORMAL - MENU_BUTTON_WIDTH;
redraw_frame(); // Remove form numbers redraw_frame(); // Remove form numbers
} }
kp_help_text = (char *)menu->reference;
ui_mode_keypad(menu->data); ui_mode_keypad(menu->data);
ui_process_keypad(); ui_process_keypad();
} }
@ -1877,7 +1878,6 @@ ui_mode_keypad(int _keypad_mode)
draw_menu(); draw_menu();
draw_keypad(); draw_keypad();
draw_numeric_area_frame(); draw_numeric_area_frame();
fetch_numeric_target();
draw_numeric_input(""); draw_numeric_input("");
} }

238
ui_sa.c
Unescape View File

@ -588,7 +588,7 @@ void menu_autosettings_cb(int item, uint8_t data)
{ {
(void)item; (void)item;
(void)data; (void)data;
reset_settings(GetMode()); reset_settings(setting.mode);
active_marker = 0; active_marker = 0;
for (int i = 1; i<MARKER_COUNT; i++ ) { for (int i = 1; i<MARKER_COUNT; i++ ) {
@ -737,11 +737,11 @@ static void menu_measure_cb(int item, uint8_t data)
#ifdef __MEASURE__ #ifdef __MEASURE__
switch(data) { switch(data) {
case M_OFF: // Off case M_OFF: // Off
reset_settings(GetMode()); reset_settings(setting.mode);
set_measurement(M_OFF); set_measurement(M_OFF);
break; break;
case M_IMD: // IMD case M_IMD: // IMD
reset_settings(GetMode()); reset_settings(setting.mode);
for (int i = 0; i< MARKERS_MAX; i++) { for (int i = 0; i< MARKERS_MAX; i++) {
markers[i].enabled = M_ENABLED; markers[i].enabled = M_ENABLED;
markers[i].mtype = M_DELTA | M_TRACKING; markers[i].mtype = M_DELTA | M_TRACKING;
@ -755,7 +755,7 @@ static void menu_measure_cb(int item, uint8_t data)
set_measurement(M_IMD); set_measurement(M_IMD);
break; break;
case M_OIP3: // OIP3 case M_OIP3: // OIP3
reset_settings(GetMode()); reset_settings(setting.mode);
for (int i = 0; i< MARKERS_MAX; i++) { for (int i = 0; i< MARKERS_MAX; i++) {
markers[i].enabled = M_ENABLED; markers[i].enabled = M_ENABLED;
markers[i].mtype = M_DELTA; markers[i].mtype = M_DELTA;
@ -775,7 +775,7 @@ static void menu_measure_cb(int item, uint8_t data)
set_measurement(M_OIP3); set_measurement(M_OIP3);
break; break;
case M_PHASE_NOISE: // Phase noise case M_PHASE_NOISE: // Phase noise
reset_settings(GetMode()); reset_settings(setting.mode);
for (int i = 0; i< MARKERS_MAX; i++) { for (int i = 0; i< MARKERS_MAX; i++) {
markers[i].enabled = M_DISABLED; markers[i].enabled = M_DISABLED;
markers[i].mtype = M_NORMAL; markers[i].mtype = M_NORMAL;
@ -796,7 +796,7 @@ static void menu_measure_cb(int item, uint8_t data)
break; break;
case M_STOP_BAND: // STop band measurement case M_STOP_BAND: // STop band measurement
reset_settings(GetMode()); reset_settings(setting.mode);
markers[1].enabled = M_ENABLED; markers[1].enabled = M_ENABLED;
markers[1].mtype = M_DELTA; markers[1].mtype = M_DELTA;
markers[2].enabled = M_ENABLED; markers[2].enabled = M_ENABLED;
@ -813,7 +813,7 @@ static void menu_measure_cb(int item, uint8_t data)
break; break;
case M_PASS_BAND: // STop band measurement case M_PASS_BAND: // STop band measurement
reset_settings(GetMode()); reset_settings(setting.mode);
markers[1].enabled = M_ENABLED; markers[1].enabled = M_ENABLED;
markers[1].mtype = M_DELTA; markers[1].mtype = M_DELTA;
markers[2].enabled = M_ENABLED; markers[2].enabled = M_ENABLED;
@ -834,7 +834,6 @@ static void menu_measure_cb(int item, uint8_t data)
ui_mode_normal(); ui_mode_normal();
break; break;
} }
kp_help_text = NULL;
#endif #endif
// selection = -1; // selection = -1;
ui_mode_normal(); ui_mode_normal();
@ -1066,7 +1065,7 @@ const char *menu_drive_text[]={"-38dBm","-35dBm","-33dBm","-30dBm","-27dBm","-24
// ===[MENU DEFINITION]========================================================= // ===[MENU DEFINITION]=========================================================
static const menuitem_t menu_store_preset_high[] = static const menuitem_t menu_store_preset_high[8] =
{ {
{ MT_CALLBACK, 0, "\2STORE\0STARTUP",menu_store_preset_cb}, { MT_CALLBACK, 0, "\2STORE\0STARTUP",menu_store_preset_cb},
{ MT_CALLBACK, 5, "STORE 5" , menu_store_preset_cb}, { MT_CALLBACK, 5, "STORE 5" , menu_store_preset_cb},
@ -1074,7 +1073,7 @@ static const menuitem_t menu_store_preset_high[] =
{ MT_CALLBACK, 7, "STORE 7" , menu_store_preset_cb}, { MT_CALLBACK, 7, "STORE 7" , menu_store_preset_cb},
{ MT_CALLBACK, 8, "STORE 8" , menu_store_preset_cb}, { MT_CALLBACK, 8, "STORE 8" , menu_store_preset_cb},
{ MT_CALLBACK, 100, "\2FACTORY\0DEFAULTS",menu_store_preset_cb}, { MT_CALLBACK, 100, "\2FACTORY\0DEFAULTS",menu_store_preset_cb},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1086,7 +1085,7 @@ static const menuitem_t menu_load_preset_high[] =
{ MT_CALLBACK, 7, "LOAD 7" , menu_load_preset_cb}, { MT_CALLBACK, 7, "LOAD 7" , menu_load_preset_cb},
{ MT_CALLBACK, 8, "LOAD 8" , menu_load_preset_cb}, { MT_CALLBACK, 8, "LOAD 8" , menu_load_preset_cb},
{ MT_SUBMENU, 0, "STORE" , menu_store_preset_high}, { MT_SUBMENU, 0, "STORE" , menu_store_preset_high},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1098,7 +1097,7 @@ static const menuitem_t menu_store_preset[] =
{ MT_CALLBACK, 3, "STORE 3" , menu_store_preset_cb}, { MT_CALLBACK, 3, "STORE 3" , menu_store_preset_cb},
{ MT_CALLBACK, 4, "STORE 4" , menu_store_preset_cb}, { MT_CALLBACK, 4, "STORE 4" , menu_store_preset_cb},
{ MT_CALLBACK, 100, "\2FACTORY\0DEFAULTS",menu_store_preset_cb}, { MT_CALLBACK, 100, "\2FACTORY\0DEFAULTS",menu_store_preset_cb},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1110,7 +1109,7 @@ static const menuitem_t menu_load_preset[] =
{ MT_CALLBACK, 3, "LOAD 3" , menu_load_preset_cb}, { MT_CALLBACK, 3, "LOAD 3" , menu_load_preset_cb},
{ MT_CALLBACK, 4, "LOAD 4" , menu_load_preset_cb}, { MT_CALLBACK, 4, "LOAD 4" , menu_load_preset_cb},
{ MT_SUBMENU, 0, "STORE" , menu_store_preset}, { MT_SUBMENU, 0, "STORE" , menu_store_preset},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1119,7 +1118,7 @@ static const menuitem_t menu_drive[] = {
{ MT_CALLBACK, 14, " 12dBm", menu_drive_cb}, { MT_CALLBACK, 14, " 12dBm", menu_drive_cb},
{ MT_CALLBACK, 13, " 9dBm", menu_drive_cb}, { MT_CALLBACK, 13, " 9dBm", menu_drive_cb},
{ MT_CALLBACK, 12, " 6dBm", menu_drive_cb}, { MT_CALLBACK, 12, " 6dBm", menu_drive_cb},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1130,7 +1129,7 @@ static const menuitem_t menu_drive_wide3[] = {
{ MT_FORM | MT_CALLBACK, 2, "-33dBm", menu_drive_cb }, { MT_FORM | MT_CALLBACK, 2, "-33dBm", menu_drive_cb },
{ MT_FORM | MT_CALLBACK, 1, "-35dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 1, "-35dBm", menu_drive_cb},
{ MT_FORM | MT_CALLBACK, 0, "-38dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 0, "-38dBm", menu_drive_cb},
{ MT_FORM | MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1140,8 +1139,8 @@ static const menuitem_t menu_drive_wide2[] = {
{ MT_FORM | MT_CALLBACK, 8, " -7dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 8, " -7dBm", menu_drive_cb},
{ MT_FORM | MT_CALLBACK, 7, "-19dBm", menu_drive_cb }, { MT_FORM | MT_CALLBACK, 7, "-19dBm", menu_drive_cb },
{ MT_FORM | MT_CALLBACK, 6, "-21dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 6, "-21dBm", menu_drive_cb},
{ MT_FORM | MT_SUBMENU, 255, S_RARROW" MORE", menu_drive_wide3}, { MT_FORM | MT_SUBMENU, 255, "\033 MORE", menu_drive_wide3},
{ MT_FORM | MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1151,8 +1150,8 @@ static const menuitem_t menu_drive_wide[] = {
{ MT_FORM | MT_CALLBACK, 13, " 7dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 13, " 7dBm", menu_drive_cb},
{ MT_FORM | MT_CALLBACK, 12, " 4dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 12, " 4dBm", menu_drive_cb},
{ MT_FORM | MT_CALLBACK, 11, " 1dBm", menu_drive_cb}, { MT_FORM | MT_CALLBACK, 11, " 1dBm", menu_drive_cb},
{ MT_FORM | MT_SUBMENU, 255, S_RARROW" MORE", menu_drive_wide2}, { MT_FORM | MT_SUBMENU, 255, "\033 MORE", menu_drive_wide2},
{ MT_FORM | MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 255, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1164,30 +1163,30 @@ const menuitem_t menu_modulation[] = {
{ MT_FORM | MT_CALLBACK, MO_NFM, "NARROW FM", menu_modulation_cb}, { MT_FORM | MT_CALLBACK, MO_NFM, "NARROW FM", menu_modulation_cb},
{ MT_FORM | MT_CALLBACK, MO_WFM, "WIDE FM", menu_modulation_cb}, { MT_FORM | MT_CALLBACK, MO_WFM, "WIDE FM", menu_modulation_cb},
{ MT_FORM | MT_CALLBACK, MO_EXTERNAL, "EXTERNAL", menu_modulation_cb}, { MT_FORM | MT_CALLBACK, MO_EXTERNAL, "EXTERNAL", menu_modulation_cb},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK",NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK",NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
const menuitem_t menu_lowoutputmode[] = { const menuitem_t menu_lowoutputmode[] = {
{ MT_FORM | MT_CALLBACK, 0, "LOW OUTPUT %s", menu_outputmode_cb}, { MT_FORM | MT_CALLBACK, 0, "LOW OUTPUT %s", menu_outputmode_cb},
{ MT_FORM | MT_KEYPAD, KM_CENTER, "FREQ: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_CENTER, "FREQ: %s", "10kHz..350Mhz"},
{ MT_FORM | MT_KEYPAD, KM_LOWOUTLEVEL, "LEVEL: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_LOWOUTLEVEL, "LEVEL: %s", "-76..-6"},
{ MT_FORM | MT_SUBMENU, 0, "MODULATION: %s", menu_modulation}, { MT_FORM | MT_SUBMENU, 0, "MODULATION: %s", menu_modulation},
{ MT_FORM | MT_KEYPAD, KM_SPAN, "SPAN: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_SPAN, "SPAN: %s", "0..350MHz"},
{ MT_FORM | MT_KEYPAD | MT_LOW, KM_LEVELSWEEP, "LEVELSWEEP: %s", NULL}, { MT_FORM | MT_KEYPAD | MT_LOW, KM_LEVELSWEEP,"LEVELSWEEP: %s", "-70..70"},
{ MT_FORM | MT_KEYPAD, KM_SWEEP_TIME, "SWEEP TIME: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_SWEEP_TIME, "SWEEP TIME: %s", "15mS..600S"},
// { MT_FORM | MT_KEYPAD, KM_10MHZ, "10MHZ: %s", NULL}, // { MT_FORM | MT_KEYPAD, KM_10MHZ, "10MHZ: %s", NULL},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
const menuitem_t menu_highoutputmode[] = { const menuitem_t menu_highoutputmode[] = {
{ MT_FORM | MT_CALLBACK, 0, "HIGH OUTPUT %s", menu_outputmode_cb}, { MT_FORM | MT_CALLBACK, 0, "HIGH OUTPUT %s", menu_outputmode_cb},
{ MT_FORM | MT_KEYPAD, KM_CENTER, "FREQ: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_CENTER, "FREQ: %s", "240MHz..960Mhz"},
{ MT_FORM | MT_SUBMENU, 0, "LEVEL: %s", menu_drive_wide}, { MT_FORM | MT_SUBMENU, 0, "LEVEL: %s", menu_drive_wide},
{ MT_FORM | MT_SUBMENU, 0, "MODULATION: %s", menu_modulation}, { MT_FORM | MT_SUBMENU, 0, "MODULATION: %s", menu_modulation},
{ MT_FORM | MT_KEYPAD, KM_SPAN, "SPAN: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_SPAN, "SPAN: %s", NULL},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK",NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK",NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1198,7 +1197,7 @@ static const menuitem_t menu_average[] = {
{ MT_CALLBACK, 3, "\2MAX\0DECAY", menu_average_cb}, { MT_CALLBACK, 3, "\2MAX\0DECAY", menu_average_cb},
{ MT_CALLBACK, 4, "AVER 4", menu_average_cb}, { MT_CALLBACK, 4, "AVER 4", menu_average_cb},
{ MT_CALLBACK, 5, "AVER 16", menu_average_cb}, { MT_CALLBACK, 5, "AVER 16", menu_average_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1210,7 +1209,7 @@ static const menuitem_t menu_rbw[] = {
{ MT_CALLBACK, 4, "100kHz", menu_rbw_cb}, { MT_CALLBACK, 4, "100kHz", menu_rbw_cb},
{ MT_CALLBACK, 5, "300kHz", menu_rbw_cb}, { MT_CALLBACK, 5, "300kHz", menu_rbw_cb},
{ MT_CALLBACK, 6, "600kHz", menu_rbw_cb}, { MT_CALLBACK, 6, "600kHz", menu_rbw_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1222,8 +1221,8 @@ static const menuitem_t menu_scale_per2[] = {
{ MT_CALLBACK, 9, "0.02/", menu_scale_per_cb}, { MT_CALLBACK, 9, "0.02/", menu_scale_per_cb},
{ MT_CALLBACK,10, "0.01/", menu_scale_per_cb}, { MT_CALLBACK,10, "0.01/", menu_scale_per_cb},
// { MT_CALLBACK,11, "0.005/", menu_scale_per_cb}, // { MT_CALLBACK,11, "0.005/", menu_scale_per_cb},
// { MT_SUBMENU, 0, S_RARROW" MORE", menu_scale_per2}, // { MT_SUBMENU, 0, "\033 MORE", menu_scale_per2},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1234,9 +1233,9 @@ static const menuitem_t menu_scale_per[] = {
{ MT_CALLBACK, 3, " 2/", menu_scale_per_cb}, { MT_CALLBACK, 3, " 2/", menu_scale_per_cb},
{ MT_CALLBACK, 4, " 1/", menu_scale_per_cb}, { MT_CALLBACK, 4, " 1/", menu_scale_per_cb},
{ MT_CALLBACK, 5, "0.5/", menu_scale_per_cb}, { MT_CALLBACK, 5, "0.5/", menu_scale_per_cb},
{ MT_SUBMENU, 0, S_RARROW" MORE", menu_scale_per2}, { MT_SUBMENU, 0, "\033 MORE", menu_scale_per2},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1244,7 +1243,7 @@ static const menuitem_t menu_reffer2[] = {
{ MT_FORM | MT_CALLBACK, 5, "3MHz" , menu_reffer_cb}, { MT_FORM | MT_CALLBACK, 5, "3MHz" , menu_reffer_cb},
{ MT_FORM | MT_CALLBACK, 6, "2MHz" , menu_reffer_cb}, { MT_FORM | MT_CALLBACK, 6, "2MHz" , menu_reffer_cb},
{ MT_FORM | MT_CALLBACK, 7, "1MHz" , menu_reffer_cb}, { MT_FORM | MT_CALLBACK, 7, "1MHz" , menu_reffer_cb},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1257,15 +1256,15 @@ static const menuitem_t menu_reffer[] = {
{ MT_FORM | MT_CALLBACK, 4, "4MHz" , menu_reffer_cb}, { MT_FORM | MT_CALLBACK, 4, "4MHz" , menu_reffer_cb},
{ MT_FORM | MT_CALLBACK, 6, "2MHz" , menu_reffer_cb}, { MT_FORM | MT_CALLBACK, 6, "2MHz" , menu_reffer_cb},
{ MT_FORM | MT_CALLBACK, 7, "1MHz" , menu_reffer_cb}, { MT_FORM | MT_CALLBACK, 7, "1MHz" , menu_reffer_cb},
// { MT_FORM | MT_SUBMENU, 0, S_RARROW" MORE", menu_reffer2}, // { MT_FORM | MT_SUBMENU, 0, "\033 MORE", menu_reffer2},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
static const menuitem_t menu_atten[] = { static const menuitem_t menu_atten[] = {
{ MT_CALLBACK,0, "AUTO", menu_atten_cb}, { MT_CALLBACK,0, "AUTO", menu_atten_cb},
{ MT_KEYPAD, KM_ATTENUATION, "MANUAL", NULL}, { MT_KEYPAD, KM_ATTENUATION, "MANUAL", "0..30"},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1273,18 +1272,18 @@ static const menuitem_t menu_atten[] = {
static const menuitem_t menu_reflevel[] = { static const menuitem_t menu_reflevel[] = {
{ MT_CALLBACK,0, "AUTO", menu_reflevel_cb}, { MT_CALLBACK,0, "AUTO", menu_reflevel_cb},
{ MT_KEYPAD, KM_REFLEVEL, "MANUAL", NULL}, { MT_KEYPAD, KM_REFLEVEL, "MANUAL", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
const menuitem_t menu_marker_search[] = { const menuitem_t menu_marker_search[] = {
//{ MT_CALLBACK, "OFF", menu_marker_search_cb }, //{ MT_CALLBACK, "OFF", menu_marker_search_cb },
{ MT_CALLBACK, 0, "\2MIN\0" S_LARROW" LEFT", menu_marker_search_cb }, { MT_CALLBACK, 0, "\2MIN\0" "\032 LEFT", menu_marker_search_cb },
{ MT_CALLBACK, 1, "\2MIN\0" S_RARROW" RIGHT", menu_marker_search_cb }, { MT_CALLBACK, 1, "\2MIN\0" "\033 RIGHT", menu_marker_search_cb },
{ MT_CALLBACK, 2, "\2MAX\0" S_LARROW" LEFT", menu_marker_search_cb }, { MT_CALLBACK, 2, "\2MAX\0" "\032 LEFT", menu_marker_search_cb },
{ MT_CALLBACK, 3, "\2MAX\0" S_RARROW" RIGHT", menu_marker_search_cb }, { MT_CALLBACK, 3, "\2MAX\0" "\033 RIGHT", menu_marker_search_cb },
{ MT_CALLBACK, 4, "TRACKING", menu_marker_search_cb }, { MT_CALLBACK, 4, "TRACKING", menu_marker_search_cb },
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1296,7 +1295,7 @@ const menuitem_t menu_marker_modify[] = {
{ MT_CALLBACK, M_NORMAL, "NORMAL", menu_marker_modify_cb}, { MT_CALLBACK, M_NORMAL, "NORMAL", menu_marker_modify_cb},
{ MT_SUBMENU, 0, "SEARCH", menu_marker_search}, { MT_SUBMENU, 0, "SEARCH", menu_marker_search},
{ MT_CALLBACK, M_DELETE, "DELETE", menu_marker_modify_cb}, { MT_CALLBACK, M_DELETE, "DELETE", menu_marker_modify_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1309,7 +1308,7 @@ const menuitem_t menu_marker_sel[] = {
{ MT_CALLBACK, 0, "DELTA", menu_marker_sel_cb }, { MT_CALLBACK, 0, "DELTA", menu_marker_sel_cb },
{ MT_CALLBACK, 0, "NOISE", menu_marker_sel_cb }, { MT_CALLBACK, 0, "NOISE", menu_marker_sel_cb },
{ MT_CALLBACK, 0, "TRACKING", menu_marker_sel_cb }, { MT_CALLBACK, 0, "TRACKING", menu_marker_sel_cb },
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1318,17 +1317,17 @@ const menuitem_t menu_marker_select[] = {
{ MT_CALLBACK, 2, "MARKER 2", menu_marker_select_cb }, { MT_CALLBACK, 2, "MARKER 2", menu_marker_select_cb },
{ MT_CALLBACK, 3, "MARKER 3", menu_marker_select_cb }, { MT_CALLBACK, 3, "MARKER 3", menu_marker_select_cb },
{ MT_CALLBACK, 4, "MARKER 4", menu_marker_select_cb }, { MT_CALLBACK, 4, "MARKER 4", menu_marker_select_cb },
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
const menuitem_t menu_marker_ops[] = { const menuitem_t menu_marker_ops[] = {
{ MT_CALLBACK, ST_START, S_RARROW"START", menu_marker_op_cb }, { MT_CALLBACK, ST_START, "\033START", menu_marker_op_cb },
{ MT_CALLBACK, ST_STOP, S_RARROW"STOP", menu_marker_op_cb }, { MT_CALLBACK, ST_STOP, "\033STOP", menu_marker_op_cb },
{ MT_CALLBACK, ST_CENTER, S_RARROW"CENTER", menu_marker_op_cb }, { MT_CALLBACK, ST_CENTER, "\033CENTER", menu_marker_op_cb },
{ MT_CALLBACK, ST_SPAN, S_RARROW"SPAN", menu_marker_op_cb }, { MT_CALLBACK, ST_SPAN, "\033SPAN", menu_marker_op_cb },
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1339,13 +1338,13 @@ static const menuitem_t menu_marker[] = {
{ MT_SUBMENU, 0, "\2MODIFY\0MARKERS", menu_marker_select}, { MT_SUBMENU, 0, "\2MODIFY\0MARKERS", menu_marker_select},
{ MT_SUBMENU, 0, "\2MARKER\0OPS", menu_marker_ops}, { MT_SUBMENU, 0, "\2MARKER\0OPS", menu_marker_ops},
{ MT_SUBMENU, 0, "\2SEARCH\0MARKER", menu_marker_search}, { MT_SUBMENU, 0, "\2SEARCH\0MARKER", menu_marker_search},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
static const menuitem_t menu_dfu[] = { static const menuitem_t menu_dfu[] = {
{ MT_FORM | MT_CALLBACK, 0, "ENTER DFU", menu_dfu_cb}, { MT_FORM | MT_CALLBACK, 0, "ENTER DFU", menu_dfu_cb},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1356,7 +1355,7 @@ static const menuitem_t menu_harmonic[] =
{ MT_CALLBACK, 3, "3", menu_harmonic_cb}, { MT_CALLBACK, 3, "3", menu_harmonic_cb},
{ MT_CALLBACK, 4, "4", menu_harmonic_cb}, { MT_CALLBACK, 4, "4", menu_harmonic_cb},
{ MT_CALLBACK, 5, "5", menu_harmonic_cb}, { MT_CALLBACK, 5, "5", menu_harmonic_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
#endif #endif
@ -1366,8 +1365,8 @@ static const menuitem_t menu_scanning_speed[] =
{ {
{ MT_CALLBACK, 0, "FAST", menu_scanning_speed_cb}, { MT_CALLBACK, 0, "FAST", menu_scanning_speed_cb},
{ MT_CALLBACK, 1, "PRECISE", menu_scanning_speed_cb}, { MT_CALLBACK, 1, "PRECISE", menu_scanning_speed_cb},
{ MT_KEYPAD, KM_SAMPLETIME, "\2SAMPLE\0DELAY", NULL}, { MT_KEYPAD, KM_SAMPLETIME, "\2SAMPLE\0DELAY", "300..30000"},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1378,26 +1377,15 @@ static const menuitem_t menu_settings2[] =
{ MT_CALLBACK, 2, "LNA", menu_settings2_cb}, { MT_CALLBACK, 2, "LNA", menu_settings2_cb},
{ MT_CALLBACK | MT_LOW, 3, "BPF", menu_settings2_cb}, { MT_CALLBACK | MT_LOW, 3, "BPF", menu_settings2_cb},
{ MT_CALLBACK | MT_LOW, 4, "\2BELOW\0IF", menu_settings2_cb}, { MT_CALLBACK | MT_LOW, 4, "\2BELOW\0IF", menu_settings2_cb},
{ MT_KEYPAD, KM_DECAY,"\2HOLD\0TIME", NULL}, { MT_KEYPAD, KM_DECAY,"\2HOLD\0TIME", "1..1000"},
{ MT_KEYPAD, KM_NOISE,"\2NOISE\0LEVEL", NULL}, { MT_KEYPAD, KM_NOISE,"\2NOISE\0LEVEL", "2..20"},
#ifdef __ULTRA__ #ifdef __ULTRA__
{ MT_SUBMENU,0, "HARMONIC", menu_harmonic}, { MT_SUBMENU,0, "HARMONIC", menu_harmonic},
#endif #endif
// { MT_KEYPAD, KM_10MHZ,"\00210MHZ\0ACTUAL", NULL}, // { MT_KEYPAD, KM_10MHZ,"\00210MHZ\0ACTUAL", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
#if 0
static const menuitem_t menu_settingshigh2[] =
{
{ MT_CALLBACK, 0, "AGC", menu_settings2_cb},
{ MT_CALLBACK, 1, "LNA", menu_settings2_cb},
{ MT_KEYPAD, KM_DECAY, "\2HOLD\0TIME", NULL},
{ MT_KEYPAD, KM_NOISE, "\2NOISE\0LEVEL", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
#endif
static const menuitem_t menu_settings[] = static const menuitem_t menu_settings[] =
{ {
@ -1405,23 +1393,13 @@ static const menuitem_t menu_settings[] =
{ MT_KEYPAD, KM_ACTUALPOWER, "\2ACTUAL\0POWER", NULL}, { MT_KEYPAD, KM_ACTUALPOWER, "\2ACTUAL\0POWER", NULL},
{ MT_KEYPAD | MT_LOW, KM_IF, "\2IF\0FREQ", NULL}, { MT_KEYPAD | MT_LOW, KM_IF, "\2IF\0FREQ", NULL},
{ MT_SUBMENU,0, "\2SCAN\0SPEED", menu_scanning_speed}, { MT_SUBMENU,0, "\2SCAN\0SPEED", menu_scanning_speed},
{ MT_KEYPAD, KM_REPEAT, "\2SAMPLE\0REPEAT", NULL}, { MT_KEYPAD, KM_REPEAT, "\2SAMPLE\0REPEAT", "1..100"},
{ MT_SUBMENU | MT_LOW,0, "\2MIXER\0DRIVE", menu_drive}, { MT_SUBMENU | MT_LOW,0, "\2MIXER\0DRIVE", menu_drive},
{ MT_SUBMENU, 0, S_RARROW" MORE", menu_settings2}, { MT_SUBMENU, 0, "\033 MORE", menu_settings2},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
#if 0
static const menuitem_t menu_settingshigh[] =
{
{ MT_KEYPAD, KM_ACTUALPOWER, "\2ACTUAL\0POWER", NULL},
{ MT_SUBMENU,0, "\2SCAN\0SPEED", menu_scanning_speed},
{ MT_KEYPAD, KM_REPEAT, "REPEATS", NULL},
{ MT_SUBMENU, 0, S_RARROW" MORE", menu_settingshigh2},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
#endif
static const menuitem_t menu_measure[] = { static const menuitem_t menu_measure[] = {
{ MT_CALLBACK, M_OFF, "OFF", menu_measure_cb}, { MT_CALLBACK, M_OFF, "OFF", menu_measure_cb},
{ MT_CALLBACK, M_IMD, "HARMONIC", menu_measure_cb}, { MT_CALLBACK, M_IMD, "HARMONIC", menu_measure_cb},
@ -1430,7 +1408,7 @@ static const menuitem_t menu_measure[] = {
{ MT_CALLBACK, M_STOP_BAND, "\2STOP\0BAND", menu_measure_cb}, { MT_CALLBACK, M_STOP_BAND, "\2STOP\0BAND", menu_measure_cb},
{ MT_CALLBACK, M_PASS_BAND, "\2PASS\0BAND", menu_measure_cb}, { MT_CALLBACK, M_PASS_BAND, "\2PASS\0BAND", menu_measure_cb},
{ MT_CALLBACK | MT_LOW, M_LINEARITY, "LINEAR", menu_measure_cb}, { MT_CALLBACK | MT_LOW, M_LINEARITY, "LINEAR", menu_measure_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1439,7 +1417,7 @@ static const menuitem_t menu_calibrate[] =
{ MT_FORM | MT_TITLE, 0, "CONNECT INPUT AND OUTPUT", NULL}, { MT_FORM | MT_TITLE, 0, "CONNECT INPUT AND OUTPUT", NULL},
{ MT_FORM | MT_CALLBACK, 0, "CALIBRATE", menu_calibrate_cb}, { MT_FORM | MT_CALLBACK, 0, "CALIBRATE", menu_calibrate_cb},
{ MT_FORM | MT_CALLBACK, 0, "RESET CALBRATION", menu_calibrate_cb}, { MT_FORM | MT_CALLBACK, 0, "RESET CALBRATION", menu_calibrate_cb},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1450,8 +1428,8 @@ static const menuitem_t menu_config[] = {
{ MT_SUBMENU, 0, "\2LEVEL\0CAL", menu_calibrate}, { MT_SUBMENU, 0, "\2LEVEL\0CAL", menu_calibrate},
{ MT_CALLBACK, 0, "VERSION", menu_config_cb}, { MT_CALLBACK, 0, "VERSION", menu_config_cb},
{ MT_SUBMENU, 0, "\2EXPERT\0CONFIG", menu_settings}, { MT_SUBMENU, 0, "\2EXPERT\0CONFIG", menu_settings},
{ MT_SUBMENU, 0, S_RARROW"DFU", menu_dfu}, { MT_SUBMENU, 0, "\033DFU", menu_dfu},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1463,21 +1441,9 @@ static const menuitem_t menu_display[] = {
{ MT_CALLBACK,3, "WATERFALL", menu_storage_cb}, { MT_CALLBACK,3, "WATERFALL", menu_storage_cb},
{ MT_KEYPAD, KM_SWEEP_TIME, "\2SWEEP\0TIME", NULL}, { MT_KEYPAD, KM_SWEEP_TIME, "\2SWEEP\0TIME", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
#if 0
static const menuitem_t menu_displayhigh[] = {
{ MT_CALLBACK,0, "\2PAUSE\0SWEEP", menu_pause_cb},
{ MT_CALLBACK,0, "STORE", menu_storage_cb},
{ MT_CALLBACK,1, "CLEAR", menu_storage_cb},
{ MT_CALLBACK,2, "SUBTRACT", menu_storage_cb},
{ MT_CALLBACK,3, "WATERFALL", menu_storage_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
#endif
static const menuitem_t menu_unit[] = static const menuitem_t menu_unit[] =
{ {
@ -1488,7 +1454,7 @@ static const menuitem_t menu_unit[] =
// { MT_CALLBACK,U_UVOLT, "uVolt", menu_unit_cb}, // { MT_CALLBACK,U_UVOLT, "uVolt", menu_unit_cb},
{ MT_CALLBACK,U_WATT, "Watt", menu_unit_cb}, { MT_CALLBACK,U_WATT, "Watt", menu_unit_cb},
// { MT_CALLBACK,U_UWATT, "uWatt", menu_unit_cb}, // { MT_CALLBACK,U_UWATT, "uWatt", menu_unit_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1497,24 +1463,10 @@ static const menuitem_t menu_trigger[] = {
{ MT_CALLBACK,T_NORMAL, "NORMAL", menu_trigger_cb}, { MT_CALLBACK,T_NORMAL, "NORMAL", menu_trigger_cb},
{ MT_CALLBACK,T_SINGLE, "SINGLE", menu_trigger_cb}, { MT_CALLBACK,T_SINGLE, "SINGLE", menu_trigger_cb},
{ MT_KEYPAD, KM_TRIGGER, "LEVEL", NULL}, { MT_KEYPAD, KM_TRIGGER, "LEVEL", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK",NULL }, { MT_CANCEL, 0, "\032 BACK",NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
#if 0
static const menuitem_t menu_levelhigh[] = {
{ MT_SUBMENU, 0, "\2REF\0LEVEL", menu_reflevel},
// { MT_SUBMENU, 0, "\2SCALE/\0DIV",menu_scale_per},
{ MT_KEYPAD, KM_SCALE, "\2SCALE/\0DIV", NULL},
{ MT_SUBMENU,0, "CALC", menu_average},
{ MT_SUBMENU, 0, "UNIT", menu_unit},
{ MT_KEYPAD, KM_OFFSET, "\2EXTERN\0AMP", NULL},
{ MT_SUBMENU, 0, "TRIGGER", menu_trigger},
{ MT_CANCEL, 0, S_LARROW" BACK",NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
#endif
static const menuitem_t menu_level[] = { static const menuitem_t menu_level[] = {
{ MT_SUBMENU, 0, "\2REF\0LEVEL", menu_reflevel}, { MT_SUBMENU, 0, "\2REF\0LEVEL", menu_reflevel},
// { MT_SUBMENU, 0, "\2SCALE/\0DIV",menu_scale_per}, // { MT_SUBMENU, 0, "\2SCALE/\0DIV",menu_scale_per},
@ -1524,7 +1476,7 @@ static const menuitem_t menu_level[] = {
{ MT_SUBMENU, 0, "UNIT", menu_unit}, { MT_SUBMENU, 0, "UNIT", menu_unit},
{ MT_KEYPAD, KM_OFFSET, "\2EXTERN\0AMP",NULL}, { MT_KEYPAD, KM_OFFSET, "\2EXTERN\0AMP",NULL},
{ MT_SUBMENU, 0, "TRIGGER", menu_trigger}, { MT_SUBMENU, 0, "TRIGGER", menu_trigger},
{ MT_CANCEL, 0, S_LARROW" BACK",NULL }, { MT_CANCEL, 0, "\032 BACK",NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1538,7 +1490,7 @@ static const menuitem_t menu_stimulus[] = {
#ifdef __SPUR__ #ifdef __SPUR__
{ MT_CALLBACK | MT_LOW,0, "\2SPUR\0REMOVAL", menu_spur_cb}, { MT_CALLBACK | MT_LOW,0, "\2SPUR\0REMOVAL", menu_spur_cb},
#endif #endif
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1554,7 +1506,7 @@ static const menuitem_t menu_mode[] = {
#ifdef __ULTRA__ #ifdef __ULTRA__
{ MT_FORM | MT_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "ULTRA HIGH INPUT",menu_mode_cb}, { MT_FORM | MT_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "ULTRA HIGH INPUT",menu_mode_cb},
#endif #endif
// { MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, // { MT_FORM | MT_CANCEL, 0, "\032 BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1567,7 +1519,7 @@ const menuitem_t menu_topultra[] = {
{ MT_SUBMENU, 0, "MARKER", menu_marker}, { MT_SUBMENU, 0, "MARKER", menu_marker},
{ MT_SUBMENU, 0, "MEASURE", menu_measure}, { MT_SUBMENU, 0, "MEASURE", menu_measure},
{ MT_SUBMENU, 0, "SETTINGS", menu_settings}, { MT_SUBMENU, 0, "SETTINGS", menu_settings},
{ MT_CANCEL, 0, S_LARROW" MODE",NULL}, { MT_CANCEL, 0, "MODE",NULL},
{ MT_NONE, 0, NULL, NULL } // sentinel, { MT_NONE, 0, NULL, NULL } // sentinel,
// MENUITEM_CLOSE, // MENUITEM_CLOSE,
}; };
@ -1586,21 +1538,6 @@ const menuitem_t menu_top[] = {
// MENUITEM_CLOSE, // MENUITEM_CLOSE,
}; };
#if 0
const menuitem_t menu_tophigh[] = {
{ MT_SUBMENU, 0, "PRESET", menu_load_preset_high},
{ MT_SUBMENU, 0, "FREQ", menu_stimulus},
{ MT_SUBMENU, 0, "LEVEL", menu_levelhigh},
{ MT_SUBMENU, 0, "DISPLAY", menu_displayhigh},
{ MT_SUBMENU, 0, "MARKER", menu_marker},
{ MT_SUBMENU, 0, "MEASURE", menu_measure},
{ MT_SUBMENU, 0, "SETTINGS", menu_settingshigh},
{ MT_CANCEL, 0, S_LARROW" MODE",NULL},
{ MT_NONE, 0, NULL, NULL } // sentinel,
// MENUITEM_CLOSE,
};
#endif
// ===[MENU DEFINITION END]====================================================== // ===[MENU DEFINITION END]======================================================
#define ACTIVE_COLOR RGBHEX(0x007FFF) #define ACTIVE_COLOR RGBHEX(0x007FFF)
@ -1624,13 +1561,13 @@ static void menu_item_modify_attribute(
int m_auto = false; int m_auto = false;
int data = menu[item].data; int data = menu[item].data;
if (menu == menu_mode) { if (menu == menu_mode) {
if (item == GetMode()) { if (item == setting.mode) {
plot_printf(uistat.text, sizeof uistat.text, "RETURN"); plot_printf(uistat.text, sizeof uistat.text, "RETURN");
mark = true; mark = true;
} else if (item < 4){ } else if (item < 4){
plot_printf(uistat.text, sizeof uistat.text, "SWITCH"); plot_printf(uistat.text, sizeof uistat.text, "SWITCH");
} else if (item == 4) { } else if (item == 4) {
plot_printf(uistat.text, sizeof uistat.text, menu_reffer_text[get_refer_output()+1]); plot_printf(uistat.text, sizeof uistat.text, menu_reffer_text[setting.refer+1]);
} }
} else if (menu == menu_highoutputmode && item == 2) { } else if (menu == menu_highoutputmode && item == 2) {
plot_printf(uistat.text, sizeof uistat.text, menu_drive_text[setting.drive]); plot_printf(uistat.text, sizeof uistat.text, menu_drive_text[setting.drive]);
@ -1646,11 +1583,11 @@ static void menu_item_modify_attribute(
plot_printf(uistat.text, sizeof uistat.text, menu_modulation_text[setting.modulation]); plot_printf(uistat.text, sizeof uistat.text, menu_modulation_text[setting.modulation]);
} }
} else if (menu == menu_reffer) { } else if (menu == menu_reffer) {
if (item < 5 && item == get_refer_output() + 1){ if (item < 5 && item == setting.refer + 1){
mark = true; mark = true;
} }
} else if (menu == menu_reffer2) { } else if (menu == menu_reffer2) {
if (item == get_refer_output() - 4){ if (item == setting.refer - 4){
mark = true; mark = true;
} }
} else if (menu == menu_stimulus) { } else if (menu == menu_stimulus) {
@ -1658,7 +1595,7 @@ static void menu_item_modify_attribute(
mark = true; mark = true;
} }
} else if (menu == menu_average) { } else if (menu == menu_average) {
if (item == GetAverage()){ if (item == setting.average){
mark = true; mark = true;
} }
} else if (menu == menu_scale_per) { } else if (menu == menu_scale_per) {
@ -1670,7 +1607,7 @@ static void menu_item_modify_attribute(
mark = true; mark = true;
} }
} else if (menu == menu_rbw) { } else if (menu == menu_rbw) {
if (rbwsel[item] == GetRBW()){ if (rbwsel[item] == setting.rbw){
mark = true; mark = true;
} }
@ -1694,10 +1631,10 @@ static void menu_item_modify_attribute(
if (item ==0 && is_paused()){ if (item ==0 && is_paused()){
mark = true; mark = true;
} }
if (item ==1 && GetStorage()){ if (item ==1 && setting.show_stored){
mark = true; mark = true;
} }
if (item == 3 && GetSubtractStorage()){ if (item == 3 && setting.subtract_stored){
mark = true; mark = true;
} }
if (item == 4 && get_waterfall()){ if (item == 4 && get_waterfall()){
@ -1811,7 +1748,6 @@ static void fetch_numeric_target(void)
break; break;
case KM_ATTENUATION: case KM_ATTENUATION:
uistat.value = get_attenuation(); uistat.value = get_attenuation();
kp_help_text = "0..30";
plot_printf(uistat.text, sizeof uistat.text, "%ddB", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%ddB", ((int32_t)uistat.value));
break; break;
case KM_ACTUALPOWER: case KM_ACTUALPOWER:
@ -1824,12 +1760,10 @@ static void fetch_numeric_target(void)
break; break;
case KM_SAMPLETIME: case KM_SAMPLETIME:
uistat.value = setting.step_delay; uistat.value = setting.step_delay;
kp_help_text = "300..30000";
plot_printf(uistat.text, sizeof uistat.text, "%3duS", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%3duS", ((int32_t)uistat.value));
break; break;
case KM_REPEAT: case KM_REPEAT:
uistat.value = setting.repeat; uistat.value = setting.repeat;
kp_help_text = "1..100";
plot_printf(uistat.text, sizeof uistat.text, "%2d", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%2d", ((int32_t)uistat.value));
break; break;
case KM_DRIVE: case KM_DRIVE:
@ -1838,17 +1772,14 @@ static void fetch_numeric_target(void)
break; break;
case KM_LOWOUTLEVEL: case KM_LOWOUTLEVEL:
uistat.value = get_attenuation(); // compensation for dB offset during low output mode uistat.value = get_attenuation(); // compensation for dB offset during low output mode
kp_help_text = "-76..-6";
plot_printf(uistat.text, sizeof uistat.text, "%ddB", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%ddB", ((int32_t)uistat.value));
break; break;
case KM_DECAY: case KM_DECAY:
uistat.value = setting.decay; uistat.value = setting.decay;
kp_help_text = "1-1000";
plot_printf(uistat.text, sizeof uistat.text, "%3d", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%3d", ((int32_t)uistat.value));
break; break;
case KM_NOISE: case KM_NOISE:
uistat.value = setting.noise; uistat.value = setting.noise;
kp_help_text = "2..20";
plot_printf(uistat.text, sizeof uistat.text, "%3d", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%3d", ((int32_t)uistat.value));
break; break;
case KM_10MHZ: case KM_10MHZ:
@ -1869,8 +1800,7 @@ static void fetch_numeric_target(void)
else else
uistat.value = setting.sweep_time; uistat.value = setting.sweep_time;
uistat.value /= 1000.0; uistat.value /= 1000.0;
kp_help_text = "15mS..600S"; plot_printf(uistat.text, sizeof uistat.text, "%.3FS", uistat.value);
plot_printf(uistat.text, sizeof uistat.text, "%.1fS", uistat.value);
break; break;
case KM_TRIGGER: case KM_TRIGGER:
uistat.value = setting.trigger_level; uistat.value = setting.trigger_level;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.