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

New menu working

Browse Source
tinySA-v0.2
erikkaashoek 6 years ago
parent 72cdb485ff
commit 29821f98de
6 changed files with 99 additions and 92 deletions
Show Stats Download Patch File Download Diff File

18
main.c
Unescape View File

@ -872,7 +872,7 @@ void load_default_properties(void)
setting._domain_mode = 0; setting._domain_mode = 0;
setting._marker_smith_format = MS_RLC; setting._marker_smith_format = MS_RLC;
#endif #endif
reset_settings(-1); reset_settings(M_LOW);
//Checksum add on caldata_save //Checksum add on caldata_save
//setting.checksum = 0; //setting.checksum = 0;
} }
@ -2600,8 +2600,7 @@ int main(void)
/* restore config */ /* restore config */
config_recall(); config_recall();
if (caldata_recall(0) == -1 || setting.mode == -1) { if (caldata_recall(0) == -1) {
setting.mode = -1; // must be done to setup the scanning stuff
setting.refer = -1; setting.refer = -1;
load_default_properties(); load_default_properties();
} }
@ -2619,6 +2618,7 @@ int main(void)
/* initial frequencies */ /* initial frequencies */
update_frequencies(); update_frequencies();
#ifdef __VNA__ #ifdef __VNA__
/* /*
* I2S Initialize * I2S Initialize
@ -2635,10 +2635,20 @@ int main(void)
plot_init(); plot_init();
if (setting.mode != -1) { if (setting.mode != -1) {
menu_mode_cb(setting.mode+1,0); menu_mode_cb(setting.mode,0);
ui_mode_normal(); // Do not show menu when autostarting mode ui_mode_normal(); // Do not show menu when autostarting mode
} }
redraw_frame(); redraw_frame();
set_mode(M_HIGH);
sweep(true);
osalThreadSleepMilliseconds(100);
set_mode(M_LOW);
sweep(true);
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO-1, Thread1, NULL); chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO-1, Thread1, NULL);
while (1) { while (1) {

7
nanovna.h
Unescape View File

@ -579,11 +579,9 @@ extern uint32_t frequencies[POINTS_COUNT];
#if 1 #if 1
#define SAVEAREA_MAX 9 #define SAVEAREA_MAX 9
// Begin addr 0x08018000
#define SAVE_CONFIG_AREA_SIZE 0x00000800
// config save area // config save area
#define SAVE_CONFIG_ADDR 0x0801B000 #define SAVE_CONFIG_ADDR 0x0801B000
// properties_t save area // setting_t save area
#define SAVE_PROP_CONFIG_0_ADDR 0x0801B800 #define SAVE_PROP_CONFIG_0_ADDR 0x0801B800
#define SAVE_PROP_CONFIG_1_ADDR 0x0801C000 #define SAVE_PROP_CONFIG_1_ADDR 0x0801C000
#define SAVE_PROP_CONFIG_2_ADDR 0x0801C800 #define SAVE_PROP_CONFIG_2_ADDR 0x0801C800
@ -593,6 +591,9 @@ extern uint32_t frequencies[POINTS_COUNT];
#define SAVE_PROP_CONFIG_6_ADDR 0x0801E800 #define SAVE_PROP_CONFIG_6_ADDR 0x0801E800
#define SAVE_PROP_CONFIG_7_ADDR 0x0801F000 #define SAVE_PROP_CONFIG_7_ADDR 0x0801F000
#define SAVE_PROP_CONFIG_8_ADDR 0x0801F800 #define SAVE_PROP_CONFIG_8_ADDR 0x0801F800
#define SAVE_CONFIG_AREA_SIZE (0x0801F800 - SAVE_CONFIG_ADDR) // Should include all save slots
#else #else
#define SAVEAREA_MAX 4 #define SAVEAREA_MAX 4
// Begin addr 0x0801C000 // Begin addr 0x0801C000

4
sa_cmd.c
Unescape View File

@ -130,7 +130,7 @@ VNA_SHELL_FUNCTION(cmd_y)
int rvalue; int rvalue;
int lvalue = 0; int lvalue = 0;
if (argc != 1 && argc != 2) { if (argc != 1 && argc != 2) {
shell_printf("usage: x {addr(0-95)} [value(0-FF)]\r\n"); shell_printf("usage: y {addr(0-95)} [value(0-FF)]\r\n");
return; return;
} }
rvalue = xtoi(argv[0]); rvalue = xtoi(argv[0]);
@ -205,7 +205,7 @@ VNA_SHELL_FUNCTION(cmd_o)
uint32_t value = my_atoi(argv[0]); uint32_t value = my_atoi(argv[0]);
if (VFO == 0) if (VFO == 0)
setting.frequency_IF = value; setting.frequency_IF = value;
// set_freq(VFO, value); set_freq(VFO, value);
} }
VNA_SHELL_FUNCTION(cmd_d) VNA_SHELL_FUNCTION(cmd_d)

8
sa_core.c
Unescape View File

@ -560,6 +560,10 @@ int temppeakIndex;
void setupSA(void) void setupSA(void)
{ {
SI4432_Init(); SI4432_Init();
SI4432_Sel = 1;
SI4432_Receive();
SI4432_Transmit(0);
PE4302_init(); PE4302_init();
PE4302_Write_Byte(0); PE4302_Write_Byte(0);
} }
@ -1528,8 +1532,8 @@ void draw_cal_status(void)
if (MODE_OUTPUT(setting.mode)) // No cal status during output if (MODE_OUTPUT(setting.mode)) // No cal status during output
return; return;
if (current_menu_is_form() && !in_selftest) // if (current_menu_is_form() && !in_selftest)
return; // return;
ili9341_set_background(DEFAULT_BG_COLOR); ili9341_set_background(DEFAULT_BG_COLOR);

6
ui.c
Unescape View File

@ -443,12 +443,12 @@ enum {
MT_TITLE, MT_TITLE,
MT_CLOSE, MT_CLOSE,
MT_KEYPAD, MT_KEYPAD,
MT_ICON = 0x10,
MT_LOW = 0x40, // Only applicable to low mode MT_LOW = 0x40, // Only applicable to low mode
MT_FORM = 0x80, // Large button menu MT_FORM = 0x80, // Large button menu
}; };
#define MT_BACK 0x40 #define MT_BACK 0x40
#define MT_LEAVE 0x20 #define MT_LEAVE 0x20
#define MT_ICON 0x10
#define MT_MASK(x) (0xF & (x)) #define MT_MASK(x) (0xF & (x))
typedef void (*menuaction_cb_t)(int item, uint8_t data); typedef void (*menuaction_cb_t)(int item, uint8_t data);
@ -1116,7 +1116,7 @@ const menuitem_t menu_top[] = {
#define MENU_STACK_DEPTH_MAX 5 #define MENU_STACK_DEPTH_MAX 5
const menuitem_t *menu_stack[MENU_STACK_DEPTH_MAX] = { const menuitem_t *menu_stack[MENU_STACK_DEPTH_MAX] = {
menu_mode, NULL, NULL, NULL menu_top, NULL, NULL, NULL
}; };
static void static void
@ -1210,7 +1210,7 @@ menu_invoke(int item)
if (cb == NULL) if (cb == NULL)
return; return;
(*cb)(item, menu->data); (*cb)(item, menu->data);
if (!(menu->type & MT_FORM)) // if (!(menu->type & MT_FORM))
draw_cal_status(); draw_cal_status();
break; break;
} }

148
ui_sa.c
Unescape View File

@ -422,19 +422,25 @@ extern const menuitem_t menu_topultra[];
void menu_mode_cb(int item, uint8_t data) void menu_mode_cb(int item, uint8_t data)
{ {
(void)data; (void)data;
set_mode(item-1); set_mode(item);
// draw_cal_status(); // draw_cal_status();
switch (item) { switch (item) {
case 0:
// if (setting.mode != M_LOW)
// set_mode(M_LOW);
menu_move_back();
ui_mode_normal();
break;
case 1: case 1:
menu_push_submenu(menu_top); // if (setting.mode != M_HIGH)
// set_mode(M_HIGH);
menu_move_back();
ui_mode_normal();
break; break;
case 2: case 2:
menu_push_submenu(menu_tophigh);
break;
case 3:
menu_push_submenu(menu_lowoutputmode); menu_push_submenu(menu_lowoutputmode);
break; break;
case 4: case 3:
menu_push_submenu(menu_highoutputmode); menu_push_submenu(menu_highoutputmode);
break; break;
#ifdef __ULTRA__ #ifdef __ULTRA__
@ -443,7 +449,7 @@ extern const menuitem_t menu_topultra[];
break; break;
#endif #endif
} }
// draw_cal_status(); draw_cal_status();
} }
void menu_load_preset_cb(int item, uint8_t data) void menu_load_preset_cb(int item, uint8_t data)
@ -465,7 +471,8 @@ void menu_store_preset_cb(int item, uint8_t data)
{ {
(void)item; (void)item;
if (data == 100) { if (data == 100) {
setting.mode = -1; reset_settings(M_LOW); // Restore all defaults in Low mode
// setting.mode = -1;
data = 0; data = 0;
} }
caldata_save(data); caldata_save(data);
@ -971,7 +978,7 @@ static const menuitem_t menu_load_preset_high[] =
static const menuitem_t menu_store_preset[] = static const menuitem_t menu_store_preset[] =
{ {
{ MT_CALLBACK, 0, "\2STORE\0STARTUP",menu_store_preset_cb}, { MT_CALLBACK, 0, "\2STORE\0STARTUP",menu_store_preset_cb},
{ MT_CALLBACK, 1, "STORE 1" , menu_store_preset_cb}, { MT_CALLBACK, 1, "STORE 1" , menu_store_preset_cb},
{ MT_CALLBACK, 2, "STORE 2" , menu_store_preset_cb}, { MT_CALLBACK, 2, "STORE 2" , menu_store_preset_cb},
{ MT_CALLBACK, 3, "STORE 3" , menu_store_preset_cb}, { MT_CALLBACK, 3, "STORE 3" , menu_store_preset_cb},
@ -1052,7 +1059,7 @@ const menuitem_t menu_lowoutputmode[] = {
{ MT_FORM | MT_KEYPAD, KM_LOWOUTLEVEL, "LEVEL: %s", NULL}, { MT_FORM | MT_KEYPAD, KM_LOWOUTLEVEL, "LEVEL: %s", NULL},
{ 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_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, S_LARROW" BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1235,14 +1242,26 @@ static const menuitem_t menu_harmonic[] =
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
#endif #endif
static const menuitem_t menu_scanning_speed[] =
{
{ MT_CALLBACK, 0, "FAST", menu_scanning_speed_cb},
{ MT_CALLBACK, 1, "PRECISE", menu_scanning_speed_cb},
{ MT_KEYPAD, KM_SAMPLETIME, "\2POINT\0TIME", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
static const menuitem_t menu_settings2[] = static const menuitem_t menu_settings2[] =
{ {
{ MT_CALLBACK, 0, "AGC", menu_settings2_cb}, { MT_CALLBACK, 0, "AGC", menu_settings2_cb},
{ MT_CALLBACK, 1, "LNA", menu_settings2_cb}, { MT_CALLBACK, 1, "LNA", menu_settings2_cb},
{ MT_CALLBACK, 2, "BPF", menu_settings2_cb}, { MT_CALLBACK | MT_LOW, 2, "BPF", menu_settings2_cb},
{ MT_CALLBACK, 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", NULL},
{ MT_KEYPAD, KM_NOISE,"\2NOISE\0LEVEL", NULL}, { MT_KEYPAD, KM_NOISE,"\2NOISE\0LEVEL", NULL},
#ifdef __ULTRA__ #ifdef __ULTRA__
{ MT_SUBMENU,0, "HARMONIC", menu_harmonic}, { MT_SUBMENU,0, "HARMONIC", menu_harmonic},
#endif #endif
@ -1251,29 +1270,39 @@ static const menuitem_t menu_settings2[] =
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
static const menuitem_t menu_scanning_speed[] = static const menuitem_t menu_settingshigh2[] =
{ {
{ MT_CALLBACK, 0, "FAST", menu_scanning_speed_cb}, { MT_CALLBACK, 0, "AGC", menu_settings2_cb},
{ MT_CALLBACK, 1, "PRECISE", menu_scanning_speed_cb}, { MT_CALLBACK, 1, "LNA", menu_settings2_cb},
{ MT_KEYPAD, KM_SAMPLETIME, "\2POINT\0TIME", NULL}, { MT_KEYPAD, KM_DECAY, "\2HOLD\0TIME", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_KEYPAD, KM_NOISE, "\2NOISE\0LEVEL", NULL},
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
}; };
static const menuitem_t menu_settings[] = static const menuitem_t menu_settings[] =
{ {
{ MT_CALLBACK, 3, "\2TRACKING\0OUTPUT",menu_settings2_cb}, { MT_CALLBACK | MT_LOW, 3, "\2LO\0OUTPUT",menu_settings2_cb},
{ MT_KEYPAD, KM_ACTUALPOWER, "\2ACTUAL\0POWER", NULL}, { MT_KEYPAD, KM_ACTUALPOWER, "\2ACTUAL\0POWER", NULL},
{ MT_KEYPAD, 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, "REPEATS", NULL}, { MT_KEYPAD, KM_REPEAT, "REPEATS", NULL},
{ MT_SUBMENU,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, S_RARROW" MORE", menu_settings2},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
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
};
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, "MARMONICS", menu_measure_cb}, { MT_CALLBACK, M_IMD, "MARMONICS", menu_measure_cb},
@ -1286,26 +1315,6 @@ static const menuitem_t menu_measure[] = {
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
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
};
static const menuitem_t menu_settingshigh[] =
{
{ MT_KEYPAD, KM_ACTUALPOWER, "\2ACTUAL\0POWER", NULL},
{ MT_KEYPAD, KM_SAMPLETIME, "\2SAMPLE\0TIME", NULL},
{ 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
};
static const menuitem_t menu_calibrate[] = 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},
@ -1316,31 +1325,15 @@ static const menuitem_t menu_calibrate[] =
}; };
static const menuitem_t menu_config[] = { static const menuitem_t menu_config[] = {
{ MT_FORM | MT_CALLBACK, 0, "TOUCH CAL", menu_config_cb}, { MT_CALLBACK, 0, "\2TOUCH\0CAL", menu_config_cb},
{ MT_FORM | MT_CALLBACK, 0, "TOUCH TEST", menu_config_cb}, { MT_CALLBACK, 0, "\2TOUCH\0TEST", menu_config_cb},
{ MT_FORM | MT_CALLBACK, 0, "SELF TEST", menu_config_cb}, { MT_CALLBACK, 0, "\2SELF\0TEST", menu_config_cb},
{ MT_FORM | MT_SUBMENU, 0, "CALIBRATE", menu_calibrate}, { MT_SUBMENU, 0, "\2LEVEL\0CAL", menu_calibrate},
{ MT_FORM | MT_CALLBACK, 0, "VERSION", menu_config_cb}, { MT_CALLBACK, 0, "VERSION", menu_config_cb},
{ MT_FORM | MT_SUBMENU, 0, S_RARROW"DFU", menu_dfu}, { MT_SUBMENU, 0, "\2EXPERT\0CONF",menu_settings},
{ MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_SUBMENU, 0, S_RARROW"DFU", menu_dfu},
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_CANCEL, 0, S_LARROW" BACK", NULL },
}; { MT_NONE, 0, NULL, NULL } // sentinel
static const menuitem_t menu_acquire[] = {
{ MT_CALLBACK, 0, "RESET", menu_autosettings_cb},
{ MT_SUBMENU, 0, "ATTEN", menu_atten},
{ MT_SUBMENU,0, "RBW", menu_rbw},
{ MT_SUBMENU,0, "CALC", menu_average},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
};
static const menuitem_t menu_acquirehigh[] = {
{ MT_CALLBACK, 0, "RESET", menu_autosettings_cb},
{ MT_SUBMENU,0, "RBW", menu_rbw},
{ MT_SUBMENU,0, "CALC", menu_average},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
}; };
static const menuitem_t menu_display[] = { static const menuitem_t menu_display[] = {
@ -1350,7 +1343,7 @@ static const menuitem_t menu_display[] = {
{ MT_CALLBACK,2, "SUBTRACT", menu_storage_cb}, { MT_CALLBACK,2, "SUBTRACT", menu_storage_cb},
{ MT_CALLBACK,3, "WATERFALL", menu_storage_cb}, { MT_CALLBACK,3, "WATERFALL", menu_storage_cb},
#ifdef __SPUR__ #ifdef __SPUR__
{ MT_CALLBACK,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, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
@ -1404,7 +1397,7 @@ 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},
{ MT_KEYPAD, KM_SCALE, "\2SCALE/\0DIV", NULL}, { MT_KEYPAD, KM_SCALE, "\2SCALE/\0DIV", NULL},
{ MT_SUBMENU, 0, "ATTEN", menu_atten}, { MT_SUBMENU | MT_LOW, 0, "ATTEN", menu_atten},
{ MT_SUBMENU,0, "AVER", menu_average}, { MT_SUBMENU,0, "AVER", menu_average},
{ 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},
@ -1430,17 +1423,16 @@ static const menuitem_t menu_stimulus[] = {
static const menuitem_t menu_mode[] = { static const menuitem_t menu_mode[] = {
{ MT_FORM | MT_TITLE, 0, "tinySA MODE", NULL}, // { MT_FORM | MT_TITLE, 0, "tinySA MODE", NULL},
{ MT_FORM | MT_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "LOW INPUT", menu_mode_cb}, { MT_FORM | MT_CALLBACK | MT_ICON, I_LOW_INPUT+I_SA, "LOW INPUT", menu_mode_cb},
{ MT_FORM | MT_CALLBACK | MT_ICON, I_HIGH_INPUT+I_SA, "HIGH INPUT", menu_mode_cb}, { MT_FORM | MT_CALLBACK | MT_ICON, I_HIGH_INPUT+I_SA, "HIGH INPUT", menu_mode_cb},
{ MT_FORM | MT_CALLBACK | MT_ICON, I_LOW_OUTPUT+I_SINUS, "LOW OUTPUT", menu_mode_cb}, { MT_FORM | MT_CALLBACK | MT_ICON, I_LOW_OUTPUT+I_SINUS, "LOW OUTPUT", menu_mode_cb},
{ MT_FORM | MT_CALLBACK | MT_ICON, I_HIGH_OUTPUT+I_GEN, "HIGH OUTPUT", menu_mode_cb}, { MT_FORM | MT_CALLBACK | MT_ICON, I_HIGH_OUTPUT+I_GEN, "HIGH OUTPUT", menu_mode_cb},
{ MT_FORM | MT_SUBMENU | MT_ICON, I_CONNECT+I_GEN, "CAL OUTPUT: %s", menu_reffer}, { MT_FORM | MT_SUBMENU | MT_ICON, I_CONNECT+I_GEN, "CAL OUTPUT: %s", menu_reffer},
{ MT_FORM | MT_SUBMENU | MT_ICON, I_EMPTY+I_CONFIG, "CONFIG", menu_config},
#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_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_FORM | MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1466,8 +1458,8 @@ const menuitem_t menu_top[] = {
{ MT_SUBMENU, 0, "DISPLAY", menu_display}, { MT_SUBMENU, 0, "DISPLAY", menu_display},
{ 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, "CONFIG", menu_config},
{ MT_CANCEL, 0, S_LARROW" MODE",NULL}, { MT_SUBMENU, 0, "MODE", menu_mode},
{ MT_NONE, 0, NULL, NULL } // sentinel, { MT_NONE, 0, NULL, NULL } // sentinel,
// MENUITEM_CLOSE, // MENUITEM_CLOSE,
}; };
@ -1506,9 +1498,9 @@ static void menu_item_modify_attribute(
int mark = false; int mark = false;
int data = menu[item].data; int data = menu[item].data;
if (menu == menu_mode) { if (menu == menu_mode) {
if (item == GetMode()+1) { if (item == GetMode()) {
mark = true; mark = true;
} else if (item == 5) { } 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[get_refer_output()+1]);
} }
} else if (menu == menu_highoutputmode && item == 2) { } else if (menu == menu_highoutputmode && item == 2) {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.