Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
sqfmi committed Dec 30, 2022
2 parents 83aada6 + aaa3d91 commit e5556cb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/Watchy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
int(responseObject["weather"][0]["id"]);
currentWeather.weatherDescription =
JSONVar::stringify(responseObject["weather"][0]["main"]);
currentWeather.external = true;
// sync NTP during weather API call and use timezone of city
gmtOffset = int(responseObject["timezone"]);
syncNTP(gmtOffset);
Expand All @@ -657,6 +658,7 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
}
currentWeather.temperature = temperature;
currentWeather.weatherConditionCode = 800;
currentWeather.external = false;
}
weatherIntervalCounter = 0;
} else {
Expand Down
1 change: 1 addition & 0 deletions src/Watchy.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ typedef struct weatherData {
int16_t weatherConditionCode;
bool isMetric;
String weatherDescription;
bool external;
} weatherData;

typedef struct watchySettings {
Expand Down

0 comments on commit e5556cb

Please sign in to comment.