From dcbcfe162c1b46761fe0932fb6f59f51eed6857b Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Sun, 20 Oct 2019 22:16:32 +0900
Subject: [PATCH] chore: shrink 5x7 font

---
 Font5x7.c | 1780 ++++++++++++++++++++++++++---------------------------
 ili9341.c |    8 +-
 nanovna.h |    2 +-
 plot.c    |    6 +-
 4 files changed, 898 insertions(+), 898 deletions(-)

diff --git a/Font5x7.c b/Font5x7.c
index 151a87f..9e242d6 100644
--- a/Font5x7.c
+++ b/Font5x7.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 
 /* Font character bitmap data. */
-const uint16_t x5x7_bits [] =
+const uint8_t x5x7_bits [] =
 {
 
   /* Character (0x00):
@@ -23,13 +23,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0xf000,
-  0xf000,
-  0xf000,
-  0xf000,
-  0xf000,
-  0xf000,
-  0x0000,
+  0xf0,
+  0xf0,
+  0xf0,
+  0xf0,
+  0xf0,
+  0xf0,
+  0x00,
 
   /* Character (0x01):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -42,13 +42,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x0000,
-  0x2000,
-  0x7000,
-  0xf800,
-  0x7000,
-  0x2000,
-  0x0000,
+  0x00,
+  0x20,
+  0x70,
+  0xf8,
+  0x70,
+  0x20,
+  0x00,
 
   /* Character (0x02):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -61,13 +61,13 @@ const uint16_t x5x7_bits [] =
      |* *             |
      |                |
      +----------------+ */
-  0x5000,
-  0xa000,
-  0x5000,
-  0xa000,
-  0x5000,
-  0xa000,
-  0x0000,
+  0x50,
+  0xa0,
+  0x50,
+  0xa0,
+  0x50,
+  0xa0,
+  0x00,
 
   /* Character (0x03):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -80,13 +80,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0xa000,
-  0xe000,
-  0xa000,
-  0xa000,
-  0x7000,
-  0x2000,
-  0x2000,
+  0xa0,
+  0xe0,
+  0xa0,
+  0xa0,
+  0x70,
+  0x20,
+  0x20,
 
   /* Character (0x04):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -99,13 +99,13 @@ const uint16_t x5x7_bits [] =
      |  **            |
      |  *             |
      +----------------+ */
-  0xc000,
-  0x8000,
-  0xc000,
-  0xb000,
-  0x2000,
-  0x3000,
-  0x2000,
+  0xc0,
+  0x80,
+  0xc0,
+  0xb0,
+  0x20,
+  0x30,
+  0x20,
 
   /* Character (0x05):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -118,13 +118,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      | * *            |
      +----------------+ */
-  0xc000,
-  0x8000,
-  0xc000,
-  0x6000,
-  0x5000,
-  0x6000,
-  0x5000,
+  0xc0,
+  0x80,
+  0xc0,
+  0x60,
+  0x50,
+  0x60,
+  0x50,
 
   /* Character (0x06):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -137,13 +137,13 @@ const uint16_t x5x7_bits [] =
      |  **            |
      |  *             |
      +----------------+ */
-  0x8000,
-  0x8000,
-  0xc000,
-  0x3000,
-  0x2000,
-  0x3000,
-  0x2000,
+  0x80,
+  0x80,
+  0xc0,
+  0x30,
+  0x20,
+  0x30,
+  0x20,
 
   /* Character (0x07):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -156,13 +156,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x5000,
-  0x2000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x50,
+  0x20,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x08):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -175,13 +175,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x7000,
-  0x2000,
-  0x0000,
-  0x7000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x70,
+  0x20,
+  0x00,
+  0x70,
+  0x00,
+  0x00,
 
   /* Character (0x09):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -194,13 +194,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  **            |
      +----------------+ */
-  0x9000,
-  0xd000,
-  0xb000,
-  0x9000,
-  0x2000,
-  0x2000,
-  0x3000,
+  0x90,
+  0xd0,
+  0xb0,
+  0x90,
+  0x20,
+  0x20,
+  0x30,
 
   /* Character (0x0a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -213,13 +213,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0xa000,
-  0xa000,
-  0xa000,
-  0x4000,
-  0x7000,
-  0x2000,
-  0x2000,
+  0xa0,
+  0xa0,
+  0xa0,
+  0x40,
+  0x70,
+  0x20,
+  0x20,
 
   /* Character (0x0b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -232,13 +232,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0xe000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x20,
+  0x20,
+  0xe0,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x0c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -251,13 +251,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0xe000,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x00,
+  0x00,
+  0x00,
+  0xe0,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x0d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -270,13 +270,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x3800,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x00,
+  0x00,
+  0x00,
+  0x38,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x0e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -289,13 +289,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0x3800,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x20,
+  0x20,
+  0x38,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x0f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -308,13 +308,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0xf800,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x20,
+  0x20,
+  0x20,
+  0xf8,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x10):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -327,13 +327,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0xf800,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x00,
+  0xf8,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x11):
      bbw=6, bbh=7, bbx=0, bby=-1, width=5
@@ -346,13 +346,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xf800,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x00,
+  0xf8,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x12):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -365,13 +365,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0xf800,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0xf8,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x13):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -384,13 +384,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0xf800,
-  0x0000,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0xf8,
+  0x00,
+  0x00,
 
   /* Character (0x14):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -403,13 +403,13 @@ const uint16_t x5x7_bits [] =
      |*****           |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0xf800,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0xf8,
+  0x00,
 
   /* Character (0x15):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -422,13 +422,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0x3800,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x20,
+  0x20,
+  0x20,
+  0x38,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x16):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -441,13 +441,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0xe000,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x20,
+  0x20,
+  0x20,
+  0xe0,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x17):
      bbw=6, bbh=7, bbx=0, bby=-1, width=5
@@ -460,13 +460,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0xf800,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x20,
+  0x20,
+  0xf8,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x18):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -479,13 +479,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0xf800,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x00,
+  0x00,
+  0x00,
+  0xf8,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x19):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -498,13 +498,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |  *             |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
 
   /* Character (0x1a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -517,13 +517,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x4000,
-  0xF800,
-  0x4000,
-  0x2000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x40,
+  0xF8,
+  0x40,
+  0x20,
+  0x00,
+  0x00,
 
   /* Character (0x1b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -536,13 +536,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x2000,
-  0x1000,
-  0xF800,
-  0x1000,
-  0x2000,
-  0x0000,
-  0x0000,
+  0x20,
+  0x10,
+  0xF8,
+  0x10,
+  0x20,
+  0x00,
+  0x00,
 
   /* Character (0x1c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -555,13 +555,13 @@ const uint16_t x5x7_bits [] =
      |*  **           |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xf800,
-  0x5000,
-  0x5000,
-  0x9800,
-  0x0000,
+  0x00,
+  0x00,
+  0xf8,
+  0x50,
+  0x50,
+  0x98,
+  0x00,
 
   /* Character (0x1d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -574,13 +574,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |*               |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0x8000,
+  0x00,
+  0x00,
+  0x90,
+  0x90,
+  0x90,
+  0xe0,
+  0x80,
 
   /* Character (0x1e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -593,13 +593,13 @@ const uint16_t x5x7_bits [] =
      |** **           |
      |                |
      +----------------+ */
-  0x0000,
-  0x7000,
-  0x8800,
-  0x8800,
-  0x5000,
-  0xb800,
-  0x0000,
+  0x00,
+  0x70,
+  0x88,
+  0x88,
+  0x50,
+  0xb8,
+  0x00,
 
   /* Character (0x1f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -612,13 +612,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x60,
+  0x90,
+  0x90,
+  0x60,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x20):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -631,13 +631,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x21):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -650,13 +650,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x0000,
-  0x2000,
-  0x0000,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
+  0x00,
+  0x20,
+  0x00,
 
   /* Character (0x22):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -669,13 +669,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x5000,
-  0x5000,
-  0x5000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x50,
+  0x50,
+  0x50,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x23):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -688,13 +688,13 @@ const uint16_t x5x7_bits [] =
      | * *            |
      |                |
      +----------------+ */
-  0x0000,
-  0x5000,
-  0xf800,
-  0x5000,
-  0xf800,
-  0x5000,
-  0x0000,
+  0x00,
+  0x50,
+  0xf8,
+  0x50,
+  0xf8,
+  0x50,
+  0x00,
 
   /* Character (0x24):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -707,13 +707,13 @@ const uint16_t x5x7_bits [] =
      | ***            |
      |                |
      +----------------+ */
-  0x0000,
-  0x7000,
-  0xa000,
-  0x7000,
-  0x2800,
-  0x7000,
-  0x0000,
+  0x00,
+  0x70,
+  0xa0,
+  0x70,
+  0x28,
+  0x70,
+  0x00,
 
   /* Character (0x25):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -726,13 +726,13 @@ const uint16_t x5x7_bits [] =
      |   *            |
      |                |
      +----------------+ */
-  0x8000,
-  0x9000,
-  0x2000,
-  0x4000,
-  0x9000,
-  0x1000,
-  0x0000,
+  0x80,
+  0x90,
+  0x20,
+  0x40,
+  0x90,
+  0x10,
+  0x00,
 
   /* Character (0x26):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -745,13 +745,13 @@ const uint16_t x5x7_bits [] =
      | * *            |
      |                |
      +----------------+ */
-  0x0000,
-  0x4000,
-  0xa000,
-  0x4000,
-  0xa000,
-  0x5000,
-  0x0000,
+  0x00,
+  0x40,
+  0xa0,
+  0x40,
+  0xa0,
+  0x50,
+  0x00,
 
   /* Character (0x27):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -764,13 +764,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x6000,
-  0x4000,
-  0x8000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x60,
+  0x40,
+  0x80,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x28):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -783,13 +783,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x2000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x2000,
-  0x0000,
+  0x20,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0x20,
+  0x00,
 
   /* Character (0x29):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -802,13 +802,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0x4000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x4000,
-  0x0000,
+  0x40,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
+  0x40,
+  0x00,
 
   /* Character (0x2a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -821,13 +821,13 @@ const uint16_t x5x7_bits [] =
      |* *             |
      |                |
      +----------------+ */
-  0x0000,
-  0xa000,
-  0x4000,
-  0xe000,
-  0x4000,
-  0xa000,
-  0x0000,
+  0x00,
+  0xa0,
+  0x40,
+  0xe0,
+  0x40,
+  0xa0,
+  0x00,
 
   /* Character (0x2b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -840,13 +840,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x0000,
-  0x2000,
-  0x2000,
-  0xf800,
-  0x2000,
-  0x2000,
-  0x0000,
+  0x00,
+  0x20,
+  0x20,
+  0xf8,
+  0x20,
+  0x20,
+  0x00,
 
   /* Character (0x2c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -859,13 +859,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |*               |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x6000,
-  0x4000,
-  0x8000,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x60,
+  0x40,
+  0x80,
 
   /* Character (0x2d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -878,13 +878,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0xf000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0xf0,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x2e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -897,13 +897,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x6000,
-  0x6000,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x60,
+  0x60,
+  0x00,
 
   /* Character (0x2f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -916,13 +916,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x1000,
-  0x2000,
-  0x4000,
-  0x8000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x10,
+  0x20,
+  0x40,
+  0x80,
+  0x00,
+  0x00,
 
   /* Character (0x30):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -935,13 +935,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0xb000,
-  0xd000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0xb0,
+  0xd0,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x31):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -954,13 +954,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0x4000,
-  0xc000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0xe000,
-  0x0000,
+  0x40,
+  0xc0,
+  0x40,
+  0x40,
+  0x40,
+  0xe0,
+  0x00,
 
   /* Character (0x32):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -973,13 +973,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x1000,
-  0x2000,
-  0x4000,
-  0xf000,
-  0x0000,
+  0x60,
+  0x90,
+  0x10,
+  0x20,
+  0x40,
+  0xf0,
+  0x00,
 
   /* Character (0x33):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -992,13 +992,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0xf000,
-  0x1000,
-  0x6000,
-  0x1000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0xf0,
+  0x10,
+  0x60,
+  0x10,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x34):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1011,13 +1011,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x2000,
-  0x6000,
-  0xa000,
-  0xf000,
-  0x2000,
-  0x2000,
-  0x0000,
+  0x20,
+  0x60,
+  0xa0,
+  0xf0,
+  0x20,
+  0x20,
+  0x00,
 
   /* Character (0x35):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1030,13 +1030,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0xf000,
-  0x8000,
-  0xe000,
-  0x1000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0xf0,
+  0x80,
+  0xe0,
+  0x10,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x36):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1049,13 +1049,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x8000,
-  0xe000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x80,
+  0xe0,
+  0x90,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x37):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1068,13 +1068,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0xf000,
-  0x1000,
-  0x2000,
-  0x2000,
-  0x4000,
-  0x4000,
-  0x0000,
+  0xf0,
+  0x10,
+  0x20,
+  0x20,
+  0x40,
+  0x40,
+  0x00,
 
   /* Character (0x38):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1087,13 +1087,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x6000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0x60,
+  0x90,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x39):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1106,13 +1106,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x9000,
-  0x7000,
-  0x1000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0x90,
+  0x70,
+  0x10,
+  0x60,
+  0x00,
 
   /* Character (0x3a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1125,13 +1125,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x0000,
-  0x6000,
-  0x6000,
-  0x0000,
-  0x6000,
-  0x6000,
-  0x0000,
+  0x00,
+  0x60,
+  0x60,
+  0x00,
+  0x60,
+  0x60,
+  0x00,
 
   /* Character (0x3b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1144,13 +1144,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |*               |
      +----------------+ */
-  0x0000,
-  0x6000,
-  0x6000,
-  0x0000,
-  0x6000,
-  0x4000,
-  0x8000,
+  0x00,
+  0x60,
+  0x60,
+  0x00,
+  0x60,
+  0x40,
+  0x80,
 
   /* Character (0x3c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1163,13 +1163,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x0000,
-  0x2000,
-  0x4000,
-  0x8000,
-  0x4000,
-  0x2000,
-  0x0000,
+  0x00,
+  0x20,
+  0x40,
+  0x80,
+  0x40,
+  0x20,
+  0x00,
 
   /* Character (0x3d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1182,13 +1182,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xf000,
-  0x0000,
-  0xf000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x00,
+  0xf0,
+  0x00,
+  0xf0,
+  0x00,
+  0x00,
 
   /* Character (0x3e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1201,13 +1201,13 @@ const uint16_t x5x7_bits [] =
      |*               |
      |                |
      +----------------+ */
-  0x0000,
-  0x8000,
-  0x4000,
-  0x2000,
-  0x4000,
-  0x8000,
-  0x0000,
+  0x00,
+  0x80,
+  0x40,
+  0x20,
+  0x40,
+  0x80,
+  0x00,
 
   /* Character (0x3f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1220,13 +1220,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0x4000,
-  0xa000,
-  0x2000,
-  0x4000,
-  0x0000,
-  0x4000,
-  0x0000,
+  0x40,
+  0xa0,
+  0x20,
+  0x40,
+  0x00,
+  0x40,
+  0x00,
 
   /* Character (0x40):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1239,13 +1239,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0xb000,
-  0xb000,
-  0x8000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0xb0,
+  0xb0,
+  0x80,
+  0x60,
+  0x00,
 
   /* Character (0x41):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1258,13 +1258,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x9000,
-  0xf000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x60,
+  0x90,
+  0x90,
+  0xf0,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x42):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1277,13 +1277,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0xe000,
-  0x9000,
-  0xe000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0x0000,
+  0xe0,
+  0x90,
+  0xe0,
+  0x90,
+  0x90,
+  0xe0,
+  0x00,
 
   /* Character (0x43):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1296,13 +1296,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x8000,
-  0x8000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0x80,
+  0x80,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x44):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1315,13 +1315,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0xe000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0x0000,
+  0xe0,
+  0x90,
+  0x90,
+  0x90,
+  0x90,
+  0xe0,
+  0x00,
 
   /* Character (0x45):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1334,13 +1334,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0xf000,
-  0x8000,
-  0xe000,
-  0x8000,
-  0x8000,
-  0xf000,
-  0x0000,
+  0xf0,
+  0x80,
+  0xe0,
+  0x80,
+  0x80,
+  0xf0,
+  0x00,
 
   /* Character (0x46):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1353,13 +1353,13 @@ const uint16_t x5x7_bits [] =
      |*               |
      |                |
      +----------------+ */
-  0xf000,
-  0x8000,
-  0xe000,
-  0x8000,
-  0x8000,
-  0x8000,
-  0x0000,
+  0xf0,
+  0x80,
+  0xe0,
+  0x80,
+  0x80,
+  0x80,
+  0x00,
 
   /* Character (0x47):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1372,13 +1372,13 @@ const uint16_t x5x7_bits [] =
      | ***            |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x8000,
-  0xb000,
-  0x9000,
-  0x7000,
-  0x0000,
+  0x60,
+  0x90,
+  0x80,
+  0xb0,
+  0x90,
+  0x70,
+  0x00,
 
   /* Character (0x48):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1391,13 +1391,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x9000,
-  0x9000,
-  0xf000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x90,
+  0x90,
+  0xf0,
+  0x90,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x49):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1410,13 +1410,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0xe000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0xe000,
-  0x0000,
+  0xe0,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0xe0,
+  0x00,
 
   /* Character (0x4a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1429,13 +1429,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x1000,
-  0x1000,
-  0x1000,
-  0x1000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x10,
+  0x10,
+  0x10,
+  0x10,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x4b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1448,13 +1448,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x9000,
-  0xa000,
-  0xc000,
-  0xc000,
-  0xa000,
-  0x9000,
-  0x0000,
+  0x90,
+  0xa0,
+  0xc0,
+  0xc0,
+  0xa0,
+  0x90,
+  0x00,
 
   /* Character (0x4c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1467,13 +1467,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0x8000,
-  0x8000,
-  0x8000,
-  0x8000,
-  0x8000,
-  0xf000,
-  0x0000,
+  0x80,
+  0x80,
+  0x80,
+  0x80,
+  0x80,
+  0xf0,
+  0x00,
 
   /* Character (0x4d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1486,13 +1486,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x9000,
-  0xf000,
-  0xf000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x90,
+  0xf0,
+  0xf0,
+  0x90,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x4e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1505,13 +1505,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x9000,
-  0xd000,
-  0xd000,
-  0xb000,
-  0xb000,
-  0x9000,
-  0x0000,
+  0x90,
+  0xd0,
+  0xd0,
+  0xb0,
+  0xb0,
+  0x90,
+  0x00,
 
   /* Character (0x4f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1524,13 +1524,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0x90,
+  0x90,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x50):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1543,13 +1543,13 @@ const uint16_t x5x7_bits [] =
      |*               |
      |                |
      +----------------+ */
-  0xe000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0x8000,
-  0x8000,
-  0x0000,
+  0xe0,
+  0x90,
+  0x90,
+  0xe0,
+  0x80,
+  0x80,
+  0x00,
 
   /* Character (0x51):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1562,13 +1562,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |   *            |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0xd000,
-  0x6000,
-  0x1000,
+  0x60,
+  0x90,
+  0x90,
+  0x90,
+  0xd0,
+  0x60,
+  0x10,
 
   /* Character (0x52):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1581,13 +1581,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0xe000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0xa000,
-  0x9000,
-  0x0000,
+  0xe0,
+  0x90,
+  0x90,
+  0xe0,
+  0xa0,
+  0x90,
+  0x00,
 
   /* Character (0x53):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1600,13 +1600,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x6000,
-  0x9000,
-  0x4000,
-  0x2000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x60,
+  0x90,
+  0x40,
+  0x20,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x54):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1619,13 +1619,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0xe000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x0000,
+  0xe0,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0x00,
 
   /* Character (0x55):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1638,13 +1638,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x9000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x90,
+  0x90,
+  0x90,
+  0x90,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x56):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1657,13 +1657,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x9000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x6000,
-  0x0000,
+  0x90,
+  0x90,
+  0x90,
+  0x90,
+  0x60,
+  0x60,
+  0x00,
 
   /* Character (0x57):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1676,13 +1676,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x9000,
-  0x9000,
-  0x9000,
-  0xf000,
-  0xf000,
-  0x9000,
-  0x0000,
+  0x90,
+  0x90,
+  0x90,
+  0xf0,
+  0xf0,
+  0x90,
+  0x00,
 
   /* Character (0x58):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1695,13 +1695,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x9000,
-  0x9000,
-  0x6000,
-  0x6000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x90,
+  0x90,
+  0x60,
+  0x60,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x59):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1714,13 +1714,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0xa000,
-  0xa000,
-  0xa000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x0000,
+  0xa0,
+  0xa0,
+  0xa0,
+  0x40,
+  0x40,
+  0x40,
+  0x00,
 
   /* Character (0x5a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1733,13 +1733,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0xf000,
-  0x1000,
-  0x2000,
-  0x4000,
-  0x8000,
-  0xf000,
-  0x0000,
+  0xf0,
+  0x10,
+  0x20,
+  0x40,
+  0x80,
+  0xf0,
+  0x00,
 
   /* Character (0x5b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1752,13 +1752,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0xe000,
-  0x8000,
-  0x8000,
-  0x8000,
-  0x8000,
-  0xe000,
-  0x0000,
+  0xe0,
+  0x80,
+  0x80,
+  0x80,
+  0x80,
+  0xe0,
+  0x00,
 
   /* Character (0x5c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1771,13 +1771,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x0000,
-  0x8000,
-  0x4000,
-  0x2000,
-  0x1000,
-  0x0000,
-  0x0000,
+  0x00,
+  0x80,
+  0x40,
+  0x20,
+  0x10,
+  0x00,
+  0x00,
 
   /* Character (0x5d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1790,13 +1790,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0xe000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0xe000,
-  0x0000,
+  0xe0,
+  0x20,
+  0x20,
+  0x20,
+  0x20,
+  0xe0,
+  0x00,
 
   /* Character (0x5e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1809,13 +1809,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x4000,
-  0xa000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x40,
+  0xa0,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x5f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1828,13 +1828,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0xf000,
-  0x0000,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0xf0,
+  0x00,
 
   /* Character (0x60):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1847,13 +1847,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0xc000,
-  0x4000,
-  0x2000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0xc0,
+  0x40,
+  0x20,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 
   /* Character (0x61):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1866,13 +1866,13 @@ const uint16_t x5x7_bits [] =
      | * *            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x7000,
-  0x9000,
-  0xb000,
-  0x5000,
-  0x0000,
+  0x00,
+  0x00,
+  0x70,
+  0x90,
+  0xb0,
+  0x50,
+  0x00,
 
   /* Character (0x62):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1885,13 +1885,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0x8000,
-  0x8000,
-  0xe000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0x0000,
+  0x80,
+  0x80,
+  0xe0,
+  0x90,
+  0x90,
+  0xe0,
+  0x00,
 
   /* Character (0x63):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1904,13 +1904,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x6000,
-  0x8000,
-  0x8000,
-  0x6000,
-  0x0000,
+  0x00,
+  0x00,
+  0x60,
+  0x80,
+  0x80,
+  0x60,
+  0x00,
 
   /* Character (0x64):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1923,13 +1923,13 @@ const uint16_t x5x7_bits [] =
      | ***            |
      |                |
      +----------------+ */
-  0x1000,
-  0x1000,
-  0x7000,
-  0x9000,
-  0x9000,
-  0x7000,
-  0x0000,
+  0x10,
+  0x10,
+  0x70,
+  0x90,
+  0x90,
+  0x70,
+  0x00,
 
   /* Character (0x65):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1942,13 +1942,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x6000,
-  0xb000,
-  0xc000,
-  0x6000,
-  0x0000,
+  0x00,
+  0x00,
+  0x60,
+  0xb0,
+  0xc0,
+  0x60,
+  0x00,
 
   /* Character (0x66):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1961,13 +1961,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0x2000,
-  0x5000,
-  0x4000,
-  0xe000,
-  0x4000,
-  0x4000,
-  0x0000,
+  0x20,
+  0x50,
+  0x40,
+  0xe0,
+  0x40,
+  0x40,
+  0x00,
 
   /* Character (0x67):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1980,13 +1980,13 @@ const uint16_t x5x7_bits [] =
      |*               |
      | ***            |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x7000,
-  0x9000,
-  0x6000,
-  0x8000,
-  0x7000,
+  0x00,
+  0x00,
+  0x70,
+  0x90,
+  0x60,
+  0x80,
+  0x70,
 
   /* Character (0x68):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -1999,13 +1999,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x8000,
-  0x8000,
-  0xe000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x80,
+  0x80,
+  0xe0,
+  0x90,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x69):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2018,13 +2018,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0x4000,
-  0x0000,
-  0xc000,
-  0x4000,
-  0x4000,
-  0xe000,
-  0x0000,
+  0x40,
+  0x00,
+  0xc0,
+  0x40,
+  0x40,
+  0xe0,
+  0x00,
 
   /* Character (0x6a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2037,13 +2037,13 @@ const uint16_t x5x7_bits [] =
      |* *             |
      | *              |
      +----------------+ */
-  0x2000,
-  0x0000,
-  0x2000,
-  0x2000,
-  0x2000,
-  0xa000,
-  0x4000,
+  0x20,
+  0x00,
+  0x20,
+  0x20,
+  0x20,
+  0xa0,
+  0x40,
 
   /* Character (0x6b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2056,13 +2056,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x8000,
-  0x8000,
-  0xa000,
-  0xc000,
-  0xa000,
-  0x9000,
-  0x0000,
+  0x80,
+  0x80,
+  0xa0,
+  0xc0,
+  0xa0,
+  0x90,
+  0x00,
 
   /* Character (0x6c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2075,13 +2075,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0xc000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0xe000,
-  0x0000,
+  0xc0,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0xe0,
+  0x00,
 
   /* Character (0x6d):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2094,13 +2094,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xa000,
-  0xf000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x00,
+  0x00,
+  0xa0,
+  0xf0,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x6e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2113,13 +2113,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xe000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x0000,
+  0x00,
+  0x00,
+  0xe0,
+  0x90,
+  0x90,
+  0x90,
+  0x00,
 
   /* Character (0x6f):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2132,13 +2132,13 @@ const uint16_t x5x7_bits [] =
      | **             |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x6000,
-  0x9000,
-  0x9000,
-  0x6000,
-  0x0000,
+  0x00,
+  0x00,
+  0x60,
+  0x90,
+  0x90,
+  0x60,
+  0x00,
 
   /* Character (0x70):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2151,13 +2151,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |*               |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xe000,
-  0x9000,
-  0x9000,
-  0xe000,
-  0x8000,
+  0x00,
+  0x00,
+  0xe0,
+  0x90,
+  0x90,
+  0xe0,
+  0x80,
 
   /* Character (0x71):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2170,13 +2170,13 @@ const uint16_t x5x7_bits [] =
      | ***            |
      |   *            |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x7000,
-  0x9000,
-  0x9000,
-  0x7000,
-  0x1000,
+  0x00,
+  0x00,
+  0x70,
+  0x90,
+  0x90,
+  0x70,
+  0x10,
 
   /* Character (0x72):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2189,13 +2189,13 @@ const uint16_t x5x7_bits [] =
      |*               |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xe000,
-  0x9000,
-  0x8000,
-  0x8000,
-  0x0000,
+  0x00,
+  0x00,
+  0xe0,
+  0x90,
+  0x80,
+  0x80,
+  0x00,
 
   /* Character (0x73):
      bbw=6, bbh=7, bbx=0, bby=-1, width=5
@@ -2208,13 +2208,13 @@ const uint16_t x5x7_bits [] =
      |***             |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x7000,
-  0xc000,
-  0x3000,
-  0xe000,
-  0x0000,
+  0x00,
+  0x00,
+  0x70,
+  0xc0,
+  0x30,
+  0xe0,
+  0x00,
 
   /* Character (0x74):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2227,13 +2227,13 @@ const uint16_t x5x7_bits [] =
      |  **            |
      |                |
      +----------------+ */
-  0x4000,
-  0x4000,
-  0xe000,
-  0x4000,
-  0x4000,
-  0x3000,
-  0x0000,
+  0x40,
+  0x40,
+  0xe0,
+  0x40,
+  0x40,
+  0x30,
+  0x00,
 
   /* Character (0x75):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2246,13 +2246,13 @@ const uint16_t x5x7_bits [] =
      | ***            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x9000,
-  0x9000,
-  0x9000,
-  0x7000,
-  0x0000,
+  0x00,
+  0x00,
+  0x90,
+  0x90,
+  0x90,
+  0x70,
+  0x00,
 
   /* Character (0x76):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2265,13 +2265,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xa000,
-  0xa000,
-  0xa000,
-  0x4000,
-  0x0000,
+  0x00,
+  0x00,
+  0xa0,
+  0xa0,
+  0xa0,
+  0x40,
+  0x00,
 
   /* Character (0x77):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2284,13 +2284,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x9000,
-  0x9000,
-  0xf000,
-  0xf000,
-  0x0000,
+  0x00,
+  0x00,
+  0x90,
+  0x90,
+  0xf0,
+  0xf0,
+  0x00,
 
   /* Character (0x78):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2303,13 +2303,13 @@ const uint16_t x5x7_bits [] =
      |*  *            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x9000,
-  0x6000,
-  0x6000,
-  0x9000,
-  0x0000,
+  0x00,
+  0x00,
+  0x90,
+  0x60,
+  0x60,
+  0x90,
+  0x00,
 
   /* Character (0x79):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2322,13 +2322,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      | *              |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0x9000,
-  0x9000,
-  0x5000,
-  0x2000,
-  0x4000,
+  0x00,
+  0x00,
+  0x90,
+  0x90,
+  0x50,
+  0x20,
+  0x40,
 
   /* Character (0x7a):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2341,13 +2341,13 @@ const uint16_t x5x7_bits [] =
      |****            |
      |                |
      +----------------+ */
-  0x0000,
-  0x0000,
-  0xf000,
-  0x2000,
-  0x4000,
-  0xf000,
-  0x0000,
+  0x00,
+  0x00,
+  0xf0,
+  0x20,
+  0x40,
+  0xf0,
+  0x00,
 
   /* Character (0x7b):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2360,13 +2360,13 @@ const uint16_t x5x7_bits [] =
      |  *             |
      |                |
      +----------------+ */
-  0x2000,
-  0x4000,
-  0xc000,
-  0x4000,
-  0x4000,
-  0x2000,
-  0x0000,
+  0x20,
+  0x40,
+  0xc0,
+  0x40,
+  0x40,
+  0x20,
+  0x00,
 
   /* Character (0x7c):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2379,13 +2379,13 @@ const uint16_t x5x7_bits [] =
      | *              |
      |                |
      +----------------+ */
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x4000,
-  0x0000,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0x40,
+  0x00,
 
   /* Character (0x7d):
      bbw=6, bbh=7, bbx=0, bby=-1, width=5
@@ -2398,13 +2398,13 @@ const uint16_t x5x7_bits [] =
      |*               |
      |                |
      +----------------+ */
-  0x8000,
-  0x4000,
-  0x6000,
-  0x4000,
-  0x4000,
-  0x8000,
-  0x0000,
+  0x80,
+  0x40,
+  0x60,
+  0x40,
+  0x40,
+  0x80,
+  0x00,
 
   /* Character (0x7e):
      bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2417,13 +2417,13 @@ const uint16_t x5x7_bits [] =
      |                |
      |                |
      +----------------+ */
-  0x5000,
-  0xa000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
+  0x50,
+  0xa0,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
 };
 
 #if 0
diff --git a/ili9341.c b/ili9341.c
index e42d6de..bbbd4bd 100644
--- a/ili9341.c
+++ b/ili9341.c
@@ -338,12 +338,12 @@ void
 ili9341_drawchar_5x7(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg)
 {
   uint16_t *buf = spi_buffer;
-  uint16_t bits;
+  uint8_t bits;
   int c, r;
   for(c = 0; c < 7; c++) {
     bits = x5x7_bits[(ch * 7) + c];
     for (r = 0; r < 5; r++) {
-      *buf++ = (0x8000 & bits) ? fg : bg;
+      *buf++ = (0x80 & bits) ? fg : bg;
       bits <<= 1;
     }
   }
@@ -364,12 +364,12 @@ void
 ili9341_drawchar_size(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg, uint8_t size)
 {
   uint16_t *buf = spi_buffer;
-  uint16_t bits;
+  uint8_t bits;
   int c, r;
   for(c = 0; c < 7*size; c++) {
     bits = x5x7_bits[(ch * 7) + (c / size)];
     for (r = 0; r < 5*size; r++) {
-      *buf++ = (0x8000 & bits) ? fg : bg;
+      *buf++ = (0x80 & bits) ? fg : bg;
       if (r % size == (size-1)) {
           bits <<= 1;
       }
diff --git a/nanovna.h b/nanovna.h
index 7f35500..e6b7a66 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -152,7 +152,7 @@ extern int area_height;
 
 // font
 
-extern const uint16_t x5x7_bits [];
+extern const uint8_t x5x7_bits [];
 extern const uint32_t numfont20x24[][24];
 
 #define S_PI    "\034"
diff --git a/plot.c b/plot.c
index a0a16ef..b4efe1d 100644
--- a/plot.c
+++ b/plot.c
@@ -1056,7 +1056,7 @@ draw_marker(int w, int h, int x, int y, int c, int ch)
       int cc = c;
       if (j <= 9 && j > 2 && i >= -1 && i <= 3) {
         uint16_t bits = x5x7_bits[(ch * 7) + (9-j)];
-        if (bits & (0x8000>>(i+1)))
+        if (bits & (0x80>>(i+1)))
           cc = 0;
       }
       if (y0 >= 0 && y0 < h && x0 >= 0 && x0 < w)
@@ -1355,7 +1355,7 @@ request_to_draw_cells_behind_numeric_input(void)
 void
 cell_drawchar_5x7(int w, int h, uint8_t ch, int x, int y, uint16_t fg, int invert)
 {
-  uint16_t bits;
+  uint8_t bits;
   int c, r;
   if (y <= -7 || y >= h || x <= -5 || x >= w)
     return;
@@ -1366,7 +1366,7 @@ cell_drawchar_5x7(int w, int h, uint8_t ch, int x, int y, uint16_t fg, int inver
     if (invert)
       bits = ~bits;
     for (r = 0; r < 5; r++) {
-      if ((x+r) >= 0 && (x+r) < w && (0x8000 & bits)) 
+      if ((x+r) >= 0 && (x+r) < w && (0x80 & bits)) 
         spi_buffer[(y+c)*w + (x+r)] = fg;
       bits <<= 1;
     }