From 1b4c9817e29cdba0313e1815660e3c2df513b283 Mon Sep 17 00:00:00 2001 From: JustScott Date: Thu, 3 Oct 2024 14:48:58 -0500 Subject: [PATCH 1/2] Add shorter/simpler weather condition options. --- src/displayapp/screens/WeatherSymbols.cpp | 23 +++++++++++++++++++++++ src/displayapp/screens/WeatherSymbols.h | 1 + 2 files changed, 24 insertions(+) diff --git a/src/displayapp/screens/WeatherSymbols.cpp b/src/displayapp/screens/WeatherSymbols.cpp index de66312f90..f7e41547c0 100644 --- a/src/displayapp/screens/WeatherSymbols.cpp +++ b/src/displayapp/screens/WeatherSymbols.cpp @@ -59,3 +59,26 @@ const char* Pinetime::Applications::Screens::Symbols::GetCondition(const Pinetim return ""; } } + +const char* Pinetime::Applications::Screens::Symbols::GetSimpleCondition(const Pinetime::Controllers::SimpleWeatherService::Icons icon) { + switch (icon) { + case Pinetime::Controllers::SimpleWeatherService::Icons::Sun: + return "Clear"; + case Pinetime::Controllers::SimpleWeatherService::Icons::CloudsSun: + case Pinetime::Controllers::SimpleWeatherService::Icons::Clouds: + case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds: + return "Clouds"; + case Pinetime::Controllers::SimpleWeatherService::Icons::CloudShowerHeavy: + return "Rain"; + case Pinetime::Controllers::SimpleWeatherService::Icons::CloudSunRain: + return "Drizzle"; + case Pinetime::Controllers::SimpleWeatherService::Icons::Thunderstorm: + return "Thunder"; + case Pinetime::Controllers::SimpleWeatherService::Icons::Snow: + return "Snow"; + case Pinetime::Controllers::SimpleWeatherService::Icons::Smog: + return "Mist"; + default: + return ""; + } +} diff --git a/src/displayapp/screens/WeatherSymbols.h b/src/displayapp/screens/WeatherSymbols.h index f3eeed5581..0fed0bdcea 100644 --- a/src/displayapp/screens/WeatherSymbols.h +++ b/src/displayapp/screens/WeatherSymbols.h @@ -8,6 +8,7 @@ namespace Pinetime { namespace Symbols { const char* GetSymbol(const Pinetime::Controllers::SimpleWeatherService::Icons icon); const char* GetCondition(const Pinetime::Controllers::SimpleWeatherService::Icons icon); + const char* GetSimpleCondition(const Pinetime::Controllers::SimpleWeatherService::Icons icon); } } } From 09337cb346ee00507e7bfe398835140e5e89000c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= Date: Mon, 29 Dec 2025 22:34:38 +0100 Subject: [PATCH 2/2] Weather : Improve simple weather conditions (Pinetime::Applications::Screens::Symbols::GetSimpleCondition) to me more consistent with OpenWeather Api (https://openweathermap.org/weather-conditions) --- src/displayapp/screens/WeatherSymbols.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/displayapp/screens/WeatherSymbols.cpp b/src/displayapp/screens/WeatherSymbols.cpp index f7e41547c0..0a963bc677 100644 --- a/src/displayapp/screens/WeatherSymbols.cpp +++ b/src/displayapp/screens/WeatherSymbols.cpp @@ -63,15 +63,15 @@ const char* Pinetime::Applications::Screens::Symbols::GetCondition(const Pinetim const char* Pinetime::Applications::Screens::Symbols::GetSimpleCondition(const Pinetime::Controllers::SimpleWeatherService::Icons icon) { switch (icon) { case Pinetime::Controllers::SimpleWeatherService::Icons::Sun: - return "Clear"; case Pinetime::Controllers::SimpleWeatherService::Icons::CloudsSun: + return "Clear"; case Pinetime::Controllers::SimpleWeatherService::Icons::Clouds: case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds: - return "Clouds"; + return "Cloudy"; case Pinetime::Controllers::SimpleWeatherService::Icons::CloudShowerHeavy: - return "Rain"; + return "Showers"; case Pinetime::Controllers::SimpleWeatherService::Icons::CloudSunRain: - return "Drizzle"; + return "Rain"; case Pinetime::Controllers::SimpleWeatherService::Icons::Thunderstorm: return "Thunder"; case Pinetime::Controllers::SimpleWeatherService::Icons::Snow: