From 50922b4ef8f999a02270dec36b70105845197c25 Mon Sep 17 00:00:00 2001
From: Lee Leahy <lpleahyjr@gmail.com>
Date: Fri, 12 Aug 2022 15:20:14 -1000
Subject: [PATCH 1/2] Move the icon width and height to above the icon data,
 add const

Make the width and height easily found for each icon by generically
searching for _Width and _Height before the icon data.  If width and
height not found, use previous width and height.

Move the icons, widths and heights from RAM into flash.
---
 Firmware/RTK_Surveyor/Display.ino |   4 +-
 Firmware/RTK_Surveyor/icons.h     | 181 +++++++++++++++---------------
 2 files changed, 92 insertions(+), 93 deletions(-)

diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino
index 12245a901..bcd00552d 100644
--- a/Firmware/RTK_Surveyor/Display.ino
+++ b/Firmware/RTK_Surveyor/Display.ino
@@ -2287,9 +2287,9 @@ void paintResets()
 }
 
 //Wrapper to avoid needing to pass width/height data twice
-void displayBitmap(uint8_t x, uint8_t y, uint8_t imageWidth, uint8_t imageHeight, uint8_t *imageData)
+void displayBitmap(uint8_t x, uint8_t y, uint8_t imageWidth, uint8_t imageHeight, const uint8_t *imageData)
 {
-  oled.bitmap(x, y, x + imageWidth, y + imageHeight, imageData, imageWidth, imageHeight);
+  oled.bitmap(x, y, x + imageWidth, y + imageHeight, (uint8_t *)imageData, imageWidth, imageHeight);
 }
 
 void displayKeysUpdated()
diff --git a/Firmware/RTK_Surveyor/icons.h b/Firmware/RTK_Surveyor/icons.h
index ddcf99727..646a5a6cf 100644
--- a/Firmware/RTK_Surveyor/icons.h
+++ b/Firmware/RTK_Surveyor/icons.h
@@ -21,11 +21,11 @@
 
 */
 
-uint8_t BT_Symbol [] = {
+const int BT_Symbol_Height = 14;
+const int BT_Symbol_Width = 7;
+const uint8_t BT_Symbol [] = {
   0x18, 0x30, 0xE0, 0xFF, 0xE6, 0x3C, 0x18, 0x06, 0x03, 0x01, 0x3F, 0x19, 0x0F, 0x06,
 };
-int BT_Symbol_Height = 14;
-int BT_Symbol_Width = 7;
 
 /*
     WiFi_Symbol [13, 9]
@@ -41,24 +41,24 @@ int BT_Symbol_Width = 7;
 
 */
 
-uint8_t WiFi_Symbol_3 [] = {
+const int WiFi_Symbol_Height = 9;
+const int WiFi_Symbol_Width = 13;
+const uint8_t WiFi_Symbol_3 [] = {
   0x08, 0x04, 0x12, 0x09, 0x25, 0x95, 0xD5, 0x95, 0x25, 0x09, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-uint8_t WiFi_Symbol_2 [] = {
+const uint8_t WiFi_Symbol_2 [] = {
   0x00, 0x00, 0x10, 0x08, 0x24, 0x94, 0xD4, 0x94, 0x24, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-uint8_t WiFi_Symbol_1 [] = {
+const uint8_t WiFi_Symbol_1 [] = {
   0x00, 0x00, 0x00, 0x00, 0x20, 0x90, 0xD0, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-uint8_t WiFi_Symbol_0 [] = {
+const uint8_t WiFi_Symbol_0 [] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-int WiFi_Symbol_Height = 9;
-int WiFi_Symbol_Width = 13;
 
 /*
     CrossHair [15, 15]
@@ -80,12 +80,12 @@ int WiFi_Symbol_Width = 13;
 
 */
 
-uint8_t CrossHair [] = {
+const int CrossHair_Height = 15;
+const int CrossHair_Width = 15;
+const uint8_t CrossHair [] = {
   0x80, 0x80, 0xF0, 0x88, 0x84, 0x84, 0x84, 0x7F, 0x84, 0x84, 0x84, 0x88, 0xF0, 0x80, 0x80, 0x00,
   0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x7F, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00,
 };
-int CrossHair_Height = 15;
-int CrossHair_Width = 15;
 
 /*
     CrossHairDual [15, 15]
@@ -107,12 +107,12 @@ int CrossHair_Width = 15;
 
 */
 
-uint8_t CrossHairDual [] = {
+const int CrossHairDual_Height = 15;
+const int CrossHairDual_Width = 15;
+const uint8_t CrossHairDual [] = {
   0x80, 0x80, 0xF0, 0x88, 0xE4, 0x94, 0x94, 0x7F, 0x94, 0x94, 0xE4, 0x88, 0xF0, 0x80, 0x80, 0x00,
   0x00, 0x07, 0x08, 0x13, 0x14, 0x14, 0x7F, 0x14, 0x14, 0x13, 0x08, 0x07, 0x00, 0x00,
 };
-int CrossHairDual_Height = 15;
-int CrossHairDual_Width = 15;
 
 /*
     SIV_Antenna [12, 13]
@@ -132,12 +132,12 @@ int CrossHairDual_Width = 15;
          ******
 */
 
-uint8_t SIV_Antenna [] = {
+const int SIV_Antenna_Height = 13;
+const int SIV_Antenna_Width = 12;
+const uint8_t SIV_Antenna [] = {
   0x00, 0x1E, 0x62, 0x84, 0x08, 0x10, 0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x1F,
   0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00,
 };
-int SIV_Antenna_Height = 13;
-int SIV_Antenna_Width = 12;
 
 /*
     SIV_Antenna_LBand [12, 13]
@@ -157,12 +157,12 @@ int SIV_Antenna_Width = 12;
          ******
 */
 
-uint8_t SIV_Antenna_LBand [] = {
+const int SIV_Antenna_LBand_Height = 13;
+const int SIV_Antenna_LBand_Width = 12;
+const uint8_t SIV_Antenna_LBand [] = {
   0x00, 0x1E, 0x62, 0x84, 0x08, 0x14, 0x22, 0x50, 0x88, 0x40, 0x20, 0x00, 0x00, 0x10, 0x10, 0x1F,
   0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00,
 };
-int SIV_Antenna_LBand_Height = 13;
-int SIV_Antenna_LBand_Width = 12;
 
 /*
     Rover_Fusion [15, 9]
@@ -178,12 +178,12 @@ int SIV_Antenna_LBand_Width = 12;
           **       **
 */
 
-uint8_t Rover_Fusion [] = {
+const int Rover_Fusion_Height = 9;
+const int Rover_Fusion_Width = 15;
+const uint8_t Rover_Fusion [] = {
   0x3E, 0xC1, 0x21, 0x21, 0xC1, 0x7D, 0x55, 0x55, 0x45, 0x41, 0xC2, 0x24, 0x24, 0xC4, 0x3C, 0x00,
   0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
-int Rover_Fusion_Height = 9;
-int Rover_Fusion_Width = 15;
 
 /*
     Rover_Fusion_Empty [15, 9]
@@ -199,12 +199,12 @@ int Rover_Fusion_Width = 15;
           **       **
 */
 
-uint8_t Rover_Fusion_Empty [] = {
+const int Rover_Fusion_Empty_Height = 9;
+const int Rover_Fusion_Empty_Width = 15;
+const uint8_t Rover_Fusion_Empty [] = {
   0x3E, 0xC1, 0x21, 0x21, 0xC1, 0x41, 0x41, 0x41, 0x41, 0x41, 0xC2, 0x24, 0x24, 0xC4, 0x3C, 0x00,
   0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
-int Rover_Fusion_Empty_Height = 9;
-int Rover_Fusion_Empty_Width = 15;
 
 /*
     BaseTemporary [14, 12]
@@ -223,12 +223,12 @@ int Rover_Fusion_Empty_Width = 15;
 
 */
 
-uint8_t BaseTemporary [] = {
+const int BaseTemporary_Height = 12;
+const int BaseTemporary_Width = 14;
+const uint8_t BaseTemporary [] = {
   0x00, 0xFF, 0x99, 0x99, 0xE7, 0xCE, 0x32, 0x32, 0xE7, 0xE7, 0x99, 0x32, 0xFE, 0x00, 0x00, 0x1F,
   0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
 };
-int BaseTemporary_Height = 12;
-int BaseTemporary_Width = 14;
 
 /*
     BaseFixed [14, 12]
@@ -247,12 +247,12 @@ int BaseTemporary_Width = 14;
         ******  ******
 */
 
-uint8_t BaseFixed [] = {
+const int BaseFixed_Height = 12;
+const int BaseFixed_Width = 14;
+const uint8_t BaseFixed [] = {
   0x00, 0xFF, 0x01, 0x0F, 0x01, 0x8F, 0x88, 0x88, 0x8F, 0x01, 0x0F, 0x01, 0xFF, 0x00, 0x0E, 0x09,
   0x08, 0x08, 0x08, 0x0F, 0x00, 0x00, 0x0F, 0x08, 0x08, 0x08, 0x09, 0x0E,
 };
-int BaseFixed_Height = 12;
-int BaseFixed_Width = 14;
 
 /*
     Battery_3 [19, 12]
@@ -271,13 +271,13 @@ int BaseFixed_Width = 14;
         *****************
 */
 
-uint8_t Battery_3 [] = {
+const int Battery_3_Height = 12;
+const int Battery_3_Width = 19;
+const uint8_t Battery_3 [] = {
   0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01,
   0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B,
   0x0B, 0x0B, 0x08, 0x0F, 0x01, 0x01,
 };
-int Battery_3_Height = 12;
-int Battery_3_Width = 19;
 
 /*
     Battery_2 [19, 12]
@@ -296,13 +296,13 @@ int Battery_3_Width = 19;
         *****************
 */
 
-uint8_t Battery_2 [] = {
+const int Battery_2_Height = 12;
+const int Battery_2_Width = 19;
+const uint8_t Battery_2 [] = {
   0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
   0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08,
   0x08, 0x08, 0x08, 0x0F, 0x01, 0x01,
 };
-int Battery_2_Height = 12;
-int Battery_2_Width = 19;
 
 /*
     Battery_1 [19, 12]
@@ -321,13 +321,13 @@ int Battery_2_Width = 19;
         *****************
 */
 
-uint8_t Battery_1 [] = {
+const int Battery_1_Height = 12;
+const int Battery_1_Width = 19;
+const uint8_t Battery_1 [] = {
   0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
   0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
   0x08, 0x08, 0x08, 0x0F, 0x01, 0x01,
 };
-int Battery_1_Height = 12;
-int Battery_1_Width = 19;
 
 /*
     Battery_0 [19, 12]
@@ -346,13 +346,13 @@ int Battery_1_Width = 19;
         *****************
 */
 
-uint8_t Battery_0 [] = {
+const int Battery_0_Height = 12;
+const int Battery_0_Width = 19;
+const uint8_t Battery_0 [] = {
   0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
   0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
   0x08, 0x08, 0x08, 0x0F, 0x01, 0x01,
 };
-int Battery_0_Height = 12;
-int Battery_0_Width = 19;
 
 /*
     Logging_3 [9, 12]
@@ -371,12 +371,12 @@ int Battery_0_Width = 19;
         *********
 */
 
-uint8_t Logging_3 [] = {
+const int Logging_3_Height = 12;
+const int Logging_3_Width = 9;
+const uint8_t Logging_3 [] = {
   0xFF, 0x01, 0x51, 0x51, 0x51, 0x51, 0x53, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
   0x08, 0x0F,
 };
-int Logging_3_Height = 12;
-int Logging_3_Width = 9;
 
 /*
     Logging_2 [9, 12]
@@ -395,12 +395,12 @@ int Logging_3_Width = 9;
         *********
 */
 
-uint8_t Logging_2 [] = {
+const int Logging_2_Height = 12;
+const int Logging_2_Width = 9;
+const uint8_t Logging_2 [] = {
   0xFF, 0x01, 0x41, 0x41, 0x41, 0x41, 0x43, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
   0x08, 0x0F,
 };
-int Logging_2_Height = 12;
-int Logging_2_Width = 9;
 
 /*
     Logging_1 [9, 12]
@@ -419,12 +419,12 @@ int Logging_2_Width = 9;
         *********
 */
 
-uint8_t Logging_1 [] = {
+const int Logging_1_Height = 12;
+const int Logging_1_Width = 9;
+const uint8_t Logging_1 [] = {
   0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
   0x08, 0x0F,
 };
-int Logging_1_Height = 12;
-int Logging_1_Width = 9;
 
 /*
     Logging_0 [9, 12]
@@ -443,44 +443,43 @@ int Logging_1_Width = 9;
         *********
 */
 
-uint8_t Logging_0 [] = {
+const int Logging_0_Height = 12;
+const int Logging_0_Width = 9;
+const uint8_t Logging_0 [] = {
   0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
   0x08, 0x0F,
 };
 
-int Logging_0_Height = 12;
-int Logging_0_Width = 9;
-
-uint8_t Logging_PPP_3 [] = {
+const uint8_t Logging_PPP_3 [] = {
   0xFF, 0x01, 0xF9, 0x49, 0x49, 0x49, 0x33, 0x06, 0xFC, 0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08,
   0x08, 0x0F,
 };
-uint8_t Logging_PPP_2 [] = {
+const uint8_t Logging_PPP_2 [] = {
   0xFF, 0x01, 0xF9, 0x41, 0x41, 0x41, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08,
   0x08, 0x0F,
 };
-uint8_t Logging_PPP_1 [] = {
+const uint8_t Logging_PPP_1 [] = {
   0xFF, 0x01, 0xC1, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08,
   0x08, 0x0F,
 };
 
-uint8_t Logging_Custom_3 [] = {
+const uint8_t Logging_Custom_3 [] = {
   0xFF, 0x01, 0xF1, 0x09, 0x09, 0x09, 0x13, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09,
   0x08, 0x0F,
 };
-uint8_t Logging_Custom_2 [] = {
+const uint8_t Logging_Custom_2 [] = {
   0xFF, 0x01, 0xF1, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09,
   0x08, 0x0F,
 };
-uint8_t Logging_Custom_1 [] = {
+const uint8_t Logging_Custom_1 [] = {
   0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09,
   0x08, 0x0F,
 };
 
 
 
-int DynamicModel_Height = 12;
-int DynamicModel_Width = 15;
+const int DynamicModel_Height = 12;
+const int DynamicModel_Width = 15;
 
 /*
     DynamicModel_1_Portable [15, 12]
@@ -499,7 +498,7 @@ int DynamicModel_Width = 15;
             ******
 */
 
-uint8_t DynamicModel_1_Portable [] = {
+const uint8_t DynamicModel_1_Portable [] = {
   0x00, 0xF0, 0x00, 0xF8, 0x04, 0x34, 0x34, 0x37, 0x37, 0x04, 0xF8, 0x00, 0xF0, 0x00, 0x00, 0x00,
   0x03, 0x00, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x03, 0x00, 0x00,
 };
@@ -521,7 +520,7 @@ uint8_t DynamicModel_1_Portable [] = {
 
 */
 
-uint8_t DynamicModel_2_Stationary [] = {
+const uint8_t DynamicModel_2_Stationary [] = {
   0x00, 0x00, 0x00, 0x00, 0x82, 0xC6, 0x6E, 0xFE, 0x6E, 0xC6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x01, 0x03, 0x06, 0x04, 0x00,
 };
@@ -543,7 +542,7 @@ uint8_t DynamicModel_2_Stationary [] = {
 
 */
 
-uint8_t DynamicModel_3_Pedestrian [] = {
+const uint8_t DynamicModel_3_Pedestrian [] = {
   0x00, 0x00, 0x00, 0x00, 0x20, 0x32, 0x95, 0xF9, 0x95, 0x32, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x04, 0x06, 0x03, 0x01, 0x00, 0x01, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00,
 };
@@ -565,7 +564,7 @@ uint8_t DynamicModel_3_Pedestrian [] = {
 
 */
 
-uint8_t DynamicModel_4_Automotive [] = {
+const uint8_t DynamicModel_4_Automotive [] = {
   0x78, 0x84, 0x44, 0x44, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x88, 0x50, 0x50, 0x90, 0x70, 0x00,
   0x01, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x00,
 };
@@ -587,7 +586,7 @@ uint8_t DynamicModel_4_Automotive [] = {
 
 */
 
-uint8_t DynamicModel_5_Sea [] = {
+const uint8_t DynamicModel_5_Sea [] = {
   0x00, 0x60, 0xE0, 0x3C, 0x26, 0x3C, 0x20, 0x20, 0x20, 0xA0, 0xA0, 0x20, 0xE0, 0x60, 0x00, 0x00,
   0x00, 0x03, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x03, 0x00, 0x00,
 };
@@ -609,7 +608,7 @@ uint8_t DynamicModel_5_Sea [] = {
 
 */
 
-uint8_t DynamicModel_6_Airborne1g [] = {
+const uint8_t DynamicModel_6_Airborne1g [] = {
   0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x08, 0x88, 0x88, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00, 0x00,
   0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
 };
@@ -631,7 +630,7 @@ uint8_t DynamicModel_6_Airborne1g [] = {
 
 */
 
-uint8_t DynamicModel_7_Airborne2g [] = {
+const uint8_t DynamicModel_7_Airborne2g [] = {
   0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x08, 0x88, 0xA8, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00, 0x00,
   0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
 };
@@ -653,7 +652,7 @@ uint8_t DynamicModel_7_Airborne2g [] = {
 
 */
 
-uint8_t DynamicModel_8_Airborne4g [] = {
+const uint8_t DynamicModel_8_Airborne4g [] = {
   0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x28, 0x88, 0xA8, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00, 0x00,
   0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
 };
@@ -675,7 +674,7 @@ uint8_t DynamicModel_8_Airborne4g [] = {
               ***
 */
 
-uint8_t DynamicModel_9_Wrist [] = {
+const uint8_t DynamicModel_9_Wrist [] = {
   0x00, 0x00, 0x00, 0xE0, 0x10, 0x08, 0x4F, 0x4F, 0x4F, 0x08, 0x10, 0xE0, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x01, 0x02, 0x1E, 0x1E, 0x1E, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
 };
@@ -697,7 +696,7 @@ uint8_t DynamicModel_9_Wrist [] = {
 
 */
 
-uint8_t DynamicModel_10_Bike [] = {
+const uint8_t DynamicModel_10_Bike [] = {
   0x00, 0x80, 0x40, 0x50, 0x90, 0xB0, 0xC0, 0xC0, 0xC0, 0xA0, 0x98, 0x4C, 0x4C, 0x80, 0x00, 0x00,
   0x01, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x00,
 };
@@ -716,11 +715,11 @@ uint8_t DynamicModel_10_Bike [] = {
            **
 */
 
-uint8_t DownloadArrow [] = {
+const int DownloadArrow_Height = 9;
+const int DownloadArrow_Width = 8;
+const uint8_t DownloadArrow [] = {
   0x20, 0x60, 0xC0, 0xFF, 0xFF, 0xC0, 0x60, 0x20, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
 };
-int DownloadArrow_Height = 9;
-int DownloadArrow_Width = 8;
 
 /*
     UploadArrow [8, 9]
@@ -736,11 +735,11 @@ int DownloadArrow_Width = 8;
            **
 */
 
-uint8_t UploadArrow [] = {
+const int UploadArrow_Height = 9;
+const int UploadArrow_Width = 8;
+const uint8_t UploadArrow [] = {
   0x08, 0x0C, 0x06, 0xFF, 0xFF, 0x06, 0x0C, 0x08, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
 };
-int UploadArrow_Height = 9;
-int UploadArrow_Width = 8;
 
 /*
     logoSparkFun [64, 48]
@@ -800,7 +799,9 @@ int UploadArrow_Width = 8;
 */
 
 //SparkFun Electronics LOGO
-uint8_t logoSparkFun [] = {
+const int logoSparkFun_Height = 48;
+const int logoSparkFun_Width = 64;
+const uint8_t logoSparkFun [] = {
   // ROW0, BYTE0 to BYTE63
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF8, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -837,20 +838,18 @@ uint8_t logoSparkFun [] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-int logoSparkFun_Height = 48;
-int logoSparkFun_Width = 64;
 
-uint8_t ESPNOW_Symbol_3 [] = {
+const int ESPNOW_Symbol_Height = 13;
+const int ESPNOW_Symbol_Width = 8;
+const uint8_t ESPNOW_Symbol_3 [] = {
   0xE0, 0x40, 0x10, 0xE4, 0x09, 0xF2, 0x04, 0xF8, 0x00, 0x00, 0x01, 0x04, 0x12, 0x09, 0x04, 0x03
 };
-uint8_t ESPNOW_Symbol_2 [] = {
+const uint8_t ESPNOW_Symbol_2 [] = {
   0xE0, 0x40, 0x10, 0xE4, 0x08, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x02, 0x01, 0x00, 0x00
 };
-uint8_t ESPNOW_Symbol_1 [] = {
+const uint8_t ESPNOW_Symbol_1 [] = {
   0xE0, 0x40, 0x10, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-uint8_t ESPNOW_Symbol_0 [] = {
+const uint8_t ESPNOW_Symbol_0 [] = {
   0xE0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-int ESPNOW_Symbol_Height = 13;
-int ESPNOW_Symbol_Width = 8;

From dfc6ac853b8757101cacabdbf1d05ad806b674c2 Mon Sep 17 00:00:00 2001
From: Lee Leahy <lpleahyjr@gmail.com>
Date: Fri, 12 Aug 2022 15:24:36 -1000
Subject: [PATCH 2/2] Update the icon drawings

---
 Firmware/RTK_Surveyor/icons.h | 1286 +++++++++++++++++++++------------
 1 file changed, 828 insertions(+), 458 deletions(-)

diff --git a/Firmware/RTK_Surveyor/icons.h b/Firmware/RTK_Surveyor/icons.h
index 646a5a6cf..bc178b627 100644
--- a/Firmware/RTK_Surveyor/icons.h
+++ b/Firmware/RTK_Surveyor/icons.h
@@ -5,746 +5,1036 @@
 /*
     BT_Symbol [7, 14]
 
-
-           **
-           ***
-        *  * **
-        ** * **
-         *****
-          ***
-          ***
-         *****
-        ** * **
-        *  * **
-           ***
-           **
-
+             1234567
+            .-------.
+        0x01|   *   |
+        0x02|   **  |
+        0x04|   *** |
+        0x08|*  * **|
+        0x10|** * **|
+        0x20| ***** |
+        0x40|  ***  |
+        0x80|  ***  |
+        0x01| ***** |
+        0x02|** * **|
+        0x04|*  * **|
+        0x08|   *** |
+        0x10|   **  |
+        0x20|   *   |
+            '-------'
 */
 
 const int BT_Symbol_Height = 14;
 const int BT_Symbol_Width = 7;
 const uint8_t BT_Symbol [] = {
-  0x18, 0x30, 0xE0, 0xFF, 0xE6, 0x3C, 0x18, 0x06, 0x03, 0x01, 0x3F, 0x19, 0x0F, 0x06,
+  0x18, 0x30, 0xE0, 0xFF, 0xE6, 0x3C, 0x18,
+  0x06, 0x03, 0x01, 0x3F, 0x19, 0x0F, 0x06
 };
 
 /*
-    WiFi_Symbol [13, 9]
-
-           *******
-          *       *
-         *  *****  *
-        *  *     *  *
-          *  ***  *
-            *   *
-
-             ***
-
+    WiFi_Symbol_3 [13, 9]
+
+                      1   
+             1234567890123
+            .-------------.
+        0x01|   *******   |
+        0x02|  *       *  |
+        0x04| *  *****  * |
+        0x08|*  *     *  *|
+        0x10|  *  ***  *  |
+        0x20|    *   *    |
+        0x40|      *      |
+        0x80|     ***     |
+        0x01|      *      |
+            '-------------'
 */
 
 const int WiFi_Symbol_Height = 9;
 const int WiFi_Symbol_Width = 13;
 const uint8_t WiFi_Symbol_3 [] = {
-  0x08, 0x04, 0x12, 0x09, 0x25, 0x95, 0xD5, 0x95, 0x25, 0x09, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x08, 0x04, 0x12, 0x09, 0x25, 0x95, 0xD5, 0x95, 0x25, 0x09, 0x12, 0x04, 0x08,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+
+/*
+    WiFi_Symbol_2 [13, 9]
+
+                      1   
+             1234567890123
+            .-------------.
+        0x01|             |
+        0x02|             |
+        0x04|    *****    |
+        0x08|   *     *   |
+        0x10|  *  ***  *  |
+        0x20|    *   *    |
+        0x40|      *      |
+        0x80|     ***     |
+        0x01|      *      |
+            '-------------'
+*/
+
 const uint8_t WiFi_Symbol_2 [] = {
-  0x00, 0x00, 0x10, 0x08, 0x24, 0x94, 0xD4, 0x94, 0x24, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x10, 0x08, 0x24, 0x94, 0xD4, 0x94, 0x24, 0x08, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+
+/*
+    WiFi_Symbol_1 [13, 9]
+
+                      1   
+             1234567890123
+            .-------------.
+        0x01|             |
+        0x02|             |
+        0x04|             |
+        0x08|             |
+        0x10|     ***     |
+        0x20|    *   *    |
+        0x40|      *      |
+        0x80|     ***     |
+        0x01|      *      |
+            '-------------'
+*/
+
 const uint8_t WiFi_Symbol_1 [] = {
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x90, 0xD0, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x90, 0xD0, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+
+/*
+    WiFi_Symbol_0 [13, 9]
+
+                      1   
+             1234567890123
+            .-------------.
+        0x01|             |
+        0x02|             |
+        0x04|             |
+        0x08|             |
+        0x10|             |
+        0x20|             |
+        0x40|      *      |
+        0x80|     ***     |
+        0x01|      *      |
+            '-------------'
+*/
+
 const uint8_t WiFi_Symbol_0 [] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 /*
     CrossHair [15, 15]
 
-
-
-            *******
-           *   *   *
-          *    *    *
-          *    *    *
-          *    *    *
-        ******* *******
-          *    *    *
-          *    *    *
-          *    *    *
-           *   *   *
-            *******
-
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|       *       |
+        0x02|       *       |
+        0x04|    *******    |
+        0x08|   *   *   *   |
+        0x10|  *    *    *  |
+        0x20|  *    *    *  |
+        0x40|  *    *    *  |
+        0x80|******* *******|
+        0x01|  *    *    *  |
+        0x02|  *    *    *  |
+        0x04|  *    *    *  |
+        0x08|   *   *   *   |
+        0x10|    *******    |
+        0x20|       *       |
+        0x40|       *       |
+            '---------------'
 */
 
 const int CrossHair_Height = 15;
 const int CrossHair_Width = 15;
 const uint8_t CrossHair [] = {
-  0x80, 0x80, 0xF0, 0x88, 0x84, 0x84, 0x84, 0x7F, 0x84, 0x84, 0x84, 0x88, 0xF0, 0x80, 0x80, 0x00,
-  0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x7F, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00,
+  0x80, 0x80, 0xF0, 0x88, 0x84, 0x84, 0x84, 0x7F, 0x84, 0x84, 0x84, 0x88, 0xF0, 0x80, 0x80,
+  0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x7F, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00
 };
 
 /*
     CrossHairDual [15, 15]
 
-
-
-            *******
-           *   *   *
-          *  *****  *
-          * *  *  * *
-          * *  *  * *
-        ******* *******
-          * *  *  * *
-          * *  *  * *
-          *  *****  *
-           *   *   *
-            *******
-
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|       *       |
+        0x02|       *       |
+        0x04|    *******    |
+        0x08|   *   *   *   |
+        0x10|  *  *****  *  |
+        0x20|  * *  *  * *  |
+        0x40|  * *  *  * *  |
+        0x80|******* *******|
+        0x01|  * *  *  * *  |
+        0x02|  * *  *  * *  |
+        0x04|  *  *****  *  |
+        0x08|   *   *   *   |
+        0x10|    *******    |
+        0x20|       *       |
+        0x40|       *       |
+            '---------------'
 */
 
 const int CrossHairDual_Height = 15;
 const int CrossHairDual_Width = 15;
 const uint8_t CrossHairDual [] = {
-  0x80, 0x80, 0xF0, 0x88, 0xE4, 0x94, 0x94, 0x7F, 0x94, 0x94, 0xE4, 0x88, 0xF0, 0x80, 0x80, 0x00,
-  0x00, 0x07, 0x08, 0x13, 0x14, 0x14, 0x7F, 0x14, 0x14, 0x13, 0x08, 0x07, 0x00, 0x00,
+  0x80, 0x80, 0xF0, 0x88, 0xE4, 0x94, 0x94, 0x7F, 0x94, 0x94, 0xE4, 0x88, 0xF0, 0x80, 0x80,
+  0x00, 0x00, 0x07, 0x08, 0x13, 0x14, 0x14, 0x7F, 0x14, 0x14, 0x13, 0x08, 0x07, 0x00, 0x00
 };
 
 /*
     SIV_Antenna [12, 13]
 
-
-         **
-         * *
-         *  *   *
-         *   * *
-          *   *
-          *    *
-           *    *
-           **    *
-           ****   *
-           **  ****
-           **
-         ******
+                      1  
+             123456789012
+            .------------.
+        0x01|            |
+        0x02| **         |
+        0x04| * *        |
+        0x08| *  *   *   |
+        0x10| *   * *    |
+        0x20|  *   *     |
+        0x40|  *    *    |
+        0x80|   *    *   |
+        0x01|   **    *  |
+        0x02|   ****   * |
+        0x04|   **  **** |
+        0x08|   **       |
+        0x10| ******     |
+            '------------'
 */
 
 const int SIV_Antenna_Height = 13;
 const int SIV_Antenna_Width = 12;
 const uint8_t SIV_Antenna [] = {
-  0x00, 0x1E, 0x62, 0x84, 0x08, 0x10, 0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x1F,
-  0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00,
+  0x00, 0x1E, 0x62, 0x84, 0x08, 0x10, 0x20, 0x50, 0x88, 0x00, 0x00, 0x00,
+  0x00, 0x10, 0x10, 0x1F, 0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00
 };
 
 /*
     SIV_Antenna_LBand [12, 13]
 
-
-         **   *
-         * * *
-         *  *   *
-         *   * *
-          *   *   *
-          *    * *
-           *    *
-           **    *
-           ****   *
-           **  ****
-           **
-         ******
+                      1  
+             123456789012
+            .------------.
+        0x01|            |
+        0x02| **   *     |
+        0x04| * * *      |
+        0x08| *  *   *   |
+        0x10| *   * *    |
+        0x20|  *   *   * |
+        0x40|  *    * *  |
+        0x80|   *    *   |
+        0x01|   **    *  |
+        0x02|   ****   * |
+        0x04|   **  **** |
+        0x08|   **       |
+        0x10| ******     |
+            '------------'
 */
 
 const int SIV_Antenna_LBand_Height = 13;
 const int SIV_Antenna_LBand_Width = 12;
 const uint8_t SIV_Antenna_LBand [] = {
-  0x00, 0x1E, 0x62, 0x84, 0x08, 0x14, 0x22, 0x50, 0x88, 0x40, 0x20, 0x00, 0x00, 0x10, 0x10, 0x1F,
-  0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00,
+  0x00, 0x1E, 0x62, 0x84, 0x08, 0x14, 0x22, 0x50, 0x88, 0x40, 0x20, 0x00,
+  0x00, 0x10, 0x10, 0x1F, 0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00
 };
 
 /*
     Rover_Fusion [15, 9]
 
-         *********
-        *         *
-        *    ****  ****
-        *    *        *
-        *    ***      *
-        * ** *     ** *
-         *  *******  *
-         *  *     *  *
-          **       **
+                      1     
+             123456789012345
+            .---------------.
+        0x01| *********     |
+        0x02|*         *    |
+        0x04|*    ****  ****|
+        0x08|*    *        *|
+        0x10|*    ***      *|
+        0x20|* ** *     ** *|
+        0x40| *  *******  * |
+        0x80| *  *     *  * |
+        0x01|  **       **  |
+            '---------------'
 */
 
 const int Rover_Fusion_Height = 9;
 const int Rover_Fusion_Width = 15;
 const uint8_t Rover_Fusion [] = {
-  0x3E, 0xC1, 0x21, 0x21, 0xC1, 0x7D, 0x55, 0x55, 0x45, 0x41, 0xC2, 0x24, 0x24, 0xC4, 0x3C, 0x00,
-  0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+  0x3E, 0xC1, 0x21, 0x21, 0xC1, 0x7D, 0x55, 0x55, 0x45, 0x41, 0xC2, 0x24, 0x24, 0xC4, 0x3C,
+  0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
 };
 
 /*
     Rover_Fusion_Empty [15, 9]
 
-         *********
-        *         *
-        *          ****
-        *             *
-        *             *
-        * **       ** *
-         *  *******  *
-         *  *     *  *
-          **       **
+                      1     
+             123456789012345
+            .---------------.
+        0x01| *********     |
+        0x02|*         *    |
+        0x04|*          ****|
+        0x08|*             *|
+        0x10|*             *|
+        0x20|* **       ** *|
+        0x40| *  *******  * |
+        0x80| *  *     *  * |
+        0x01|  **       **  |
+            '---------------'
 */
 
 const int Rover_Fusion_Empty_Height = 9;
 const int Rover_Fusion_Empty_Width = 15;
 const uint8_t Rover_Fusion_Empty [] = {
-  0x3E, 0xC1, 0x21, 0x21, 0xC1, 0x41, 0x41, 0x41, 0x41, 0x41, 0xC2, 0x24, 0x24, 0xC4, 0x3C, 0x00,
-  0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+  0x3E, 0xC1, 0x21, 0x21, 0xC1, 0x41, 0x41, 0x41, 0x41, 0x41, 0xC2, 0x24, 0x24, 0xC4, 0x3C,
+  0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
 };
 
 /*
     BaseTemporary [14, 12]
 
-         ****   ***
-         *  ****** **
-         *  **  **  *
-         *** *    * *
-         ***  **  ***
-         *  * **** **
-         *  **  **  *
-         *****  *** *
-         *   ***   **
-
-
-
+                      1    
+             12345678901234
+            .--------------.
+        0x01| ****   ***   |
+        0x02| *  ****** ** |
+        0x04| *  **  **  * |
+        0x08| *** *    * * |
+        0x10| ***  **  *** |
+        0x20| *  * **** ** |
+        0x40| *  **  **  * |
+        0x80| *****  *** * |
+        0x01| *   ***   ** |
+        0x02| *            |
+        0x04| *            |
+        0x08| *            |
+            '--------------'
 */
 
 const int BaseTemporary_Height = 12;
 const int BaseTemporary_Width = 14;
 const uint8_t BaseTemporary [] = {
-  0x00, 0xFF, 0x99, 0x99, 0xE7, 0xCE, 0x32, 0x32, 0xE7, 0xE7, 0x99, 0x32, 0xFE, 0x00, 0x00, 0x1F,
-  0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
+  0x00, 0xFF, 0x99, 0x99, 0xE7, 0xCE, 0x32, 0x32, 0xE7, 0xE7, 0x99, 0x32, 0xFE, 0x00,
+  0x00, 0x1F, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00
 };
 
 /*
     BaseFixed [14, 12]
 
-         *****  *****
-         * * *  * * *
-         * * *  * * *
-         * * **** * *
-         *          *
-         *          *
-         *          *
-         *   ****   *
-         *   *  *   *
-        *    *  *    *
-        *    *  *    *
-        ******  ******
+                      1    
+             12345678901234
+            .--------------.
+        0x01| *****  ***** |
+        0x02| * * *  * * * |
+        0x04| * * *  * * * |
+        0x08| * * **** * * |
+        0x10| *          * |
+        0x20| *          * |
+        0x40| *          * |
+        0x80| *   ****   * |
+        0x01| *   *  *   * |
+        0x02|*    *  *    *|
+        0x04|*    *  *    *|
+        0x08|******  ******|
+            '--------------'
 */
 
 const int BaseFixed_Height = 12;
 const int BaseFixed_Width = 14;
 const uint8_t BaseFixed [] = {
-  0x00, 0xFF, 0x01, 0x0F, 0x01, 0x8F, 0x88, 0x88, 0x8F, 0x01, 0x0F, 0x01, 0xFF, 0x00, 0x0E, 0x09,
-  0x08, 0x08, 0x08, 0x0F, 0x00, 0x00, 0x0F, 0x08, 0x08, 0x08, 0x09, 0x0E,
+  0x00, 0xFF, 0x01, 0x0F, 0x01, 0x8F, 0x88, 0x88, 0x8F, 0x01, 0x0F, 0x01, 0xFF, 0x00,
+  0x0E, 0x09, 0x08, 0x08, 0x08, 0x0F, 0x00, 0x00, 0x0F, 0x08, 0x08, 0x08, 0x09, 0x0E
 };
 
 /*
     Battery_3 [19, 12]
 
-        *****************
-        *               *
-        * ***  ***  *** *
-        * ***  ***  *** ***
-        * ***  ***  ***   *
-        * ***  ***  ***   *
-        * ***  ***  ***   *
-        * ***  ***  ***   *
-        * ***  ***  *** ***
-        * ***  ***  *** *
-        *               *
-        *****************
+                      1         
+             1234567890123456789
+            .-------------------.
+        0x01|*****************  |
+        0x02|*               *  |
+        0x04|* ***  ***  *** *  |
+        0x08|* ***  ***  *** ***|
+        0x10|* ***  ***  ***   *|
+        0x20|* ***  ***  ***   *|
+        0x40|* ***  ***  ***   *|
+        0x80|* ***  ***  ***   *|
+        0x01|* ***  ***  *** ***|
+        0x02|* ***  ***  *** *  |
+        0x04|*               *  |
+        0x08|*****************  |
+            '-------------------'
 */
 
 const int Battery_3_Height = 12;
 const int Battery_3_Width = 19;
 const uint8_t Battery_3 [] = {
-  0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01,
-  0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B,
-  0x0B, 0x0B, 0x08, 0x0F, 0x01, 0x01,
+  0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x0F, 0x08, 0xF8,
+  0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x0F, 0x01, 0x01
 };
 
 /*
     Battery_2 [19, 12]
 
-        *****************
-        *               *
-        * ***  ***      *
-        * ***  ***      ***
-        * ***  ***        *
-        * ***  ***        *
-        * ***  ***        *
-        * ***  ***        *
-        * ***  ***      ***
-        * ***  ***      *
-        *               *
-        *****************
+                      1         
+             1234567890123456789
+            .-------------------.
+        0x01|*****************  |
+        0x02|*               *  |
+        0x04|* ***  ***      *  |
+        0x08|* ***  ***      ***|
+        0x10|* ***  ***        *|
+        0x20|* ***  ***        *|
+        0x40|* ***  ***        *|
+        0x80|* ***  ***        *|
+        0x01|* ***  ***      ***|
+        0x02|* ***  ***      *  |
+        0x04|*               *  |
+        0x08|*****************  |
+            '-------------------'
 */
 
 const int Battery_2_Height = 12;
 const int Battery_2_Width = 19;
 const uint8_t Battery_2 [] = {
-  0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-  0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x0F, 0x01, 0x01,
+  0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F, 0x08, 0xF8,
+  0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F, 0x01, 0x01
 };
 
 /*
     Battery_1 [19, 12]
 
-        *****************
-        *               *
-        * ***           *
-        * ***           ***
-        * ***             *
-        * ***             *
-        * ***             *
-        * ***             *
-        * ***           ***
-        * ***           *
-        *               *
-        *****************
+                      1         
+             1234567890123456789
+            .-------------------.
+        0x01|*****************  |
+        0x02|*               *  |
+        0x04|* ***           *  |
+        0x08|* ***           ***|
+        0x10|* ***             *|
+        0x20|* ***             *|
+        0x40|* ***             *|
+        0x80|* ***             *|
+        0x01|* ***           ***|
+        0x02|* ***           *  |
+        0x04|*               *  |
+        0x08|*****************  |
+            '-------------------'
 */
 
 const int Battery_1_Height = 12;
 const int Battery_1_Width = 19;
 const uint8_t Battery_1 [] = {
-  0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-  0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x0F, 0x01, 0x01,
+  0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F, 0x08, 0xF8,
+  0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F, 0x01, 0x01
 };
 
 /*
     Battery_0 [19, 12]
 
-        *****************
-        *               *
-        *               *
-        *               ***
-        *                 *
-        *                 *
-        *                 *
-        *                 *
-        *               ***
-        *               *
-        *               *
-        *****************
+                      1         
+             1234567890123456789
+            .-------------------.
+        0x01|*****************  |
+        0x02|*               *  |
+        0x04|*               *  |
+        0x08|*               ***|
+        0x10|*                 *|
+        0x20|*                 *|
+        0x40|*                 *|
+        0x80|*                 *|
+        0x01|*               ***|
+        0x02|*               *  |
+        0x04|*               *  |
+        0x08|*****************  |
+            '-------------------'
 */
 
 const int Battery_0_Height = 12;
 const int Battery_0_Width = 19;
 const uint8_t Battery_0 [] = {
-  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-  0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x0F, 0x01, 0x01,
+  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F, 0x08, 0xF8,
+  0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F, 0x01, 0x01
 };
 
 /*
     Logging_3 [9, 12]
 
-        *******
-        *     **
-        *      **
-        *       *
-        * ***** *
-        *       *
-        * ***** *
-        *       *
-        * ***** *
-        *       *
-        *       *
-        *********
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|* ***** *|
+        0x20|*       *|
+        0x40|* ***** *|
+        0x80|*       *|
+        0x01|* ***** *|
+        0x02|*       *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
 */
 
 const int Logging_3_Height = 12;
 const int Logging_3_Width = 9;
 const uint8_t Logging_3 [] = {
-  0xFF, 0x01, 0x51, 0x51, 0x51, 0x51, 0x53, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
-  0x08, 0x0F,
+  0xFF, 0x01, 0x51, 0x51, 0x51, 0x51, 0x53, 0x06, 0xFC,
+  0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x0F
 };
 
 /*
     Logging_2 [9, 12]
 
-        *******
-        *     **
-        *      **
-        *       *
-        *       *
-        *       *
-        * ***** *
-        *       *
-        * ***** *
-        *       *
-        *       *
-        *********
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|*       *|
+        0x20|*       *|
+        0x40|* ***** *|
+        0x80|*       *|
+        0x01|* ***** *|
+        0x02|*       *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
 */
 
 const int Logging_2_Height = 12;
 const int Logging_2_Width = 9;
 const uint8_t Logging_2 [] = {
-  0xFF, 0x01, 0x41, 0x41, 0x41, 0x41, 0x43, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
-  0x08, 0x0F,
+  0xFF, 0x01, 0x41, 0x41, 0x41, 0x41, 0x43, 0x06, 0xFC,
+  0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x0F
 };
 
 /*
     Logging_1 [9, 12]
 
-        *******
-        *     **
-        *      **
-        *       *
-        *       *
-        *       *
-        *       *
-        *       *
-        * ***** *
-        *       *
-        *       *
-        *********
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|*       *|
+        0x20|*       *|
+        0x40|*       *|
+        0x80|*       *|
+        0x01|* ***** *|
+        0x02|*       *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
 */
 
 const int Logging_1_Height = 12;
 const int Logging_1_Width = 9;
 const uint8_t Logging_1 [] = {
-  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
-  0x08, 0x0F,
+  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC,
+  0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x0F
 };
 
 /*
     Logging_0 [9, 12]
 
-        *******
-        *     **
-        *      **
-        *       *
-        *       *
-        *       *
-        *       *
-        *       *
-        *       *
-        *       *
-        *       *
-        *********
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|*       *|
+        0x20|*       *|
+        0x40|*       *|
+        0x80|*       *|
+        0x01|*       *|
+        0x02|*       *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
 */
 
 const int Logging_0_Height = 12;
 const int Logging_0_Width = 9;
 const uint8_t Logging_0 [] = {
-  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x0F,
+  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC,
+  0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F
 };
 
+/*
+    Logging_PPP_3 [9, 12]
+
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|* ****  *|
+        0x10|* *   * *|
+        0x20|* *   * *|
+        0x40|* ****  *|
+        0x80|* *     *|
+        0x01|* *     *|
+        0x02|* *     *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
+*/
+
 const uint8_t Logging_PPP_3 [] = {
-  0xFF, 0x01, 0xF9, 0x49, 0x49, 0x49, 0x33, 0x06, 0xFC, 0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x0F,
+  0xFF, 0x01, 0xF9, 0x49, 0x49, 0x49, 0x33, 0x06, 0xFC,
+  0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F
 };
+
+/*
+    Logging_PPP_2 [9, 12]
+
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|* *     *|
+        0x10|* *     *|
+        0x20|* *     *|
+        0x40|* ****  *|
+        0x80|* *     *|
+        0x01|* *     *|
+        0x02|* *     *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
+*/
+
 const uint8_t Logging_PPP_2 [] = {
-  0xFF, 0x01, 0xF9, 0x41, 0x41, 0x41, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x0F,
+  0xFF, 0x01, 0xF9, 0x41, 0x41, 0x41, 0x03, 0x06, 0xFC,
+  0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F
 };
+
+/*
+    Logging_PPP_1 [9, 12]
+
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|*       *|
+        0x20|*       *|
+        0x40|* *     *|
+        0x80|* *     *|
+        0x01|* *     *|
+        0x02|* *     *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
+*/
+
 const uint8_t Logging_PPP_1 [] = {
-  0xFF, 0x01, 0xC1, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x0F,
+  0xFF, 0x01, 0xC1, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC,
+  0x0F, 0x08, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F
 };
 
+/*
+    Logging_Custom_3 [9, 12]
+
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*  ***  *|
+        0x10|* *   * *|
+        0x20|* *     *|
+        0x40|* *     *|
+        0x80|* *     *|
+        0x01|* *   * *|
+        0x02|*  ***  *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
+*/
+
 const uint8_t Logging_Custom_3 [] = {
-  0xFF, 0x01, 0xF1, 0x09, 0x09, 0x09, 0x13, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09,
-  0x08, 0x0F,
+  0xFF, 0x01, 0xF1, 0x09, 0x09, 0x09, 0x13, 0x06, 0xFC,
+  0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09, 0x08, 0x0F
 };
+
+/*
+    Logging_Custom_2 [9, 12]
+
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|* *     *|
+        0x20|* *     *|
+        0x40|* *     *|
+        0x80|* *     *|
+        0x01|* *   * *|
+        0x02|*  ***  *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
+*/
+
 const uint8_t Logging_Custom_2 [] = {
-  0xFF, 0x01, 0xF1, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09,
-  0x08, 0x0F,
-};
-const uint8_t Logging_Custom_1 [] = {
-  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09,
-  0x08, 0x0F,
+  0xFF, 0x01, 0xF1, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC,
+  0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09, 0x08, 0x0F
 };
 
+/*
+    Logging_Custom_1 [9, 12]
+
+             123456789
+            .---------.
+        0x01|*******  |
+        0x02|*     ** |
+        0x04|*      **|
+        0x08|*       *|
+        0x10|*       *|
+        0x20|*       *|
+        0x40|*       *|
+        0x80|*       *|
+        0x01|* *   * *|
+        0x02|*  ***  *|
+        0x04|*       *|
+        0x08|*********|
+            '---------'
+*/
 
-
-const int DynamicModel_Height = 12;
-const int DynamicModel_Width = 15;
+const uint8_t Logging_Custom_1 [] = {
+  0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0xFC,
+  0x0F, 0x08, 0x09, 0x0A, 0x0A, 0x0A, 0x09, 0x08, 0x0F
+};
 
 /*
     DynamicModel_1_Portable [15, 12]
 
-               **
-               **
-            ******
-           *      *
-         * * **** * *
-         * * **** * *
-         * *      * *
-         * *      * *
-         * *      * *
-         * *      * *
-           *      *
-            ******
+                      1     
+             123456789012345
+            .---------------.
+        0x01|       **      |
+        0x02|       **      |
+        0x04|    ******     |
+        0x08|   *      *    |
+        0x10| * * **** * *  |
+        0x20| * * **** * *  |
+        0x40| * *      * *  |
+        0x80| * *      * *  |
+        0x01| * *      * *  |
+        0x02| * *      * *  |
+        0x04|   *      *    |
+        0x08|    ******     |
+            '---------------'
 */
 
+const int DynamicModel_Height = 12;
+const int DynamicModel_Width = 15;
 const uint8_t DynamicModel_1_Portable [] = {
-  0x00, 0xF0, 0x00, 0xF8, 0x04, 0x34, 0x34, 0x37, 0x37, 0x04, 0xF8, 0x00, 0xF0, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x03, 0x00, 0x00,
+  0x00, 0xF0, 0x00, 0xF8, 0x04, 0x34, 0x34, 0x37, 0x37, 0x04, 0xF8, 0x00, 0xF0, 0x00, 0x00,
+  0x00, 0x03, 0x00, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x03, 0x00, 0x00
 };
 
 /*
     DynamicModel_2_Stationary [15, 12]
 
-
-            *******
-             *****
-              ***
-
-              ***
-             *****
-            ** * **
-           **  *  **
-          **   *   **
-         **    *    **
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02|    *******    |
+        0x04|     *****     |
+        0x08|      ***      |
+        0x10|       *       |
+        0x20|      ***      |
+        0x40|     *****     |
+        0x80|    ** * **    |
+        0x01|   **  *  **   |
+        0x02|  **   *   **  |
+        0x04| **    *    ** |
+        0x08|               |
+            '---------------'
 */
 
 const uint8_t DynamicModel_2_Stationary [] = {
-  0x00, 0x00, 0x00, 0x00, 0x82, 0xC6, 0x6E, 0xFE, 0x6E, 0xC6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x01, 0x03, 0x06, 0x04, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x82, 0xC6, 0x6E, 0xFE, 0x6E, 0xC6, 0x82, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x01, 0x03, 0x06, 0x04, 0x00
 };
 
 /*
     DynamicModel_3_Pedestrian [15, 12]
 
-              ***
-             *   *
-              * *
-
-             *****
-            ** * **
-               *  *
-              ***
-             ** **
-            **   *
-           **    **
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|      ***      |
+        0x02|     *   *     |
+        0x04|      * *      |
+        0x08|       *       |
+        0x10|     *****     |
+        0x20|    ** * **    |
+        0x40|       *  *    |
+        0x80|      ***      |
+        0x01|     ** **     |
+        0x02|    **   *     |
+        0x04|   **    **    |
+        0x08|               |
+            '---------------'
 */
 
 const uint8_t DynamicModel_3_Pedestrian [] = {
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x32, 0x95, 0xF9, 0x95, 0x32, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x04, 0x06, 0x03, 0x01, 0x00, 0x01, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x32, 0x95, 0xF9, 0x95, 0x32, 0x60, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x04, 0x06, 0x03, 0x01, 0x00, 0x01, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00
 };
 
 /*
     DynamicModel_4_Automotive [15, 12]
 
-
-
-         *********
-        *         *
-        *          ****
-        *             *
-        * **       ** *
-         *  *******  *
-         *  *     *  *
-          **       **
-
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02|               |
+        0x04| *********     |
+        0x08|*         *    |
+        0x10|*          ****|
+        0x20|*             *|
+        0x40|* **       ** *|
+        0x80| *  *******  * |
+        0x01| *  *     *  * |
+        0x02|  **       **  |
+        0x04|               |
+        0x08|               |
+            '---------------'
 */
 
 const uint8_t DynamicModel_4_Automotive [] = {
-  0x78, 0x84, 0x44, 0x44, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x88, 0x50, 0x50, 0x90, 0x70, 0x00,
-  0x01, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x00,
+  0x78, 0x84, 0x44, 0x44, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x88, 0x50, 0x50, 0x90, 0x70,
+  0x00, 0x01, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x00
 };
 
 /*
     DynamicModel_5_Sea [15, 12]
 
-
-
-           ***
-           * *
-           * *
-         *************
-         **         **
-          *      ** *
-          *         *
-          **       **
-           *********
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02|    *          |
+        0x04|   ***         |
+        0x08|   * *         |
+        0x10|   * *         |
+        0x20| ************* |
+        0x40| **         ** |
+        0x80|  *      ** *  |
+        0x01|  *         *  |
+        0x02|  **       **  |
+        0x04|   *********   |
+        0x08|               |
+            '---------------'
 */
 
 const uint8_t DynamicModel_5_Sea [] = {
-  0x00, 0x60, 0xE0, 0x3C, 0x26, 0x3C, 0x20, 0x20, 0x20, 0xA0, 0xA0, 0x20, 0xE0, 0x60, 0x00, 0x00,
-  0x00, 0x03, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x03, 0x00, 0x00,
+  0x00, 0x60, 0xE0, 0x3C, 0x26, 0x3C, 0x20, 0x20, 0x20, 0xA0, 0xA0, 0x20, 0xE0, 0x60, 0x00,
+  0x00, 0x00, 0x03, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x03, 0x00, 0x00
 };
 
 /*
     DynamicModel_6_Airborne1g [15, 12]
 
-
-
-         **
-         ***********
-         * *       **
-         * *     *  **
-         * *         *
-         * *  ***   **
-         ****** *****
-              * *
-              * *
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02| *             |
+        0x04| **            |
+        0x08| ***********   |
+        0x10| * *       **  |
+        0x20| * *     *  ** |
+        0x40| * *         * |
+        0x80| * *  ***   ** |
+        0x01| ****** *****  |
+        0x02|      * *      |
+        0x04|      * *      |
+        0x08|       *       |
+            '---------------'
 */
 
 const uint8_t DynamicModel_6_Airborne1g [] = {
-  0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x08, 0x88, 0x88, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00, 0x00,
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+  0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x08, 0x88, 0x88, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00,
+  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
 };
 
 /*
     DynamicModel_7_Airborne2g [15, 12]
 
-
-
-         **
-         ***********
-         * *       **
-         * *   * *  **
-         * *         *
-         * *  ***   **
-         ****** *****
-              * *
-              * *
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02| *             |
+        0x04| **            |
+        0x08| ***********   |
+        0x10| * *       **  |
+        0x20| * *   * *  ** |
+        0x40| * *         * |
+        0x80| * *  ***   ** |
+        0x01| ****** *****  |
+        0x02|      * *      |
+        0x04|      * *      |
+        0x08|       *       |
+            '---------------'
 */
 
 const uint8_t DynamicModel_7_Airborne2g [] = {
-  0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x08, 0x88, 0xA8, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00, 0x00,
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+  0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x08, 0x88, 0xA8, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00,
+  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
 };
 
 /*
     DynamicModel_8_Airborne4g [15, 12]
 
-
-
-         **
-         ***********
-         * *       **
-         * * * * *  **
-         * *         *
-         * *  ***   **
-         ****** *****
-              * *
-              * *
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02| *             |
+        0x04| **            |
+        0x08| ***********   |
+        0x10| * *       **  |
+        0x20| * * * * *  ** |
+        0x40| * *         * |
+        0x80| * *  ***   ** |
+        0x01| ****** *****  |
+        0x02|      * *      |
+        0x04|      * *      |
+        0x08|       *       |
+            '---------------'
 */
 
 const uint8_t DynamicModel_8_Airborne4g [] = {
-  0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x28, 0x88, 0xA8, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00, 0x00,
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+  0x00, 0xFE, 0x0C, 0xF8, 0x08, 0x28, 0x88, 0xA8, 0x88, 0x28, 0x08, 0x18, 0xB0, 0xE0, 0x00,
+  0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x08, 0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
 };
 
 /*
     DynamicModel_9_Wrist [15, 12]
 
-              ***
-              ***
-              ***
-             *****
-            *     *
-           *       *
-           *  ***  *
-           *       *
-            *     *
-             *****
-              ***
-              ***
+                      1     
+             123456789012345
+            .---------------.
+        0x01|      ***      |
+        0x02|      ***      |
+        0x04|      ***      |
+        0x08|     *****     |
+        0x10|    *     *    |
+        0x20|   *       *   |
+        0x40|   *  ***  *   |
+        0x80|   *       *   |
+        0x01|    *     *    |
+        0x02|     *****     |
+        0x04|      ***      |
+        0x08|      ***      |
+            '---------------'
 */
 
 const uint8_t DynamicModel_9_Wrist [] = {
-  0x00, 0x00, 0x00, 0xE0, 0x10, 0x08, 0x4F, 0x4F, 0x4F, 0x08, 0x10, 0xE0, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x01, 0x02, 0x1E, 0x1E, 0x1E, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0xE0, 0x10, 0x08, 0x4F, 0x4F, 0x4F, 0x08, 0x10, 0xE0, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x1E, 0x1E, 0x1E, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
 };
 
 /*
     DynamicModel_10_Bike [15, 12]
 
-
-
-                   **
-                  ***
-           ***    *
-             *   *
-          **  ***  **
-         *  *******  *
-         *  *     *  *
-          **       **
-
-
+                      1     
+             123456789012345
+            .---------------.
+        0x01|               |
+        0x02|               |
+        0x04|           **  |
+        0x08|          ***  |
+        0x10|   ***    *    |
+        0x20|     *   *     |
+        0x40|  **  ***  **  |
+        0x80| *  *******  * |
+        0x01| *  *     *  * |
+        0x02|  **       **  |
+        0x04|               |
+        0x08|               |
+            '---------------'
 */
 
 const uint8_t DynamicModel_10_Bike [] = {
-  0x00, 0x80, 0x40, 0x50, 0x90, 0xB0, 0xC0, 0xC0, 0xC0, 0xA0, 0x98, 0x4C, 0x4C, 0x80, 0x00, 0x00,
-  0x01, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x00,
+  0x00, 0x80, 0x40, 0x50, 0x90, 0xB0, 0xC0, 0xC0, 0xC0, 0xA0, 0x98, 0x4C, 0x4C, 0x80, 0x00,
+  0x00, 0x01, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x00
 };
 
 /*
     DownloadArrow [8, 9]
 
-           **
-           **
-           **
-           **
-           **
-        ** ** **
-         ******
-          ****
-           **
+             12345678
+            .--------.
+        0x01|   **   |
+        0x02|   **   |
+        0x04|   **   |
+        0x08|   **   |
+        0x10|   **   |
+        0x20|** ** **|
+        0x40| ****** |
+        0x80|  ****  |
+        0x01|   **   |
+            '--------'
 */
 
 const int DownloadArrow_Height = 9;
 const int DownloadArrow_Width = 8;
 const uint8_t DownloadArrow [] = {
-  0x20, 0x60, 0xC0, 0xFF, 0xFF, 0xC0, 0x60, 0x20, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
+  0x20, 0x60, 0xC0, 0xFF, 0xFF, 0xC0, 0x60, 0x20,
+  0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
 };
 
 /*
     UploadArrow [8, 9]
 
-           **
-          ****
-         ******
-        ** ** **
-           **
-           **
-           **
-           **
-           **
+             12345678
+            .--------.
+        0x01|   **   |
+        0x02|  ****  |
+        0x04| ****** |
+        0x08|** ** **|
+        0x10|   **   |
+        0x20|   **   |
+        0x40|   **   |
+        0x80|   **   |
+        0x01|   **   |
+            '--------'
 */
 
 const int UploadArrow_Height = 9;
 const int UploadArrow_Width = 8;
 const uint8_t UploadArrow [] = {
-  0x08, 0x0C, 0x06, 0xFF, 0xFF, 0x06, 0x0C, 0x08, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
+  0x08, 0x0C, 0x06, 0xFF, 0xFF, 0x06, 0x0C, 0x08,
+  0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00
 };
 
 /*
     logoSparkFun [64, 48]
 
-                      1         2         3         4         5         6
+                      1         2         3         4         5         6    
              1234567890123456789012345678901234567890123456789012345678901234
             .----------------------------------------------------------------.
         0x01|                            **********                          |
@@ -798,58 +1088,138 @@ const uint8_t UploadArrow [] = {
             '----------------------------------------------------------------'
 */
 
-//SparkFun Electronics LOGO
 const int logoSparkFun_Height = 48;
 const int logoSparkFun_Width = 64;
 const uint8_t logoSparkFun [] = {
-  // ROW0, BYTE0 to BYTE63
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF8, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
   0xFF, 0xFF, 0xFF, 0x0F, 0x07, 0x07, 0x06, 0x06, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-  // ROW1, BYTE64 to BYTE127
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0x07, 0x0F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE, 0xFC, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFC, 0xF8, 0xE0,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-  // ROW2, BYTE128 to BYTE191
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
   0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xF0, 0xFD, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-  // ROW3, BYTE192 to BYTE255
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x1F, 0x07, 0x01,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-  // ROW4, BYTE256 to BYTE319
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F,
   0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-  // ROW5, BYTE320 to BYTE383
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
   0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
+/*
+    ESPNOW_Symbol_3 [8, 13]
+
+             12345678
+            .--------.
+        0x01|    *   |
+        0x02|     *  |
+        0x04|   *  * |
+        0x08|    *  *|
+        0x10|  *  * *|
+        0x20|*  * * *|
+        0x40|** * * *|
+        0x80|*  * * *|
+        0x01|  *  * *|
+        0x02|    *  *|
+        0x04|   *  * |
+        0x08|     *  |
+        0x10|    *   |
+            '--------'
+*/
+
 const int ESPNOW_Symbol_Height = 13;
 const int ESPNOW_Symbol_Width = 8;
 const uint8_t ESPNOW_Symbol_3 [] = {
-  0xE0, 0x40, 0x10, 0xE4, 0x09, 0xF2, 0x04, 0xF8, 0x00, 0x00, 0x01, 0x04, 0x12, 0x09, 0x04, 0x03
+  0xE0, 0x40, 0x10, 0xE4, 0x09, 0xF2, 0x04, 0xF8,
+  0x00, 0x00, 0x01, 0x04, 0x12, 0x09, 0x04, 0x03
 };
+
+/*
+    ESPNOW_Symbol_2 [8, 13]
+
+             12345678
+            .--------.
+        0x01|        |
+        0x02|        |
+        0x04|   *    |
+        0x08|    *   |
+        0x10|  *  *  |
+        0x20|*  * *  |
+        0x40|** * *  |
+        0x80|*  * *  |
+        0x01|  *  *  |
+        0x02|    *   |
+        0x04|   *    |
+        0x08|        |
+        0x10|        |
+            '--------'
+*/
+
 const uint8_t ESPNOW_Symbol_2 [] = {
-  0xE0, 0x40, 0x10, 0xE4, 0x08, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x02, 0x01, 0x00, 0x00
+  0xE0, 0x40, 0x10, 0xE4, 0x08, 0xF0, 0x00, 0x00,
+  0x00, 0x00, 0x01, 0x04, 0x02, 0x01, 0x00, 0x00
 };
+
+/*
+    ESPNOW_Symbol_1 [8, 13]
+
+             12345678
+            .--------.
+        0x01|        |
+        0x02|        |
+        0x04|        |
+        0x08|        |
+        0x10|  *     |
+        0x20|*  *    |
+        0x40|** *    |
+        0x80|*  *    |
+        0x01|  *     |
+        0x02|        |
+        0x04|        |
+        0x08|        |
+        0x10|        |
+            '--------'
+*/
+
 const uint8_t ESPNOW_Symbol_1 [] = {
-  0xE0, 0x40, 0x10, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+  0xE0, 0x40, 0x10, 0xE0, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+
+/*
+    ESPNOW_Symbol_0 [8, 13]
+
+             12345678
+            .--------.
+        0x01|        |
+        0x02|        |
+        0x04|        |
+        0x08|        |
+        0x10|        |
+        0x20|*       |
+        0x40|**      |
+        0x80|*       |
+        0x01|        |
+        0x02|        |
+        0x04|        |
+        0x08|        |
+        0x10|        |
+            '--------'
+*/
+
 const uint8_t ESPNOW_Symbol_0 [] = {
-  0xE0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+  0xE0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+