Bugs corrected

- Overload warning when normalized
- trace store not working
- save command not working
pull/4/head
erikkaashoek 5 years ago
parent ff54300994
commit 140a1be1a8

@ -1785,7 +1785,7 @@ VNA_SHELL_FUNCTION(cmd_trace)
set_unit(type); set_unit(type);
goto update; goto update;
} }
goto usage; // goto usage;
} }
static const char cmd_store_list[] = "store|clear|subtract"; static const char cmd_store_list[] = "store|clear|subtract";
if (argc == 1) { if (argc == 1) {
@ -1803,7 +1803,7 @@ VNA_SHELL_FUNCTION(cmd_trace)
goto update; goto update;
} }
} }
goto usage; // goto usage;
} }
// 0 1 // 0 1
static const char cmd_scale_ref_list[] = "scale|reflevel"; static const char cmd_scale_ref_list[] = "scale|reflevel";

@ -2097,8 +2097,9 @@ static void cell_draw_marker_info(int x0, int y0)
// buf[k++] = 0; // buf[k++] = 0;
ili9341_set_background(DEFAULT_BG_COLOR); ili9341_set_background(DEFAULT_BG_COLOR);
uint16_t color; uint16_t color;
if ((setting.mode == M_LOW && temppeakLevel - get_attenuation() + setting.offset > -1) || if ((!setting.subtract_stored) && // Disabled when normalized
(setting.mode == M_HIGH && temppeakLevel - get_attenuation()+ setting.offset > -10)) ((setting.mode == M_LOW && temppeakLevel - get_attenuation() + setting.offset > -1) ||
(setting.mode == M_HIGH && temppeakLevel - get_attenuation()+ setting.offset > -10) ))
color = BRIGHT_COLOR_RED; color = BRIGHT_COLOR_RED;
else else
color = marker_color(markers[i].mtype); color = marker_color(markers[i].mtype);

@ -894,6 +894,13 @@ static UI_FUNCTION_ADV_CALLBACK(menu_storage_acb)
break; break;
case 3: case 3:
toggle_normalize(); toggle_normalize();
if (setting.subtract_stored) {
kp_help_text = "Ref level";
ui_mode_keypad(KM_REFLEVEL);
ui_process_keypad();
// setting.normalize_level = uistat.value;
} else
set_auto_reflevel(true);
break; break;
} }
ui_mode_normal(); ui_mode_normal();

Loading…
Cancel
Save

Powered by TurnKey Linux.