From cc3988be24cd0f9e780f2b91f40fafb3f3b421fa Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Wed, 22 Dec 2021 03:44:36 +0100
Subject: [PATCH] maybe this time

---
 source/Core/Drivers/Font.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h
index 0da135f5..f256caa4 100644
--- a/source/Core/Drivers/Font.h
+++ b/source/Core/Drivers/Font.h
@@ -124,28 +124,28 @@ const uint8_t WarningBlock24[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x0C, 0x02, 0xF1, 0xF1, 0xF1, 0x02, 0x0C, 0x30, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0xC0, 0xB0, 0x8C, 0x83, 0x80, 0x80, 0x80, 0x80, 0xB3, 0xB3, 0xB3, 0x80, 0x80, 0x80, 0x80, 0x83, 0x8C, 0xB0, 0xC0, 0x00, 0x00};
 
-#if defined(MODEL_TS100) + defined(MODEL_Pinecil) > 1
+#if defined(MODEL_TS100) + defined(MODEL_Pinecil) >= 1
 const uint8_t idleScreenBG[] = {
     // width = 84
     // height = 16
     0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0xbd, 0x81, 0x01, 0x01, 0xfd, 0x01, 0x01, 0x71, 0x55, 0x71,
     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x31, 0x49, 0x81, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x31, 0x49, 0x81, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83, 0xba, 0x83, 0x80, 0x8e, 0xaa, 0x8e, 0x80, 0x80, 0xbf, 0x80,
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x44, 0x4c, 0x94, 0x8c, 0x94, 0x8c, 0x9c, 0x80,
-    0x9c, 0x8a, 0xa6, 0x8a, 0xa6, 0x8e, 0xa6, 0x8e, 0xae, 0x9c, 0x80, 0x9d, 0x8c, 0x94, 0x88, 0x8a, 0x89, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00};
+    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x22, 0x4a, 0x46, 0x8a, 0xa6, 0x8a, 0xa6, 0x8a, 0xa6,
+    0x8a, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xbe, 0x80, 0xae, 0x94, 0x8c, 0x94, 0x88, 0x8a, 0x89, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00};
 const uint8_t disconnectedTipIcon[] = {
     //
     // 41 x 16
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0xc0, 0x40, 0x80, 0x00, 0x8c, 0x9c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x20, 0x70,
-    0x38, 0x9c, 0x8c, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0x40, 0xe0, 0x60, 0xe0, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x00, 0x03, 0x05, 0x01, 0x04, 0x01, 0x04, 0x01,
-    0x04, 0x01, 0x03, 0x00, 0x33, 0x39, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x38, 0x33, 0x00, 0x03, 0x02, 0x01, 0x04, 0x01, 0x0a, 0x01, 0x0f, 0x00};
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0x9c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x20, 0x70, 0x38, 0x9c, 0x4c, 0xc0, 0x40, 0xc0,
+    0x40, 0xc0, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x60, 0xe0, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x05, 0x00, 0x07, 0x01, 0x04, 0x01, 0x30, 0x39,
+    0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x38, 0x31, 0x04, 0x01, 0x04, 0x01, 0x07, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x09, 0x0f, 0x00};
 const uint8_t disconnectedTipIconFlip[] = {
     //
     // 41 x 16
-    0x00, 0xe0, 0x60, 0xe0, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x8c, 0x9c, 0x38, 0x70, 0x20, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x9c, 0x8c, 0x00, 0x80, 0x40, 0xc0, 0x40, 0xc0,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x01, 0x0a, 0x01, 0x04, 0x01, 0x02, 0x03, 0x00, 0x33, 0x38, 0x1c, 0x0e, 0x07,
-    0x03, 0x01, 0x04, 0x0e, 0x1c, 0x39, 0x33, 0x00, 0x03, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00};
+    0x00, 0xe0, 0x60, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0xc0, 0x40, 0xc0, 0x40, 0xc0, 0x4c, 0x9c, 0x38, 0x70, 0x20, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x9c, 0xcc,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x09, 0x04, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x07, 0x01, 0x04, 0x01,
+    0x04, 0x31, 0x38, 0x1c, 0x0e, 0x07, 0x03, 0x01, 0x04, 0x0e, 0x1c, 0x39, 0x30, 0x01, 0x04, 0x01, 0x07, 0x00, 0x05, 0x02, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00};
 #endif
 
 #ifdef MODEL_MHP30
@@ -172,7 +172,7 @@ const uint8_t disconnectedTipIconFlip[] = {
     0x03, 0x01, 0x04, 0x0e, 0x1c, 0x39, 0x33, 0x00, 0x03, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x05, 0x03, 0x00, 0x03, 0x01, 0x02, 0x01, 0x01, 0x01, 0x00};
 #endif
 
-#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 1
+#if defined(MODEL_TS80) + defined(MODEL_TS80P) >= 1
 const uint8_t idleScreenBG[] = {
     // width = 84
     // height = 16