Skip to content

Commit

Permalink
Switch from CityID to Lat an Lon, expose sunrise and sunset
Browse files Browse the repository at this point in the history
  • Loading branch information
Sudrien committed Jun 16, 2023
1 parent 342eb48 commit b84ab91
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 33 deletions.
8 changes: 5 additions & 3 deletions examples/WatchFaces/7_SEG/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/Basic/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/DOS/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/MacPaint/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/Mario/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/Pokemon/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/StarryHorizon/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
8 changes: 5 additions & 3 deletions examples/WatchFaces/Tetris/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#define SETTINGS_H

//Weather Settings
#define CITY_ID "5128581" //New York City https://openweathermap.org/current#cityid
#define LAT "45.793411" // New York City, Looked up on https://www.latlong.net/
#define LON "-97.751968"
#define OPENWEATHERMAP_APIKEY "f058fe1cad2afe8e2ddc5d063a64cecb" //use your own API key :)
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?id=" //open weather api
#define OPENWEATHERMAP_URL "http://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&lang={lang}&units={units}&appid={apiKey}" //open weather api
#define TEMP_UNIT "metric" //metric = Celsius , imperial = Fahrenheit
#define TEMP_LANG "en"
#define WEATHER_UPDATE_INTERVAL 30 //must be greater than 5, measured in minutes
Expand All @@ -13,7 +14,8 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT, will be overwritten by weather data

watchySettings settings{
.cityID = CITY_ID,
.lat = LAT,
.lon = LON,
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
.weatherURL = OPENWEATHERMAP_URL,
.weatherUnit = TEMP_UNIT,
Expand Down
19 changes: 12 additions & 7 deletions src/Watchy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,12 +626,12 @@ void Watchy::drawWatchFace() {
}

weatherData Watchy::getWeatherData() {
return getWeatherData(settings.cityID, settings.weatherUnit,
return getWeatherData(settings.lat, settings.lon, settings.weatherUnit,
settings.weatherLang, settings.weatherURL,
settings.weatherAPIKey, settings.weatherUpdateInterval);
}

weatherData Watchy::getWeatherData(String cityID, String units, String lang,
weatherData Watchy::getWeatherData(String lat, String lon, String units, String lang,
String url, String apiKey,
uint8_t updateInterval) {
currentWeather.isMetric = units == String("metric");
Expand All @@ -644,9 +644,12 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
if (connectWiFi()) {
HTTPClient http; // Use Weather API for live data if WiFi is connected
http.setConnectTimeout(3000); // 3 second max timeout
String weatherQueryURL = url + cityID + String("&units=") + units +
String("&lang=") + lang + String("&appid=") +
apiKey;
String weatherQueryURL = url;
weatherQueryURL.replace("{lat}", lat);
weatherQueryURL.replace("{lon}", lon);
weatherQueryURL.replace("{units}", units);
weatherQueryURL.replace("{lang}", lang);
weatherQueryURL.replace("{apiKey}", apiKey);
http.begin(weatherQueryURL.c_str());
int httpResponseCode = http.GET();
if (httpResponseCode == 200) {
Expand All @@ -656,9 +659,11 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang,
currentWeather.weatherConditionCode =
int(responseObject["weather"][0]["id"]);
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
breakTime((time_t)(int)responseObject["sys"]["sunrise"], currentWeather.sunrise);
breakTime((time_t)(int)responseObject["sys"]["sunset"], currentWeather.sunset);
// sync NTP during weather API call and use timezone of lat & lon
gmtOffset = int(responseObject["timezone"]);
syncNTP(gmtOffset);
} else {
Expand Down
7 changes: 5 additions & 2 deletions src/Watchy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ typedef struct weatherData {
bool isMetric;
String weatherDescription;
bool external;
tmElements_t sunrise;
tmElements_t sunset;
} weatherData;

typedef struct watchySettings {
// Weather Settings
String cityID;
String lat;
String lon;
String weatherAPIKey;
String weatherURL;
String weatherUnit;
Expand Down Expand Up @@ -70,7 +73,7 @@ class Watchy {
void setupWifi();
bool connectWiFi();
weatherData getWeatherData();
weatherData getWeatherData(String cityID, String units, String lang,
weatherData getWeatherData(String lat, String lon, String units, String lang,
String url, String apiKey, uint8_t updateInterval);
void updateFWBegin();

Expand Down

0 comments on commit b84ab91

Please sign in to comment.