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

Replace force_set_markmap to redraw_request |= REDRAW_AREA for less screen update

Browse Source
Removed_REF_marker
DiSlord 5 years ago committed by erikkaashoek
parent 7484de11bb
commit 62e7c27bb2
6 changed files with 36 additions and 52 deletions
Show Stats Download Patch File Download Diff File

9
main.c
Unescape View File

@ -1872,17 +1872,10 @@ void set_trace_type(int t, int type)
}
if (force) {
plot_into_index(measured);
force_set_markmap();
redraw_request |= REDRAW_AREA;
}
}
void set_trace_channel(int t, int channel)
{
if (trace[t].channel != channel) {
trace[t].channel = channel;
force_set_markmap();
}
}
void set_trace_scale(float scale)
{

1
nanovna.h
Unescape View File

@ -693,7 +693,6 @@ void request_to_draw_cells_behind_numeric_input(void);
void redraw_marker(int marker);
void markmap_all_markers(void);
void plot_into_index(measurement_t measured);
void force_set_markmap(void);
void draw_frequencies(void);
void draw_all(bool flush);

57
plot.c
Unescape View File

@ -150,12 +150,11 @@ void update_grid(void)
grid_offset = (WIDTH) * ((fstart % grid) / 100) / (fspan / 100);
grid_width = (WIDTH) * (grid / 100) / (fspan / 1000);
force_set_markmap();
if (get_waterfall()){
ili9341_set_background(LCD_BG_COLOR);
ili9341_fill(OFFSETX, graph_bottom, LCD_WIDTH - OFFSETX, CHART_BOTTOM - graph_bottom);
}
redraw_request |= REDRAW_FREQUENCY;
redraw_request |= REDRAW_FREQUENCY | REDRAW_AREA;
}
#ifdef __VNA__
@ -1028,13 +1027,6 @@ static float distance_of_index(int idx)
}
#endif
static inline void
mark_map(int x, int y)
{
if (y >= 0 && y < MAX_MARKMAP_Y && x >= 0 && x < MAX_MARKMAP_X)
markmap[current_mappage][y] |= 1 << x;
}
static inline void
swap_markmap(void)
{
@ -1047,24 +1039,27 @@ clear_markmap(void)
memset(markmap[current_mappage], 0, sizeof markmap[current_mappage]);
}
void
static void
force_set_markmap(void)
{
memset(markmap[current_mappage], 0xff, sizeof markmap[current_mappage]);
}
void
invalidate_rect(int x0, int y0, int x1, int y1)
/*
* Force region of screen update
*/
static void
invalidate_rect_func(int x0, int y0, int x1, int y1)
{
x0 /= CELLWIDTH;
x1 /= CELLWIDTH;
y0 /= CELLHEIGHT;
y1 /= CELLHEIGHT;
int x, y;
map_t *map = &markmap[current_mappage][0];
for (y = y0; y <= y1; y++)
if ((uint32_t)y < MAX_MARKMAP_Y)
for (x = x0; x <= x1; x++)
mark_map(x, y);
map[y]|= 1 << x;
}
#define invalidate_rect(x0, y0, x1, y1) invalidate_rect_func((x0)/CELLWIDTH, (y0)/CELLHEIGHT, (x1)/CELLWIDTH, (y1)/CELLHEIGHT)
#define SWAP(x,y) {int t=x;x=y;y=t;}
@ -1575,8 +1570,8 @@ draw_cell(int m, int n)
int x = CELL_X(index) - x0 - X_MARKER_OFFSET;
int y = CELL_Y(index) - y0 - Y_MARKER_OFFSET;
// Check marker icon on cell
if (x + MARKER_WIDTH >= 0 && x - MARKER_WIDTH < CELLWIDTH &&
y + MARKER_HEIGHT >= 0 && y - MARKER_HEIGHT < CELLHEIGHT){
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 + t);
cell_blit_bitmap(x, y, MARKER_WIDTH, MARKER_HEIGHT, MARKER_BITMAP(0));
@ -1723,18 +1718,19 @@ request_to_draw_cells_behind_numeric_input(void)
}
static void
cell_blit_bitmap(int x, int y, uint16_t w, uint16_t h, const uint8_t *bitmap)
cell_blit_bitmap(int x, int y, uint16_t w, uint16_t h, const uint8_t *bmp)
{
if (x <= -w)
return;
uint8_t bits = 0;
int c = h+y, r;
for (; y < c; y++) {
for (r = 0; r < w; r++) {
if ((r&7)==0) bits = *bitmap++;
if (y >= 0 && x+r >= 0 && y < CELLHEIGHT && x+r < CELLWIDTH && (0x80 & bits))
for (r = 0; r < w; r++, bits<<=1) {
if ((r&7)==0) bits = *bmp++;
if ((0x80 & bits) == 0) continue; // no pixel
if ((uint32_t)(y+0) >= CELLHEIGHT) continue; // y < 0 || y >= CELLHEIGHT
if ((uint32_t)(x+r) >= CELLWIDTH ) continue; // x+r < 0 || x+r >= CELLWIDTH
cell_buffer[y*CELLWIDTH + x + r] = foreground_color;
bits <<= 1;
}
}
}
@ -1742,21 +1738,22 @@ cell_blit_bitmap(int x, int y, uint16_t w, uint16_t h, const uint8_t *bitmap)
void
cell_drawstring(char *str, int x, int y)
{
if (y <= -FONT_GET_HEIGHT || y >= CELLHEIGHT)
if ((uint32_t)(y+FONT_GET_HEIGHT) >= CELLHEIGHT + FONT_GET_HEIGHT)
return;
while (*str) {
if (x >= CELLWIDTH)
return;
uint8_t ch = *str++;
uint16_t ch = *str++;
uint16_t w = FONT_GET_WIDTH(ch);
cell_blit_bitmap(x, y, w, FONT_GET_HEIGHT, FONT_GET_DATA(ch));
x += w;
}
}
void
static void
cell_drawstring_7x13(char *str, int x, int y)
{
if (y <= -bFONT_GET_HEIGHT || y >= CELLHEIGHT)
if ((uint32_t)(y+bFONT_GET_HEIGHT) >= CELLHEIGHT + bFONT_GET_HEIGHT)
return;
while (*str) {
if (x >= CELLWIDTH)
@ -1772,7 +1769,7 @@ void
cell_drawstring_10x14(char *str, int x, int y)
{
#ifdef wFONT_GET_DATA
if (y <= -wFONT_GET_HEIGHT || y >= CELLHEIGHT)
if ((uint32_t)(y+wFONT_GET_HEIGHT) >= CELLHEIGHT + wFONT_GET_HEIGHT)
return;
while (*str) {
if (x >= CELLWIDTH)
@ -2300,7 +2297,7 @@ int display_test(void)
spi_buffer[w] = 0;
}
ili9341_read_memory(0, h, LCD_WIDTH, 1, LCD_WIDTH, spi_buffer);
for (int volatile w = 0; w < LCD_WIDTH; w++) {
for (int w = 0; w < LCD_WIDTH; w++) {
if (spi_buffer[w] != ((w*h) & 0xfff))
return false;
}

4
sa_core.c
Unescape View File

@ -1128,7 +1128,7 @@ void user_set_scale(float s)
set_scale(s);
if (UNIT_IS_LINEAR(setting.unit) && setting.reflevel < setting.scale*NGRIDY)
set_reflevel(setting.scale*NGRIDY);
force_set_markmap();
redraw_request|=REDRAW_AREA;
}
void set_scale(float t) {
@ -1171,7 +1171,7 @@ void set_offset(float offset)
min = level_min();
max = min + level_range();
plot_printf(low_level_help_text, sizeof low_level_help_text, "%+d..%+d", min + (int)offset, max + (int)offset);
force_set_markmap();
redraw_request|=REDRAW_AREA;
dirty = true; // No HW update required, only status panel refresh but need to ensure the cached value is updated in the calculation of the RSSI
}

2
ui.c
Unescape View File

@ -143,8 +143,6 @@ static int16_t last_touch_y;
#define KP_DONE 1
#define KP_CANCEL 2
void ui_mode_normal(void);
//static void ui_mode_menu(void);
static void ui_mode_keypad(int _keypad_mode);
// static void draw_menu(void);
static void leave_ui_mode(void);

9
ui_sa.c
Unescape View File

@ -652,13 +652,9 @@ static UI_FUNCTION_CALLBACK(menu_config_cb)
switch (data) {
case CONFIG_MENUITEM_TOUCH_CAL:
touch_cal_exec();
redraw_frame();
request_to_redraw_grid();
break;
case CONFIG_MENUITEM_TOUCH_TEST:
touch_draw_test();
redraw_frame();
request_to_redraw_grid();
break;
case CONFIG_MENUITEM_SELFTEST:
sweep_mode = 0; // Suspend sweep to save time
@ -666,12 +662,13 @@ static UI_FUNCTION_CALLBACK(menu_config_cb)
setting.test = 0;
setting.test_argument = 0;
sweep_mode = SWEEP_SELFTEST;
break;
return;
case CONFIG_MENUITEM_VERSION:
show_version();
break;
}
redraw_frame();
request_to_redraw_grid();
}
}
static UI_FUNCTION_CALLBACK(menu_dfu_cb)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.