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

Version 1.4.3I.

Browse Source
This commit is contained in:
GuruSR 2022-05-10 15:36:43 -04:00 committed by GitHub
parent 22bbd5fbf9
commit 3d18cf8cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 295 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/GSR.ino
View File

@ -1,6 +1,151 @@
#include "Watchy_GSR.h" #include "Watchy_GSR.h"
WatchyGSR watchy; // Place all of your data and variables here.
//RTC_DATA_ATTR uint8_t MyStyle; // Remember RTC_DATA_ATTR for your variables so they don't get wiped on deep sleep.
class OverrideGSR : public WatchyGSR {
/*
* Keep your functions inside the class, but at the bottom to avoid confusion.
* Be sure to visit https://github.com/GuruSR/Watchy_GSR/blob/main/Override%20Information.md for full information on how to override
* including functions that are available to your override to enhance functionality.
*/
public:
OverrideGSR() : WatchyGSR() {}
/*
void InsertPost(){
};
*/
/*
String InsertNTPServer() { return "<your favorite ntp server address>"; }
*/
/*
void InsertDefaults(){
};
*/
/*
bool OverrideBitmap(){
return false;
};
*/
/*
void InsertOnMinute(){
};
*/
/*
void InsertWiFi(){
};
*/
/*
void InsertWiFiEnding(){
};
*/
// The next 3 functions allow you to add your own WatchFaces, there are examples that do work below.
/*
void InsertAddWatchStyles(){
MyStyle = AddWatchStyle("Mine");
};
*/
/*
void InsertInitWatchStyle(uint8_t StyleID){
if (StyleID == MyStyle){
Design.Menu.Top = 72;
Design.Menu.Header = 25;
Design.Menu.Data = 66;
Design.Menu.Gutter = 3;
Design.Menu.Font = &aAntiCorona12pt7b;
Design.Menu.FontSmall = &aAntiCorona11pt7b;
Design.Menu.FontSmaller = &aAntiCorona10pt7b;
Design.Face.Bitmap = nullptr;
Design.Face.SleepBitmap = nullptr;
Design.Face.Gutter = 4;
Design.Face.Time = 56;
Design.Face.TimeHeight = 45;
Design.Face.TimeColor = GxEPD_BLACK;
Design.Face.TimeFont = &aAntiCorona36pt7b;
Design.Face.TimeLeft = 0;
Design.Face.TimeStyle = WatchyGSR::dCENTER;
Design.Face.Day = 101;
Design.Face.DayGutter = 4;
Design.Face.DayColor = GxEPD_BLACK;
Design.Face.DayFont = &aAntiCorona16pt7b;
Design.Face.DayFontSmall = &aAntiCorona15pt7b;
Design.Face.DayFontSmaller = &aAntiCorona14pt7b;
Design.Face.DayLeft = 0;
Design.Face.DayStyle = WatchyGSR::dCENTER;
Design.Face.Date = 143;
Design.Face.DateGutter = 4;
Design.Face.DateColor = GxEPD_BLACK;
Design.Face.DateFont = &aAntiCorona15pt7b;
Design.Face.DateFontSmall = &aAntiCorona14pt7b;
Design.Face.DateFontSmaller = &aAntiCorona13pt7b;
Design.Face.DateLeft = 0;
Design.Face.DateStyle = WatchyGSR::dCENTER;
Design.Face.Year = 186;
Design.Face.YearLeft = 99;
Design.Face.YearColor = GxEPD_BLACK;
Design.Face.YearFont = &aAntiCorona16pt7b;
Design.Face.YearLeft = 0;
Design.Face.YearStyle = WatchyGSR::dCENTER;
Design.Status.WIFIx = 5;
Design.Status.WIFIy = 193;
Design.Status.BATTx = 155;
Design.Status.BATTy = 178;
}
};
*/
/*
void InsertDrawWatchStyle(uint8_t StyleID){
if (StyleID == MyStyle){
if (SafeToDraw()){
drawTime();
drawDay();
drawYear();
}
if (NoMenu()) drawDate();
}
};
*/
/*
bool InsertHandlePressed(uint8_t SwitchNumber, bool &Haptic, bool &Refresh) {
switch (SwitchNumber){
case 2: //Back
Haptic = true; // Cause Hptic feedback if set to true.
Refresh = true; // Cause the screen to be refreshed (redrwawn).
return true; // Respond with "I used a button", so the WatchyGSR knows you actually did something with a button.
break;
case 3: //Up
return true;
break;
case 4: //Down
return true;
}
return false;
};
*/
/*
bool OverrideSleepBitmap(){
return false;
};
*/
};
// Do not edit anything below this, leave all of your code above.
OverrideGSR watchy;
void setup(){ void setup(){
watchy.init(); watchy.init();

163
src/Watchy_GSR.cpp
View File

@ -16,15 +16,6 @@ const float Reduce[5] = {1.0,0.8,0.6,0.4,0.2};
#define GSettings "GSR-Options" #define GSettings "GSR-Options"
#define GTZ "GSR-TZ" #define GTZ "GSR-TZ"
/* Private
RTC_DATA_ATTR WatchyGSR::GSRWireless GSRWiFi;
RTC_DATA_ATTR WatchyGSR::CPUWork CPUSet;
RTC_DATA_ATTR WatchyGSR::Stepping Steps;
RTC_DATA_ATTR WatchyGSR::Optional Options;
RTC_DATA_ATTR WatchyGSR::DesignStyles WatchStyles;
RTC_DATA_ATTR WatchyGSR::MenuUse Menu;
*/
// Protected // Protected
RTC_DATA_ATTR struct GSRWireless final { RTC_DATA_ATTR struct GSRWireless final {
bool Requested; // Request WiFi. bool Requested; // Request WiFi.
@ -85,70 +76,6 @@ RTC_DATA_ATTR struct MenuUse final {
int8_t SubSubItem; // Used mostly in the alarm to offset choice. int8_t SubSubItem; // Used mostly in the alarm to offset choice.
} Menu; } Menu;
RTC_DATA_ATTR struct Designing final {
struct MenuPOS {
byte Gutter; // 3
byte Top; // MenuTop 72
byte Header; // HeaderY 97
byte Data; // DataY 138
const GFXfont *Font; // Menu Font.
const GFXfont *FontSmall; // Menu Font.
const GFXfont *FontSmaller; // Menu Font.
} Menu;
struct FacePOS {
const unsigned char *Bitmap; // Null
const unsigned char *SleepBitmap; // Null
byte Gutter; // 4
byte Time; // TimeY 56
byte TimeHeight; // 45
uint16_t TimeColor; // Font Color.
const GFXfont *TimeFont; // Font.
WatchyGSR::DesOps TimeStyle; // dCENTER
byte TimeLeft; // Only for dSTATIC
byte Day; // DayY 101
byte DayGutter; // 4
uint16_t DayColor; // Font Color.
const GFXfont *DayFont; // Font.
const GFXfont *DayFontSmall; // Font.
const GFXfont *DayFontSmaller; // Font.
WatchyGSR::DesOps DayStyle; // dCENTER
byte DayLeft; // Only for dSTATIC
byte Date; // DateY 143
byte DateGutter; // 4
uint16_t DateColor; // Font Color.
const GFXfont *DateFont; // Font.
const GFXfont *DateFontSmall; // Font.
const GFXfont *DateFontSmaller; // Font.
WatchyGSR::DesOps DateStyle; // dCENTER
byte DateLeft; // Only for dSTATIC
byte Year; // YearY 186
uint16_t YearColor; // Font Color.
const GFXfont *YearFont; // Font.
WatchyGSR::DesOps YearStyle; // dCENTER
byte YearLeft; // Only for dSTATIC
} Face;
struct StatusPOS {
byte WIFIx; // NTPX 5
byte WIFIy; // NTPY 193
byte BATTx; // 155
byte BATTy; // 178
} Status;
} Design;
RTC_DATA_ATTR struct TimeData final {
time_t UTC_RAW; // Copy of the UTC on init.
tmElements_t UTC; // Copy of UTC only split up for usage.
tmElements_t Local; // Copy of the Local time on init.
String TimeZone; // The location timezone, not the actual POSIX.
unsigned long EPSMS; // Milliseconds (rounded to the enxt minute) when the clock was updated via NTP.
bool NewMinute; // Set to True when New Minute happens.
time_t TravelTest; // For Travel Testing.
int32_t Drifting; // The amount to add to UTC_RAW after reading from the RTC.
int64_t WatchyRTC; // Counts Microseconds from boot.
bool DeadRTC; // Set when Drift fails to get a good count less than 30 seconds.
uint8_t NextAlarm; // Next index that will need to wake the Watchy from sleep to fire.
bool BedTime; // If the hour is within the Bed Time settings.
} WatchTime;
RTC_DATA_ATTR int GuiMode; RTC_DATA_ATTR int GuiMode;
RTC_DATA_ATTR bool VibeMode; // Vibe Motor is On=True/Off=False, used for the Haptic and Alarms. RTC_DATA_ATTR bool VibeMode; // Vibe Motor is On=True/Off=False, used for the Haptic and Alarms.
RTC_DATA_ATTR String WatchyStatus; // Used for the indicator in the bottom left, so when it changes, it asks for a screen refresh, if not, it doesn't. RTC_DATA_ATTR String WatchyStatus; // Used for the indicator in the bottom left, so when it changes, it asks for a screen refresh, if not, it doesn't.
@ -218,6 +145,8 @@ RTC_DATA_ATTR struct dispUpdate final {
//WatchyRTC WatchyGSR::SRTC; //WatchyRTC WatchyGSR::SRTC;
SmallRTC WatchyGSR::SRTC; SmallRTC WatchyGSR::SRTC;
SmallNTP WatchyGSR::SNTP; SmallNTP WatchyGSR::SNTP;
RTC_DATA_ATTR Designing Design;
RTC_DATA_ATTR TimeData WatchTime;
RTC_DATA_ATTR StableBMA SBMA; RTC_DATA_ATTR StableBMA SBMA;
GxEPD2_BW<GxEPD2_154_D67, GxEPD2_154_D67::HEIGHT> WatchyGSR::display(GxEPD2_154_D67(EPD_CS, EPD_DC, EPD_RESET, EPD_BUSY)); GxEPD2_BW<GxEPD2_154_D67, GxEPD2_154_D67::HEIGHT> WatchyGSR::display(GxEPD2_154_D67(EPD_CS, EPD_DC, EPD_RESET, EPD_BUSY));
@ -251,6 +180,7 @@ bool IDidIt; // Tells if the Drifting was done this minute.
bool AlarmsOn; // Moved for CPU. bool AlarmsOn; // Moved for CPU.
bool Rebooted; // Used in DisplayInit to force a full initial on power up. bool Rebooted; // Used in DisplayInit to force a full initial on power up.
time_t TurboTime; // Moved here for less work. time_t TurboTime; // Moved here for less work.
uint8_t Missed; // Button not in menu, not used, so can be used by override.
unsigned long LastButton, OTAFail; unsigned long LastButton, OTAFail;
WatchyGSR::WatchyGSR(){} //constructor WatchyGSR::WatchyGSR(){} //constructor
@ -278,7 +208,7 @@ void WatchyGSR::setupDefaults(){
void WatchyGSR::init(String datetime){ void WatchyGSR::init(String datetime){
uint64_t wakeupBit; uint64_t wakeupBit;
int AlarmIndex, Pushed; // Alarm being played. int AlarmIndex;
bool WaitForNext, Pulse, DoOnce, B, Up; bool WaitForNext, Pulse, DoOnce, B, Up;
unsigned long Since, APLoop; unsigned long Since, APLoop;
uint8_t I; uint8_t I;
@ -301,6 +231,7 @@ void WatchyGSR::init(String datetime){
Updates.Init = true; Updates.Init = true;
Updates.Tapped = false; Updates.Tapped = false;
LastButton = 0; LastButton = 0;
Missed = 0;
Darkness.Last = 0; Darkness.Last = 0;
Darkness.Tilt = 0; Darkness.Tilt = 0;
Darkness.Woke = false; Darkness.Woke = false;
@ -347,13 +278,15 @@ 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;
//HWVer = SRTC.getWatchyHWVer();
//if (SRTC.getType() == PCF8563){ if (HWVer == 1.5) { UP_PIN = 32; UP_MASK = GPIO_SEL_32; } else { UP_PIN = 35; UP_MASK = GPIO_SEL_35; } }
HWVer = 1.0; HWVer = 1.0;
if (SRTC.getType() == PCF8563){ if (SRTC.getADCPin() == 35) { HWVer =1.5; UP_PIN = 32; UP_MASK = GPIO_SEL_32; } else { HWVer = 2.0; UP_PIN = 35; UP_MASK = GPIO_SEL_35; } } if (SRTC.getType() == PCF8563){ if (SRTC.getADCPin() == 35) { HWVer =1.5; UP_PIN = 32; UP_MASK = GPIO_SEL_32; } else { HWVer = 2.0; UP_PIN = 35; UP_MASK = GPIO_SEL_35; } }
BTN_MASK = MENU_MASK|BACK_MASK|UP_MASK|DOWN_MASK; BTN_MASK = MENU_MASK|BACK_MASK|UP_MASK|DOWN_MASK;
initZeros(); initZeros();
setupDefaults(); setupDefaults();
Rebooted=true;
_bmaConfig(); _bmaConfig();
Rebooted=true;
if (DefaultWatchStyles){ if (DefaultWatchStyles){
I = AddWatchStyle("Classic GSR"); I = AddWatchStyle("Classic GSR");
I = AddWatchStyle("Ballsy"); I = AddWatchStyle("Ballsy");
@ -417,6 +350,7 @@ void WatchyGSR::init(String datetime){
} }
if (Button > 0) { handleButtonPress(Button); Button = 0; } if (Button > 0) { handleButtonPress(Button); Button = 0; }
if (Missed > 0) { if (InsertHandlePressed(Missed, DoHaptic, UpdateDisp)) SetTurbo(); Missed = 0; }
AlarmsOn =(Alarms_Times[0] > 0 || Alarms_Times[1] > 0 || Alarms_Times[2] > 0 || Alarms_Times[3] > 0 || TimerDown.ToneLeft > 0); AlarmsOn =(Alarms_Times[0] > 0 || Alarms_Times[1] > 0 || Alarms_Times[2] > 0 || Alarms_Times[3] > 0 || TimerDown.ToneLeft > 0);
ActiveMode = (InTurbo() || DarkWait() || NTPData.State > 0 || AlarmsOn || WatchyAPOn || OTAUpdate || NTPData.TimeTest || WatchTime.DeadRTC || GSRWiFi.Requested); ActiveMode = (InTurbo() || DarkWait() || NTPData.State > 0 || AlarmsOn || WatchyAPOn || OTAUpdate || NTPData.TimeTest || WatchTime.DeadRTC || GSRWiFi.Requested);
@ -636,6 +570,7 @@ void WatchyGSR::init(String datetime){
if (!DarkWait()) GoDark(); if (!DarkWait()) GoDark();
handleInterrupt(); handleInterrupt();
if (Button > 0) { handleButtonPress(Button); Button = 0; } if (Button > 0) { handleButtonPress(Button); Button = 0; }
if (Missed > 0) { if (InsertHandlePressed(Missed, DoHaptic, UpdateDisp)) SetTurbo(); Missed = 0; }
if (UpdateDisp) showWatchFace(); //partial updates on tick if (UpdateDisp) showWatchFace(); //partial updates on tick
if (!Updates.Init) { if (!(InTurbo() || DarkWait())) DisplaySleep(); } if (!Updates.Init) { if (!(InTurbo() || DarkWait())) DisplaySleep(); }
@ -654,6 +589,7 @@ void WatchyGSR::init(String datetime){
} }
if (Button > 0) { handleButtonPress(Button); Button = 0; } if (Button > 0) { handleButtonPress(Button); Button = 0; }
if (Missed > 0) { if (InsertHandlePressed(Missed, DoHaptic, UpdateDisp)) SetTurbo(); Missed = 0; }
processWiFiRequest(); // Process any WiFi requests. processWiFiRequest(); // Process any WiFi requests.
if (UpdateDisp) showWatchFace(); //partial updates on tick if (UpdateDisp) showWatchFace(); //partial updates on tick
AlarmsOn =(Alarms_Times[0] > 0 || Alarms_Times[1] > 0 || Alarms_Times[2] > 0 || Alarms_Times[3] > 0 || TimerDown.ToneLeft > 0); AlarmsOn =(Alarms_Times[0] > 0 || Alarms_Times[1] > 0 || Alarms_Times[2] > 0 || Alarms_Times[3] > 0 || TimerDown.ToneLeft > 0);
@ -668,7 +604,9 @@ void WatchyGSR::StartWeb(){
/*return index page which is stored in basicIndex */ /*return index page which is stored in basicIndex */
server.on("/", HTTP_GET, [=]() { server.on("/", HTTP_GET, [=]() {
server.sendHeader("Connection", "close"); server.sendHeader("Connection", "close");
server.send(200, "text/html", basicIndex); String S = basicIndex;
S.replace("^",(OTA() ? basicOTA : ""));
server.send(200, "text/html", S);
OTATimer=millis(); OTATimer=millis();
}); });
server.on("/settings", HTTP_GET, [=]() { server.on("/settings", HTTP_GET, [=]() {
@ -683,9 +621,11 @@ void WatchyGSR::StartWeb(){
OTATimer=millis(); OTATimer=millis();
}); });
server.on("/update", HTTP_GET, [=]() { server.on("/update", HTTP_GET, [=]() {
server.sendHeader("Connection", "close"); if (OTA()){
server.send(200, "text/html", updateIndex); server.sendHeader("Connection", "close");
OTATimer=millis(); server.send(200, "text/html", updateIndex);
OTATimer=millis();
}
}); });
server.on("/settings", HTTP_POST, [=](){ server.on("/settings", HTTP_POST, [=](){
if (server.argName(0) == "settings") { StoreSettings(server.arg(0)); RecordSettings(); } if (server.argName(0) == "settings") { StoreSettings(server.arg(0)); RecordSettings(); }
@ -1292,7 +1232,7 @@ void WatchyGSR::deepSleep(){
bool BatOk, BT,B, DM; bool BatOk, BT,B, DM;
UpdateUTC(); UpdateClock(); UpdateUTC(); UpdateClock();
B = false; B = false; VibeTo(false);
UpdateBMA(); GoDark(); UpdateBMA(); GoDark();
DM = (Darkness.Went && !TimerDown.Active && GuiMode != MENUON); DM = (Darkness.Went && !TimerDown.Active && GuiMode != MENUON);
@ -1525,7 +1465,7 @@ void WatchyGSR::drawChargeMe(bool Dark){
void WatchyGSR::drawStatus(){ void WatchyGSR::drawStatus(){
if (WatchyStatus > ""){ if (WatchyStatus > ""){
display.fillRect(Design.Status.WIFIx, Design.Status.WIFIy - 19, 60, 20, BackColor()); //display.fillRect(Design.Status.WIFIx, Design.Status.WIFIy - 19, 60, 20, BackColor());
display.setFont(&Bronova_Regular13pt7b); display.setFont(&Bronova_Regular13pt7b);
if (WatchyStatus.startsWith("WiFi")){ if (WatchyStatus.startsWith("WiFi")){
display.drawBitmap(Design.Status.WIFIx, Design.Status.WIFIy - 18, iWiFi, 19, 19, ForeColor()); display.drawBitmap(Design.Status.WIFIx, Design.Status.WIFIy - 18, iWiFi, 19, 19, ForeColor());
@ -1968,7 +1908,7 @@ void WatchyGSR::handleButtonPress(uint8_t Pressed){
UpdateDisp = true; // Quick Update. UpdateDisp = true; // Quick Update.
SetTurbo(); SetTurbo();
} }
} } else Missed = 2; // Missed a SW2.
break; break;
case 3: case 3:
if (GuiMode == MENUON){ // Up Button [SW3] if (GuiMode == MENUON){ // Up Button [SW3]
@ -2145,7 +2085,7 @@ void WatchyGSR::handleButtonPress(uint8_t Pressed){
UpdateDisp = true; // Quick Update. UpdateDisp = true; // Quick Update.
SetTurbo(); SetTurbo();
} }
} } else Missed = 3; // Missed a SW3.
break; break;
case 4: case 4:
if (GuiMode == MENUON){ // Down Button [SW4] if (GuiMode == MENUON){ // Down Button [SW4]
@ -2323,7 +2263,7 @@ void WatchyGSR::handleButtonPress(uint8_t Pressed){
UpdateDisp = true; // Quick Update. UpdateDisp = true; // Quick Update.
SetTurbo(); SetTurbo();
} }
} } else Missed = 4; // Missed a SW4.
} }
} }
@ -2414,8 +2354,8 @@ void WatchyGSR::ManageTime(){
} }
void WatchyGSR::_bmaConfig() { void WatchyGSR::_bmaConfig() {
uint8_t Type = SRTC.getType();
if (SBMA.begin(_readRegister, _writeRegister, delay, SRTC.getType()) == false) { if (SBMA.begin(_readRegister, _writeRegister, delay, Type) == false) {
//fail to init BMA //fail to init BMA
return; return;
} }
@ -2488,14 +2428,16 @@ void WatchyGSR::InsertWiFiEnding() {}
void WatchyGSR::InsertAddWatchStyles() {} void WatchyGSR::InsertAddWatchStyles() {}
void WatchyGSR::InsertInitWatchStyle(uint8_t StyleID) {} void WatchyGSR::InsertInitWatchStyle(uint8_t StyleID) {}
void WatchyGSR::InsertDrawWatchStyle(uint8_t StyleID) {} void WatchyGSR::InsertDrawWatchStyle(uint8_t StyleID) {}
bool WatchyGSR::InsertHandlePressed(uint8_t SwitchNumber, bool &Haptic, bool &Refresh) { return false; }
uint8_t WatchyGSR::AddWatchStyle(String StyleName){ uint8_t WatchyGSR::AddWatchStyle(String StyleName){
if (WatchStyles.Count >= MaxStyles || StyleName.length() > 30) return 255; // Full / too long.. if (WatchStyles.Count >= MaxStyles || StyleName.length() > 30) return 255; // Full / too long..
for (int I = 0; I < WatchStyles.Count; I++) for (int I = 0; I < WatchStyles.Count; I++)
if (String(WatchStyles.Style[I * 32]) == StyleName) return 255; // Error, alrady there. if (String(WatchStyles.Style[I * 32]) == StyleName) return 255; // Error, alrady there.
strcpy(&WatchStyles.Style[WatchStyles.Count * 32], StyleName.c_str()); strcpy(&WatchStyles.Style[WatchStyles.Count * 32], StyleName.c_str());
int O = WatchStyles.Count;
WatchStyles.Count++; WatchStyles.Count++;
return WatchStyles.Count; return O;
} }
String WatchyGSR::InsertNTPServer() { return "pool.ntp.org"; } String WatchyGSR::InsertNTPServer() { return "pool.ntp.org"; }
void WatchyGSR::AllowDefaultWatchStyles(bool Allow) { DefaultWatchStyles = Allow; } void WatchyGSR::AllowDefaultWatchStyles(bool Allow) { DefaultWatchStyles = Allow; }
@ -2914,7 +2856,7 @@ void WatchyGSR::initZeros(){
String S = ""; String S = "";
uint8_t I; uint8_t I;
GuiMode = WATCHON; GuiMode = WATCHON;
VibeMode = 0; VibeMode = false;
WatchyStatus = ""; WatchyStatus = "";
WatchTime.TimeZone = ""; WatchTime.TimeZone = "";
WatchTime.Drifting = 0; WatchTime.Drifting = 0;
@ -3300,6 +3242,17 @@ void WatchyGSR::RefreshCPU(int Value){
if (C != CPUSet.Freq) if (setCpuFrequencyMhz(C)); CPUSet.Freq = C; if (C != CPUSet.Freq) if (setCpuFrequencyMhz(C)); CPUSet.Freq = C;
} }
bool WatchyGSR::OTA(){
esp_partition_iterator_t IT = esp_partition_find(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_0, NULL);
if (IT != NULL){
const esp_partition_t *Part = esp_partition_get(IT);
uint64_t Size = Part->size;
esp_partition_iterator_release(IT);
return (Size == 0x1E0000);
}
return false;
}
// Function to find the existing WiFi power in the static index. // Function to find the existing WiFi power in the static index.
uint8_t WatchyGSR::getTXOffset(wifi_power_t Current){ uint8_t WatchyGSR::getTXOffset(wifi_power_t Current){
@ -3322,28 +3275,28 @@ void WatchyGSR::DisplayInit(bool ForceDark){
void WatchyGSR::DisplaySleep(){ if (!Updates.Init) { Updates.Init = true; display.hibernate(); } } void WatchyGSR::DisplaySleep(){ if (!Updates.Init) { Updates.Init = true; display.hibernate(); } }
bool WatchyGSR::SafeToDraw() { return (!(OTAUpdate || WatchyAPOn || (Menu.Item == MENU_TOFF && Menu.SubItem == 2))); } bool WatchyGSR::SafeToDraw() { return (!(OTAUpdate || WatchyAPOn || (Menu.Item == MENU_TOFF && Menu.SubItem == 2))); }
bool WatchyGSR::NoMenu() { return (GuiMode == WATCHON); };
void WatchyGSR::getAngle(uint16_t Angle, uint8_t Away, uint8_t &X, uint8_t &Y){ void WatchyGSR::getAngle(uint16_t Angle, uint8_t Width, uint8_t Height, uint8_t &X, uint8_t &Y){
uint8_t S = 200 - (Away * 2);
float fX, fY, fA; float fX, fY, fA;
if (Angle > 44 && Angle < 135){ // Right if (Angle > 44 && Angle < 135){ // Right
fA = Angle - 45; fA /= 90; fA = Angle - 45; fA /= 90;
fY = Away + (fA * S); fY = (fA * Height);
fX = 200 - Away; fX = Width;
}else if (Angle > 134 && Angle < 225){ // Bottom }else if (Angle > 134 && Angle < 225){ // Bottom
fA = Angle - 135; fA /= 90; fA = Angle - 135; fA /= 90;
fX = 200 - (Away + (fA * S)); fX = Width - (fA * Width);
fY = 200 - Away; fY = Height;
}else if (Angle > 224 && Angle < 315){ // Left. }else if (Angle > 224 && Angle < 315){ // Left.
fA = Angle - 225; fA /= 90; fA = Angle - 225; fA /= 90;
fY = 200 - (Away + (fA * S)); fY = Height - (fA * Height);
fX = Away; fX = 0;
}else { // Top }else { // Top
if (Angle > 314) Angle -= 315; if (Angle > 314) Angle -= 315;
else Angle += 45; else Angle += 45;
fA = Angle; fA /= 90; fA = Angle; fA /= 90;
fX = Away + (fA * S); fX = (fA * Width);
fY = Away; fY = 0;
} }
X = fX; X = fX;
Y = fY; Y = fY;
@ -3461,17 +3414,17 @@ void WatchyGSR::drawWatchFaceStyle(){
drawDate(); drawDate();
if (SafeToDraw()){ if (SafeToDraw()){
for (A = 0; A < 60; A++){ for (A = 0; A < 60; A++){
getAngle(A * 6, 5, X, Y); getAngle(A * 6, 190, 190, X, Y);
display.fillCircle(X, Y, (A == WatchTime.Local.Minute ? 5 : (A % 5 == 0 ? 3 : 1)), ForeColor()); display.fillCircle(X + 5, Y + 5, (A == WatchTime.Local.Minute ? 5 : (A % 5 == 0 ? 3 : 1)), ForeColor());
} }
X = WatchTime.Local.Hour; X = WatchTime.Local.Hour;
if (X > 11) X -= 12; if (X > 11) X -= 12;
A = (X * 30) + (WatchTime.Local.Minute / 2); A = (X * 30) + (WatchTime.Local.Minute / 2);
getAngle(A, 22, X, Y); getAngle(A, 158, 158, X, Y);
display.fillCircle(X, Y, 9, ForeColor()); display.fillCircle(X + 21, Y + 21, 9, ForeColor());
if (WatchTime.Local.Hour < 12) display.fillCircle(X, Y, 3, BackColor()); if (WatchTime.Local.Hour < 12) display.fillCircle(X + 21, Y + 21, 3, BackColor());
} }
if (GuiMode == WATCHON) drawYear(); if (NoMenu()) drawYear();
break; break;
default: default:
if (SafeToDraw()){ if (SafeToDraw()){
@ -3479,7 +3432,7 @@ void WatchyGSR::drawWatchFaceStyle(){
drawDay(); drawDay();
drawYear(); drawYear();
} }
if (GuiMode == WATCHON) drawDate(); if (NoMenu()) drawDate();
break; break;
} }
} }

81
src/Watchy_GSR.h
View File

@ -5,6 +5,7 @@
#include "Defines_GSR.h" #include "Defines_GSR.h"
#include "Web-HTML.h" #include "Web-HTML.h"
#include <Arduino.h> #include <Arduino.h>
#include <esp_partition.h>
#include <FunctionalInterrupt.h> #include <FunctionalInterrupt.h>
#include <ESPmDNS.h> #include <ESPmDNS.h>
#include <WiFi.h> #include <WiFi.h>
@ -39,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.3H"; static constexpr const char* Build = "1.4.3I";
enum DesOps {dSTATIC, dLEFT, dRIGHT, dCENTER}; enum DesOps {dSTATIC, dLEFT, dRIGHT, dCENTER};
public: public:
@ -76,14 +77,16 @@ class WatchyGSR{
virtual void InsertAddWatchStyles(); virtual void InsertAddWatchStyles();
virtual void InsertDrawWatchStyle(uint8_t StyleID); virtual void InsertDrawWatchStyle(uint8_t StyleID);
virtual void InsertInitWatchStyle(uint8_t StyleID); virtual void InsertInitWatchStyle(uint8_t StyleID);
virtual bool InsertHandlePressed(uint8_t SwitchNumber, bool &Haptic, bool &Refresh);
virtual uint8_t AddWatchStyle(String StyleName) final; virtual uint8_t AddWatchStyle(String StyleName) final;
virtual String InsertNTPServer(); virtual String InsertNTPServer();
virtual void AllowDefaultWatchStyles(bool Allow = true) final; virtual void AllowDefaultWatchStyles(bool Allow = true) final;
virtual void AskForWiFi() final; virtual void AskForWiFi() final;
virtual wl_status_t currentWiFi() final; virtual wl_status_t currentWiFi() final;
virtual void endWiFi() final; virtual void endWiFi() final;
virtual void getAngle(uint16_t Angle, uint8_t Away, uint8_t &X, uint8_t &Y) final; virtual void getAngle(uint16_t Angle, uint8_t Width, uint8_t Height, uint8_t &X, uint8_t &Y) final;
virtual bool SafeToDraw() final; virtual bool SafeToDraw() final;
virtual bool NoMenu() final;
virtual void initWatchFaceStyle(); virtual void initWatchFaceStyle();
virtual void drawWatchFaceStyle(); virtual void drawWatchFaceStyle();
private: private:
@ -143,9 +146,81 @@ class WatchyGSR{
bool Showing(); bool Showing();
void RefreshCPU(); void RefreshCPU();
void RefreshCPU(int Value); void RefreshCPU(int Value);
bool OTA();
uint8_t getTXOffset(wifi_power_t Current); uint8_t getTXOffset(wifi_power_t Current);
void DisplayInit(bool ForceDark = false); void DisplayInit(bool ForceDark = false);
void DisplaySleep(); void DisplaySleep();
}; };
extern RTC_DATA_ATTR StableBMA SBMA;
struct MenuPOS {
byte Gutter; // 3
byte Top; // MenuTop 72
byte Header; // HeaderY 97
byte Data; // DataY 138
const GFXfont *Font; // Menu Font.
const GFXfont *FontSmall; // Menu Font.
const GFXfont *FontSmaller; // Menu Font.
};
struct FacePOS {
const unsigned char *Bitmap; // Null
const unsigned char *SleepBitmap; // Null
byte Gutter; // 4
byte Time; // TimeY 56
byte TimeHeight; // 45
uint16_t TimeColor; // Font Color.
const GFXfont *TimeFont; // Font.
WatchyGSR::DesOps TimeStyle; // dCENTER
byte TimeLeft; // Only for dSTATIC
byte Day; // DayY 101
byte DayGutter; // 4
uint16_t DayColor; // Font Color.
const GFXfont *DayFont; // Font.
const GFXfont *DayFontSmall; // Font.
const GFXfont *DayFontSmaller; // Font.
WatchyGSR::DesOps DayStyle; // dCENTER
byte DayLeft; // Only for dSTATIC
byte Date; // DateY 143
byte DateGutter; // 4
uint16_t DateColor; // Font Color.
const GFXfont *DateFont; // Font.
const GFXfont *DateFontSmall; // Font.
const GFXfont *DateFontSmaller; // Font.
WatchyGSR::DesOps DateStyle; // dCENTER
byte DateLeft; // Only for dSTATIC
byte Year; // YearY 186
uint16_t YearColor; // Font Color.
const GFXfont *YearFont; // Font.
WatchyGSR::DesOps YearStyle; // dCENTER
byte YearLeft; // Only for dSTATIC
};
struct StatusPOS {
byte WIFIx; // NTPX 5
byte WIFIy; // NTPY 193
byte BATTx; // 155
byte BATTy; // 178
};
struct Designing final {
struct MenuPOS Menu;
struct FacePOS Face;
struct StatusPOS Status;
};
struct TimeData final {
time_t UTC_RAW; // Copy of the UTC on init.
tmElements_t UTC; // Copy of UTC only split up for usage.
tmElements_t Local; // Copy of the Local time on init.
String TimeZone; // The location timezone, not the actual POSIX.
unsigned long EPSMS; // Milliseconds (rounded to the enxt minute) when the clock was updated via NTP.
bool NewMinute; // Set to True when New Minute happens.
time_t TravelTest; // For Travel Testing.
int32_t Drifting; // The amount to add to UTC_RAW after reading from the RTC.
int64_t WatchyRTC; // Counts Microseconds from boot.
bool DeadRTC; // Set when Drift fails to get a good count less than 30 seconds.
uint8_t NextAlarm; // Next index that will need to wake the Watchy from sleep to fire.
bool BedTime; // If the hour is within the Bed Time settings.
};
extern Designing Design;
extern TimeData WatchTime;
extern StableBMA SBMA;
#endif #endif

23
src/Web-HTML.h
View File

@ -49,16 +49,19 @@ static const char basicIndex[] = {
0x61, 0x6C, 0x20, 0x57, 0x69, 0x46, 0x69, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x50, 0x61, 0x6C, 0x20, 0x57, 0x69, 0x46, 0x69, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x50,
0x6F, 0x69, 0x6E, 0x74, 0x73, 0x3C, 0x2F, 0x62, 0x75, 0x74, 0x74, 0x6F, 0x6E, 0x3E, 0x3C, 0x2F, 0x6F, 0x69, 0x6E, 0x74, 0x73, 0x3C, 0x2F, 0x62, 0x75, 0x74, 0x74, 0x6F, 0x6E, 0x3E, 0x3C, 0x2F,
0x66, 0x6F, 0x72, 0x6D, 0x3E, 0x3C, 0x2F, 0x66, 0x6F, 0x6E, 0x74, 0x3E, 0x3C, 0x2F, 0x74, 0x64, 0x66, 0x6F, 0x72, 0x6D, 0x3E, 0x3C, 0x2F, 0x66, 0x6F, 0x6E, 0x74, 0x3E, 0x3C, 0x2F, 0x74, 0x64,
0x3E, 0x3C, 0x2F, 0x74, 0x72, 0x3E, 0x3C, 0x74, 0x72, 0x3E, 0x3C, 0x74, 0x64, 0x3E, 0x3C, 0x66, 0x3E, 0x3C, 0x2F, 0x74, 0x72, 0x3E, 0x5E, 0x3C, 0x2F, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x3E, 0x3C,
0x6F, 0x6E, 0x74, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x3D, 0x32, 0x3E, 0x3C, 0x66, 0x6F, 0x72, 0x6D, 0x2F, 0x62, 0x6F, 0x64, 0x79, 0x3E, 0x3C, 0x2F, 0x68, 0x74, 0x6D, 0x6C, 0x3E, 0x00
0x20, 0x61, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x3D, 0x27, 0x2F, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, };
0x27, 0x3E, 0x3C, 0x62, 0x75, 0x74, 0x74, 0x6F, 0x6E, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3D, 0x27,
0x73, 0x75, 0x62, 0x6D, 0x69, 0x74, 0x27, 0x3E, 0x55, 0x70, 0x6C, 0x6F, 0x61, 0x64, 0x20, 0x4E, static const char basicOTA[] = {
0x65, 0x77, 0x20, 0x46, 0x69, 0x72, 0x6D, 0x77, 0x61, 0x72, 0x65, 0x3C, 0x2F, 0x62, 0x75, 0x74, 0x3C, 0x74, 0x72, 0x3E, 0x3C, 0x74, 0x64, 0x3E, 0x3C, 0x66, 0x6F, 0x6E, 0x74, 0x20, 0x73, 0x69,
0x74, 0x6F, 0x6E, 0x3E, 0x3C, 0x2F, 0x66, 0x6F, 0x72, 0x6D, 0x3E, 0x3C, 0x2F, 0x66, 0x6F, 0x6E, 0x7A, 0x65, 0x3D, 0x32, 0x3E, 0x3C, 0x66, 0x6F, 0x72, 0x6D, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6F,
0x74, 0x3E, 0x3C, 0x2F, 0x74, 0x64, 0x3E, 0x3C, 0x2F, 0x74, 0x72, 0x3E, 0x3C, 0x2F, 0x74, 0x61, 0x6E, 0x3D, 0x27, 0x2F, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x27, 0x3E, 0x3C, 0x62, 0x75, 0x74,
0x62, 0x6C, 0x65, 0x3E, 0x3C, 0x2F, 0x62, 0x6F, 0x64, 0x79, 0x3E, 0x3C, 0x2F, 0x68, 0x74, 0x6D, 0x74, 0x6F, 0x6E, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3D, 0x27, 0x73, 0x75, 0x62, 0x6D, 0x69, 0x74,
0x6C, 0x3E, 0x00 0x27, 0x3E, 0x55, 0x70, 0x6C, 0x6F, 0x61, 0x64, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x46, 0x69, 0x72,
0x6D, 0x77, 0x61, 0x72, 0x65, 0x3C, 0x2F, 0x62, 0x75, 0x74, 0x74, 0x6F, 0x6E, 0x3E, 0x3C, 0x2F,
0x66, 0x6F, 0x72, 0x6D, 0x3E, 0x3C, 0x2F, 0x66, 0x6F, 0x6E, 0x74, 0x3E, 0x3C, 0x2F, 0x74, 0x64,
0x3E, 0x3C, 0x2F, 0x74, 0x72, 0x3E, 0x00
}; };
static const char settingsA[] = { static const char settingsA[] = {