diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d69c1d6be6cdf2b9ec7a569547f8bd1274353908..0a97a0158b2f9af46d4ef4a073906e25ea5481e8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -398,7 +398,6 @@ 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
@@ -607,7 +606,6 @@ 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 a1f0439ebf2bf14647914cec7be5ad8780fe2d1b..a58c3a76b4b4281ea1d94253c9553963bd6b1ee2 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]),
- SimpleWeatherService::Temperature {ToInt16(&dataBuffer[10])},
- SimpleWeatherService::Temperature {ToInt16(&dataBuffer[12])},
- SimpleWeatherService::Temperature {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 {SimpleWeatherService::Temperature {ToInt16(&dataBuffer[11 + (i * 5)])},
- SimpleWeatherService::Temperature {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};
@@ -98,9 +98,9 @@ if (GetVersion(dataBuffer) == 0) {
currentWeather = CreateCurrentWeather(dataBuffer);
NRF_LOG_INFO("Current weather :\n\tTimestamp : %d\n\tTemperature:%d\n\tMin:%d\n\tMax:%d\n\tIcon:%d\n\tLocation:%s",
currentWeather->timestamp,
- currentWeather->temperature,
- currentWeather->minTemperature,
- currentWeather->maxTemperature,
+ currentWeather->temperature.PreciseCelsius(),
+ currentWeather->minTemperature.PreciseCelsius(),
+ currentWeather->maxTemperature.PreciseCelsius(),
currentWeather->iconId,
currentWeather->location.data());
}
@@ -112,8 +112,8 @@ NRF_LOG_INFO("Forecast : Timestamp : %d", forecast->timestamp);
for (int i = 0; i < 5; i++) {
NRF_LOG_INFO("\t[%d] Min: %d - Max : %d - Icon : %d",
i,
- forecast->days[i].minTemperature,
- forecast->days[i].maxTemperature,
+ forecast->days[i].minTemperature.PreciseCelsius(),
+ forecast->days[i].maxTemperature.PreciseCelsius(),
forecast->days[i].iconId);
}
}
@@ -154,14 +154,13 @@ return {};
}
bool SimpleWeatherService::CurrentWeather::operator==(const SimpleWeatherService::CurrentWeather& other) const {
- 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 &&
+ return this->iconId == other.iconId && this->temperature == other.temperature && this->timestamp == other.timestamp &&
+ this->maxTemperature == other.maxTemperature && this->minTemperature == other.maxTemperature &&
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.temp == other.maxTemperature.temp &&
- this->minTemperature.temp == other.maxTemperature.temp;
+ return this->iconId == other.iconId && this->maxTemperature == other.maxTemperature && this->minTemperature == other.maxTemperature;
}
bool SimpleWeatherService::Forecast::operator==(const SimpleWeatherService::Forecast& other) const {
diff --git a/src/components/ble/SimpleWeatherService.h b/src/components/ble/SimpleWeatherService.h
index ee40fd6fae08d426cc8419c78893205be0ee8c46..36bbea4822911af134b82feb6c38674eee6ce1e1 100644
--- a/src/components/ble/SimpleWeatherService.h
+++ b/src/components/ble/SimpleWeatherService.h
@@ -61,8 +61,33 @@ Smog = 8, // Mist
Unknown = 255
};
- struct Temperature {
- int16_t temp;
+ class Temperature {
+ public:
+ explicit Temperature(int16_t raw = 0) : raw {raw} {
+ }
+
+ [[nodiscard]] int16_t PreciseCelsius() const {
+ return raw;
+ }
+
+ [[nodiscard]] int16_t PreciseFahrenheit() const {
+ return raw * 9 / 5 + 3200;
+ }
+
+ [[nodiscard]] int16_t Celsius() const {
+ return (PreciseCelsius() + 50) / 100;
+ }
+
+ [[nodiscard]] int16_t Fahrenheit() const {
+ return (PreciseFahrenheit() + 50) / 100;
+ }
+
+ bool operator==(const Temperature& other) const {
+ return raw == other.raw;
+ }
+
+ private:
+ int16_t raw;
};
using Location = std::array<char, 33>; // 32 char + \0 (end of string)
diff --git a/src/displayapp/Weather.cpp b/src/displayapp/Weather.cpp
deleted file mode 100644
index a0f0a281c2fe325844306d3b8b84cb96e3dbe894..0000000000000000000000000000000000000000
--- a/src/displayapp/Weather.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#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
deleted file mode 100644
index 0dd17fcee26a7f0d308b50b96a98a9d2b722bb8e..0000000000000000000000000000000000000000
--- a/src/displayapp/Weather.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#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 b6c4caa1e380a43445900bfa0f3db7902a2e9ae7..d944117dd7e7a50bbd11e743d9eb972f0fe5e0b5 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -3,7 +3,6 @@
#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"
@@ -176,12 +175,13 @@ currentWeather = weatherService.Current();
if (currentWeather.IsUpdated()) {
auto optCurrentWeather = currentWeather.Get();
if (optCurrentWeather) {
+ int16_t temp = optCurrentWeather->temperature.Celsius();
char tempUnit = 'C';
if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
+ temp = optCurrentWeather->temperature.Fahrenheit();
tempUnit = 'F';
}
- Applications::Temperature temp = Applications::Convert(optCurrentWeather->temperature, settingsController.GetWeatherFormat());
- lv_label_set_text_fmt(temperature, "%d°%c", temp.temp, tempUnit);
+ lv_label_set_text_fmt(temperature, "%d°%c", 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 c59461118064f705821ffcc3876abfcfe9b8677c..22ccefc72283089d3f5517d825a3ca92ff53088a 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp
+++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -23,7 +23,6 @@ #include "displayapp/screens/WatchFacePineTimeStyle.h"
#include <lvgl/lvgl.h>
#include <cstdio>
#include "displayapp/Colors.h"
-#include "displayapp/Weather.h"
#include "displayapp/screens/BatteryIcon.h"
#include "displayapp/screens/BleIcon.h"
#include "displayapp/screens/NotificationIcon.h"
@@ -544,7 +543,10 @@ currentWeather = weatherService.Current();
if (currentWeather.IsUpdated()) {
auto optCurrentWeather = currentWeather.Get();
if (optCurrentWeather) {
- Applications::Temperature temp = Applications::Convert(optCurrentWeather->temperature, settingsController.GetWeatherFormat());
+ int16_t temp = optCurrentWeather->temperature.Celsius();
+ if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
+ temp = optCurrentWeather->temperature.Fahrenheit();
+ }
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 1bdad983cedaf42fb65fae9c780bfc88f640df24..275153e93bfe20bdf421c2251afaa13a5b66525c 100644
--- a/src/displayapp/screens/Weather.cpp
+++ b/src/displayapp/screens/Weather.cpp
@@ -5,7 +5,6 @@
#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"
@@ -13,23 +12,23 @@
using namespace Pinetime::Applications::Screens;
namespace {
- lv_color_t TemperatureColor(Pinetime::Applications::Temperature temp) {
- if (temp.temp <= 0) { // freezing
+ lv_color_t TemperatureColor(Pinetime::Controllers::SimpleWeatherService::Temperature temp) {
+ if (temp.Celsius() <= 0) { // freezing
return Colors::blue;
- } else if (temp.temp <= 4) { // ice
+ } else if (temp.Celsius() <= 4) { // ice
return LV_COLOR_CYAN;
- } else if (temp.temp >= 27) { // hot
+ } else if (temp.Celsius() >= 27) { // hot
return Colors::deepOrange;
}
return Colors::orange; // normal
}
- uint8_t TemperatureStyle(Pinetime::Applications::Temperature temp) {
- if (temp.temp <= 0) { // freezing
+ uint8_t TemperatureStyle(Pinetime::Controllers::SimpleWeatherService::Temperature temp) {
+ if (temp.Celsius() <= 0) { // freezing
return LV_TABLE_PART_CELL3;
- } else if (temp.temp <= 4) { // ice
+ } else if (temp.Celsius() <= 4) { // ice
return LV_TABLE_PART_CELL4;
- } else if (temp.temp >= 27) { // hot
+ } else if (temp.Celsius() >= 27) { // hot
return LV_TABLE_PART_CELL6;
}
return LV_TABLE_PART_CELL5; // normal
@@ -119,19 +118,25 @@ currentWeather = weatherService.Current();
if (currentWeather.IsUpdated()) {
auto optCurrentWeather = currentWeather.Get();
if (optCurrentWeather) {
- 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));
+ int16_t temp = optCurrentWeather->temperature.Celsius();
+ int16_t minTemp = optCurrentWeather->minTemperature.Celsius();
+ int16_t maxTemp = optCurrentWeather->maxTemperature.Celsius();
char tempUnit = 'C';
if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
+ temp = optCurrentWeather->temperature.Fahrenheit();
+ minTemp = optCurrentWeather->minTemperature.Fahrenheit();
+ maxTemp = optCurrentWeather->maxTemperature.Fahrenheit();
tempUnit = 'F';
}
+ lv_obj_set_style_local_text_color(temperature,
+ LV_LABEL_PART_MAIN,
+ LV_STATE_DEFAULT,
+ TemperatureColor(optCurrentWeather->temperature));
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", temp.temp, tempUnit);
- lv_label_set_text_fmt(minTemperature, "%d°", minTemp.temp);
- lv_label_set_text_fmt(maxTemperature, "%d°", maxTemp.temp);
+ lv_label_set_text_fmt(temperature, "%d°%c", temp, tempUnit);
+ lv_label_set_text_fmt(minTemperature, "%d°", minTemp);
+ lv_label_set_text_fmt(maxTemperature, "%d°", maxTemp);
} else {
lv_label_set_text(icon, "");
lv_label_set_text(condition, "");
@@ -149,12 +154,14 @@ if (optCurrentForecast) {
std::tm localTime = *std::localtime(reinterpret_cast<const time_t*>(&optCurrentForecast->timestamp));
for (int i = 0; i < Controllers::SimpleWeatherService::MaxNbForecastDays; i++) {
- 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));
+ int16_t minTemp = optCurrentForecast->days[i].maxTemperature.Celsius();
+ int16_t maxTemp = optCurrentForecast->days[i].minTemperature.Celsius();
+ if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
+ minTemp = optCurrentForecast->days[i].maxTemperature.Fahrenheit();
+ maxTemp = optCurrentForecast->days[i].minTemperature.Fahrenheit();
+ }
+ lv_table_set_cell_type(forecast, 2, i, TemperatureStyle(optCurrentForecast->days[i].maxTemperature));
+ lv_table_set_cell_type(forecast, 3, i, TemperatureStyle(optCurrentForecast->days[i].minTemperature));
uint8_t wday = localTime.tm_wday + i + 1;
if (wday > 7) {
wday -= 7;
@@ -165,7 +172,7 @@ 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.temp) - snprintf(nullptr, 0, "%d", minTemp.temp);
+ int diff = snprintf(nullptr, 0, "%d", maxTemp) - snprintf(nullptr, 0, "%d", minTemp);
if (diff <= 0) {
maxPadding[-diff] = '\0';
minPadding[0] = '\0';
@@ -173,8 +180,8 @@ } else {
maxPadding[0] = '\0';
minPadding[diff] = '\0';
}
- 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);
+ 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);
}
} else {
for (int i = 0; i < Controllers::SimpleWeatherService::MaxNbForecastDays; i++) {