Formatting

Use defines for font chars

Font5x7.c

@@ -26,7 +26,6 @@
 /* Font character bitmap data. */
 const uint8_t x5x7_bits[127*7] =
 {
-
   /* Character (0x00):
      width=5
      +--------+
@@ -107,20 +106,20 @@ const uint8_t x5x7_bits[127*7] =
      width=6
      +--------+
      |        |
-     |  *     |
+     |**      |
-     |  *     |
+     |****    |
-     | * *    |
+     |******  |
-     | * *    |
+     |****    |
-     |*   *   |
+     |**      |
-     |*****   |
+     |        |
      +--------+ */
   0b00000000|CHAR5x7_WIDTH_6px,
-  0b00100000,
+  0b11000000,
-  0b00100000,
+  0b11110000,
-  0b01010000,
+  0b00011100,
-  0b01010000,
+  0b11110000,
-  0b10001000,
+  0b11000000,
-  0b11111000,
+  0b00000000,
 
   /* Character (0x05):
      width=5
@@ -468,20 +467,20 @@ const uint8_t x5x7_bits[127*7] =
      width=6
      +--------+
      |        |
-     |**      |
+     |  *     |
-     |****    |
+     |  *     |
-     |******  |
+     | * *    |
-     |****    |
+     | * *    |
-     |**      |
+     |*   *   |
-     |        |
+     |*****   |
      +--------+ */
   0b00000000|CHAR5x7_WIDTH_6px,
-  0b11000000,
+  0b00100000,
-  0b11110000,
+  0b00100000,
-  0b00011100,
+  0b01010000,
-  0b11110000,
+  0b01010000,
-  0b11000000,
+  0b10001000,
-  0b00000000,
+  0b11111000,
 
   /* Character (0x18):
      width=5

Font7x13b.c

@@ -135,31 +135,31 @@ const uint8_t x7x11b_bits[127*11] =
 		0b00011000,
 
 		/* Character 4 (0x04):
-		   width 8
+		   width 7
 		   +-------+
-		   |       |
+		   |  **   |
-		   |   *   |
+		   |  **   |
-		   |   *   |
+		   |  **   |
-		   |  ***  |
+		   |  **   |
-		   |  ***  |
-		   | ** ** |
-		   | ** ** |
-		   |**   **|
-		   |**   **|
 		   |*******|
+		   |*******|
+		   |       |
+		   |       |
+		   |       |
+		   |       |
 		   |       |
 		   +-------+ */
-		0b00000000|CHAR7x11_WIDTH_8px,
+		0b00110000|CHAR7x11_WIDTH_7px,
-		0b00010000,
+		0b00110000,
-		0b00010000,
+		0b00110000,
-		0b00111000,
+		0b00110000,
-		0b00111000,
+		0b11111110,
-		0b01101100,
-		0b01101100,
-		0b11000110,
-		0b11000110,
 		0b11111110,
 		0b00000000,
+		0b00000000,
+		0b00000000,
+		0b00000000,
+		0b00000000,
 
 		/* Character 5 (0x05):
 		   width 7
@@ -648,31 +648,31 @@ const uint8_t x7x11b_bits[127*11] =
 		0b00110000,
 
 		/* Character 23 (0x17):
-		   width 7
+		   width 8
 		   +-------+
-		   |  **   |
-		   |  **   |
-		   |  **   |
-		   |  **   |
-		   |*******|
-		   |*******|
-		   |       |
-		   |       |
-		   |       |
 		   |       |
+		   |   *   |
+		   |   *   |
+		   |  ***  |
+		   |  ***  |
+		   | ** ** |
+		   | ** ** |
+		   |**   **|
+		   |**   **|
+		   |*******|
 		   |       |
 		   +-------+ */
-		0b00110000|CHAR7x11_WIDTH_7px,
+		0b00000000|CHAR7x11_WIDTH_8px,
-		0b00110000,
+		0b00010000,
-		0b00110000,
+		0b00010000,
-		0b00110000,
+		0b00111000,
-		0b11111110,
+		0b00111000,
+		0b01101100,
+		0b01101100,
+		0b11000110,
+		0b11000110,
 		0b11111110,
 		0b00000000,
-		0b00000000,
-		0b00000000,
-		0b00000000,
-		0b00000000,
 
 		/* Character 24 (0x18):
 		   width 5

nanovna.h

@@ -364,15 +364,15 @@ extern const uint16_t numfont16x22[];
 #define KP_GET_Y(posy) ((posy)*KP_HEIGHT + 12 )
 #endif
 
-#define S_DELTA "\004"
+#define S_DELTA    "\029"  // 0x17
-#define S_DEGREE "\037"
+#define S_SARROW   "\030"  // 0x18
-#define S_SARROW "\030"
+#define S_INFINITY "\031"  // 0x19
-#define S_INFINITY "\031"
+#define S_LARROW   "\032"  // 0x1A
-#define S_LARROW "\032"
+#define S_RARROW   "\033"  // 0x1B
-#define S_RARROW "\033"
+#define S_PI       "\034"  // 0x1C
-#define S_PI    "\034"
+#define S_MICRO    "\035"  // 0x1D
-#define S_MICRO "\035"
+#define S_OHM      "\036"  // 0x1E
-#define S_OHM   "\036"
+#define S_DEGREE   "\037"  // 0x1F
 // trace 
 
 #define MAX_TRACE_TYPE 12