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

Working

Browse Source
tinySA-V4-SI4463
erikkaashoek 5 years ago
parent 932a5808fb
commit a4c68d3ef7
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File

36
ui.c
Unescape View File

@ -608,6 +608,7 @@ enum {
MT_CANCEL, // menu, step back on one level up
MT_TITLE, // Title
MT_KEYPAD,
MT_REPEATS = 0x08,
MT_ICON = 0x10,
MT_HIGH = 0x20, // Only applicable to high mode
MT_LOW = 0x40, // Only applicable to low mode
@ -615,7 +616,8 @@ enum {
};
//#define MT_BACK 0x40
//#define MT_LEAVE 0x20
#define MT_MASK(x) (0xF & (x))
#define MT_MASK(x) (0x7 & (x))
#define DATA_STARTS_REPEATS(S,R) (((R)<<4)+(S))
#define MT_CUSTOM_LABEL 0
@ -808,24 +810,31 @@ static bool menuDisabled(uint8_t type){
return false;
}
static const menuitem_t *menu_next_item(const menuitem_t *m){
static const menuitem_t *menu_next_item(const menuitem_t *m, int *sub_item){
do{
if (m->type & MT_REPEATS) {
(*sub_item)++;
if (*sub_item < ((m->data>>4) & 0x0f))
return m;
*sub_item = 0;
}
m++;
m = MT_MASK(m->type) == MT_NONE ? (menuitem_t *)m->reference : m;
} while(m!=NULL && menuDisabled(m->type));
return m;
}
static const menuitem_t *current_menu_item(int i){
static const menuitem_t *current_menu_item(int i, int *sub_item){
*sub_item = 0;
const menuitem_t * m = menu_stack[menu_current_level];
while (i--) m = menu_next_item(m);
while (i--) m = menu_next_item(m,sub_item);
return m;
}
static int current_menu_get_count(void){
int i = 0;
int i = 0,sub_item = 0;
const menuitem_t *m = menu_stack[menu_current_level];
while (m){m = menu_next_item(m); i++;}
while (m){m = menu_next_item(m, &sub_item); i++;}
return i;
}
@ -902,7 +911,8 @@ menu_move_top(void)
static void
menu_invoke(int item)
{
const menuitem_t *menu = current_menu_item(item);
int sub_item;
const menuitem_t *menu = current_menu_item(item, &sub_item);
if (menu == NULL) return;
switch (MT_MASK(menu->type)) {
// case MT_NONE:
@ -917,7 +927,7 @@ menu_invoke(int item)
case MT_CALLBACK: {
uistat.auto_center_marker = false;
menuaction_cb_t cb = (menuaction_cb_t)menu->reference;
if (cb) (*cb)(item, menu->data);
if (cb) (*cb)(item, (menu->type & MT_REPEATS) ? (menu->data & 0x0f)+sub_item : menu->data);
// if (!(menu->type & MT_FORM))
redraw_request |= REDRAW_CAL_STATUS;
break;
@ -925,7 +935,7 @@ menu_invoke(int item)
case MT_ADV_CALLBACK: {
uistat.auto_center_marker = false;
menuaction_acb_t cb = (menuaction_acb_t)menu->reference;
if (cb) (*cb)(item, menu->data, NULL);
if (cb) (*cb)(item, (menu->type & MT_REPEATS) ? (menu->data & 0x0f)+sub_item : menu->data, NULL);
// if (!(menu->type & MT_FORM))
redraw_request |= REDRAW_CAL_STATUS | REDRAW_BATTERY;
break;
@ -1175,7 +1185,8 @@ draw_menu_buttons(const menuitem_t *menu, uint32_t mask)
int i, y;
ui_button_t button;
const menuitem_t *m = menu;
for (i = 0, y = 0; m; m = menu_next_item(m), i++, y += menu_button_height) {
int sub_item = 0;
for (i = 0, y = 0; m; m = menu_next_item(m, &sub_item), i++, y += menu_button_height) {
if ((mask&(1<<i)) == 0)
continue;
button.icon = BUTTON_ICON_NONE;
@ -1204,7 +1215,7 @@ draw_menu_buttons(const menuitem_t *menu, uint32_t mask)
// MT_ADV_CALLBACK - allow change button data in callback, more easy and correct
if (MT_MASK(m->type) == MT_ADV_CALLBACK){
menuaction_acb_t cb = (menuaction_acb_t)m->reference;
if (cb) (*cb)(i, m->data, &button);
if (cb) (*cb)(i, (m->type & MT_REPEATS) ? (m->data & 0x0f)+sub_item : m->data, &button);
// Apply custom text, from button label and
if (m->label != MT_CUSTOM_LABEL)
plot_printf(button.text, sizeof(button.text), m->label, button.param_1.u);
@ -1486,7 +1497,8 @@ menu_apply_touch(int touch_x, int touch_y)
active_button_start = LCD_WIDTH - MENU_BUTTON_WIDTH;
// active_button_stop = LCD_WIDTH;
}
for (i = 0; m; m = menu_next_item(m), i++, y+= menu_button_height) {
int sub_item = 0;
for (i = 0; m; m = menu_next_item(m,&sub_item), i++, y+= menu_button_height) {
if (MT_MASK(m->type) == MT_TITLE) continue;
if (y < touch_y && touch_y < y+menu_button_height && touch_x > active_button_start) {
menu_select_touch(m, i, (( touch_x - active_button_start) * 5 ) / MENU_FORM_WIDTH);

24
ui_sa.c
Unescape View File

@ -1711,7 +1711,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_limit_select_acb)
(void)item;
if(b){
if (setting.limits[data-1].enabled) {
plot_printf(b->text, sizeof(b->text), "%.6FHz\n%.6fdBm", (float)setting.limits[data-1].frequency, setting.limits[data-1].level);
plot_printf(b->text, sizeof(b->text), "%.6FHz\n%.1fdBm", (float)setting.limits[data-1].frequency, setting.limits[data-1].level);
b->icon = BUTTON_ICON_CHECK;
} else {
plot_printf(b->text, sizeof(b->text), "EMPTY");
@ -2253,22 +2253,16 @@ static const menuitem_t menu_load_preset_high[] =
static const menuitem_t menu_store_preset[] =
{
{ MT_ADV_CALLBACK, 0, "STORE AS\nSTARTUP",menu_store_preset_acb},
{ MT_ADV_CALLBACK, 1, "STORE %d", menu_store_preset_acb},
{ MT_ADV_CALLBACK, 2, "STORE %d", menu_store_preset_acb},
{ MT_ADV_CALLBACK, 3, "STORE %d", menu_store_preset_acb},
{ MT_ADV_CALLBACK, 4, "STORE %d", menu_store_preset_acb},
{ MT_ADV_CALLBACK |MT_REPEATS, DATA_STARTS_REPEATS(1,4), "STORE %d", menu_store_preset_acb},
{ MT_ADV_CALLBACK, 100,"FACTORY\nDEFAULTS",menu_store_preset_acb},
{ MT_NONE, 0, NULL,menu_back} // next-> menu_back
};
static const menuitem_t menu_load_preset[] =
{
{ MT_ADV_CALLBACK, 0, "LOAD\nSTARTUP", menu_load_preset_acb},
{ MT_ADV_CALLBACK, 1, MT_CUSTOM_LABEL, menu_load_preset_acb},
{ MT_ADV_CALLBACK, 2, MT_CUSTOM_LABEL, menu_load_preset_acb},
{ MT_ADV_CALLBACK, 3, MT_CUSTOM_LABEL, menu_load_preset_acb},
{ MT_ADV_CALLBACK, 4, MT_CUSTOM_LABEL, menu_load_preset_acb},
{ MT_SUBMENU, 0, "STORE" , menu_store_preset},
{ MT_ADV_CALLBACK, 0, "LOAD\nSTARTUP", menu_load_preset_acb},
{ MT_ADV_CALLBACK|MT_REPEATS, DATA_STARTS_REPEATS(1,4), MT_CUSTOM_LABEL, menu_load_preset_acb},
{ MT_SUBMENU, 0, "STORE" , menu_store_preset},
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back
};
#ifdef TINYSA4
@ -2493,12 +2487,14 @@ static const menuitem_t menu_limit_modify[] =
};
const menuitem_t menu_limit_select[] = {
{ MT_ADV_CALLBACK, 1, MT_CUSTOM_LABEL, menu_limit_select_acb },
{ MT_ADV_CALLBACK | MT_REPEATS, DATA_STARTS_REPEATS(1,6), MT_CUSTOM_LABEL, menu_limit_select_acb },
#if 0
{ MT_ADV_CALLBACK, 2, MT_CUSTOM_LABEL, menu_limit_select_acb },
{ MT_ADV_CALLBACK, 3, MT_CUSTOM_LABEL, menu_limit_select_acb },
{ MT_ADV_CALLBACK, 4, MT_CUSTOM_LABEL, menu_limit_select_acb },
{ MT_ADV_CALLBACK, 5, MT_CUSTOM_LABEL, menu_limit_select_acb },
{ MT_ADV_CALLBACK, 6, MT_CUSTOM_LABEL, menu_limit_select_acb },
#endif
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back
};
#endif
@ -3104,10 +3100,10 @@ static void menu_item_modify_attribute( // To modify menu bu
else if (item == 1)
button->icon =setting.offset_delay > 0 ? BUTTON_ICON_CHECK_MANUAL : BUTTON_ICON_CHECK_AUTO;
} else if (menu == menu_display) {
if (item == 2)
if (item == 4)
button->icon = setting.sweep_time_us != 0 ? BUTTON_ICON_CHECK_MANUAL : BUTTON_ICON_CHECK_AUTO;
} else if (menu == menu_sweep_speed) {
if (item == 4)
if (item == 3)
button->icon = setting.fast_speedup != 0 ? BUTTON_ICON_CHECK_MANUAL : BUTTON_ICON_CHECK_AUTO;
} else if (menu == menu_reflevel) {
if (item == 1)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.