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

Merge pull request #202 from khenderick/feature/weather-source 

Keep track on weather source
pull/204/head
SQFMI 2022-12-29 18:34:06 -05:00 committed by GitHub
parent 7333873f08 f49e1a5fab
commit aaa3d91113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Watchy.cpp
View File

@ -618,6 +618,7 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
int(responseObject["weather"][0]["id"]); int(responseObject["weather"][0]["id"]);
currentWeather.weatherDescription = currentWeather.weatherDescription =
JSONVar::stringify(responseObject["weather"][0]["main"]); JSONVar::stringify(responseObject["weather"][0]["main"]);
currentWeather.external = true;
// sync NTP during weather API call and use timezone of city // sync NTP during weather API call and use timezone of city
syncNTP(long(responseObject["timezone"])); syncNTP(long(responseObject["timezone"]));
} else { } else {
@ -634,6 +635,7 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
} }
currentWeather.temperature = temperature; currentWeather.temperature = temperature;
currentWeather.weatherConditionCode = 800; currentWeather.weatherConditionCode = 800;
currentWeather.external = false;
} }
weatherIntervalCounter = 0; weatherIntervalCounter = 0;
} else { } else {

1
src/Watchy.h
View File

@ -22,6 +22,7 @@ typedef struct weatherData {
int16_t weatherConditionCode; int16_t weatherConditionCode;
bool isMetric; bool isMetric;
String weatherDescription; String weatherDescription;
bool external;
} weatherData; } weatherData;
typedef struct watchySettings { typedef struct watchySettings {