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

Version 1.4.3G.

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

21
src/Watchy_GSR.cpp
View File

@ -1285,23 +1285,26 @@ void WatchyGSR::setFontFor(String O, const GFXfont *Normal, const GFXfont *Small
} }
void WatchyGSR::deepSleep(){ void WatchyGSR::deepSleep(){
uint8_t I, N, D; uint8_t I, N, D, H;
bool BatOk, BT,B, DM; bool BatOk, BT,B, DM;
UpdateUTC(); UpdateClock(); UpdateUTC(); UpdateClock();
BatOk = (Battery.Last == 0 || Battery.Last > Battery.LowLevel);
BT = (Options.SleepStyle == 2 && WatchTime.BedTime);
B = (((Options.SleepStyle == 1 || (Options.SleepStyle > 2 && Options.SleepStyle != 4)) || BT) && BatOk);
B = false;
UpdateBMA(); GoDark(); UpdateBMA(); GoDark();
DM = (Darkness.Went && !TimerDown.Active && GuiMode != MENUON); DM = (Darkness.Went && !TimerDown.Active && GuiMode != MENUON);
D = WatchTime.Local.Wday + 1;
if (DM){ if (DM){
D = WatchTime.Local.Wday + 1;
H - WatchTime.Local.Hour;
BatOk = (Battery.Last == 0 || Battery.Last > Battery.LowLevel);
BT = (Options.SleepStyle == 2 && WatchTime.BedTime);
B = (((Options.SleepStyle == 1 || (Options.SleepStyle > 2 && Options.SleepStyle != 4)) || BT) && BatOk);
if (Battery.Direction == 1) N = (WatchTime.UTC.Minute - (WatchTime.UTC.Minute%5) + 5); else N = (WatchTime.UTC.Minute < 30 ? 30 : 60); if (Battery.Direction == 1) N = (WatchTime.UTC.Minute - (WatchTime.UTC.Minute%5) + 5); else N = (WatchTime.UTC.Minute < 30 ? 30 : 60);
if (WatchTime.NextAlarm != 99){ if (WatchTime.NextAlarm != 99){ if (Alarms_Minutes[WatchTime.NextAlarm] >= WatchTime.Local.Minute && Alarms_Minutes[WatchTime.NextAlarm] < N) N = Alarms_Minutes[WatchTime.NextAlarm]; }
if (Alarms_Minutes[WatchTime.NextAlarm] >= WatchTime.Local.Minute && Alarms_Minutes[WatchTime.NextAlarm] < N) N = Alarms_Minutes[WatchTime.NextAlarm]; if (N == 60){
H = (H + 1) % 24;
if (H == 0) D = ((D + 1) > 7 ? 1 : D + 1);
} }
if (N == 60 && WatchTime.Local.Hour == 23) D = constrain(D + 1, 1, 7);
} }
if (Options.NeedsSaving) RecordSettings(); if (Options.NeedsSaving) RecordSettings();
@ -1309,7 +1312,7 @@ void WatchyGSR::deepSleep(){
for(I = 0; I < 40; I++) { pinMode(I, INPUT); } for(I = 0; I < 40; I++) { pinMode(I, INPUT); }
esp_sleep_enable_ext1_wakeup((B ? SBMA.WakeMask() : 0) | BTN_MASK, ESP_EXT1_WAKEUP_ANY_HIGH); //enable deep sleep wake on button press ... |ACC_INT_MASK esp_sleep_enable_ext1_wakeup((B ? SBMA.WakeMask() : 0) | BTN_MASK, ESP_EXT1_WAKEUP_ANY_HIGH); //enable deep sleep wake on button press ... |ACC_INT_MASK
esp_sleep_enable_ext0_wakeup(RTC_INT_PIN, 0); //enable deep sleep wake on RTC interrupt esp_sleep_enable_ext0_wakeup(RTC_INT_PIN, 0); //enable deep sleep wake on RTC interrupt
if (DM) SRTC.atMinuteWake(N % 60, WatchTime.Local.Hour, D); if (DM) SRTC.atMinuteWake(N % 60, H, D);
else SRTC.nextMinuteWake(); else SRTC.nextMinuteWake();
esp_deep_sleep_start(); esp_deep_sleep_start();
} }

2
src/Watchy_GSR.h
View File

@ -39,7 +39,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.3F"; static constexpr const char* Build = "1.4.3G";
enum DesOps {dSTATIC, dLEFT, dRIGHT, dCENTER}; enum DesOps {dSTATIC, dLEFT, dRIGHT, dCENTER};
public: public: