pinetimestyle: Display temp in Fahrenheit with setting

InfiniTimeOrg · Nov 16, 2023 · 539e126 · 539e126
1 parent 002d1b7
commit 539e126
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -539,7 +539,12 @@ void WatchFacePineTimeStyle::Refresh() {
 
   if (weatherService.GetCurrentTemperature()->timestamp != 0 && weatherService.GetCurrentClouds()->timestamp != 0 &&
       weatherService.GetCurrentPrecipitation()->timestamp != 0) {
-    nowTemp = (weatherService.GetCurrentTemperature()->temperature / 100);
+    std::unique_ptr<Controllers::WeatherData::Temperature>& temp = weatherService.GetCurrentTemperature();
+    if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Metric) {
+      nowTemp = temp->temperature / 100;
+    } else {
+      nowTemp = weatherService.GetTempFahrenheit(temp->temperature) / 100;
+    }
     clouds = (weatherService.GetCurrentClouds()->amount);
     precip = (weatherService.GetCurrentPrecipitation()->amount);
     if (nowTemp.IsUpdated()) {