diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a97a0158b2f9af46d4ef4a073906e25ea5481e8..d69c1d6be6cdf2b9ec7a569547f8bd1274353908 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -398,6 +398,7 @@ displayapp/screens/Alarm.cpp
displayapp/screens/Styles.cpp
displayapp/screens/WeatherSymbols.cpp
displayapp/Colors.cpp
+ displayapp/Weather.cpp
displayapp/widgets/Counter.cpp
displayapp/widgets/PageIndicator.cpp
displayapp/widgets/DotIndicator.cpp
@@ -606,6 +607,7 @@ displayapp/screens/FirmwareValidation.h
displayapp/screens/ApplicationList.h
displayapp/screens/CheckboxList.h
displayapp/Apps.h
+ displayapp/Weather.h
displayapp/screens/Notifications.h
displayapp/screens/HeartRate.h
displayapp/screens/Metronome.h
diff --git a/src/components/ble/SimpleWeatherService.cpp b/src/components/ble/SimpleWeatherService.cpp
index 504cad14b5491259a82a541029ece3f16f035df5..a1f0439ebf2bf14647914cec7be5ad8780fe2d1b 100644
--- a/src/components/ble/SimpleWeatherService.cpp
+++ b/src/components/ble/SimpleWeatherService.cpp
@@ -42,9 +42,9 @@ SimpleWeatherService::Location cityName;
std::memcpy(cityName.data(), &dataBuffer[16], 32);
cityName[32] = '\0';
return SimpleWeatherService::CurrentWeather(ToUInt64(&dataBuffer[2]),
- ToInt16(&dataBuffer[10]),
- ToInt16(&dataBuffer[12]),
- ToInt16(&dataBuffer[14]),
+ SimpleWeatherService::Temperature {ToInt16(&dataBuffer[10])},
+ SimpleWeatherService::Temperature {ToInt16(&dataBuffer[12])},
+ SimpleWeatherService::Temperature {ToInt16(&dataBuffer[14])},
SimpleWeatherService::Icons {dataBuffer[16 + 32]},
std::move(cityName));
}
@@ -56,8 +56,8 @@ std::array days;
const uint8_t nbDaysInBuffer = dataBuffer[10];
const uint8_t nbDays = std::min(SimpleWeatherService::MaxNbForecastDays, nbDaysInBuffer);
for (int i = 0; i < nbDays; i++) {
- days[i] = SimpleWeatherService::Forecast::Day {ToInt16(&dataBuffer[11 + (i * 5)]),
- ToInt16(&dataBuffer[13 + (i * 5)]),
+ days[i] = SimpleWeatherService::Forecast::Day {SimpleWeatherService::Temperature {ToInt16(&dataBuffer[11 + (i * 5)])},
+ SimpleWeatherService::Temperature {ToInt16(&dataBuffer[13 + (i * 5)])},
SimpleWeatherService::Icons {dataBuffer[15 + (i * 5)]}};
}
return SimpleWeatherService::Forecast {timestamp, nbDays, days};
@@ -154,13 +154,14 @@ return {};
}
bool SimpleWeatherService::CurrentWeather::operator==(const SimpleWeatherService::CurrentWeather& other) const {
- return this->iconId == other.iconId && this->temperature == other.temperature && this->timestamp == other.timestamp &&
- this->maxTemperature == other.maxTemperature && this->minTemperature == other.maxTemperature &&
+ return this->iconId == other.iconId && this->temperature.temp == other.temperature.temp && this->timestamp == other.timestamp &&
+ this->maxTemperature.temp == other.maxTemperature.temp && this->minTemperature.temp == other.maxTemperature.temp &&
std::strcmp(this->location.data(), other.location.data()) == 0;
}
bool SimpleWeatherService::Forecast::Day::operator==(const SimpleWeatherService::Forecast::Day& other) const {
- return this->iconId == other.iconId && this->maxTemperature == other.maxTemperature && this->minTemperature == other.maxTemperature;
+ return this->iconId == other.iconId && this->maxTemperature.temp == other.maxTemperature.temp &&
+ this->minTemperature.temp == other.maxTemperature.temp;
}
bool SimpleWeatherService::Forecast::operator==(const SimpleWeatherService::Forecast& other) const {
diff --git a/src/components/ble/SimpleWeatherService.h b/src/components/ble/SimpleWeatherService.h
index 30cc5c03a2e77ba56e959eedca088308a44629e3..ee40fd6fae08d426cc8419c78893205be0ee8c46 100644
--- a/src/components/ble/SimpleWeatherService.h
+++ b/src/components/ble/SimpleWeatherService.h
@@ -61,13 +61,17 @@ Smog = 8, // Mist
Unknown = 255
};
+ struct Temperature {
+ int16_t temp;
+ };
+
using Location = std::array<char, 33>; // 32 char + \0 (end of string)
struct CurrentWeather {
CurrentWeather(uint64_t timestamp,
- int16_t temperature,
- int16_t minTemperature,
- int16_t maxTemperature,
+ Temperature temperature,
+ Temperature minTemperature,
+ Temperature maxTemperature,
Icons iconId,
Location&& location)
: timestamp {timestamp},
@@ -79,9 +83,9 @@ location {std::move(location)} {
}
uint64_t timestamp;
- int16_t temperature;
- int16_t minTemperature;
- int16_t maxTemperature;
+ Temperature temperature;
+ Temperature minTemperature;
+ Temperature maxTemperature;
Icons iconId;
Location location;
@@ -93,8 +97,8 @@ uint64_t timestamp;
uint8_t nbDays;
struct Day {
- int16_t minTemperature;
- int16_t maxTemperature;
+ Temperature minTemperature;
+ Temperature maxTemperature;
Icons iconId;
bool operator==(const Day& other) const;
@@ -107,10 +111,6 @@ };
std::optional<CurrentWeather> Current() const;
std::optional<Forecast> GetForecast() const;
-
- static int16_t CelsiusToFahrenheit(int16_t celsius) {
- return celsius * 9 / 5 + 3200;
- }
private:
// 00050000-78fc-48fe-8e23-433b3a1942d0
diff --git a/src/displayapp/Weather.cpp b/src/displayapp/Weather.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a0f0a281c2fe325844306d3b8b84cb96e3dbe894
--- /dev/null
+++ b/src/displayapp/Weather.cpp
@@ -0,0 +1,13 @@
+#include "displayapp/Weather.h"
+
+using namespace Pinetime::Applications;
+
+Temperature Pinetime::Applications::Convert(Controllers::SimpleWeatherService::Temperature temp,
+ Controllers::Settings::WeatherFormat format) {
+ Temperature t = {temp.temp};
+ if (format == Controllers::Settings::WeatherFormat::Imperial) {
+ t.temp = t.temp * 9 / 5 + 3200;
+ }
+ t.temp = t.temp / 100 + (t.temp % 100 >= 50 ? 1 : 0);
+ return t;
+}
diff --git a/src/displayapp/Weather.h b/src/displayapp/Weather.h
new file mode 100644
index 0000000000000000000000000000000000000000..0dd17fcee26a7f0d308b50b96a98a9d2b722bb8e
--- /dev/null
+++ b/src/displayapp/Weather.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cstdint>
+#include <variant>
+
+#include "components/ble/SimpleWeatherService.h"
+#include "components/settings/Settings.h"
+
+namespace Pinetime {
+ namespace Applications {
+ struct Temperature {
+ int16_t temp;
+ };
+
+ Temperature Convert(Controllers::SimpleWeatherService::Temperature temp, Controllers::Settings::WeatherFormat format);
+ }
+}
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index 2e00ee9819b7b3106f69ce18484ed5c8aaa689e5..b6c4caa1e380a43445900bfa0f3db7902a2e9ae7 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -2,6 +2,8 @@ #include "displayapp/screens/WatchFaceDigital.h"
#include <lvgl/lvgl.h>
#include <cstdio>
+
+#include "displayapp/Weather.h"
#include "displayapp/screens/NotificationIcon.h"
#include "displayapp/screens/Symbols.h"
#include "displayapp/screens/WeatherSymbols.h"
@@ -174,14 +176,12 @@ currentWeather = weatherService.Current();
if (currentWeather.IsUpdated()) {
auto optCurrentWeather = currentWeather.Get();
if (optCurrentWeather) {
- int16_t temp = optCurrentWeather->temperature;
char tempUnit = 'C';
if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
- temp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(temp);
tempUnit = 'F';
}
- temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
- lv_label_set_text_fmt(temperature, "%d°%c", temp, tempUnit);
+ Applications::Temperature temp = Applications::Convert(optCurrentWeather->temperature, settingsController.GetWeatherFormat());
+ lv_label_set_text_fmt(temperature, "%d°%c", temp.temp, tempUnit);
lv_label_set_text(weatherIcon, Symbols::GetSymbol(optCurrentWeather->iconId));
} else {
lv_label_set_text_static(temperature, "");
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
index e56031f74ad8f7ec9fb0b47621ca110bd616bfc1..c59461118064f705821ffcc3876abfcfe9b8677c 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp
+++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -22,7 +22,8 @@
#include "displayapp/screens/WatchFacePineTimeStyle.h"
#include <lvgl/lvgl.h>
#include <cstdio>
-#include <displayapp/Colors.h>
+#include "displayapp/Colors.h"
+#include "displayapp/Weather.h"
#include "displayapp/screens/BatteryIcon.h"
#include "displayapp/screens/BleIcon.h"
#include "displayapp/screens/NotificationIcon.h"
@@ -543,11 +544,7 @@ currentWeather = weatherService.Current();
if (currentWeather.IsUpdated()) {
auto optCurrentWeather = currentWeather.Get();
if (optCurrentWeather) {
- int16_t temp = optCurrentWeather->temperature;
- if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
- temp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(temp);
- }
- temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
+ Applications::Temperature temp = Applications::Convert(optCurrentWeather->temperature, settingsController.GetWeatherFormat());
lv_label_set_text_fmt(temperature, "%d°", temp);
lv_label_set_text(weatherIcon, Symbols::GetSymbol(optCurrentWeather->iconId));
} else {
diff --git a/src/displayapp/screens/Weather.cpp b/src/displayapp/screens/Weather.cpp
index 5321b7cc2986065f2949cd7821e5f5415e2fc514..1bdad983cedaf42fb65fae9c780bfc88f640df24 100644
--- a/src/displayapp/screens/Weather.cpp
+++ b/src/displayapp/screens/Weather.cpp
@@ -1,8 +1,11 @@
#include "displayapp/screens/Weather.h"
+
#include <lvgl/lvgl.h>
+
#include "components/ble/SimpleWeatherService.h"
#include "components/datetime/DateTimeController.h"
#include "components/settings/Settings.h"
+#include "displayapp/Weather.h"
#include "displayapp/DisplayApp.h"
#include "displayapp/screens/WeatherSymbols.h"
#include "displayapp/InfiniTimeTheme.h"
@@ -10,30 +13,26 @@
using namespace Pinetime::Applications::Screens;
namespace {
- lv_color_t TemperatureColor(int16_t temperature) {
- if (temperature <= 0) { // freezing
+ lv_color_t TemperatureColor(Pinetime::Applications::Temperature temp) {
+ if (temp.temp <= 0) { // freezing
return Colors::blue;
- } else if (temperature <= 400) { // ice
+ } else if (temp.temp <= 4) { // ice
return LV_COLOR_CYAN;
- } else if (temperature >= 2700) { // hot
+ } else if (temp.temp >= 27) { // hot
return Colors::deepOrange;
}
return Colors::orange; // normal
}
- uint8_t TemperatureStyle(int16_t temperature) {
- if (temperature <= 0) { // freezing
+ uint8_t TemperatureStyle(Pinetime::Applications::Temperature temp) {
+ if (temp.temp <= 0) { // freezing
return LV_TABLE_PART_CELL3;
- } else if (temperature <= 400) { // ice
+ } else if (temp.temp <= 4) { // ice
return LV_TABLE_PART_CELL4;
- } else if (temperature >= 2700) { // hot
+ } else if (temp.temp >= 27) { // hot
return LV_TABLE_PART_CELL6;
}
return LV_TABLE_PART_CELL5; // normal
- }
-
- int16_t RoundTemperature(int16_t temp) {
- return temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
}
}
@@ -120,22 +119,19 @@ currentWeather = weatherService.Current();
if (currentWeather.IsUpdated()) {
auto optCurrentWeather = currentWeather.Get();
if (optCurrentWeather) {
- int16_t temp = optCurrentWeather->temperature;
- int16_t minTemp = optCurrentWeather->minTemperature;
- int16_t maxTemp = optCurrentWeather->maxTemperature;
+ Applications::Temperature temp = Applications::Convert(optCurrentWeather->temperature, settingsController.GetWeatherFormat());
+ Applications::Temperature minTemp = Applications::Convert(optCurrentWeather->minTemperature, settingsController.GetWeatherFormat());
+ Applications::Temperature maxTemp = Applications::Convert(optCurrentWeather->maxTemperature, settingsController.GetWeatherFormat());
lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, TemperatureColor(temp));
char tempUnit = 'C';
if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
- temp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(temp);
- minTemp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(minTemp);
- maxTemp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(maxTemp);
tempUnit = 'F';
}
lv_label_set_text(icon, Symbols::GetSymbol(optCurrentWeather->iconId));
lv_label_set_text(condition, Symbols::GetCondition(optCurrentWeather->iconId));
- lv_label_set_text_fmt(temperature, "%d°%c", RoundTemperature(temp), tempUnit);
- lv_label_set_text_fmt(minTemperature, "%d°", RoundTemperature(minTemp));
- lv_label_set_text_fmt(maxTemperature, "%d°", RoundTemperature(maxTemp));
+ lv_label_set_text_fmt(temperature, "%d°%c", temp.temp, tempUnit);
+ lv_label_set_text_fmt(minTemperature, "%d°", minTemp.temp);
+ lv_label_set_text_fmt(maxTemperature, "%d°", maxTemp.temp);
} else {
lv_label_set_text(icon, "");
lv_label_set_text(condition, "");
@@ -153,27 +149,23 @@ if (optCurrentForecast) {
std::tm localTime = *std::localtime(reinterpret_cast<const time_t*>(&optCurrentForecast->timestamp));
for (int i = 0; i < Controllers::SimpleWeatherService::MaxNbForecastDays; i++) {
- int16_t maxTemp = optCurrentForecast->days[i].maxTemperature;
- int16_t minTemp = optCurrentForecast->days[i].minTemperature;
+ Applications::Temperature maxTemp =
+ Applications::Convert(optCurrentForecast->days[i].maxTemperature, settingsController.GetWeatherFormat());
+ Applications::Temperature minTemp =
+ Applications::Convert(optCurrentForecast->days[i].minTemperature, settingsController.GetWeatherFormat());
lv_table_set_cell_type(forecast, 2, i, TemperatureStyle(maxTemp));
lv_table_set_cell_type(forecast, 3, i, TemperatureStyle(minTemp));
- if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
- maxTemp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(maxTemp);
- minTemp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(minTemp);
- }
uint8_t wday = localTime.tm_wday + i + 1;
if (wday > 7) {
wday -= 7;
}
- maxTemp = RoundTemperature(maxTemp);
- minTemp = RoundTemperature(minTemp);
const char* dayOfWeek = Controllers::DateTime::DayOfWeekShortToStringLow(static_cast<Controllers::DateTime::Days>(wday));
lv_table_set_cell_value(forecast, 0, i, dayOfWeek);
lv_table_set_cell_value(forecast, 1, i, Symbols::GetSymbol(optCurrentForecast->days[i].iconId));
// Pad cells based on the largest number of digits on each column
char maxPadding[3] = " ";
char minPadding[3] = " ";
- int diff = snprintf(nullptr, 0, "%d", maxTemp) - snprintf(nullptr, 0, "%d", minTemp);
+ int diff = snprintf(nullptr, 0, "%d", maxTemp.temp) - snprintf(nullptr, 0, "%d", minTemp.temp);
if (diff <= 0) {
maxPadding[-diff] = '\0';
minPadding[0] = '\0';
@@ -181,8 +173,8 @@ } else {
maxPadding[0] = '\0';
minPadding[diff] = '\0';
}
- lv_table_set_cell_value_fmt(forecast, 2, i, "%s%d", maxPadding, maxTemp);
- lv_table_set_cell_value_fmt(forecast, 3, i, "%s%d", minPadding, minTemp);
+ lv_table_set_cell_value_fmt(forecast, 2, i, "%s%d", maxPadding, maxTemp.temp);
+ lv_table_set_cell_value_fmt(forecast, 3, i, "%s%d", minPadding, minTemp.temp);
}
} else {
for (int i = 0; i < Controllers::SimpleWeatherService::MaxNbForecastDays; i++) {