Merge branch 'main' into simple-calculator

InfiniTimeOrg · Dec 10, 2024 · 98b84c8 · 98b84c8
2 parents aca8a1d + d69cfcf
commit 98b84c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/displayapp/screens/Weather.cpp b/src/displayapp/screens/Weather.cpp
@@ -154,11 +154,11 @@ void Weather::Refresh() {
       std::tm localTime = *std::localtime(reinterpret_cast<const time_t*>(&optCurrentForecast->timestamp));
 
       for (int i = 0; i < optCurrentForecast->nbDays; i++) {
-        int16_t minTemp = optCurrentForecast->days[i]->minTemperature.Celsius();
         int16_t maxTemp = optCurrentForecast->days[i]->maxTemperature.Celsius();
+        int16_t minTemp = optCurrentForecast->days[i]->minTemperature.Celsius();
         if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
-          minTemp = optCurrentForecast->days[i]->maxTemperature.Fahrenheit();
-          maxTemp = optCurrentForecast->days[i]->minTemperature.Fahrenheit();
+          maxTemp = optCurrentForecast->days[i]->maxTemperature.Fahrenheit();
+          minTemp = 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));