2016-10-28 13:50:51 +02:00
|
|
|
#include <math.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include "ch.h"
|
|
|
|
|
#include "hal.h"
|
|
|
|
|
#include "chprintf.h"
|
|
|
|
|
#include "nanovna.h"
|
|
|
|
|
|
2019-08-27 10:46:26 +02:00
|
|
|
static void cell_draw_marker_info(int m, int n, int w, int h);
|
2017-01-01 12:03:21 +01:00
|
|
|
|
|
|
|
|
int16_t grid_offset;
|
|
|
|
|
int16_t grid_width;
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int16_t area_width = AREA_WIDTH_NORMAL;
|
|
|
|
|
int16_t area_height = AREA_HEIGHT_NORMAL;
|
2017-01-01 12:03:21 +01:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Depends from spi_buffer size, CELLWIDTH*CELLHEIGHT <= sizeof(spi_buffer)
|
|
|
|
|
#define CELLWIDTH (64)
|
|
|
|
|
#define CELLHEIGHT (32)
|
2020-02-23 15:13:52 +01:00
|
|
|
// Check buffer size
|
|
|
|
|
#if CELLWIDTH*CELLHEIGHT > SPI_BUFFER_SIZE
|
|
|
|
|
#error "Too small spi_buffer size SPI_BUFFER_SIZE < CELLWIDTH*CELLHEIGH"
|
|
|
|
|
#endif
|
2016-10-28 19:44:09 +02:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// indicate dirty cells (not redraw if cell data not changed)
|
|
|
|
|
#define MAX_MARKMAP_X ((320+CELLWIDTH-1)/CELLWIDTH)
|
|
|
|
|
#define MAX_MARKMAP_Y ((240+CELLHEIGHT-1)/CELLHEIGHT)
|
|
|
|
|
uint16_t markmap[2][MAX_MARKMAP_Y];
|
|
|
|
|
uint16_t current_mappage = 0;
|
2016-10-28 19:44:09 +02:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Trace data cache, for faster redraw cells
|
|
|
|
|
// CELL_X[16:31] x position
|
|
|
|
|
// CELL_Y[ 0:15] y position
|
|
|
|
|
static uint32_t trace_index[TRACES_MAX][POINTS_COUNT];
|
2016-10-28 19:44:09 +02:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#define INDEX(x, y) ((((uint32_t)x)<<16)|(((uint32_t)y)))
|
|
|
|
|
#define CELL_X(i) (int)(((i)>>16))
|
|
|
|
|
#define CELL_Y(i) (int)(((i)&0xFFFF))
|
|
|
|
|
//#define CELL_P(i, x, y) (((((x)&0x03e0UL)<<22) | (((y)&0x03e0UL)<<17)) == ((i)&0xffc00000UL))
|
2016-10-28 19:44:09 +02:00
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
//#define floatToInt(v) ((int)(v))
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static int
|
|
|
|
|
floatToInt(float v){
|
|
|
|
|
if (v < 0) return v-0.5;
|
|
|
|
|
if (v > 0) return v+0.5;
|
|
|
|
|
return 0;
|
2020-01-25 13:46:09 +01:00
|
|
|
}
|
2016-10-28 19:44:09 +02:00
|
|
|
|
2016-12-12 15:45:49 +01:00
|
|
|
void update_grid(void)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2020-01-25 18:54:03 +01:00
|
|
|
uint32_t gdigit = 100000000;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
uint32_t fstart = get_sweep_frequency(ST_START);
|
|
|
|
|
uint32_t fspan = get_sweep_frequency(ST_SPAN);
|
2020-01-25 18:54:03 +01:00
|
|
|
uint32_t grid;
|
2016-12-11 13:51:54 +01:00
|
|
|
|
2016-10-28 13:50:51 +02:00
|
|
|
while (gdigit > 100) {
|
|
|
|
|
grid = 5 * gdigit;
|
|
|
|
|
if (fspan / grid >= 4)
|
|
|
|
|
break;
|
|
|
|
|
grid = 2 * gdigit;
|
|
|
|
|
if (fspan / grid >= 4)
|
|
|
|
|
break;
|
|
|
|
|
grid = gdigit;
|
|
|
|
|
if (fspan / grid >= 4)
|
|
|
|
|
break;
|
|
|
|
|
gdigit /= 10;
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
grid_offset = (WIDTH) * ((fstart % grid) / 100) / (fspan / 100);
|
|
|
|
|
grid_width = (WIDTH) * (grid / 100) / (fspan / 1000);
|
2016-10-28 13:50:51 +02:00
|
|
|
|
|
|
|
|
force_set_markmap();
|
2019-09-23 05:43:39 +02:00
|
|
|
redraw_request |= REDRAW_FREQUENCY;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2019-10-23 01:07:20 +02:00
|
|
|
static inline int
|
2016-10-28 13:50:51 +02:00
|
|
|
circle_inout(int x, int y, int r)
|
|
|
|
|
{
|
|
|
|
|
int d = x*x + y*y - r*r;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (d < -r)
|
2016-10-28 13:50:51 +02:00
|
|
|
return 1;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (d > r)
|
2016-10-28 13:50:51 +02:00
|
|
|
return -1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-23 01:17:24 +02:00
|
|
|
static int
|
2016-11-26 16:47:21 +01:00
|
|
|
polar_grid(int x, int y)
|
|
|
|
|
{
|
|
|
|
|
int d;
|
|
|
|
|
|
|
|
|
|
// offset to center
|
|
|
|
|
x -= P_CENTER_X;
|
|
|
|
|
y -= P_CENTER_Y;
|
|
|
|
|
|
|
|
|
|
// outer circle
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS);
|
|
|
|
|
if (d < 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
// vertical and horizontal axis
|
|
|
|
|
if (x == 0 || y == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS / 5);
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (d > 0) return 0;
|
|
|
|
|
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS * 2 / 5);
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (d > 0) return 0;
|
|
|
|
|
|
|
|
|
|
// cross sloping lines
|
|
|
|
|
if (x == y || x == -y)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS * 3 / 5);
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (d > 0) return 0;
|
|
|
|
|
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS * 4 / 5);
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Constant Resistance circle: (u - r/(r+1))^2 + v^2 = 1/(r+1)^2
|
|
|
|
|
* Constant Reactance circle: (u - 1)^2 + (v-1/x)^2 = 1/x^2
|
|
|
|
|
*/
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static int
|
2016-10-28 13:50:51 +02:00
|
|
|
smith_grid(int x, int y)
|
|
|
|
|
{
|
2016-11-26 16:47:21 +01:00
|
|
|
int d;
|
|
|
|
|
|
|
|
|
|
// offset to center
|
|
|
|
|
x -= P_CENTER_X;
|
|
|
|
|
y -= P_CENTER_Y;
|
|
|
|
|
|
|
|
|
|
// outer circle
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS);
|
2016-10-28 13:50:51 +02:00
|
|
|
if (d < 0)
|
|
|
|
|
return 0;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (d == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-28 01:17:54 +01:00
|
|
|
|
|
|
|
|
// horizontal axis
|
|
|
|
|
if (y == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
// shift circle center to right origin
|
|
|
|
|
x -= P_RADIUS;
|
|
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Constant Reactance Circle: 2j : R/2 = P_RADIUS/2
|
|
|
|
|
if (circle_inout(x, y+P_RADIUS/2, P_RADIUS/2) == 0)
|
|
|
|
|
return 1;
|
|
|
|
|
if (circle_inout(x, y-P_RADIUS/2, P_RADIUS/2) == 0)
|
|
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Constant Resistance Circle: 3 : R/4 = P_RADIUS/4
|
|
|
|
|
d = circle_inout(x+P_RADIUS/4, y, P_RADIUS/4);
|
2016-10-28 13:50:51 +02:00
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Constant Reactance Circle: 1j : R = P_RADIUS
|
|
|
|
|
if (circle_inout(x, y+P_RADIUS, P_RADIUS) == 0)
|
|
|
|
|
return 1;
|
|
|
|
|
if (circle_inout(x, y-P_RADIUS, P_RADIUS) == 0)
|
|
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Constant Resistance Circle: 1 : R/2
|
|
|
|
|
d = circle_inout(x+P_RADIUS/2, y, P_RADIUS/2);
|
2016-10-28 13:50:51 +02:00
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Constant Reactance Circle: 1/2j : R*2
|
|
|
|
|
if (circle_inout(x, y+P_RADIUS*2, P_RADIUS*2) == 0)
|
|
|
|
|
return 1;
|
|
|
|
|
if (circle_inout(x, y-P_RADIUS*2, P_RADIUS*2) == 0)
|
|
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Constant Resistance Circle: 1/3 : R*3/4
|
|
|
|
|
if (circle_inout(x+P_RADIUS*3/4, y, P_RADIUS*3/4) == 0)
|
|
|
|
|
return 1;
|
2016-10-28 13:50:51 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-23 01:17:24 +02:00
|
|
|
#if 0
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static int
|
2016-11-26 16:47:21 +01:00
|
|
|
smith_grid2(int x, int y, float scale)
|
|
|
|
|
{
|
|
|
|
|
int d;
|
|
|
|
|
|
|
|
|
|
// offset to center
|
|
|
|
|
x -= P_CENTER_X;
|
|
|
|
|
y -= P_CENTER_Y;
|
|
|
|
|
|
|
|
|
|
// outer circle
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS);
|
|
|
|
|
if (d < 0)
|
|
|
|
|
return 0;
|
|
|
|
|
if (d == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
// shift circle center to right origin
|
|
|
|
|
x -= P_RADIUS * scale;
|
|
|
|
|
|
|
|
|
|
// Constant Reactance Circle: 2j : R/2 = 58
|
|
|
|
|
if (circle_inout(x, y+58*scale, 58*scale) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (circle_inout(x, y-58*scale, 58*scale) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
#if 0
|
|
|
|
|
// Constant Resistance Circle: 3 : R/4 = 29
|
|
|
|
|
d = circle_inout(x+29*scale, y, 29*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
d = circle_inout(x-29*scale, y, 29*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Constant Reactance Circle: 1j : R = 116
|
|
|
|
|
if (circle_inout(x, y+116*scale, 116*scale) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (circle_inout(x, y-116*scale, 116*scale) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
// Constant Resistance Circle: 1 : R/2 = 58
|
|
|
|
|
d = circle_inout(x+58*scale, y, 58*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
d = circle_inout(x-58*scale, y, 58*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
// Constant Reactance Circle: 1/2j : R*2 = 232
|
|
|
|
|
if (circle_inout(x, y+232*scale, 232*scale) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
if (circle_inout(x, y-232*scale, 232*scale) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
// Constant Resistance Circle: 1/3 : R*3/4 = 87
|
|
|
|
|
d = circle_inout(x+87*scale, y, 87*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
d = circle_inout(x+87*scale, y, 87*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Constant Resistance Circle: 0 : R
|
|
|
|
|
d = circle_inout(x+P_RADIUS*scale, y, P_RADIUS*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
d = circle_inout(x-P_RADIUS*scale, y, P_RADIUS*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
|
|
|
|
|
// Constant Resistance Circle: -1/3 : R*3/2 = 174
|
|
|
|
|
d = circle_inout(x+174*scale, y, 174*scale);
|
|
|
|
|
if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
d = circle_inout(x-174*scale, y, 174*scale);
|
|
|
|
|
//if (d > 0) return 0;
|
2020-01-19 09:16:18 +01:00
|
|
|
if (d == 0) return 1;
|
2016-11-26 16:47:21 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
2019-10-23 01:17:24 +02:00
|
|
|
#endif
|
2016-11-28 01:17:54 +01:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#if 0
|
2016-11-28 01:17:54 +01:00
|
|
|
const int cirs[][4] = {
|
2020-01-26 18:56:45 +01:00
|
|
|
{ 0, 58/2, 58/2, 0 }, // Constant Reactance Circle: 2j : R/2 = 58
|
|
|
|
|
{ 29/2, 0, 29/2, 1 }, // Constant Resistance Circle: 3 : R/4 = 29
|
|
|
|
|
{ 0, 115/2, 115/2, 0 }, // Constant Reactance Circle: 1j : R = 115
|
|
|
|
|
{ 58/2, 0, 58/2, 1 }, // Constant Resistance Circle: 1 : R/2 = 58
|
|
|
|
|
{ 0, 230/2, 230/2, 0 }, // Constant Reactance Circle: 1/2j : R*2 = 230
|
|
|
|
|
{ 86/2, 0, 86/2, 1 }, // Constant Resistance Circle: 1/3 : R*3/4 = 86
|
|
|
|
|
{ 0, 460/2, 460/2, 0 }, // Constant Reactance Circle: 1/4j : R*4 = 460
|
|
|
|
|
{ 115/2, 0, 115/2, 1 }, // Constant Resistance Circle: 0 : R
|
|
|
|
|
{ 173/2, 0, 173/2, 1 }, // Constant Resistance Circle: -1/3 : R*3/2 = 173
|
|
|
|
|
{ 0, 0, 0, 0 } // sentinel
|
2016-11-28 01:17:54 +01:00
|
|
|
};
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static int
|
2016-11-28 01:17:54 +01:00
|
|
|
smith_grid3(int x, int y)
|
|
|
|
|
{
|
|
|
|
|
int d;
|
|
|
|
|
|
|
|
|
|
// offset to center
|
|
|
|
|
x -= P_CENTER_X;
|
|
|
|
|
y -= P_CENTER_Y;
|
|
|
|
|
|
|
|
|
|
// outer circle
|
|
|
|
|
d = circle_inout(x, y, P_RADIUS);
|
|
|
|
|
if (d < 0)
|
|
|
|
|
return 0;
|
|
|
|
|
if (d == 0)
|
2020-01-19 14:47:50 +01:00
|
|
|
return 1;
|
2016-11-28 01:17:54 +01:00
|
|
|
|
|
|
|
|
// shift circle center to right origin
|
|
|
|
|
x -= P_RADIUS /2;
|
|
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; cirs[i][2]; i++) {
|
|
|
|
|
d = circle_inout(x+cirs[i][0], y+cirs[i][1], cirs[i][2]);
|
|
|
|
|
if (d == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-28 01:17:54 +01:00
|
|
|
if (d > 0 && cirs[i][3])
|
|
|
|
|
return 0;
|
|
|
|
|
d = circle_inout(x-cirs[i][0], y-cirs[i][1], cirs[i][2]);
|
|
|
|
|
if (d == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-28 01:17:54 +01:00
|
|
|
if (d > 0 && cirs[i][3])
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#endif
|
2016-11-28 01:17:54 +01:00
|
|
|
|
2016-11-02 14:38:04 +01:00
|
|
|
#if 0
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static int
|
2016-10-28 13:50:51 +02:00
|
|
|
rectangular_grid(int x, int y)
|
|
|
|
|
{
|
2016-11-02 14:38:04 +01:00
|
|
|
//#define FREQ(x) (((x) * (fspan / 1000) / (WIDTH-1)) * 1000 + fstart)
|
2016-10-28 13:50:51 +02:00
|
|
|
//int32_t n = FREQ(x-1) / fgrid;
|
|
|
|
|
//int32_t m = FREQ(x) / fgrid;
|
|
|
|
|
//if ((m - n) > 0)
|
|
|
|
|
//if (((x * 6) % (WIDTH-1)) < 6)
|
|
|
|
|
//if (((x - grid_offset) % grid_width) == 0)
|
2017-01-15 15:27:05 +01:00
|
|
|
if (x == 0 || x == WIDTH-1)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-05 15:06:24 +01:00
|
|
|
if ((y % GRIDY) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-10-28 13:50:51 +02:00
|
|
|
if ((((x + grid_offset) * 10) % grid_width) < 10)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-02 14:38:04 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2019-10-23 01:17:24 +02:00
|
|
|
static int
|
2016-11-02 14:38:04 +01:00
|
|
|
rectangular_grid_x(int x)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
x-=CELLOFFSETX;
|
2017-01-15 15:27:05 +01:00
|
|
|
if (x < 0)
|
|
|
|
|
return 0;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (x == 0 || x == WIDTH)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-02 14:38:04 +01:00
|
|
|
if ((((x + grid_offset) * 10) % grid_width) < 10)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-11-02 14:38:04 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-23 01:17:24 +02:00
|
|
|
static int
|
2016-11-02 14:38:04 +01:00
|
|
|
rectangular_grid_y(int y)
|
|
|
|
|
{
|
2017-01-15 15:27:05 +01:00
|
|
|
if (y < 0)
|
|
|
|
|
return 0;
|
2016-11-05 15:06:24 +01:00
|
|
|
if ((y % GRIDY) == 0)
|
2020-01-19 09:16:18 +01:00
|
|
|
return 1;
|
2016-10-28 13:50:51 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-02 14:38:04 +01:00
|
|
|
#if 0
|
2016-10-28 13:50:51 +02:00
|
|
|
int
|
|
|
|
|
set_strut_grid(int x)
|
|
|
|
|
{
|
|
|
|
|
uint16_t *buf = spi_buffer;
|
|
|
|
|
int y;
|
|
|
|
|
|
|
|
|
|
for (y = 0; y < HEIGHT; y++) {
|
|
|
|
|
int c = rectangular_grid(x, y);
|
|
|
|
|
c |= smith_grid(x, y);
|
|
|
|
|
*buf++ = c;
|
|
|
|
|
}
|
|
|
|
|
return y;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
draw_on_strut(int v0, int d, int color)
|
|
|
|
|
{
|
|
|
|
|
int v;
|
|
|
|
|
int v1 = v0 + d;
|
|
|
|
|
if (v0 < 0) v0 = 0;
|
|
|
|
|
if (v1 < 0) v1 = 0;
|
|
|
|
|
if (v0 >= HEIGHT) v0 = HEIGHT-1;
|
|
|
|
|
if (v1 >= HEIGHT) v1 = HEIGHT-1;
|
|
|
|
|
if (v0 == v1) {
|
|
|
|
|
v = v0; d = 2;
|
|
|
|
|
} else if (v0 < v1) {
|
|
|
|
|
v = v0; d = v1 - v0 + 1;
|
|
|
|
|
} else {
|
|
|
|
|
v = v1; d = v0 - v1 + 1;
|
|
|
|
|
}
|
|
|
|
|
while (d-- > 0)
|
|
|
|
|
spi_buffer[v++] |= color;
|
|
|
|
|
}
|
2016-11-02 14:38:04 +01:00
|
|
|
#endif
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2016-11-02 13:08:33 +01:00
|
|
|
/*
|
|
|
|
|
* calculate log10(abs(gamma))
|
|
|
|
|
*/
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
logmag(const float *v)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2019-08-25 16:07:01 +02:00
|
|
|
return log10f(v[0]*v[0] + v[1]*v[1]) * 10;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2016-11-02 13:08:33 +01:00
|
|
|
/*
|
|
|
|
|
* calculate phase[-2:2] of coefficient
|
|
|
|
|
*/
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
phase(const float *v)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2019-08-25 16:07:01 +02:00
|
|
|
return 2 * atan2f(v[1], v[0]) / M_PI * 90;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-08 11:44:33 +02:00
|
|
|
/*
|
|
|
|
|
* calculate groupdelay
|
|
|
|
|
*/
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
groupdelay(const float *v, const float *w, float deltaf)
|
2019-09-08 11:44:33 +02:00
|
|
|
{
|
|
|
|
|
#if 1
|
|
|
|
|
// atan(w)-atan(v) = atan((w-v)/(1+wv))
|
|
|
|
|
float r = w[0]*v[1] - w[1]*v[0];
|
|
|
|
|
float i = w[0]*v[0] + w[1]*v[1];
|
|
|
|
|
return atan2f(r, i) / (2 * M_PI * deltaf);
|
|
|
|
|
#else
|
|
|
|
|
return (atan2f(w[0], w[1]) - atan2f(v[0], v[1])) / (2 * M_PI * deltaf);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-02 13:08:33 +01:00
|
|
|
/*
|
2019-08-25 16:07:01 +02:00
|
|
|
* calculate abs(gamma)
|
|
|
|
|
*/
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
linear(const float *v)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2019-08-25 16:07:01 +02:00
|
|
|
return - sqrtf(v[0]*v[0] + v[1]*v[1]);
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2016-11-02 13:08:33 +01:00
|
|
|
/*
|
|
|
|
|
* calculate vswr; (1+gamma)/(1-gamma)
|
|
|
|
|
*/
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
swr(const float *v)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
|
|
|
|
float x = sqrtf(v[0]*v[0] + v[1]*v[1]);
|
2020-01-25 13:46:09 +01:00
|
|
|
if (x >= 1)
|
2017-01-01 16:00:25 +01:00
|
|
|
return INFINITY;
|
2016-10-28 13:50:51 +02:00
|
|
|
return (1 + x)/(1 - x);
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
resitance(const float *v) {
|
2019-08-24 00:45:53 +02:00
|
|
|
float z0 = 50;
|
|
|
|
|
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
|
|
|
|
|
float zr = ((1+v[0])*(1-v[0]) - v[1]*v[1]) * d;
|
|
|
|
|
return zr;
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static float
|
|
|
|
|
reactance(const float *v) {
|
2019-08-24 00:45:53 +02:00
|
|
|
float z0 = 50;
|
|
|
|
|
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
|
|
|
|
|
float zi = 2*v[1] * d;
|
|
|
|
|
return zi;
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
2016-10-28 13:50:51 +02:00
|
|
|
cartesian_scale(float re, float im, int *xp, int *yp, float scale)
|
|
|
|
|
{
|
|
|
|
|
//float scale = 4e-3;
|
2020-01-19 09:16:18 +01:00
|
|
|
int x = floatToInt(re * P_RADIUS * scale);
|
|
|
|
|
int y = floatToInt(im * P_RADIUS * scale);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (x < -P_RADIUS) x = -P_RADIUS;
|
|
|
|
|
else if (x > P_RADIUS) x = P_RADIUS;
|
|
|
|
|
if (y < -P_RADIUS) y = -P_RADIUS;
|
|
|
|
|
else if (y > P_RADIUS) y = P_RADIUS;
|
2020-01-19 09:16:18 +01:00
|
|
|
*xp = P_CENTER_X + x;
|
|
|
|
|
*yp = P_CENTER_Y - y;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2019-11-23 03:04:45 +01:00
|
|
|
float
|
2020-01-25 18:54:03 +01:00
|
|
|
groupdelay_from_array(int i, float array[POINTS_COUNT][2])
|
2019-10-16 16:50:07 +02:00
|
|
|
{
|
2020-01-23 20:05:32 +01:00
|
|
|
int bottom = (i == 0) ? 0 : i - 1;
|
2020-01-25 18:54:03 +01:00
|
|
|
int top = (i == POINTS_COUNT-1) ? POINTS_COUNT-1 : i + 1;
|
2020-01-23 20:05:32 +01:00
|
|
|
float deltaf = frequencies[top] - frequencies[bottom];
|
|
|
|
|
return groupdelay(array[bottom], array[top], deltaf);
|
2019-10-16 16:50:07 +02:00
|
|
|
}
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2020-02-11 09:54:05 +01:00
|
|
|
static float
|
|
|
|
|
gamma2resistance(const float v[2])
|
|
|
|
|
{
|
|
|
|
|
float z0 = 50;
|
|
|
|
|
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
|
|
|
|
|
return ((1+v[0])*(1-v[0]) - v[1]*v[1]) * d;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static float
|
|
|
|
|
gamma2reactance(const float v[2])
|
|
|
|
|
{
|
|
|
|
|
float z0 = 50;
|
|
|
|
|
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
|
|
|
|
|
return 2*v[1] * d;
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static uint32_t
|
|
|
|
|
trace_into_index(int t, int i, float array[POINTS_COUNT][2])
|
2016-10-28 19:44:09 +02:00
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int y, x;
|
|
|
|
|
|
2019-10-16 16:22:47 +02:00
|
|
|
float *coeff = array[i];
|
2020-02-23 03:37:41 +01:00
|
|
|
float refpos = NGRIDY - get_trace_refpos(t);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
float v = refpos;
|
2019-08-26 16:58:47 +02:00
|
|
|
float scale = 1 / get_trace_scale(t);
|
2016-10-28 19:44:09 +02:00
|
|
|
switch (trace[t].type) {
|
|
|
|
|
case TRC_LOGMAG:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= logmag(coeff) * scale;
|
2016-10-28 19:44:09 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_PHASE:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= phase(coeff) * scale;
|
2016-10-28 19:44:09 +02:00
|
|
|
break;
|
2019-09-08 11:44:33 +02:00
|
|
|
case TRC_DELAY:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= groupdelay_from_array(i, array) * scale;
|
2019-09-08 11:44:33 +02:00
|
|
|
break;
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_LINEAR:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v+= linear(coeff) * scale;
|
2016-10-28 19:44:09 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_SWR:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v+= (1 - swr(coeff)) * scale;
|
2016-10-28 19:44:09 +02:00
|
|
|
break;
|
2019-08-24 00:45:53 +02:00
|
|
|
case TRC_REAL:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= coeff[0] * scale;
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_IMAG:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= coeff[1] * scale;
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_R:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= resitance(coeff) * scale;
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_X:
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
v-= reactance(coeff) * scale;
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_SMITH:
|
2017-01-05 01:04:28 +01:00
|
|
|
//case TRC_ADMIT:
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_POLAR:
|
2017-02-03 13:18:33 +01:00
|
|
|
cartesian_scale(coeff[0], coeff[1], &x, &y, scale);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
goto set_index;
|
2016-10-28 19:44:09 +02:00
|
|
|
}
|
2020-02-23 03:37:41 +01:00
|
|
|
if (v < 0) v = 0;
|
|
|
|
|
if (v > NGRIDY) v = NGRIDY;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
x = (i * (WIDTH) + (sweep_points-1)/2) / (sweep_points-1) + CELLOFFSETX;
|
2020-01-19 09:16:18 +01:00
|
|
|
y = floatToInt(v * GRIDY);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
set_index:
|
|
|
|
|
return INDEX(x, y);
|
2016-10-28 19:44:09 +02:00
|
|
|
}
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2019-08-27 10:46:26 +02:00
|
|
|
static void
|
2019-11-30 02:17:14 +01:00
|
|
|
format_smith_value(char *buf, int len, const float coeff[2], uint32_t frequency)
|
2016-11-05 15:06:24 +01:00
|
|
|
{
|
|
|
|
|
// z = (gamma+1)/(gamma-1) * z0
|
|
|
|
|
float z0 = 50;
|
|
|
|
|
float d = z0 / ((1-coeff[0])*(1-coeff[0])+coeff[1]*coeff[1]);
|
2019-08-10 06:16:17 +02:00
|
|
|
float zr = ((1+coeff[0])*(1-coeff[0]) - coeff[1]*coeff[1]) * d;
|
2016-11-05 15:06:24 +01:00
|
|
|
float zi = 2*coeff[1] * d;
|
2020-02-11 09:54:05 +01:00
|
|
|
char prefix;
|
|
|
|
|
float value;
|
2020-01-18 05:03:38 +01:00
|
|
|
switch (marker_smith_format) {
|
2019-11-30 02:17:14 +01:00
|
|
|
case MS_LIN:
|
|
|
|
|
chsnprintf(buf, len, "%.2f %.1f" S_DEGREE, linear(coeff), phase(coeff));
|
|
|
|
|
break;
|
2016-11-05 15:06:24 +01:00
|
|
|
|
2019-11-30 02:17:14 +01:00
|
|
|
case MS_LOG: {
|
|
|
|
|
float v = logmag(coeff);
|
|
|
|
|
if (v == -INFINITY)
|
2020-01-19 09:16:18 +01:00
|
|
|
chsnprintf(buf, len, "-"S_INFINITY" dB");
|
2019-11-30 02:17:14 +01:00
|
|
|
else
|
|
|
|
|
chsnprintf(buf, len, "%.1fdB %.1f" S_DEGREE, v, phase(coeff));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MS_REIM:
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, "%F%+Fj", coeff[0], coeff[1]);
|
2019-11-30 02:17:14 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case MS_RX:
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, "%F"S_OHM"%+Fj", zr, zi);
|
2019-11-30 02:17:14 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case MS_RLC:
|
2020-01-19 09:16:18 +01:00
|
|
|
if (zi < 0){// Capacity
|
2020-02-11 09:54:05 +01:00
|
|
|
prefix = 'F';
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
value = -1 / (2 * M_PI * frequency * zi);
|
2020-01-19 09:16:18 +01:00
|
|
|
}
|
|
|
|
|
else {
|
2020-02-11 09:54:05 +01:00
|
|
|
prefix = 'H';
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
value = zi / (2 * M_PI * frequency);
|
2019-11-30 02:17:14 +01:00
|
|
|
}
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, "%F"S_OHM" %F%c", zr, value, prefix);
|
2019-11-30 02:17:14 +01:00
|
|
|
break;
|
2016-11-05 15:06:24 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-27 10:46:26 +02:00
|
|
|
static void
|
2020-01-25 18:54:03 +01:00
|
|
|
trace_get_value_string(int t, char *buf, int len, float array[POINTS_COUNT][2], int i)
|
2016-10-28 19:44:09 +02:00
|
|
|
{
|
2019-10-16 16:22:47 +02:00
|
|
|
float *coeff = array[i];
|
2016-10-28 19:44:09 +02:00
|
|
|
float v;
|
2020-02-11 09:54:05 +01:00
|
|
|
char *format;
|
2016-10-28 19:44:09 +02:00
|
|
|
switch (trace[t].type) {
|
|
|
|
|
case TRC_LOGMAG:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2fdB";
|
2016-10-28 19:44:09 +02:00
|
|
|
v = logmag(coeff);
|
|
|
|
|
break;
|
|
|
|
|
case TRC_PHASE:
|
2020-02-22 04:24:32 +01:00
|
|
|
format = "%.1f"S_DEGREE;
|
2016-10-28 19:44:09 +02:00
|
|
|
v = phase(coeff);
|
|
|
|
|
break;
|
2019-09-08 11:44:33 +02:00
|
|
|
case TRC_DELAY:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2Fs";
|
2019-10-16 16:50:07 +02:00
|
|
|
v = groupdelay_from_array(i, array);
|
2019-09-08 11:44:33 +02:00
|
|
|
break;
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_LINEAR:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.4f";
|
2016-10-28 19:44:09 +02:00
|
|
|
v = linear(coeff);
|
|
|
|
|
break;
|
|
|
|
|
case TRC_SWR:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.4f";
|
2016-10-28 19:44:09 +02:00
|
|
|
v = swr(coeff);
|
2016-11-05 15:06:24 +01:00
|
|
|
break;
|
2019-08-24 00:45:53 +02:00
|
|
|
case TRC_REAL:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.4f";
|
|
|
|
|
v = coeff[0];
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_IMAG:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.4fj";
|
|
|
|
|
v = coeff[1];
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_R:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2F"S_OHM;
|
|
|
|
|
v = gamma2resistance(coeff);
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
|
|
|
|
case TRC_X:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2F"S_OHM;
|
|
|
|
|
v = gamma2reactance(coeff);
|
2019-08-24 00:45:53 +02:00
|
|
|
break;
|
2020-02-11 09:54:05 +01:00
|
|
|
case TRC_SMITH:
|
|
|
|
|
format_smith_value(buf, len, coeff, frequencies[i]);
|
|
|
|
|
return;
|
|
|
|
|
//case TRC_ADMIT:
|
2016-11-05 15:06:24 +01:00
|
|
|
case TRC_POLAR:
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, "%.2f%+.2fj", coeff[0], coeff[1]);
|
|
|
|
|
default:
|
|
|
|
|
return;
|
2016-10-28 19:44:09 +02:00
|
|
|
}
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, format, v);
|
2016-10-28 19:44:09 +02:00
|
|
|
}
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2019-11-29 13:53:07 +01:00
|
|
|
static void
|
2020-01-25 18:54:03 +01:00
|
|
|
trace_get_value_string_delta(int t, char *buf, int len, float array[POINTS_COUNT][2], int index, int index_ref)
|
2019-11-29 13:53:07 +01:00
|
|
|
{
|
|
|
|
|
float *coeff = array[index];
|
|
|
|
|
float *coeff_ref = array[index_ref];
|
|
|
|
|
float v;
|
2020-02-11 09:54:05 +01:00
|
|
|
char *format;
|
2019-11-29 13:53:07 +01:00
|
|
|
switch (trace[t].type) {
|
|
|
|
|
case TRC_LOGMAG:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = S_DELTA"%.2fdB";
|
2019-11-29 13:53:07 +01:00
|
|
|
v = logmag(coeff) - logmag(coeff_ref);
|
|
|
|
|
break;
|
|
|
|
|
case TRC_PHASE:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = S_DELTA"%.2f"S_DEGREE;
|
2019-11-29 13:53:07 +01:00
|
|
|
v = phase(coeff) - phase(coeff_ref);
|
|
|
|
|
break;
|
|
|
|
|
case TRC_DELAY:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2Fs";
|
2019-11-29 13:53:07 +01:00
|
|
|
v = groupdelay_from_array(index, array) - groupdelay_from_array(index_ref, array);
|
|
|
|
|
break;
|
|
|
|
|
case TRC_LINEAR:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = S_DELTA"%.3f";
|
2019-11-29 13:53:07 +01:00
|
|
|
v = linear(coeff) - linear(coeff_ref);
|
|
|
|
|
break;
|
|
|
|
|
case TRC_SWR:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = S_DELTA"%.3f";
|
|
|
|
|
v = swr(coeff);
|
|
|
|
|
if (v!=INFINITY)
|
|
|
|
|
v-=swr(coeff_ref);
|
2019-11-29 13:53:07 +01:00
|
|
|
break;
|
|
|
|
|
case TRC_SMITH:
|
2019-11-30 02:17:14 +01:00
|
|
|
format_smith_value(buf, len, coeff, frequencies[index]);
|
2020-02-11 09:54:05 +01:00
|
|
|
return;
|
2019-11-29 13:53:07 +01:00
|
|
|
case TRC_REAL:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = S_DELTA"%.3f";
|
|
|
|
|
v = coeff[0] - coeff_ref[0];
|
2019-11-29 13:53:07 +01:00
|
|
|
break;
|
|
|
|
|
case TRC_IMAG:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = S_DELTA"%.3fj";
|
|
|
|
|
v = coeff[1] - coeff_ref[1];
|
2019-11-29 13:53:07 +01:00
|
|
|
break;
|
|
|
|
|
case TRC_R:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2F"S_OHM;
|
|
|
|
|
v = gamma2resistance(coeff);
|
2019-11-29 13:53:07 +01:00
|
|
|
break;
|
|
|
|
|
case TRC_X:
|
2020-02-11 09:54:05 +01:00
|
|
|
format = "%.2F"S_OHM;
|
|
|
|
|
v = gamma2reactance(coeff);
|
2019-11-29 13:53:07 +01:00
|
|
|
break;
|
|
|
|
|
//case TRC_ADMIT:
|
|
|
|
|
case TRC_POLAR:
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, "%.2f%+.2fj", coeff[0], coeff[1]);
|
|
|
|
|
return;
|
|
|
|
|
default:
|
|
|
|
|
return;
|
2019-11-29 13:53:07 +01:00
|
|
|
}
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, len, format, v);
|
2019-11-29 13:53:07 +01:00
|
|
|
}
|
|
|
|
|
|
2020-01-31 16:13:53 +01:00
|
|
|
static int
|
2016-10-28 19:44:09 +02:00
|
|
|
trace_get_info(int t, char *buf, int len)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2020-02-11 09:54:05 +01:00
|
|
|
const char *name = get_trace_typename(t);
|
|
|
|
|
float scale = get_trace_scale(t);
|
2016-10-28 19:44:09 +02:00
|
|
|
switch (trace[t].type) {
|
|
|
|
|
case TRC_LOGMAG:
|
2020-02-11 09:54:05 +01:00
|
|
|
return chsnprintf(buf, len, "%s %ddB/", name, (int)scale);
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_PHASE:
|
2020-02-11 09:54:05 +01:00
|
|
|
return chsnprintf(buf, len, "%s %d" S_DEGREE "/", name, (int)scale);
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_SMITH:
|
2017-01-05 01:04:28 +01:00
|
|
|
//case TRC_ADMIT:
|
2016-10-28 19:44:09 +02:00
|
|
|
case TRC_POLAR:
|
2020-02-11 09:54:05 +01:00
|
|
|
if (scale != 1.0)
|
|
|
|
|
return chsnprintf(buf, len, "%s %.1fFS", name, scale);
|
|
|
|
|
else
|
2020-02-22 04:24:32 +01:00
|
|
|
return chsnprintf(buf, len, "%s ", name);
|
2016-10-28 19:44:09 +02:00
|
|
|
default:
|
2020-02-11 09:54:05 +01:00
|
|
|
return chsnprintf(buf, len, "%s %F/", name, scale);
|
2016-10-28 19:44:09 +02:00
|
|
|
}
|
2020-02-11 09:54:05 +01:00
|
|
|
return 0;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-11 14:22:42 +02:00
|
|
|
static float time_of_index(int idx) {
|
2019-09-21 15:20:08 +02:00
|
|
|
return 1.0 / (float)(frequencies[1] - frequencies[0]) / (float)FFT_SIZE * idx;
|
2019-09-11 14:22:42 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-11 01:17:40 +02:00
|
|
|
static float distance_of_index(int idx) {
|
|
|
|
|
#define SPEED_OF_LIGHT 299792458
|
2019-09-21 15:20:08 +02:00
|
|
|
float distance = ((float)idx * (float)SPEED_OF_LIGHT) / ( (float)(frequencies[1] - frequencies[0]) * (float)FFT_SIZE * 2.0);
|
2020-01-18 05:03:38 +01:00
|
|
|
return distance * velocity_factor;
|
2019-09-11 01:17:40 +02:00
|
|
|
}
|
|
|
|
|
|
2016-10-28 13:50:51 +02:00
|
|
|
static inline void
|
|
|
|
|
mark_map(int x, int y)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (y >= 0 && y < MAX_MARKMAP_Y && x >= 0 && x < MAX_MARKMAP_X)
|
2016-10-28 13:50:51 +02:00
|
|
|
markmap[current_mappage][y] |= 1<<x;
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
2016-10-28 13:50:51 +02:00
|
|
|
swap_markmap(void)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
current_mappage^= 1;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
2016-10-28 13:50:51 +02:00
|
|
|
clear_markmap(void)
|
|
|
|
|
{
|
|
|
|
|
memset(markmap[current_mappage], 0, sizeof markmap[current_mappage]);
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
void
|
2016-10-28 13:50:51 +02:00
|
|
|
force_set_markmap(void)
|
|
|
|
|
{
|
|
|
|
|
memset(markmap[current_mappage], 0xff, sizeof markmap[current_mappage]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
invalidateRect(int x0, int y0, int x1, int y1){
|
|
|
|
|
x0/=CELLWIDTH;
|
|
|
|
|
x1/=CELLWIDTH;
|
|
|
|
|
y0/=CELLHEIGHT;
|
|
|
|
|
y1/=CELLHEIGHT;
|
|
|
|
|
int x, y;
|
|
|
|
|
for (y=y0; y<=y1; y++)
|
|
|
|
|
for (x=x0; x<=x1; x++)
|
|
|
|
|
mark_map(x, y);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2016-10-28 19:44:09 +02:00
|
|
|
mark_cells_from_index(void)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2016-10-28 19:44:09 +02:00
|
|
|
int t;
|
2016-10-28 13:50:51 +02:00
|
|
|
/* mark cells between each neighber points */
|
|
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
2016-11-02 13:08:33 +01:00
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
2016-10-28 13:50:51 +02:00
|
|
|
int x0 = CELL_X(trace_index[t][0]);
|
|
|
|
|
int y0 = CELL_Y(trace_index[t][0]);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int m0 = x0 / CELLWIDTH;
|
|
|
|
|
int n0 = y0 / CELLHEIGHT;
|
2016-10-28 19:44:09 +02:00
|
|
|
int i;
|
2016-10-28 13:50:51 +02:00
|
|
|
mark_map(m0, n0);
|
2017-01-16 16:13:42 +01:00
|
|
|
for (i = 1; i < sweep_points; i++) {
|
2016-10-28 13:50:51 +02:00
|
|
|
int x1 = CELL_X(trace_index[t][i]);
|
|
|
|
|
int y1 = CELL_Y(trace_index[t][i]);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int m1 = x1 / CELLWIDTH;
|
|
|
|
|
int n1 = y1 / CELLHEIGHT;
|
2016-10-28 13:50:51 +02:00
|
|
|
while (m0 != m1 || n0 != n1) {
|
|
|
|
|
if (m0 == m1) {
|
|
|
|
|
if (n0 < n1) n0++; else n0--;
|
|
|
|
|
} else if (n0 == n1) {
|
|
|
|
|
if (m0 < m1) m0++; else m0--;
|
|
|
|
|
} else {
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int x = ((m0 < m1) ? (m0 + 1) : m0) * CELLWIDTH;
|
|
|
|
|
int y = ((n0 < n1) ? (n0 + 1) : n0) * CELLHEIGHT;
|
2016-10-28 13:50:51 +02:00
|
|
|
int sgn = (n0 < n1) ? 1 : -1;
|
|
|
|
|
if (sgn*(y-y0)*(x1-x0) < sgn*(x-x0)*(y1-y0)) {
|
|
|
|
|
if (m0 < m1) m0++;
|
|
|
|
|
else m0--;
|
|
|
|
|
} else {
|
|
|
|
|
if (n0 < n1) n0++;
|
|
|
|
|
else n0--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
mark_map(m0, n0);
|
|
|
|
|
}
|
|
|
|
|
x0 = x1;
|
|
|
|
|
y0 = y1;
|
|
|
|
|
m0 = m1;
|
|
|
|
|
n0 = n1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static inline void
|
|
|
|
|
markmap_upperarea(void)
|
2016-10-28 19:44:09 +02:00
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Hardcoded, Text info from upper area
|
|
|
|
|
invalidateRect(0, 0, AREA_WIDTH_NORMAL, 31);
|
2016-10-28 19:44:09 +02:00
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#define INSIDE 0b0000;
|
|
|
|
|
#define LEFT 0b0001;
|
|
|
|
|
#define RIGHT 0b0010;
|
|
|
|
|
#define BOTTOM 0b0100;
|
|
|
|
|
#define TOP 0b1000;
|
2019-08-26 08:21:57 +02:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static uint32_t
|
2019-08-26 08:21:57 +02:00
|
|
|
_compute_outcode(int w, int h, int x, int y)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
uint32_t code = INSIDE;
|
2019-08-26 08:21:57 +02:00
|
|
|
if (x < 0) {
|
|
|
|
|
code |= LEFT;
|
|
|
|
|
} else
|
|
|
|
|
if (x > w) {
|
|
|
|
|
code |= RIGHT;
|
|
|
|
|
}
|
|
|
|
|
if (y < 0) {
|
|
|
|
|
code |= BOTTOM;
|
|
|
|
|
} else
|
|
|
|
|
if (y > h) {
|
|
|
|
|
code |= TOP;
|
|
|
|
|
}
|
|
|
|
|
return code;
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-23 01:17:24 +02:00
|
|
|
static void
|
2016-10-28 19:44:09 +02:00
|
|
|
cell_drawline(int w, int h, int x0, int y0, int x1, int y1, int c)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
uint32_t outcode1 = _compute_outcode(w, h, x0, y0);
|
|
|
|
|
uint32_t outcode2 = _compute_outcode(w, h, x1, y1);
|
|
|
|
|
if (outcode1 & outcode2) {
|
2019-08-26 08:21:57 +02:00
|
|
|
// this line is out of requested area. early return
|
|
|
|
|
return;
|
|
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// If outcode1 == 0 && outcode2 == 0, no clipping, not need check
|
|
|
|
|
//outcode1+=outcode2;
|
|
|
|
|
// modifed Bresenham's line algorithm, see https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm
|
|
|
|
|
int dx = x1 - x0, sx = 1; if (dx < 0) {dx = -dx; sx = -1;}
|
|
|
|
|
int dy = y1 - y0, sy = 1; if (dy < 0) {dy = -dy; sy = -1;}
|
|
|
|
|
int err = (dx > dy ? dx : -dy) / 2;
|
|
|
|
|
|
|
|
|
|
while (1){
|
|
|
|
|
if (//outcode1 == 0 ||
|
|
|
|
|
(y0 >= 0 && y0 < h && x0 >= 0 && x0 < w))
|
|
|
|
|
spi_buffer[y0*w+x0] |= c;
|
|
|
|
|
if (x0 == x1 && y0 == y1)
|
|
|
|
|
break;
|
|
|
|
|
int e2 = err;
|
|
|
|
|
if (e2 > -dx) { err -= dy; x0 += sx; }
|
|
|
|
|
if (e2 < dy) { err += dx; y0 += sy; }
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#if 0
|
2016-10-28 13:50:51 +02:00
|
|
|
int
|
2020-01-25 18:54:03 +01:00
|
|
|
search_index_range(int x, int y, uint32_t index[POINTS_COUNT], int *i0, int *i1)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
int head = 0;
|
2017-01-16 16:13:42 +01:00
|
|
|
int tail = sweep_points;
|
2017-01-16 17:49:22 +01:00
|
|
|
i = 0;
|
2016-10-28 13:50:51 +02:00
|
|
|
x &= 0x03e0;
|
|
|
|
|
y &= 0x03e0;
|
|
|
|
|
while (head < tail) {
|
|
|
|
|
i = (head + tail) / 2;
|
|
|
|
|
if (x < CELL_X0(index[i]))
|
|
|
|
|
tail = i+1;
|
|
|
|
|
else if (x > CELL_X0(index[i]))
|
|
|
|
|
head = i;
|
|
|
|
|
else if (y < CELL_Y0(index[i]))
|
|
|
|
|
tail = i+1;
|
|
|
|
|
else if (y > CELL_Y0(index[i]))
|
|
|
|
|
head = i;
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (x != CELL_X0(index[i]) || y != CELL_Y0(index[i]))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
j = i;
|
|
|
|
|
while (j > 0 && x == CELL_X0(index[j-1]) && y == CELL_Y0(index[j-1]))
|
|
|
|
|
j--;
|
|
|
|
|
*i0 = j;
|
|
|
|
|
j = i;
|
2020-01-25 18:54:03 +01:00
|
|
|
while (j < POINTS_COUNT-1 && x == CELL_X0(index[j+1]) && y == CELL_Y0(index[j+1]))
|
2016-10-28 13:50:51 +02:00
|
|
|
j++;
|
|
|
|
|
*i1 = j;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#endif
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2019-10-23 01:17:24 +02:00
|
|
|
static int
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
search_index_range_x(int x1, int x2, uint32_t index[POINTS_COUNT], int *i0, int *i1)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
int head = 0;
|
2017-01-16 16:13:42 +01:00
|
|
|
int tail = sweep_points;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int idx_x;
|
|
|
|
|
|
|
|
|
|
// Search index point in cell
|
|
|
|
|
while (1) {
|
2016-10-28 13:50:51 +02:00
|
|
|
i = (head + tail) / 2;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
idx_x = CELL_X(index[i]);
|
|
|
|
|
if (idx_x >= x2){ // index after cell
|
|
|
|
|
if (tail == i)
|
|
|
|
|
return false;
|
|
|
|
|
tail = i;
|
|
|
|
|
}
|
|
|
|
|
else if (idx_x < x1){ // index before cell
|
2019-09-29 06:19:42 +02:00
|
|
|
if (head == i)
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
return false;
|
2017-01-16 18:19:10 +01:00
|
|
|
head = i;
|
2019-09-29 06:19:42 +02:00
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
else // index in cell (x =< idx_x < cell_end)
|
|
|
|
|
break;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
j = i;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Search index left from point
|
|
|
|
|
do{
|
2016-10-28 13:50:51 +02:00
|
|
|
j--;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
}while (j > 0 && x1 <= CELL_X(index[j]));
|
2016-10-28 13:50:51 +02:00
|
|
|
*i0 = j;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Search index right from point
|
|
|
|
|
do{
|
|
|
|
|
i++;
|
|
|
|
|
}while (i < sweep_points-1 && CELL_X(index[i]) < x2);
|
|
|
|
|
*i1 = i;
|
|
|
|
|
|
2016-10-28 13:50:51 +02:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-23 13:45:37 +01:00
|
|
|
#define REFERENCE_WIDTH 6
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#define REFERENCE_HEIGHT 5
|
|
|
|
|
#define REFERENCE_X_OFFSET 5
|
|
|
|
|
#define REFERENCE_Y_OFFSET 2
|
|
|
|
|
|
|
|
|
|
// Reference bitmap
|
|
|
|
|
static const uint8_t reference_bitmap[]={
|
|
|
|
|
0b11000000,
|
|
|
|
|
0b11110000,
|
|
|
|
|
0b11111100,
|
|
|
|
|
0b11110000,
|
|
|
|
|
0b11000000,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
2017-01-15 15:27:05 +01:00
|
|
|
draw_refpos(int w, int h, int x, int y, int c)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int y0=y, j;
|
|
|
|
|
for (j=0; j<REFERENCE_HEIGHT; j++, y0++){
|
|
|
|
|
if (y0 < 0 || y0 >= h)
|
|
|
|
|
continue;
|
|
|
|
|
int x0=x;
|
|
|
|
|
uint8_t bits = reference_bitmap[j];
|
|
|
|
|
while (bits){
|
|
|
|
|
if (x0 >= 0 && x0 < w)
|
|
|
|
|
spi_buffer[y0*w+x0] = (bits&0x80) ? c : DEFAULT_BG_COLOR;
|
|
|
|
|
x0++;
|
|
|
|
|
bits<<=1;
|
2017-01-15 15:27:05 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#define MARKER_WIDTH 7
|
|
|
|
|
#define MARKER_HEIGHT 10
|
|
|
|
|
#define X_MARKER_OFFSET 3
|
|
|
|
|
#define Y_MARKER_OFFSET 10
|
|
|
|
|
static const uint8_t marker_bitmap[]={
|
|
|
|
|
// Marker 1
|
|
|
|
|
0b11111110,
|
|
|
|
|
0b11101110,
|
|
|
|
|
0b11001110,
|
|
|
|
|
0b11101110,
|
|
|
|
|
0b11101110,
|
|
|
|
|
0b11101110,
|
|
|
|
|
0b11000110,
|
|
|
|
|
0b01111100,
|
|
|
|
|
0b00111000,
|
|
|
|
|
0b00010000,
|
|
|
|
|
// Marker 2
|
|
|
|
|
0b11111110,
|
|
|
|
|
0b11000110,
|
|
|
|
|
0b10111010,
|
|
|
|
|
0b11111010,
|
|
|
|
|
0b11000110,
|
|
|
|
|
0b10111110,
|
|
|
|
|
0b10000010,
|
|
|
|
|
0b01111100,
|
|
|
|
|
0b00111000,
|
|
|
|
|
0b00010000,
|
|
|
|
|
// Marker 3
|
|
|
|
|
0b11111110,
|
|
|
|
|
0b11000110,
|
|
|
|
|
0b10111010,
|
|
|
|
|
0b11100110,
|
|
|
|
|
0b11111010,
|
|
|
|
|
0b10111010,
|
|
|
|
|
0b11000110,
|
|
|
|
|
0b01111100,
|
|
|
|
|
0b00111000,
|
|
|
|
|
0b00010000,
|
|
|
|
|
// Marker 4
|
|
|
|
|
0b11111110,
|
|
|
|
|
0b11110110,
|
|
|
|
|
0b11100110,
|
|
|
|
|
0b11010110,
|
|
|
|
|
0b10110110,
|
|
|
|
|
0b10110110,
|
|
|
|
|
0b10000010,
|
|
|
|
|
0b01110100,
|
|
|
|
|
0b00111000,
|
|
|
|
|
0b00010000,
|
|
|
|
|
};
|
2017-01-15 15:27:05 +01:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
|
|
|
|
draw_marker(int w, int h, int x, int y, int c, int ch)
|
|
|
|
|
{
|
|
|
|
|
int y0=y, j;
|
|
|
|
|
for (j=0;j<MARKER_HEIGHT;j++,y0++){
|
|
|
|
|
int x0=x;
|
|
|
|
|
uint8_t bits = marker_bitmap[ch*10+j];
|
|
|
|
|
bool force_color = false;
|
|
|
|
|
while (bits){
|
|
|
|
|
if (bits&0x80)
|
|
|
|
|
force_color = true;
|
|
|
|
|
if (x0 >= 0 && x0 < w && y0 >= 0 && y0 < h){
|
|
|
|
|
if (bits&0x80)
|
|
|
|
|
spi_buffer[y0*w+x0] = c;
|
|
|
|
|
else if (force_color)
|
|
|
|
|
spi_buffer[y0*w+x0] = DEFAULT_BG_COLOR;
|
|
|
|
|
}
|
|
|
|
|
x0++;
|
|
|
|
|
bits<<=1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
markmap_marker(int marker)
|
2017-01-15 15:27:05 +01:00
|
|
|
{
|
2017-01-16 17:49:22 +01:00
|
|
|
int t;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (!markers[marker].enabled)
|
|
|
|
|
return;
|
2017-01-15 15:27:05 +01:00
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
|
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
uint32_t index = trace_index[t][markers[marker].index];
|
|
|
|
|
int x = CELL_X(index) - X_MARKER_OFFSET;
|
|
|
|
|
int y = CELL_Y(index) - Y_MARKER_OFFSET;
|
|
|
|
|
invalidateRect(x, y, x+MARKER_WIDTH-1, y+MARKER_HEIGHT-1);
|
2017-01-15 15:27:05 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
|
|
|
|
markmap_all_markers(void)
|
2020-01-19 09:16:18 +01:00
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < MARKERS_MAX; i++) {
|
|
|
|
|
if (!markers[i].enabled)
|
|
|
|
|
continue;
|
|
|
|
|
markmap_marker(i);
|
|
|
|
|
}
|
|
|
|
|
markmap_upperarea();
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2017-01-03 08:39:00 +01:00
|
|
|
void
|
|
|
|
|
marker_position(int m, int t, int *x, int *y)
|
|
|
|
|
{
|
|
|
|
|
uint32_t index = trace_index[t][markers[m].index];
|
|
|
|
|
*x = CELL_X(index);
|
|
|
|
|
*y = CELL_Y(index);
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-22 06:11:00 +02:00
|
|
|
static int greater(int x, int y) { return x > y; }
|
|
|
|
|
static int lesser(int x, int y) { return x < y; }
|
|
|
|
|
|
|
|
|
|
static int (*compare)(int x, int y) = lesser;
|
2020-01-18 14:27:56 +01:00
|
|
|
int8_t marker_tracking = false;
|
2019-10-22 06:11:00 +02:00
|
|
|
|
|
|
|
|
int
|
2020-01-18 14:27:56 +01:00
|
|
|
marker_search(void)
|
2019-10-22 06:11:00 +02:00
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
|
|
if (uistat.current_trace == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
int value = CELL_Y(trace_index[uistat.current_trace][0]);
|
2020-01-25 18:54:03 +01:00
|
|
|
for (i = 0; i < POINTS_COUNT; i++) {
|
2019-10-22 06:11:00 +02:00
|
|
|
uint32_t index = trace_index[uistat.current_trace][i];
|
|
|
|
|
if ((*compare)(value, CELL_Y(index))) {
|
|
|
|
|
value = CELL_Y(index);
|
|
|
|
|
found = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return found;
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-18 14:27:56 +01:00
|
|
|
void
|
|
|
|
|
set_marker_search(int mode)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
compare = (mode == 0) ? greater : lesser;
|
2020-01-18 14:27:56 +01:00
|
|
|
}
|
|
|
|
|
|
2019-10-22 06:11:00 +02:00
|
|
|
int
|
|
|
|
|
marker_search_left(int from)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int found = -1;
|
|
|
|
|
|
|
|
|
|
if (uistat.current_trace == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
int value = CELL_Y(trace_index[uistat.current_trace][from]);
|
|
|
|
|
for (i = from - 1; i >= 0; i--) {
|
|
|
|
|
uint32_t index = trace_index[uistat.current_trace][i];
|
|
|
|
|
if ((*compare)(value, CELL_Y(index)))
|
|
|
|
|
break;
|
|
|
|
|
value = CELL_Y(index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (; i >= 0; i--) {
|
|
|
|
|
uint32_t index = trace_index[uistat.current_trace][i];
|
|
|
|
|
if ((*compare)(CELL_Y(index), value)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
found = i;
|
|
|
|
|
value = CELL_Y(index);
|
|
|
|
|
}
|
|
|
|
|
return found;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
marker_search_right(int from)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int found = -1;
|
|
|
|
|
|
|
|
|
|
if (uistat.current_trace == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
int value = CELL_Y(trace_index[uistat.current_trace][from]);
|
2020-01-25 18:54:03 +01:00
|
|
|
for (i = from + 1; i < POINTS_COUNT; i++) {
|
2019-10-22 06:11:00 +02:00
|
|
|
uint32_t index = trace_index[uistat.current_trace][i];
|
|
|
|
|
if ((*compare)(value, CELL_Y(index)))
|
|
|
|
|
break;
|
|
|
|
|
value = CELL_Y(index);
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-25 18:54:03 +01:00
|
|
|
for (; i < POINTS_COUNT; i++) {
|
2019-10-22 06:11:00 +02:00
|
|
|
uint32_t index = trace_index[uistat.current_trace][i];
|
|
|
|
|
if ((*compare)(CELL_Y(index), value)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
found = i;
|
|
|
|
|
value = CELL_Y(index);
|
|
|
|
|
}
|
|
|
|
|
return found;
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-03 08:39:00 +01:00
|
|
|
int
|
|
|
|
|
search_nearest_index(int x, int y, int t)
|
|
|
|
|
{
|
|
|
|
|
uint32_t *index = trace_index[t];
|
|
|
|
|
int min_i = -1;
|
|
|
|
|
int min_d = 1000;
|
|
|
|
|
int i;
|
2017-01-16 16:13:42 +01:00
|
|
|
for (i = 0; i < sweep_points; i++) {
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int16_t dx = x - CELL_X(index[i]);
|
|
|
|
|
int16_t dy = y - CELL_Y(index[i]);
|
2017-01-03 08:39:00 +01:00
|
|
|
if (dx < 0) dx = -dx;
|
|
|
|
|
if (dy < 0) dy = -dy;
|
2017-01-05 01:04:28 +01:00
|
|
|
if (dx > 20 || dy > 20)
|
2017-01-03 08:39:00 +01:00
|
|
|
continue;
|
|
|
|
|
int d = dx*dx + dy*dy;
|
|
|
|
|
if (d < min_d) {
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
min_d = d;
|
2017-01-03 08:39:00 +01:00
|
|
|
min_i = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return min_i;
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-28 19:44:09 +02:00
|
|
|
void
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
plot_into_index(float measured[2][POINTS_COUNT][2])
|
2016-10-28 19:44:09 +02:00
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int t, i;
|
2016-11-03 13:56:56 +01:00
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
|
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int ch = trace[t].channel;
|
|
|
|
|
for (i = 0; i < sweep_points; i++)
|
|
|
|
|
trace_index[t][i] = trace_into_index(t, i, measured[ch]);
|
2016-11-03 13:56:56 +01:00
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#if 0
|
|
|
|
|
for (t = 0; t < TRACES_MAX; t++)
|
|
|
|
|
if (trace[t].enabled && trace[t].polar)
|
|
|
|
|
quicksort(trace_index[t], 0, sweep_points);
|
|
|
|
|
#endif
|
2016-11-03 13:56:56 +01:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
mark_cells_from_index();
|
|
|
|
|
markmap_all_markers();
|
2016-11-03 13:56:56 +01:00
|
|
|
}
|
|
|
|
|
|
2019-08-27 10:46:26 +02:00
|
|
|
static void
|
2016-10-28 13:50:51 +02:00
|
|
|
draw_cell(int m, int n)
|
|
|
|
|
{
|
|
|
|
|
int x0 = m * CELLWIDTH;
|
|
|
|
|
int y0 = n * CELLHEIGHT;
|
|
|
|
|
int w = CELLWIDTH;
|
|
|
|
|
int h = CELLHEIGHT;
|
|
|
|
|
int x, y;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
int i0, i1, i;
|
2016-10-28 13:50:51 +02:00
|
|
|
int t;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Clip cell by area
|
|
|
|
|
if (x0 + w > area_width)
|
|
|
|
|
w = area_width - x0;
|
2016-11-03 13:56:56 +01:00
|
|
|
if (y0 + h > area_height)
|
|
|
|
|
h = area_height - y0;
|
2016-11-04 14:34:19 +01:00
|
|
|
if (w <= 0 || h <= 0)
|
|
|
|
|
return;
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2016-11-02 14:38:04 +01:00
|
|
|
PULSE;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Clear buffer
|
2020-01-19 09:16:18 +01:00
|
|
|
memset(spi_buffer, DEFAULT_BG_COLOR, sizeof spi_buffer);
|
|
|
|
|
uint16_t c = config.grid_color;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Draw grid
|
|
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
|
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
|
|
|
|
uint32_t trace_type = (1<<trace[t].type);
|
|
|
|
|
// Draw rectangular plot
|
|
|
|
|
if (trace_type&RECTANGULAR_GRID_MASK){
|
|
|
|
|
for (x = 0; x < w; x++) {
|
|
|
|
|
if (rectangular_grid_x(x+x0)){
|
|
|
|
|
for (y = 0; y < h; y++)
|
|
|
|
|
spi_buffer[y * w + x] = c;
|
|
|
|
|
}
|
2020-01-19 09:16:18 +01:00
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
for (y = 0; y < h; y++) {
|
|
|
|
|
if (rectangular_grid_y(y+y0)){
|
|
|
|
|
for (x = 0; x < w; x++)
|
|
|
|
|
if (x+x0 >= CELLOFFSETX && x+x0 <= WIDTH+CELLOFFSETX)
|
|
|
|
|
spi_buffer[y * w + x] = c;
|
|
|
|
|
}
|
2020-01-19 09:16:18 +01:00
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
continue;
|
2016-11-28 01:17:54 +01:00
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if(trace_type&(1<<TRC_SMITH)){
|
|
|
|
|
for (y = 0; y < h; y++)
|
|
|
|
|
for (x = 0; x < w; x++)
|
|
|
|
|
if (smith_grid(x+x0, y+y0))
|
|
|
|
|
spi_buffer[y * w + x] = c;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if(trace_type&(1<<TRC_POLAR)){
|
|
|
|
|
for (y = 0; y < h; y++)
|
|
|
|
|
for (x = 0; x < w; x++)
|
|
|
|
|
if (polar_grid(x+x0, y+y0))
|
|
|
|
|
spi_buffer[y * w + x] = c;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
#if 0
|
|
|
|
|
if(trace_type&(1<<TRC_ADMIT)){
|
|
|
|
|
for (y = 0; y < h; y++)
|
|
|
|
|
for (x = 0; x < w; x++)
|
|
|
|
|
if (smith_grid3(x+x0, y+y0)
|
|
|
|
|
// smith_grid2(x+x0, y+y0, 0.5))
|
|
|
|
|
spi_buffer[y * w + x] = c;
|
|
|
|
|
continue;
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#endif
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
2016-11-02 14:38:04 +01:00
|
|
|
PULSE;
|
2016-10-28 13:50:51 +02:00
|
|
|
|
|
|
|
|
#if 1
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Draw traces
|
2016-11-28 15:44:21 +01:00
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
2017-01-05 15:28:32 +01:00
|
|
|
if (!trace[t].enabled)
|
2016-11-28 15:44:21 +01:00
|
|
|
continue;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
c = config.trace_color[t];
|
|
|
|
|
// draw polar plot (check all points)
|
|
|
|
|
i0 = 0; i1=0;
|
|
|
|
|
uint32_t trace_type = (1<<trace[t].type);
|
|
|
|
|
if (trace_type & ((1<<TRC_SMITH)|(1<<TRC_POLAR)))
|
|
|
|
|
i1 = sweep_points-1;
|
|
|
|
|
else // draw rectangular plot (search index range in cell)
|
|
|
|
|
search_index_range_x(x0, x0+w, trace_index[t], &i0, &i1);
|
|
|
|
|
for (i=i0; i < i1; i++) {
|
|
|
|
|
int x1 = CELL_X(trace_index[t][i ]) - x0;
|
|
|
|
|
int y1 = CELL_Y(trace_index[t][i ]) - y0;
|
|
|
|
|
int x2 = CELL_X(trace_index[t][i+1]) - x0;
|
|
|
|
|
int y2 = CELL_Y(trace_index[t][i+1]) - y0;
|
|
|
|
|
cell_drawline(w, h, x1, y1, x2, y2, c);
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
PULSE;
|
|
|
|
|
//draw marker symbols on each trace
|
|
|
|
|
for (i = 0; i < MARKERS_MAX; i++) {
|
|
|
|
|
if (!markers[i].enabled)
|
2017-01-05 15:28:32 +01:00
|
|
|
continue;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
|
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
|
|
|
|
uint32_t index = trace_index[t][markers[i].index];
|
|
|
|
|
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<w && y+MARKER_HEIGHT>=0 && y-MARKER_HEIGHT<h)
|
|
|
|
|
draw_marker(w, h, x, y, config.trace_color[t], i);
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
}
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Draw trace and marker info on the top
|
|
|
|
|
if (n == 0)
|
|
|
|
|
cell_draw_marker_info(m, n, w, h);
|
2016-10-28 13:50:51 +02:00
|
|
|
|
2016-11-02 14:38:04 +01:00
|
|
|
PULSE;
|
2017-01-15 15:27:05 +01:00
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Draw refrence position
|
|
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
|
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
|
|
|
|
uint32_t trace_type = (1<<trace[t].type);
|
|
|
|
|
if (trace_type&((1<<TRC_SMITH)|(1<<TRC_POLAR)))
|
|
|
|
|
continue;
|
|
|
|
|
int x = 0 - x0 + CELLOFFSETX - REFERENCE_X_OFFSET;
|
|
|
|
|
if (x+REFERENCE_WIDTH>=0 && x-REFERENCE_WIDTH<w){
|
2020-02-23 03:37:41 +01:00
|
|
|
int y = HEIGHT - floatToInt((get_trace_refpos(t) * GRIDY)) - y0 - REFERENCE_Y_OFFSET;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
if (y+REFERENCE_HEIGHT>=0 && y-REFERENCE_HEIGHT<h)
|
|
|
|
|
draw_refpos(w, h, x, y, config.trace_color[t]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Draw cell
|
|
|
|
|
ili9341_bulk(OFFSETX + x0, OFFSETY + y0, w, h);
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
2019-09-24 19:40:00 +02:00
|
|
|
draw_all_cells(bool flush_markmap)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
|
|
|
|
int m, n;
|
2016-11-03 13:56:56 +01:00
|
|
|
for (m = 0; m < (area_width+CELLWIDTH-1) / CELLWIDTH; m++)
|
|
|
|
|
for (n = 0; n < (area_height+CELLHEIGHT-1) / CELLHEIGHT; n++) {
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
uint16_t bit = 1<<m;
|
|
|
|
|
if ((markmap[0][n] & bit) || (markmap[1][n] & bit)){
|
2016-10-28 13:50:51 +02:00
|
|
|
draw_cell(m, n);
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// ili9341_fill(m*CELLWIDTH+10, n*CELLHEIGHT, 2, 2, RGB565(255,0,0));
|
|
|
|
|
}
|
|
|
|
|
// else
|
|
|
|
|
// ili9341_fill(m*CELLWIDTH+10, n*CELLHEIGHT, 2, 2, RGB565(0,255,0));
|
2016-11-03 13:56:56 +01:00
|
|
|
}
|
|
|
|
|
|
2019-09-24 19:40:00 +02:00
|
|
|
if (flush_markmap) {
|
|
|
|
|
// keep current map for update
|
|
|
|
|
swap_markmap();
|
|
|
|
|
// clear map for next plotting
|
|
|
|
|
clear_markmap();
|
|
|
|
|
}
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-23 05:43:39 +02:00
|
|
|
void
|
2019-09-24 19:40:00 +02:00
|
|
|
draw_all(bool flush)
|
2019-09-23 05:43:39 +02:00
|
|
|
{
|
2020-02-22 14:41:50 +01:00
|
|
|
if (redraw_request & REDRAW_MARKER)
|
|
|
|
|
markmap_upperarea();
|
|
|
|
|
if (redraw_request & (REDRAW_CELLS | REDRAW_MARKER))
|
2019-09-24 19:40:00 +02:00
|
|
|
draw_all_cells(flush);
|
2019-09-23 05:43:39 +02:00
|
|
|
if (redraw_request & REDRAW_FREQUENCY)
|
|
|
|
|
draw_frequencies();
|
|
|
|
|
if (redraw_request & REDRAW_CAL_STATUS)
|
|
|
|
|
draw_cal_status();
|
|
|
|
|
redraw_request = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-03 13:56:56 +01:00
|
|
|
void
|
2016-11-04 14:34:19 +01:00
|
|
|
redraw_marker(int marker, int update_info)
|
2016-11-03 13:56:56 +01:00
|
|
|
{
|
2019-12-25 01:15:55 +01:00
|
|
|
if (marker < 0)
|
|
|
|
|
return;
|
2016-11-03 13:56:56 +01:00
|
|
|
// mark map on new position of marker
|
|
|
|
|
markmap_marker(marker);
|
|
|
|
|
|
|
|
|
|
// mark cells on marker info
|
2016-11-04 14:34:19 +01:00
|
|
|
if (update_info)
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
markmap_upperarea();
|
2016-11-03 13:56:56 +01:00
|
|
|
|
2019-09-24 19:40:00 +02:00
|
|
|
draw_all_cells(TRUE);
|
2016-11-03 13:56:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2017-09-17 11:52:02 +02:00
|
|
|
request_to_draw_cells_behind_menu(void)
|
2016-11-03 13:56:56 +01:00
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Values Hardcoded from ui.c
|
|
|
|
|
invalidateRect(320-70, 0, 319, 239);
|
2019-09-23 05:43:39 +02:00
|
|
|
redraw_request |= REDRAW_CELLS;
|
2017-09-30 16:06:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
request_to_draw_cells_behind_numeric_input(void)
|
|
|
|
|
{
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
// Values Hardcoded from ui.c
|
|
|
|
|
invalidateRect(0, 240-32, 319, 239);
|
2019-09-23 05:43:39 +02:00
|
|
|
redraw_request |= REDRAW_CELLS;
|
2016-11-03 13:56:56 +01:00
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static int
|
2020-02-11 09:54:05 +01:00
|
|
|
cell_drawchar(int w, int h, uint8_t ch, int x, int y)
|
|
|
|
|
{
|
|
|
|
|
uint8_t bits;
|
|
|
|
|
int c, r, ch_size;
|
|
|
|
|
const uint8_t *char_buf = FONT_GET_DATA(ch);
|
|
|
|
|
ch_size=FONT_GET_WIDTH(ch);
|
|
|
|
|
if (y <= -FONT_GET_HEIGHT || y >= h || x <= -ch_size || x >= w)
|
|
|
|
|
return ch_size;
|
|
|
|
|
for(c = 0; c < FONT_GET_HEIGHT; c++) {
|
|
|
|
|
bits = *char_buf++;
|
|
|
|
|
if ((y + c) < 0 || (y + c) >= h)
|
|
|
|
|
continue;
|
|
|
|
|
for (r = 0; r < ch_size; r++) {
|
|
|
|
|
if ((x+r) >= 0 && (x+r) < w && (0x80 & bits))
|
|
|
|
|
spi_buffer[(y+c)*w + (x+r)] = foreground_color;
|
|
|
|
|
bits <<= 1;
|
|
|
|
|
}
|
2017-09-17 11:52:02 +02:00
|
|
|
}
|
2020-02-11 09:54:05 +01:00
|
|
|
return ch_size;
|
2017-09-17 11:52:02 +02:00
|
|
|
}
|
|
|
|
|
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
static void
|
2020-02-11 09:54:05 +01:00
|
|
|
cell_drawstring(int w, int h, char *str, int x, int y)
|
2017-09-17 11:52:02 +02:00
|
|
|
{
|
|
|
|
|
while (*str) {
|
2020-02-11 09:54:05 +01:00
|
|
|
x += cell_drawchar(w, h, *str, x, y);
|
2016-10-28 13:50:51 +02:00
|
|
|
str++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-27 10:46:26 +02:00
|
|
|
static void
|
2016-10-28 13:50:51 +02:00
|
|
|
cell_draw_marker_info(int m, int n, int w, int h)
|
|
|
|
|
{
|
2020-02-11 09:54:05 +01:00
|
|
|
char buf[32];
|
2016-10-28 13:50:51 +02:00
|
|
|
int t;
|
2016-11-04 14:34:19 +01:00
|
|
|
if (n != 0)
|
2016-10-28 20:11:13 +02:00
|
|
|
return;
|
2016-11-04 14:34:19 +01:00
|
|
|
if (active_marker < 0)
|
2016-10-28 13:50:51 +02:00
|
|
|
return;
|
2016-10-28 19:44:09 +02:00
|
|
|
int idx = markers[active_marker].index;
|
|
|
|
|
int j = 0;
|
2019-11-23 09:47:14 +01:00
|
|
|
if (active_marker != -1 && previous_marker != -1 && uistat.current_trace != -1) {
|
|
|
|
|
int t = uistat.current_trace;
|
|
|
|
|
int mk;
|
|
|
|
|
for (mk = 0; mk < MARKERS_MAX; mk++) {
|
|
|
|
|
if (!markers[mk].enabled)
|
|
|
|
|
continue;
|
|
|
|
|
int xpos = 1 + (j%2)*146;
|
2020-01-19 09:16:18 +01:00
|
|
|
int ypos = 1 + (j/2)*8;
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
xpos -= m * CELLWIDTH - CELLOFFSETX;
|
2019-11-23 09:47:14 +01:00
|
|
|
ypos -= n * CELLHEIGHT;
|
2020-02-11 09:54:05 +01:00
|
|
|
|
|
|
|
|
setForegroundColor(config.trace_color[t]);
|
|
|
|
|
if (mk == active_marker)
|
|
|
|
|
cell_drawstring(w, h, S_SARROW, xpos, ypos);
|
|
|
|
|
xpos += 5;
|
2020-01-25 18:54:03 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "M%d", mk+1);
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2020-02-11 09:54:05 +01:00
|
|
|
xpos += 13;
|
2019-11-24 00:51:01 +01:00
|
|
|
//trace_get_info(t, buf, sizeof buf);
|
2020-02-11 09:54:05 +01:00
|
|
|
uint32_t freq = frequencies[markers[mk].index];
|
2019-11-29 13:53:07 +01:00
|
|
|
if (uistat.marker_delta && mk != active_marker) {
|
2020-02-11 09:54:05 +01:00
|
|
|
uint32_t freq1 = frequencies[markers[active_marker].index];
|
|
|
|
|
uint32_t delta = freq > freq1 ? freq - freq1 : freq1 - freq;
|
|
|
|
|
chsnprintf(buf, sizeof buf, S_DELTA"%.9qHz", delta);
|
2019-11-29 13:53:07 +01:00
|
|
|
} else {
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "%.10qHz", freq);
|
2019-11-29 13:53:07 +01:00
|
|
|
}
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2020-02-11 09:54:05 +01:00
|
|
|
xpos += 67;
|
2019-11-29 13:53:07 +01:00
|
|
|
if (uistat.marker_delta && mk != active_marker)
|
2020-02-22 04:24:32 +01:00
|
|
|
trace_get_value_string_delta(t, buf, sizeof buf, measured[trace[t].channel], markers[mk].index, markers[active_marker].index);
|
2019-11-29 13:53:07 +01:00
|
|
|
else
|
|
|
|
|
trace_get_value_string(t, buf, sizeof buf, measured[trace[t].channel], markers[mk].index);
|
2020-01-19 09:16:18 +01:00
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
|
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2019-11-23 09:47:14 +01:00
|
|
|
j++;
|
|
|
|
|
}
|
2019-11-29 14:16:29 +01:00
|
|
|
|
|
|
|
|
// draw marker delta
|
|
|
|
|
if (!uistat.marker_delta && previous_marker >= 0 && active_marker != previous_marker && markers[previous_marker].enabled) {
|
|
|
|
|
int idx0 = markers[previous_marker].index;
|
2020-02-11 09:54:05 +01:00
|
|
|
int xpos = 180;
|
2020-01-19 09:16:18 +01:00
|
|
|
int ypos = 1 + (j/2)*8;
|
2019-11-29 14:16:29 +01:00
|
|
|
xpos -= m * CELLWIDTH -CELLOFFSETX;
|
|
|
|
|
ypos -= n * CELLHEIGHT;
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, sizeof buf, S_DELTA"%d-%d", active_marker+1, previous_marker+1);
|
2020-01-19 09:16:18 +01:00
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
|
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2020-02-11 09:54:05 +01:00
|
|
|
xpos += 24;
|
2019-11-29 14:16:29 +01:00
|
|
|
if ((domain_mode & DOMAIN_MODE) == DOMAIN_FREQ) {
|
2020-02-11 09:54:05 +01:00
|
|
|
uint32_t freq = frequencies[idx];
|
|
|
|
|
uint32_t freq1 = frequencies[idx0];
|
|
|
|
|
uint32_t delta = freq > freq1 ? freq - freq1 : freq1 - freq;
|
|
|
|
|
chsnprintf(buf, sizeof buf, "%c%.13qHz", freq >= freq1 ? '+' : '-', delta);
|
2019-11-29 14:16:29 +01:00
|
|
|
} else {
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "%Fs (%Fm)", time_of_index(idx) - time_of_index(idx0), distance_of_index(idx) - distance_of_index(idx0));
|
2019-11-29 14:16:29 +01:00
|
|
|
}
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2019-11-29 14:16:29 +01:00
|
|
|
}
|
2019-11-23 09:47:14 +01:00
|
|
|
} else {
|
|
|
|
|
for (t = 0; t < TRACES_MAX; t++) {
|
|
|
|
|
if (!trace[t].enabled)
|
|
|
|
|
continue;
|
|
|
|
|
int xpos = 1 + (j%2)*146;
|
2020-01-19 09:16:18 +01:00
|
|
|
int ypos = 1 + (j/2)*8;
|
2019-11-23 09:47:14 +01:00
|
|
|
xpos -= m * CELLWIDTH -CELLOFFSETX;
|
|
|
|
|
ypos -= n * CELLHEIGHT;
|
2020-01-19 09:16:18 +01:00
|
|
|
setForegroundColor(config.trace_color[t]);
|
|
|
|
|
if (t == uistat.current_trace)
|
2020-02-11 09:54:05 +01:00
|
|
|
cell_drawstring(w, h, S_SARROW, xpos, ypos);
|
2020-01-19 09:16:18 +01:00
|
|
|
xpos += 5;
|
|
|
|
|
chsnprintf(buf, sizeof buf, "CH%d", trace[t].channel);
|
|
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
|
|
|
|
xpos += 19;
|
|
|
|
|
|
2020-02-11 09:54:05 +01:00
|
|
|
int n = trace_get_info(t, buf, sizeof buf);
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2020-02-11 09:54:05 +01:00
|
|
|
xpos += n * 5 + 2;
|
2020-01-31 16:13:53 +01:00
|
|
|
//xpos += 60;
|
2019-11-23 09:47:14 +01:00
|
|
|
trace_get_value_string(t, buf, sizeof buf, measured[trace[t].channel], idx);
|
2020-01-31 16:13:53 +01:00
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2019-11-23 09:47:14 +01:00
|
|
|
j++;
|
|
|
|
|
}
|
2019-11-29 14:16:29 +01:00
|
|
|
|
|
|
|
|
// draw marker frequency
|
2020-01-25 18:54:03 +01:00
|
|
|
int xpos = 185;
|
2020-01-19 09:16:18 +01:00
|
|
|
int ypos = 1 + (j/2)*8;
|
2019-11-29 14:16:29 +01:00
|
|
|
xpos -= m * CELLWIDTH -CELLOFFSETX;
|
|
|
|
|
ypos -= n * CELLHEIGHT;
|
2020-01-25 18:54:03 +01:00
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
2020-01-19 09:16:18 +01:00
|
|
|
if (uistat.lever_mode == LM_MARKER)
|
2020-02-11 09:54:05 +01:00
|
|
|
cell_drawstring(w, h, S_SARROW, xpos, ypos);
|
2019-11-29 14:16:29 +01:00
|
|
|
xpos += 5;
|
2020-01-25 18:54:03 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "M%d:", active_marker+1);
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2020-02-11 09:54:05 +01:00
|
|
|
xpos += 19;
|
2020-01-19 09:16:18 +01:00
|
|
|
|
2019-11-29 14:16:29 +01:00
|
|
|
if ((domain_mode & DOMAIN_MODE) == DOMAIN_FREQ) {
|
2020-02-22 04:24:32 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "%qHz", frequencies[idx]);
|
2019-11-29 14:16:29 +01:00
|
|
|
} else {
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "%Fs (%Fm)", time_of_index(idx), distance_of_index(idx));
|
2019-11-29 14:16:29 +01:00
|
|
|
}
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2019-11-23 09:47:14 +01:00
|
|
|
}
|
2020-01-19 09:16:18 +01:00
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
2019-10-08 17:38:36 +02:00
|
|
|
if (electrical_delay != 0) {
|
|
|
|
|
// draw electrical delay
|
|
|
|
|
int xpos = 21;
|
2020-01-19 09:16:18 +01:00
|
|
|
int ypos = 1 + ((j+1)/2)*8;
|
2019-10-08 17:38:36 +02:00
|
|
|
xpos -= m * CELLWIDTH -CELLOFFSETX;
|
|
|
|
|
ypos -= n * CELLHEIGHT;
|
2020-02-11 09:54:05 +01:00
|
|
|
|
2019-10-08 17:38:36 +02:00
|
|
|
float light_speed_ps = 299792458e-12; //(m/ps)
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf, sizeof buf, "Edelay %Fs %Fm", electrical_delay * 1e-12,
|
|
|
|
|
electrical_delay * light_speed_ps * velocity_factor);
|
2020-01-19 09:16:18 +01:00
|
|
|
cell_drawstring(w, h, buf, xpos, ypos);
|
2019-10-08 17:38:36 +02:00
|
|
|
}
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
draw_frequencies(void)
|
|
|
|
|
{
|
2020-02-11 09:54:05 +01:00
|
|
|
char buf1[32];
|
|
|
|
|
char buf2[32];buf2[0]=0;
|
2020-01-26 07:09:11 +01:00
|
|
|
if ((domain_mode & DOMAIN_MODE) == DOMAIN_FREQ) {
|
2020-02-22 14:41:50 +01:00
|
|
|
if (FREQ_IS_STARTSTOP()) {
|
2020-02-22 04:24:32 +01:00
|
|
|
chsnprintf(buf1, sizeof(buf1), " START %qHz", frequency0);
|
|
|
|
|
chsnprintf(buf2, sizeof(buf2), " STOP %qHz", frequency1);
|
2020-02-22 14:41:50 +01:00
|
|
|
} else if (FREQ_IS_CENTERSPAN()) {
|
|
|
|
|
chsnprintf(buf1, sizeof(buf1), " CENTER %qHz", FREQ_CENTER());
|
|
|
|
|
chsnprintf(buf2, sizeof(buf2), " SPAN %qHz", FREQ_SPAN());
|
2020-01-26 07:09:11 +01:00
|
|
|
} else {
|
2020-02-22 04:24:32 +01:00
|
|
|
chsnprintf(buf1, sizeof(buf1), " CW %qHz", frequency0);
|
2020-01-26 07:09:11 +01:00
|
|
|
}
|
|
|
|
|
} else {
|
2020-02-11 09:54:05 +01:00
|
|
|
chsnprintf(buf1, sizeof(buf1), " START 0s");
|
|
|
|
|
chsnprintf(buf2, sizeof(buf2), "STOP %Fs (%Fm)", time_of_index(POINTS_COUNT-1), distance_of_index(POINTS_COUNT-1));
|
2020-01-26 07:09:11 +01:00
|
|
|
}
|
|
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
|
|
|
|
setBackgroundColor(DEFAULT_BG_COLOR);
|
2020-02-23 13:45:37 +01:00
|
|
|
ili9341_fill(0, FREQUENCIES_YPOS, 320, FONT_GET_HEIGHT, DEFAULT_BG_COLOR);
|
2020-02-22 04:24:32 +01:00
|
|
|
if (uistat.lever_mode == LM_CENTER)
|
2020-02-23 13:45:37 +01:00
|
|
|
buf1[0] = S_SARROW[0];
|
2020-02-22 04:24:32 +01:00
|
|
|
if (uistat.lever_mode == LM_SPAN)
|
2020-02-23 13:45:37 +01:00
|
|
|
buf2[0] = S_SARROW[0];
|
2020-02-23 03:37:41 +01:00
|
|
|
ili9341_drawstring(buf1, FREQUENCIES_XPOS1, FREQUENCIES_YPOS);
|
|
|
|
|
ili9341_drawstring(buf2, FREQUENCIES_XPOS2, FREQUENCIES_YPOS);
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
2016-11-17 16:53:40 +01:00
|
|
|
void
|
|
|
|
|
draw_cal_status(void)
|
|
|
|
|
{
|
|
|
|
|
int x = 0;
|
|
|
|
|
int y = 100;
|
2020-01-19 09:16:18 +01:00
|
|
|
#define YSTEP 8
|
|
|
|
|
setForegroundColor(DEFAULT_FG_COLOR);
|
|
|
|
|
setBackgroundColor(DEFAULT_BG_COLOR);
|
|
|
|
|
ili9341_fill(0, y, 10, 6*YSTEP, DEFAULT_BG_COLOR);
|
2016-11-17 16:53:40 +01:00
|
|
|
if (cal_status & CALSTAT_APPLY) {
|
|
|
|
|
char c[3] = "C0";
|
2019-08-11 06:09:21 +02:00
|
|
|
c[1] += lastsaveid;
|
2017-09-15 15:13:17 +02:00
|
|
|
if (cal_status & CALSTAT_INTERPOLATED)
|
|
|
|
|
c[0] = 'c';
|
2019-08-11 06:09:21 +02:00
|
|
|
else if (active_props == ¤t_props)
|
2016-11-17 16:53:40 +01:00
|
|
|
c[1] = '*';
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_drawstring(c, x, y);
|
2016-11-17 16:53:40 +01:00
|
|
|
y += YSTEP;
|
2017-02-02 23:28:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cal_status & CALSTAT_ED) {
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_drawstring("D", x, y);
|
2017-02-02 23:28:20 +01:00
|
|
|
y += YSTEP;
|
|
|
|
|
}
|
|
|
|
|
if (cal_status & CALSTAT_ER) {
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_drawstring("R", x, y);
|
2017-02-02 23:28:20 +01:00
|
|
|
y += YSTEP;
|
|
|
|
|
}
|
|
|
|
|
if (cal_status & CALSTAT_ES) {
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_drawstring("S", x, y);
|
2017-02-02 23:28:20 +01:00
|
|
|
y += YSTEP;
|
|
|
|
|
}
|
|
|
|
|
if (cal_status & CALSTAT_ET) {
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_drawstring("T", x, y);
|
2017-02-02 23:28:20 +01:00
|
|
|
y += YSTEP;
|
|
|
|
|
}
|
|
|
|
|
if (cal_status & CALSTAT_EX) {
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_drawstring("X", x, y);
|
2017-02-02 23:28:20 +01:00
|
|
|
y += YSTEP;
|
2016-11-17 16:53:40 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-19 09:16:18 +01:00
|
|
|
// Draw battery level
|
Big code redisign (increase CELL draw size, more faster screen render), also save about 4-5kB flash size
Try remove all hardcoded values from code (use definition if set)
Some error fix
main.c:
Rewrite Shell, now it run on main thread and require less RAM (not need stack)
(possible run it as thread if define VNA_SHELL_THREAD
Remove not used trace_info[].scale_unit in set_trace_scale/get_trace_scale (it just divede on set and multiple on get, better use it for default scale set)
Replace some hardcoded values
MARKERS_MAX
SAVEAREA_MAX
TRACES_MAX
plot.c
Rewrite CELLWIDTH and CELLHEIGHT use, now possible set any CELL width and height (CELLWIDTH * CELLHEIGHT <= spi_buffer size)
Free RAM from shell stack use fore increase spi_buffer size now it have 2048 pixel (64x32)
Rewrite cell index and markmap use (now correct use cell size, and more faster), correct use CELLWIDTH and CELLHEIGHT in calculation
Fore set update area use invalidateRect (still need use some hardcoded values :( )
Rewrite cell_draw_line
Rewrite many hardcoded size definitions
Refrence point now draw as bitmap (less size, more costumable)
Fix drag marker (now correct search closest index in search_nearest_index)
Rewrite plot_into_index, now correct use size definitions, moe
ui.c
Small rewrite keyboard definitions, for use less flash size
Define KP_WIDTH, KP_HEIGHT for set key size
Better look some big font symvols
All:
use static fore some local functions (use less space on calls)
replace tabs on spaces (code style)
Use M_PI from math.h fore define pi value
Fix printf on print HEX values
2020-02-22 08:50:54 +01:00
|
|
|
#define BATTERY_TOP_LEVEL 4100
|
|
|
|
|
#define BATTERY_BOTTOM_LEVEL 3100
|
|
|
|
|
#define BATTERY_WARNING_LEVEL 3300
|
2020-01-19 09:16:18 +01:00
|
|
|
|
2019-09-09 13:28:10 +02:00
|
|
|
void
|
|
|
|
|
draw_battery_status(void)
|
|
|
|
|
{
|
2020-02-11 09:54:05 +01:00
|
|
|
if (vbat<=0)
|
|
|
|
|
return;
|
|
|
|
|
uint8_t string_buf[25];
|
|
|
|
|
// Set battery color
|
|
|
|
|
setForegroundColor(vbat < BATTERY_WARNING_LEVEL ? DEFAULT_LOW_BAT_COLOR : DEFAULT_NORMAL_BAT_COLOR);
|
|
|
|
|
setBackgroundColor(DEFAULT_BG_COLOR);
|
|
|
|
|
// chsnprintf(string_buf, sizeof string_buf, "V:%d", vbat);
|
|
|
|
|
// ili9341_drawstringV(string_buf, 1, 60);
|
|
|
|
|
// Prepare battery bitmap image
|
|
|
|
|
// Battery top
|
|
|
|
|
int x=0;
|
|
|
|
|
string_buf[x++] = 0b00111100;
|
|
|
|
|
string_buf[x++] = 0b00100100;
|
|
|
|
|
string_buf[x++] = 0b11111111;
|
|
|
|
|
// string_buf[x++] = 0b10000001;
|
|
|
|
|
// Fill battery status
|
|
|
|
|
for (int power=BATTERY_TOP_LEVEL; power > BATTERY_BOTTOM_LEVEL; power-=100)
|
|
|
|
|
string_buf[x++] = (power > vbat) ? 0b10000001 : // Empty line
|
|
|
|
|
0b11111111; // Full line
|
|
|
|
|
// Battery bottom
|
|
|
|
|
// string_buf[x++] = 0b10000001;
|
|
|
|
|
string_buf[x++] = 0b11111111;
|
|
|
|
|
// Draw battery
|
|
|
|
|
blit8BitWidthBitmap(0, 1, 8, x, string_buf);
|
2019-09-09 13:28:10 +02:00
|
|
|
}
|
|
|
|
|
|
2017-09-15 21:11:18 +02:00
|
|
|
void
|
2017-09-17 11:52:02 +02:00
|
|
|
request_to_redraw_grid(void)
|
2017-09-15 21:11:18 +02:00
|
|
|
{
|
2017-09-17 11:52:02 +02:00
|
|
|
force_set_markmap();
|
2019-09-23 05:43:39 +02:00
|
|
|
redraw_request |= REDRAW_CELLS;
|
2017-09-15 21:11:18 +02:00
|
|
|
}
|
|
|
|
|
|
2016-10-28 13:50:51 +02:00
|
|
|
void
|
2017-09-17 11:52:02 +02:00
|
|
|
redraw_frame(void)
|
2016-10-28 13:50:51 +02:00
|
|
|
{
|
2020-01-19 09:16:18 +01:00
|
|
|
ili9341_fill(0, 0, 320, 240, DEFAULT_BG_COLOR);
|
2016-10-28 13:50:51 +02:00
|
|
|
draw_frequencies();
|
2016-11-17 16:53:40 +01:00
|
|
|
draw_cal_status();
|
2016-10-28 13:50:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
plot_init(void)
|
|
|
|
|
{
|
|
|
|
|
force_set_markmap();
|
|
|
|
|
}
|