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

Markers on stored trace

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 49a4dede62
commit a46a56aed5
6 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
main.c
Unescape View File

@ -1018,7 +1018,7 @@ config_t config = {
.correction_frequency = {{ 1000000, 500000000, 1000000000, 1500000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000, 6500000000, 7000000000, 7500000000, 8000000000, 8500000000, 9000000000, 10000000000 },
{ 1000000, 500000000, 1000000000, 1500000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000, 6500000000, 7000000000, 7500000000, 8000000000, 8500000000, 9000000000, 10000000000 }},
.correction_value = {{ 0, +3, +11, +8.5, +2, +3, +10, +15, +12, +4, +0, +18, +22, +30, +30, +30, +30, +30, +30, +30 },
{ 0, 0, +1, +2, +2, +4, +9, +10, +16, +15, +17, +22, +30, +30, +30, +30, +30, +30, +30, +30 }},
{ 0, +3, +11, +8.5, +2, +3, +10, +15, +12, +4, +0, +18, +22, +30, +30, +30, +30, +30, +30, +30 }},
.setting_frequency_30mhz = 30000000,
.cor_am = 0,
.cor_wfm = 0,

2
nanovna.h
Unescape View File

@ -686,7 +686,7 @@ float groupdelay_from_array(int i, float array[POINTS_COUNT][2]);
#endif
// marker
enum {
M_NORMAL=0,M_REFERENCE=1, M_DELTA=2, M_NOISE=4, M_TRACKING=8, M_DELETE=16 // Tracking must be last.
M_NORMAL=0,M_REFERENCE=1, M_DELTA=2, M_NOISE=4, M_STORED=8, M_TRACKING=16, M_DELETE=32 // Tracking must be last.
};
enum {

24
plot.c
Unescape View File

@ -909,18 +909,26 @@ draw_cell(int m, int n)
// PULSE;
// draw marker symbols on each trace (<10 system ticks for all screen calls)
#if 1
if (trace[TRACE_ACTUAL].enabled) {
for (int t = TRACE_ACTUAL; t <= TRACE_STORED; t++ ) {
if (trace[t].enabled) {
for (i = 0; i < MARKERS_MAX; i++) {
if (!markers[i].enabled)
continue;
if (markers[i].mtype & M_STORED) {
if (t == TRACE_ACTUAL)
continue;
} else {
if (t == TRACE_STORED)
continue;
}
int idx = markers[i].index;
int x = trace_index_x[idx] - x0 - X_MARKER_OFFSET;
int y = trace_index_y[TRACE_ACTUAL][idx] - y0 - Y_MARKER_OFFSET;
int y = trace_index_y[t][idx] - y0 - Y_MARKER_OFFSET;
// Check marker icon on cell
if ((uint32_t)(x+MARKER_WIDTH ) < (CELLWIDTH + MARKER_WIDTH ) &&
(uint32_t)(y+MARKER_HEIGHT) < (CELLHEIGHT + MARKER_HEIGHT)){
// Draw marker plate
ili9341_set_foreground(LCD_TRACE_1_COLOR + TRACE_ACTUAL);
ili9341_set_foreground(LCD_TRACE_1_COLOR + t);
cell_blit_bitmap(x, y, MARKER_WIDTH, MARKER_HEIGHT, MARKER_BITMAP(0));
// Draw marker number
ili9341_set_foreground(LCD_BG_COLOR);
@ -928,6 +936,7 @@ draw_cell(int m, int n)
}
}
}
}
#endif
// Draw trace and marker info on the top (50 system ticks for all screen calls)
#if 1
@ -1486,9 +1495,16 @@ static void cell_draw_marker_info(int x0, int y0)
#endif
if (!markers[i].enabled)
continue;
for (t = TRACE_ACTUAL; t <= TRACE_ACTUAL; t++) { // Only show info on actual trace
for (t = TRACE_ACTUAL; t <= TRACE_STORED; t++) { // Only show info on actual trace
if (!trace[t].enabled)
continue;
if (markers[i].mtype & M_STORED) {
if (t == TRACE_ACTUAL)
continue;
} else {
if (t == TRACE_STORED)
continue;
}
uint16_t color;
int level = temppeakLevel - get_attenuation() + setting.external_gain;
if ((!setting.subtract_stored) && // Disabled when normalized

4
sa_core.c
Unescape View File

@ -4498,7 +4498,11 @@ common_silent:
#endif
case TP_30MHZ:
set_mode(M_LOW);
#ifdef TINYSA4
maxFreq = 9900000000ULL; // needed to measure the LPF rejection
#else
maxFreq = 2000000000; // needed to measure the LPF rejection
#endif
set_refer_output(0);
dirty = true;
// set_step_delay(1); // Do not set !!!!!

2
ui.c
Unescape View File

@ -986,6 +986,7 @@ static UI_FUNCTION_CALLBACK(menu_marker_search_cb)
// select_lever_mode(LM_SEARCH); // Jump from maximum to maximum
}
#if 0
static UI_FUNCTION_ADV_CALLBACK(menu_marker_tracking_acb){
(void)item;
(void)data;
@ -996,6 +997,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_marker_tracking_acb){
}
markers[active_marker].mtype ^= M_TRACKING;
}
#endif
#ifdef __VNA__
static void

21
ui_sa.c
Unescape View File

@ -1269,21 +1269,24 @@ static UI_FUNCTION_ADV_CALLBACK(menu_marker_modify_acb)
{
if (data == M_NORMAL) {
markers[active_marker].mtype = M_NORMAL;
} else if (data == M_REFERENCE) {
}
if (data == M_REFERENCE) {
for (int i = 0; i<MARKER_COUNT; i++ ) {
if (markers[i].mtype & M_REFERENCE)
if (i != active_marker && markers[i].mtype & M_REFERENCE)
markers[i].mtype &= ~M_REFERENCE;
}
markers[active_marker].mtype |= M_REFERENCE;
markers[active_marker].mtype &= ~M_DELTA;
} else {
if (data == M_DELTA && (markers[active_marker].mtype & M_REFERENCE))
}
if (data == M_DELTA)
markers[active_marker].mtype &= ~M_REFERENCE;
#if 1
markers[active_marker].mtype ^= data;
#else
if (markers[active_marker].mtype & data)
markers[active_marker].mtype &= ~data;
else
markers[active_marker].mtype |= data;
}
#endif
}
markmap_all_markers();
// redraw_marker(active_marker, TRUE);
@ -1841,7 +1844,7 @@ const menuitem_t menu_marker_search[] = {
{ MT_CALLBACK, 2, "MAX\n" S_LARROW" LEFT", menu_marker_search_cb },
{ MT_CALLBACK, 3, "MAX\n" S_RARROW" RIGHT", menu_marker_search_cb },
{ MT_KEYPAD, KM_MARKER, "ENTER\nFREQUENCY", NULL},
{ MT_ADV_CALLBACK, 0, "TRACKING",menu_marker_tracking_acb },
{ MT_ADV_CALLBACK, M_TRACKING, "TRACKING",menu_marker_modify_acb },
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
@ -1850,8 +1853,8 @@ const menuitem_t menu_marker_modify[] = {
{ MT_ADV_CALLBACK, M_REFERENCE, "REFER", menu_marker_modify_acb},
{ MT_ADV_CALLBACK, M_DELTA, "DELTA", menu_marker_modify_acb},
{ MT_ADV_CALLBACK, M_NOISE, "NOISE", menu_marker_modify_acb},
{ MT_ADV_CALLBACK, M_TRACKING, "TRACKING", menu_marker_tracking_acb},
{ MT_ADV_CALLBACK, M_NORMAL, "NORMAL", menu_marker_modify_acb},
{ MT_ADV_CALLBACK, M_TRACKING, "TRACKING", menu_marker_modify_acb},
{ MT_ADV_CALLBACK, M_STORED, "STORED", menu_marker_modify_acb},
{ MT_SUBMENU, 0, "SEARCH", menu_marker_search},
{ MT_CALLBACK, M_DELETE, "DELETE", menu_marker_delete_cb},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.