From 6aecec6267d202dcd892f5c77a2e27442512c629 Mon Sep 17 00:00:00 2001 From: Daniel Eichhorn Date: Sun, 23 Jul 2017 07:50:05 +0200 Subject: [PATCH] Moved helper functions out to meteocon file --- esp8266-weather-station-color.ino | 77 ----------------------------- settings.h | 2 +- weathericons.h | 81 +++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 78 deletions(-) diff --git a/esp8266-weather-station-color.ino b/esp8266-weather-station-color.ino index 6309a8e..5a5ce80 100644 --- a/esp8266-weather-station-color.ino +++ b/esp8266-weather-station-color.ino @@ -575,80 +575,3 @@ void calibrationCallback(int16_t x, int16_t y) { gfx.fillCircle(x, y, 10); } -// Helper function, should be part of the weather station library and should disappear soon -const char* getMeteoconIconFromProgmem(String iconText) { - - if (iconText == "chanceflurries") return chanceflurries; - if (iconText == "chancerain") return chancerain; - if (iconText == "chancesleet") return chancesleet; - if (iconText == "chancesnow") return chancesnow; - if (iconText == "chancetstorms") return chancestorms; - if (iconText == "clear") return clear; - if (iconText == "cloudy") return cloudy; - if (iconText == "flurries") return flurries; - if (iconText == "fog") return fog; - if (iconText == "hazy") return hazy; - if (iconText == "mostlycloudy") return mostlycloudy; - if (iconText == "mostlysunny") return mostlysunny; - if (iconText == "partlycloudy") return partlycloudy; - if (iconText == "partlysunny") return partlysunny; - if (iconText == "sleet") return sleet; - if (iconText == "rain") return rain; - if (iconText == "snow") return snow; - if (iconText == "sunny") return sunny; - if (iconText == "tstorms") return tstorms; - - - return unknown; -} -const char* getMiniMeteoconIconFromProgmem(String iconText) { - if (iconText == "chanceflurries") return minichanceflurries; - if (iconText == "chancerain") return minichancerain; - if (iconText == "chancesleet") return minichancesleet; - if (iconText == "chancesnow") return minichancesnow; - if (iconText == "chancetstorms") return minichancestorms; - if (iconText == "clear") return miniclear; - if (iconText == "cloudy") return minicloudy; - if (iconText == "flurries") return miniflurries; - if (iconText == "fog") return minifog; - if (iconText == "hazy") return minihazy; - if (iconText == "mostlycloudy") return minimostlycloudy; - if (iconText == "mostlysunny") return minimostlysunny; - if (iconText == "partlycloudy") return minipartlycloudy; - if (iconText == "partlysunny") return minipartlysunny; - if (iconText == "sleet") return minisleet; - if (iconText == "rain") return minirain; - if (iconText == "snow") return minisnow; - if (iconText == "sunny") return minisunny; - if (iconText == "tstorms") return minitstorms; - - - return miniunknown; -} -// Helper function, should be part of the weather station library and should disappear soon -const String getShortText(String iconText) { - - if (iconText == "chanceflurries") return "Chance of Flurries"; - if (iconText == "chancerain") return "Chance of Rain"; - if (iconText == "chancesleet") return "Chance of Sleet"; - if (iconText == "chancesnow") return "Chance of Snow"; - if (iconText == "chancetstorms") return "Chance of Storms"; - if (iconText == "clear") return "Clear"; - if (iconText == "cloudy") return "Cloudy"; - if (iconText == "flurries") return "Flurries"; - if (iconText == "fog") return "Fog"; - if (iconText == "hazy") return "Hazy"; - if (iconText == "mostlycloudy") return "Mostly Cloudy"; - if (iconText == "mostlysunny") return "Mostly Sunny"; - if (iconText == "partlycloudy") return "Partly Couldy"; - if (iconText == "partlysunny") return "Partly Sunny"; - if (iconText == "sleet") return "Sleet"; - if (iconText == "rain") return "Rain"; - if (iconText == "snow") return "Snow"; - if (iconText == "sunny") return "Sunny"; - if (iconText == "tstorms") return "Storms"; - - - return "-"; -} - diff --git a/settings.h b/settings.h index e5141c1..265f53a 100644 --- a/settings.h +++ b/settings.h @@ -46,7 +46,7 @@ const int SLEEP_INTERVAL_SECS = 0; // Going to Sleep after idle times, set 0 f // e.g. http://api.wunderground.com/api/808ba87ed77c4511/conditions/q/CA/SAN_FRANCISCO.json <- note that in the US you use the state instead of country code const String DISPLAYED_CITY_NAME = "Zürich"; -const String WUNDERGRROUND_API_KEY = "afe8d9c8337d73d9"; +const String WUNDERGRROUND_API_KEY = ""; const String WUNDERGRROUND_LANGUAGE = "EN"; const String WUNDERGROUND_COUNTRY = "CH"; const String WUNDERGROUND_CITY = "Zurich"; diff --git a/weathericons.h b/weathericons.h index cd2f4b3..1bda4b3 100644 --- a/weathericons.h +++ b/weathericons.h @@ -1,3 +1,4 @@ + const char SquixLogo[] PROGMEM = { 0x01, // Version: 1 0x02, // BitDepth: 2 @@ -3706,5 +3707,85 @@ const char miniunknown[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; + +// Helper function, should be part of the weather station library and should disappear soon +const char* getMeteoconIconFromProgmem(String iconText) { + + if (iconText == "chanceflurries") return chanceflurries; + if (iconText == "chancerain") return chancerain; + if (iconText == "chancesleet") return chancesleet; + if (iconText == "chancesnow") return chancesnow; + if (iconText == "chancetstorms") return chancestorms; + if (iconText == "clear") return clear; + if (iconText == "cloudy") return cloudy; + if (iconText == "flurries") return flurries; + if (iconText == "fog") return fog; + if (iconText == "hazy") return hazy; + if (iconText == "mostlycloudy") return mostlycloudy; + if (iconText == "mostlysunny") return mostlysunny; + if (iconText == "partlycloudy") return partlycloudy; + if (iconText == "partlysunny") return partlysunny; + if (iconText == "sleet") return sleet; + if (iconText == "rain") return rain; + if (iconText == "snow") return snow; + if (iconText == "sunny") return sunny; + if (iconText == "tstorms") return tstorms; + + + return unknown; +} +const char* getMiniMeteoconIconFromProgmem(String iconText) { + if (iconText == "chanceflurries") return minichanceflurries; + if (iconText == "chancerain") return minichancerain; + if (iconText == "chancesleet") return minichancesleet; + if (iconText == "chancesnow") return minichancesnow; + if (iconText == "chancetstorms") return minichancestorms; + if (iconText == "clear") return miniclear; + if (iconText == "cloudy") return minicloudy; + if (iconText == "flurries") return miniflurries; + if (iconText == "fog") return minifog; + if (iconText == "hazy") return minihazy; + if (iconText == "mostlycloudy") return minimostlycloudy; + if (iconText == "mostlysunny") return minimostlysunny; + if (iconText == "partlycloudy") return minipartlycloudy; + if (iconText == "partlysunny") return minipartlysunny; + if (iconText == "sleet") return minisleet; + if (iconText == "rain") return minirain; + if (iconText == "snow") return minisnow; + if (iconText == "sunny") return minisunny; + if (iconText == "tstorms") return minitstorms; + + + return miniunknown; +} +// Helper function, should be part of the weather station library and should disappear soon +const String getShortText(String iconText) { + + if (iconText == "chanceflurries") return "Chance of Flurries"; + if (iconText == "chancerain") return "Chance of Rain"; + if (iconText == "chancesleet") return "Chance of Sleet"; + if (iconText == "chancesnow") return "Chance of Snow"; + if (iconText == "chancetstorms") return "Chance of Storms"; + if (iconText == "clear") return "Clear"; + if (iconText == "cloudy") return "Cloudy"; + if (iconText == "flurries") return "Flurries"; + if (iconText == "fog") return "Fog"; + if (iconText == "hazy") return "Hazy"; + if (iconText == "mostlycloudy") return "Mostly Cloudy"; + if (iconText == "mostlysunny") return "Mostly Sunny"; + if (iconText == "partlycloudy") return "Partly Couldy"; + if (iconText == "partlysunny") return "Partly Sunny"; + if (iconText == "sleet") return "Sleet"; + if (iconText == "rain") return "Rain"; + if (iconText == "snow") return "Snow"; + if (iconText == "sunny") return "Sunny"; + if (iconText == "tstorms") return "Storms"; + + + return "-"; +} + + +