kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 04:45:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into clean-up-updatenotifications-and-nunjuck-templating

Browse Source
This commit is contained in:
Michael Teeuw
2021-10-06 15:21:54 +02:00
committed by GitHub
parent 1751cabb9d 7fdeed14f5
commit 5bfbd3eaa0
16 changed files with 767 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/default/weather/providers/openweathermap.js
View File

@@ -127,6 +127,8 @@ WeatherProvider.register("openweathermap", {
currentWeather.humidity = currentWeatherData.main.humidity;
currentWeather.temperature = currentWeatherData.main.temp;
currentWeather.feelsLikeTemp = currentWeatherData.main.feels_like;
if (this.config.windUnits === "metric") {
currentWeather.windSpeed = this.config.useKmh ? currentWeatherData.wind.speed * 3.6 : currentWeatherData.wind.speed;
} else {