diff --git a/Font5x7.c b/Font5x7.c index 1a08e44..9cdbe43 100644 --- a/Font5x7.c +++ b/Font5x7.c @@ -586,19 +586,19 @@ const uint16_t x5x7_bits [] = bbw=5, bbh=7, bbx=0, bby=-1, width=5 +----------------+ | | - | ** | - | * | - |*** | - | * | - |* ** | + | *** | + |* * | + |* * | + | * * | + |** ** | | | +----------------+ */ 0x0000, - 0x3000, - 0x4000, - 0xe000, - 0x4000, - 0xb000, + 0x7000, + 0x8800, + 0x8800, + 0x5000, + 0xb800, 0x0000, /* Character (0x1f): @@ -927,20 +927,20 @@ const uint16_t x5x7_bits [] = /* Character (0x30): bbw=5, bbh=7, bbx=0, bby=-1, width=5 +----------------+ - | * | - |* * | - |* * | - |* * | - |* * | - | * | + | ** | + |* * | + |* * | + |* * | + |* * | + | ** | | | +----------------+ */ - 0x4000, - 0xa000, - 0xa000, - 0xa000, - 0xa000, - 0x4000, + 0x6000, + 0x9000, + 0x9000, + 0x9000, + 0x9000, + 0x6000, 0x0000, /* Character (0x31): diff --git a/ili9431.c b/ili9431.c index 3cfdbec..1e1ad14 100644 --- a/ili9431.c +++ b/ili9431.c @@ -175,6 +175,12 @@ const uint8_t ili9341_init_seq[] = { 0xB7, 1, 0x06, // display function control 0xB6, 4, 0x0A, 0x82, 0x27, 0x00, + + // control display + //0x53, 1, 0x0c, + // diaplay brightness + //0x51, 1, 0xff, + // sleep out 0x11, 0, 0 // sentinel diff --git a/main.c b/main.c index 3d722df..230743a 100644 --- a/main.c +++ b/main.c @@ -852,11 +852,20 @@ static void cmd_marker(BaseSequentialStream *chp, int argc, char *argv[]) } 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; if (t < 0 || t >= 4) goto usage; if (argc == 1) { chprintf(chp, "%d %d\r\n", t+1, markers[t].index); + active_marker = t; + markers[t].enabled = TRUE; return; } if (argc > 1) { diff --git a/nanovna.h b/nanovna.h index 4fb999e..c179304 100644 --- a/nanovna.h +++ b/nanovna.h @@ -122,6 +122,8 @@ void draw_cell_all(void); extern const uint16_t x5x7_bits []; extern const uint32_t numfont20x24[][24]; +#define CHAR_OHM '\0x1e' + int caldata_save(void); int caldata_recall(void);