dominic/watchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 1.4.3D.

Browse Source
This commit is contained in:
GuruSR 2022-03-29 21:49:30 -04:00 committed by GitHub
parent a20ef3e2da
commit edff8a204b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Watchy_GSR.cpp
View File

@ -338,7 +338,10 @@ void WatchyGSR::init(String datetime){
Battery.LowLevel = SRTC.getRTCBattery(true); Battery.LowLevel = SRTC.getRTCBattery(true);
UP_PIN = 32; UP_PIN = 32;
UP_MASK = GPIO_SEL_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; BTN_MASK = MENU_MASK|BACK_MASK|UP_MASK|DOWN_MASK;
initZeros(); initZeros();
setupDefaults(); setupDefaults();

9
src/Watchy_GSR.h
View File

@ -26,6 +26,8 @@
#include "ArduinoNvs.h" #include "ArduinoNvs.h"
#include "Bronova_Regular13pt7b.h" #include "Bronova_Regular13pt7b.h"
#include "aAntiCorona10pt7b.h"
#include "aAntiCorona11pt7b.h"
#include "aAntiCorona12pt7b.h" #include "aAntiCorona12pt7b.h"
#include "aAntiCorona13pt7b.h" #include "aAntiCorona13pt7b.h"
#include "aAntiCorona14pt7b.h" #include "aAntiCorona14pt7b.h"
@ -38,7 +40,7 @@ class WatchyGSR{
static SmallRTC SRTC; static SmallRTC SRTC;
static SmallNTP SNTP; static SmallNTP SNTP;
static GxEPD2_BW<GxEPD2_154_D67, GxEPD2_154_D67::HEIGHT> display; 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}; enum DesOps {dSTATIC, dLEFT, dRIGHT, dCENTER};
public: public:
WatchyGSR(); WatchyGSR();
@ -55,7 +57,7 @@ class WatchyGSR{
virtual float BatteryRead() final; virtual float BatteryRead() final;
virtual bool IsDark() final; virtual bool IsDark() final;
IRAM_ATTR virtual void handleInterrupt() final; IRAM_ATTR virtual void handleInterrupt() final;
void drawChargeMe(); void drawChargeMe(bool Dark = false);
void drawStatus(); void drawStatus();
virtual void VibeTo(bool Mode) final; virtual void VibeTo(bool Mode) final;
virtual String MakeTime(int Hour, int Minutes, bool& Alarm) final; virtual String MakeTime(int Hour, int Minutes, bool& Alarm) final;
@ -85,7 +87,8 @@ class WatchyGSR{
private: private:
void setStatus(String Status); void setStatus(String Status);
void drawMenu(); 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 GoDark();
void detectBattery(); void detectBattery();
void ProcessNTP(); void ProcessNTP();