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

add ohm char font, change face of zero "0"

Browse source
This commit is contained in:
TT 2016-10-29 16:52:48 +09:00
parent 3eb8125086
commit 539653b52a
4 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Font5x7.c
View file

@ -586,19 +586,19 @@ const uint16_t x5x7_bits [] =
bbw=5, bbh=7, bbx=0, bby=-1, width=5 bbw=5, bbh=7, bbx=0, bby=-1, width=5
+----------------+ +----------------+
| | | |
| ** | | *** |
| * | |* * |
|*** | |* * |
| * | | * * |
|* ** | |** ** |
| | | |
+----------------+ */ +----------------+ */
0x0000, 0x0000,
0x3000, 0x7000,
0x4000, 0x8800,
0xe000, 0x8800,
0x4000, 0x5000,
0xb000, 0xb800,
0x0000, 0x0000,
/* Character (0x1f): /* Character (0x1f):
@ -927,20 +927,20 @@ const uint16_t x5x7_bits [] =
/* Character (0x30): /* Character (0x30):
bbw=5, bbh=7, bbx=0, bby=-1, width=5 bbw=5, bbh=7, bbx=0, bby=-1, width=5
+----------------+ +----------------+
| * | | ** |
|* * | |* * |
|* * | |* * |
|* * | |* * |
|* * | |* * |
| * | | ** |
| | | |
+----------------+ */ +----------------+ */
0x4000, 0x6000,
0xa000, 0x9000,
0xa000, 0x9000,
0xa000, 0x9000,
0xa000, 0x9000,
0x4000, 0x6000,
0x0000, 0x0000,
/* Character (0x31): /* Character (0x31):

6
ili9431.c
View file

@ -175,6 +175,12 @@ const uint8_t ili9341_init_seq[] = {
0xB7, 1, 0x06, 0xB7, 1, 0x06,
// display function control // display function control
0xB6, 4, 0x0A, 0x82, 0x27, 0x00, 0xB6, 4, 0x0A, 0x82, 0x27, 0x00,
// control display
//0x53, 1, 0x0c,
// diaplay brightness
//0x51, 1, 0xff,
// sleep out // sleep out
0x11, 0, 0x11, 0,
0 // sentinel 0 // sentinel

9
main.c
View file

@ -852,11 +852,20 @@ static void cmd_marker(BaseSequentialStream *chp, int argc, char *argv[])
} }
return; return;
} }
if (strcmp(argv[0], "off") == 0) {
active_marker = -1;
for (t = 0; t < 4; t++)
markers[t].enabled = FALSE;
return;
}
t = atoi(argv[0])-1; t = atoi(argv[0])-1;
if (t < 0 || t >= 4) if (t < 0 || t >= 4)
goto usage; goto usage;
if (argc == 1) { if (argc == 1) {
chprintf(chp, "%d %d\r\n", t+1, markers[t].index); chprintf(chp, "%d %d\r\n", t+1, markers[t].index);
active_marker = t;
markers[t].enabled = TRUE;
return; return;
} }
if (argc > 1) { if (argc > 1) {

2
nanovna.h
View file

@ -122,6 +122,8 @@ void draw_cell_all(void);
extern const uint16_t x5x7_bits []; extern const uint16_t x5x7_bits [];
extern const uint32_t numfont20x24[][24]; extern const uint32_t numfont20x24[][24];
#define CHAR_OHM '\0x1e'
int caldata_save(void); int caldata_save(void);
int caldata_recall(void); int caldata_recall(void);