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

Merge branch 'master' into master

Browse source
This commit is contained in:
DiSlord 2020-01-21 20:45:02 +03:00 committed by GitHub
parent 4b9c348a1a 066027f5b5
commit e7bdead77a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nanovna.h
View file

@ -334,9 +334,8 @@ int ili9341_drawchar_size(uint8_t ch, int x, int y, uint8_t size);
void ili9341_drawstring_size(const char *str, int x, int y, uint8_t size);
void ili9341_drawfont(uint8_t ch, int x, int y);
void ili9341_read_memory(int x, int y, int w, int h, int len, uint16_t* out);
void ili9341_line(int x0, int y0, int x1, int y1);
void show_version(void);
void show_logo(void);
void ili9341_read_memory_continue(int len, uint16_t* out);
void ili9341_line(int x0, int y0, int x1, int y1, uint16_t fg);
/*
* flash.c

2
ui.c
View file

@ -305,8 +305,6 @@ void touch_wait_release(void)
} while(status != EVT_TOUCH_RELEASED);
}
extern void ili9341_line(int, int, int, int);
void
touch_cal_exec(void)
{