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

Make gmtOffset effectively displayed.

pull/264/head^2
Elías A. Angulo Klein 2024-07-22 02:41:06 +02:00
parent f63f561b52
commit ddf69e79c7
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Watchy.cpp
View File

@ -36,6 +36,7 @@ void Watchy::init(String datetime) {
#else #else
Wire.begin(SDA, SCL); // init i2c Wire.begin(SDA, SCL); // init i2c
#endif #endif
RTC.init(); RTC.init();
// Init the display since is almost sure we will use it // Init the display since is almost sure we will use it
display.epd2.initWatchy(); display.epd2.initWatchy();
@ -445,9 +446,10 @@ void Watchy::setTime() {
int8_t month = currentTime.Month; int8_t month = currentTime.Month;
int8_t year = currentTime.Year; //tmYearToY2k(currentTime.Year); int8_t year = currentTime.Year; //tmYearToY2k(currentTime.Year);
#endif #endif
int8_t gmt = gmtOffset / 3600; // gmt variable defaults to TIMEZONES_SELECTED if defined
int8_t gmt = OFFSETS_SEC[tzIndex] / 3600;
int8_t tzIndex = TIMEZONES_SELECTED;
int8_t setIndex = SET_HOUR; int8_t setIndex = SET_HOUR;
@ -529,13 +531,8 @@ void Watchy::setTime() {
} }
if(tzIndex < 13){ gmt = OFFSETS_SEC[tzIndex] / 3600;
gmt = (tzIndex); gmtOffset = gmt * 3600;
}else if(tzIndex == 13){
gmt = 0;
}else{
gmt = - (tzIndex - 13);
}
display.fillScreen(GxEPD_BLACK); display.fillScreen(GxEPD_BLACK);
display.setTextColor(GxEPD_WHITE); display.setTextColor(GxEPD_WHITE);
@ -619,14 +616,14 @@ void Watchy::setTime() {
tm.Minute = minute; tm.Minute = minute;
tm.Second = 0; tm.Second = 0;
gmtOffset = gmt * 3600;
if(TIMEZONES_NON_GMT_OVERRIDE == 0){ if(TIMEZONES_NON_GMT_OVERRIDE == 0){
setenv("TZ", timeZones[tzIndex].timezone, 1); setenv("TZ", timeZones[tzIndex].timezone, 1);
} else if (TIMEZONES_NON_GMT_OVERRIDE == 1) {
setenv("TZ", tz_override.timezone, 1);
} else{ } else{
#if TIMEZONES_NON_GMT_OVERRIDE == 1
setenv("TZ", tz_override.timezone, 1);
#else
setenv("TZ", timeZones[TIMEZONES_SELECTED].timezone, 1); setenv("TZ", timeZones[TIMEZONES_SELECTED].timezone, 1);
#endif
} }
tzset(); tzset();
@ -775,7 +772,7 @@ weatherData Watchy::_getWeatherData(String cityID, String lat, String lon, Strin
breakTime((time_t)(int)responseObject["sys"]["sunset"], currentWeather.sunset); breakTime((time_t)(int)responseObject["sys"]["sunset"], currentWeather.sunset);
// sync NTP during weather API call and use timezone of lat & lon // sync NTP during weather API call and use timezone of lat & lon
gmtOffset = int(responseObject["timezone"]); gmtOffset = int(responseObject["timezone"]);
syncNTP(); syncNTP(gmtOffset);
} else { } else {
// http error // http error
} }
@ -1144,7 +1141,7 @@ void Watchy::showSyncNTP() {
display.println(gmtOffset); display.println(gmtOffset);
display.display(true); // full refresh display.display(true); // full refresh
if (connectWiFi()) { if (connectWiFi()) {
if (syncNTP()) { if (syncNTP(gmtOffset)) {
display.println("NTP Sync Success\n"); display.println("NTP Sync Success\n");
display.println("Current Time Is:"); display.println("Current Time Is:");

2
src/Watchy.h
View File

@ -58,7 +58,7 @@ typedef struct watchySettings {
int8_t weatherUpdateInterval; int8_t weatherUpdateInterval;
// NTP Settings // NTP Settings
String ntpServer; String ntpServer;
int gmtOffset; long gmtOffset;
// //
bool vibrateOClock; bool vibrateOClock;
} watchySettings; } watchySettings;

1
src/Watchy32KRTC.cpp
View File

@ -64,7 +64,6 @@ void Watchy32KRTC::set(tmElements_t tm) {
timeInfo.tm_hour = tm.Hour; timeInfo.tm_hour = tm.Hour;
timeInfo.tm_min = tm.Minute; timeInfo.tm_min = tm.Minute;
timeInfo.tm_sec = tm.Second; timeInfo.tm_sec = tm.Second;
// Convert tm to timeval // Convert tm to timeval
struct timeval tv; struct timeval tv;
tv.tv_sec = mktime(&timeInfo); tv.tv_sec = mktime(&timeInfo);