pacohope
/
Watchy
mirror of https://github.com/sqfmi/Watchy.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

pull/193/head
sqfmi 2022-10-14 22:23:24 -04:00
parent a24b1d0945 99158e19d4
commit 9e5d7ad19c
11 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/WatchFaces/7_SEG/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

6
examples/WatchFaces/Basic/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

6
examples/WatchFaces/DOS/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

6
examples/WatchFaces/MacPaint/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

6
examples/WatchFaces/Pokemon/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

6
examples/WatchFaces/StarryHorizon/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

6
examples/WatchFaces/Tetris/settings.h
View File

@ -10,8 +10,7 @@
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes #define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
//NTP Settings //NTP Settings
#define NTP_SERVER "pool.ntp.org" #define NTP_SERVER "pool.ntp.org"
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
#define DST_OFFSET_SEC 3600
watchySettings settings{ watchySettings settings{
CITY_ID, CITY_ID,
@ -21,8 +20,7 @@ watchySettings settings{
TEMP_LANG, TEMP_LANG,
WEATHER_UPDATE_INTERVAL, WEATHER_UPDATE_INTERVAL,
NTP_SERVER, NTP_SERVER,
GMT_OFFSET_SEC, GMT_OFFSET_SEC
DST_OFFSET_SEC
}; };
#endif #endif

2
library.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Watchy", "name": "Watchy",
"version": "1.4.2", "version": "1.4.3",
"description": "Watchy - An Open Source E-Paper Watch by SQFMI", "description": "Watchy - An Open Source E-Paper Watch by SQFMI",
"authors": [ "authors": [
{ {

2
library.properties
View File

@ -1,5 +1,5 @@
name=Watchy name=Watchy
version=1.4.2 version=1.4.3
author=SQFMI author=SQFMI
maintainer=SQFMI maintainer=SQFMI
sentence=Watchy - An Open Source E-Paper Watch by SQFMI sentence=Watchy - An Open Source E-Paper Watch by SQFMI

16
src/Watchy.cpp
View File

@ -54,7 +54,7 @@ void Watchy::displayBusyCallback(const void *) {
void Watchy::deepSleep() { void Watchy::deepSleep() {
display.hibernate(); display.hibernate();
if (displayFullInit) // For some reason, seems to be enabled on first boot if (displayFullInit) // For some reason, seems to be enabled on first boot
esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER); esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
displayFullInit = false; // Notify not to init it again displayFullInit = false; // Notify not to init it again
RTC.clearAlarm(); // resets the alarm flag in the RTC RTC.clearAlarm(); // resets the alarm flag in the RTC
@ -618,6 +618,8 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
int(responseObject["weather"][0]["id"]); int(responseObject["weather"][0]["id"]);
currentWeather.weatherDescription = currentWeather.weatherDescription =
responseObject["weather"][0]["main"]; responseObject["weather"][0]["main"];
// sync NTP during weather API call and use timezone of city
syncNTP(long(responseObject["timezone"]));
} else { } else {
// http error // http error
} }
@ -975,13 +977,17 @@ void Watchy::showSyncNTP() {
bool Watchy::syncNTP() { // NTP sync - call after connecting to WiFi and bool Watchy::syncNTP() { // NTP sync - call after connecting to WiFi and
// remember to turn it back off // remember to turn it back off
return syncNTP(settings.gmtOffset, settings.dstOffset, return syncNTP(settings.gmtOffset,
settings.ntpServer.c_str()); settings.ntpServer.c_str());
} }
bool Watchy::syncNTP(long gmt, int dst, bool Watchy::syncNTP(long gmt) {
String ntpServer) { // NTP sync - call after connecting to return syncNTP(gmt, settings.ntpServer.c_str());
// WiFi and remember to turn it back off }
bool Watchy::syncNTP(long gmt, String ntpServer) {
// NTP sync - call after connecting to
// WiFi and remember to turn it back off
WiFiUDP ntpUDP; WiFiUDP ntpUDP;
NTPClient timeClient(ntpUDP, ntpServer.c_str(), gmt); NTPClient timeClient(ntpUDP, ntpServer.c_str(), gmt);
timeClient.begin(); timeClient.begin();

3
src/Watchy.h
View File

@ -62,7 +62,8 @@ public:
void showUpdateFW(); void showUpdateFW();
void showSyncNTP(); void showSyncNTP();
bool syncNTP(); bool syncNTP();
bool syncNTP(long gmt, int dst, String ntpServer); bool syncNTP(long gmt);
bool syncNTP(long gmt, String ntpServer);
void setTime(); void setTime();
void setupWifi(); void setupWifi();
bool connectWiFi(); bool connectWiFi();