From edff8a204baf0d6bcea700a64b66b18bc3a5fdfe Mon Sep 17 00:00:00 2001
From: GuruSR <17853390+GuruSR@users.noreply.github.com>
Date: Tue, 29 Mar 2022 21:49:30 -0400
Subject: [PATCH] Version 1.4.3D.

---
 src/Watchy_GSR.cpp | 5 ++++-
 src/Watchy_GSR.h   | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Watchy_GSR.cpp b/src/Watchy_GSR.cpp
index b37cc12..615249a 100644
--- a/src/Watchy_GSR.cpp
+++ b/src/Watchy_GSR.cpp
@@ -338,7 +338,10 @@ void WatchyGSR::init(String datetime){
             Battery.LowLevel = SRTC.getRTCBattery(true);
             UP_PIN = 32;
             UP_MASK = GPIO_SEL_32;
-            if (SRTC.getType() == PCF8563) { UP_PIN = 35; UP_MASK = GPIO_SEL_35; }
+            if (SRTC.getType() == PCF8563){
+                UP_PIN = 35; UP_MASK = GPIO_SEL_35;
+                if (SRTC.getADCPin() == 35) { UP_PIN = 32; UP_MASK = GPIO_SEL_32; }
+            }
             BTN_MASK = MENU_MASK|BACK_MASK|UP_MASK|DOWN_MASK;
             initZeros();
             setupDefaults();
diff --git a/src/Watchy_GSR.h b/src/Watchy_GSR.h
index 42de13e..e382222 100644
--- a/src/Watchy_GSR.h
+++ b/src/Watchy_GSR.h
@@ -26,6 +26,8 @@
 #include "ArduinoNvs.h"
 
 #include "Bronova_Regular13pt7b.h"
+#include "aAntiCorona10pt7b.h"
+#include "aAntiCorona11pt7b.h"
 #include "aAntiCorona12pt7b.h"
 #include "aAntiCorona13pt7b.h"
 #include "aAntiCorona14pt7b.h"
@@ -38,7 +40,7 @@ class WatchyGSR{
         static SmallRTC SRTC;
         static SmallNTP SNTP;
         static GxEPD2_BW<GxEPD2_154_D67, GxEPD2_154_D67::HEIGHT> display;
-        static constexpr const char* Build = "1.4.3";
+        static constexpr const char* Build = "1.4.3D";
         enum DesOps {dSTATIC, dLEFT, dRIGHT, dCENTER};
     public:
         WatchyGSR();
@@ -55,7 +57,7 @@ class WatchyGSR{
         virtual float BatteryRead() final;
         virtual bool IsDark() final;
         IRAM_ATTR virtual void handleInterrupt() final;
-        void drawChargeMe();
+        void drawChargeMe(bool Dark = false);
         void drawStatus();
         virtual void VibeTo(bool Mode) final;
         virtual String MakeTime(int Hour, int Minutes, bool& Alarm) final;
@@ -85,7 +87,8 @@ class WatchyGSR{
    private:
         void setStatus(String Status);
         void drawMenu();
-        void drawData(String dData, byte Left, byte Bottom, WatchyGSR::DesOps Style, bool isTime = false, bool PM = false);
+        void setFontFor(String O, const GFXfont *Normal, const GFXfont *Small, const GFXfont *Smaller, byte Gutter = 5);
+        void drawData(String dData, byte Left, byte Bottom, WatchyGSR::DesOps Style, byte Gutter, bool isTime = false, bool PM = false);
         void GoDark();
         void detectBattery();
         void ProcessNTP();