mirror of https://github.com/sqfmi/Watchy.git
Merge branch 'master' into dev
commit
9e5d7ad19c
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -10,8 +10,7 @@
|
|||
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
|
||||
//NTP Settings
|
||||
#define NTP_SERVER "pool.ntp.org"
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5
|
||||
#define DST_OFFSET_SEC 3600
|
||||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
|
@ -21,8 +20,7 @@ watchySettings settings{
|
|||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC,
|
||||
DST_OFFSET_SEC
|
||||
GMT_OFFSET_SEC
|
||||
};
|
||||
|
||||
#endif
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Watchy",
|
||||
"version": "1.4.2",
|
||||
"version": "1.4.3",
|
||||
"description": "Watchy - An Open Source E-Paper Watch by SQFMI",
|
||||
"authors": [
|
||||
{
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name=Watchy
|
||||
version=1.4.2
|
||||
version=1.4.3
|
||||
author=SQFMI
|
||||
maintainer=SQFMI
|
||||
sentence=Watchy - An Open Source E-Paper Watch by SQFMI
|
||||
|
|
|
@ -54,7 +54,7 @@ void Watchy::displayBusyCallback(const void *) {
|
|||
void Watchy::deepSleep() {
|
||||
display.hibernate();
|
||||
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
|
||||
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"]);
|
||||
currentWeather.weatherDescription =
|
||||
responseObject["weather"][0]["main"];
|
||||
// sync NTP during weather API call and use timezone of city
|
||||
syncNTP(long(responseObject["timezone"]));
|
||||
} else {
|
||||
// http error
|
||||
}
|
||||
|
@ -975,13 +977,17 @@ void Watchy::showSyncNTP() {
|
|||
|
||||
bool Watchy::syncNTP() { // NTP sync - call after connecting to WiFi and
|
||||
// remember to turn it back off
|
||||
return syncNTP(settings.gmtOffset, settings.dstOffset,
|
||||
return syncNTP(settings.gmtOffset,
|
||||
settings.ntpServer.c_str());
|
||||
}
|
||||
|
||||
bool Watchy::syncNTP(long gmt, int dst,
|
||||
String ntpServer) { // NTP sync - call after connecting to
|
||||
// WiFi and remember to turn it back off
|
||||
bool Watchy::syncNTP(long gmt) {
|
||||
return syncNTP(gmt, settings.ntpServer.c_str());
|
||||
}
|
||||
|
||||
bool Watchy::syncNTP(long gmt, String ntpServer) {
|
||||
// NTP sync - call after connecting to
|
||||
// WiFi and remember to turn it back off
|
||||
WiFiUDP ntpUDP;
|
||||
NTPClient timeClient(ntpUDP, ntpServer.c_str(), gmt);
|
||||
timeClient.begin();
|
||||
|
|
|
@ -62,7 +62,8 @@ public:
|
|||
void showUpdateFW();
|
||||
void showSyncNTP();
|
||||
bool syncNTP();
|
||||
bool syncNTP(long gmt, int dst, String ntpServer);
|
||||
bool syncNTP(long gmt);
|
||||
bool syncNTP(long gmt, String ntpServer);
|
||||
void setTime();
|
||||
void setupWifi();
|
||||
bool connectWiFi();
|
||||
|
|
Loading…
Reference in New Issue