ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move some definitions too nanovna.h

Browse source
This commit is contained in:
DiSlord 2020-07-11 18:05:44 +03:00
parent 3522c05375
commit fdf88ae289
2 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
nanovna.h
View file

@ -171,8 +171,25 @@ void tlv320aic3204_write_reg(uint8_t page, uint8_t reg, uint8_t data);
/* /*
* plot.c * plot.c
*/ */
// LCD display size settings
#define LCD_WIDTH 320
#define LCD_HEIGHT 240
// Offset of plot area // Used font settings
extern const uint8_t x5x7_bits [];
#define FONT_GET_DATA(ch) (&x5x7_bits[ch*7])
#define FONT_GET_WIDTH(ch) (8-(x5x7_bits[ch*7]&7))
#define FONT_MAX_WIDTH 7
#define FONT_WIDTH 5
#define FONT_GET_HEIGHT 7
#define FONT_STR_HEIGHT 8
extern const uint16_t numfont16x22[];
#define NUM_FONT_GET_DATA(ch) (&numfont16x22[ch*22])
#define NUM_FONT_GET_WIDTH 16
#define NUM_FONT_GET_HEIGHT 22
// Offset of plot area (size of additional info at left side)
#define OFFSETX 10 #define OFFSETX 10
#define OFFSETY 0 #define OFFSETY 0
@ -187,13 +204,13 @@ void tlv320aic3204_write_reg(uint8_t page, uint8_t reg, uint8_t data);
#define FREQUENCIES_XPOS1 OFFSETX #define FREQUENCIES_XPOS1 OFFSETX
#define FREQUENCIES_XPOS2 206 #define FREQUENCIES_XPOS2 206
#define FREQUENCIES_XPOS3 135 #define FREQUENCIES_XPOS3 135
#define FREQUENCIES_YPOS (240-7) #define FREQUENCIES_YPOS (LCD_HEIGHT-7)
// GRIDX calculated depends from frequency span // GRIDX calculated depends from frequency span
//#define GRIDY 29 //#define GRIDY 29
#define GRIDY (HEIGHT / NGRIDY) #define GRIDY (HEIGHT / NGRIDY)
// // Need for reference marker draw
#define CELLOFFSETX 5 #define CELLOFFSETX 5
#define AREA_WIDTH_NORMAL (CELLOFFSETX + WIDTH + 1 + 4) #define AREA_WIDTH_NORMAL (CELLOFFSETX + WIDTH + 1 + 4)
#define AREA_HEIGHT_NORMAL ( HEIGHT + 1) #define AREA_HEIGHT_NORMAL ( HEIGHT + 1)
@ -206,20 +223,32 @@ void tlv320aic3204_write_reg(uint8_t page, uint8_t reg, uint8_t data);
extern int16_t area_width; extern int16_t area_width;
extern int16_t area_height; extern int16_t area_height;
// font // Maximum menu buttons count
extern const uint8_t x5x7_bits []; #define MENU_BUTTON_MAX 8
#define FONT_GET_DATA(ch) (&x5x7_bits[ch*7]) // Menu buttons size
#define FONT_GET_WIDTH(ch) (8-(x5x7_bits[ch*7]&7)) #define MENU_BUTTON_WIDTH 60
#define FONT_MAX_WIDTH 7 #define MENU_BUTTON_HEIGHT 29
#define FONT_WIDTH 5 #define MENU_BUTTON_BORDER 1
#define FONT_GET_HEIGHT 7
#define FONT_STR_HEIGHT 8
extern const uint16_t numfont16x22[]; // Height of numerical input field (at bottom)
#define NUM_FONT_GET_DATA(ch) (&numfont16x22[ch*22]) #define NUM_INPUT_HEIGHT 32
#define NUM_FONT_GET_WIDTH 16
#define NUM_FONT_GET_HEIGHT 22
// On screen keyboard button size
#if 1
#define KP_WIDTH ((LCD_WIDTH) / 4) // numeric keypad button width
#define KP_HEIGHT ((LCD_HEIGHT - NUM_INPUT_HEIGHT) / 4) // numeric keypad button height
// Key x, y position (0 - 15) on screen
#define KP_GET_X(posx) ((posx) * KP_WIDTH) // numeric keypad left
#define KP_GET_Y(posy) ((posy) * KP_HEIGHT) // numeric keypad top
#else
#define KP_WIDTH 48
#define KP_HEIGHT 48
// Key x, y position (0 - 15) on screen
#define KP_GET_X(posx) ((posx)*KP_WIDTH + (LCD_WIDTH-64-KP_WIDTH*4))
#define KP_GET_Y(posy) ((posy)*KP_HEIGHT + 12 )
#endif
// Additional chars in fonts
#define S_DELTA "\004" #define S_DELTA "\004"
#define S_DEGREE "\037" #define S_DEGREE "\037"
#define S_SARROW "\030" #define S_SARROW "\030"
@ -369,9 +398,6 @@ extern volatile uint8_t redraw_request;
// Define size of screen buffer in pixels (one pixel 16bit size) // Define size of screen buffer in pixels (one pixel 16bit size)
#define SPI_BUFFER_SIZE 2048 #define SPI_BUFFER_SIZE 2048
#define LCD_WIDTH 320
#define LCD_HEIGHT 240
#define DEFAULT_FG_COLOR RGB565(255,255,255) #define DEFAULT_FG_COLOR RGB565(255,255,255)
#define DEFAULT_BG_COLOR RGB565( 0, 0, 0) #define DEFAULT_BG_COLOR RGB565( 0, 0, 0)
#define DEFAULT_GRID_COLOR RGB565(128,128,128) #define DEFAULT_GRID_COLOR RGB565(128,128,128)

24
ui.c
View file

@ -654,7 +654,6 @@ static UI_FUNCTION_CALLBACK(menu_transform_cb)
(void)data; (void)data;
domain_mode ^= DOMAIN_TIME; domain_mode ^= DOMAIN_TIME;
select_lever_mode(LM_MARKER); select_lever_mode(LM_MARKER);
draw_frequencies();
ui_mode_normal(); ui_mode_normal();
} }
@ -1268,29 +1267,6 @@ menu_invoke(int item)
} }
} }
// Maximum menu buttons count
#define MENU_BUTTON_MAX 8
// Menu buttons size
#define MENU_BUTTON_WIDTH 60
#define MENU_BUTTON_HEIGHT 29
#define MENU_BUTTON_BORDER 1
// Height of numerical input field (at bottom)
#define NUM_INPUT_HEIGHT 32
#if 1
#define KP_WIDTH ((LCD_WIDTH) / 4) // numeric keypad button width
#define KP_HEIGHT ((LCD_HEIGHT - NUM_INPUT_HEIGHT) / 4) // numeric keypad button height
// Key x, y position (0 - 15) on screen
#define KP_GET_X(posx) ((posx) * KP_WIDTH) // numeric keypad left
#define KP_GET_Y(posy) ((posy) * KP_HEIGHT) // numeric keypad top
#else
#define KP_WIDTH 48
#define KP_HEIGHT 48
// Key x, y position (0 - 15) on screen
#define KP_GET_X(posx) ((posx)*KP_WIDTH + (LCD_WIDTH-64-KP_WIDTH*4))
#define KP_GET_Y(posy) ((posy)*KP_HEIGHT + 12 )
#endif
// Key names // Key names
#define KP_0 0 #define KP_0 0
#define KP_1 1 #define KP_1 1