kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1264 from parnic/develop

Browse Source 
Fixed heat index
This commit is contained in:
Michael Teeuw 2018-05-01 09:55:42 +02:00 committed by GitHub
commit 1081049074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fixed issues where a module crashes when it tries to dismiss a non existing alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240) - Fixed issues where a module crashes when it tries to dismiss a non existing alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240)
- In default module currentWeather/currentWeather.js line 296, 300, self.config.animationSpeed can not be found because the notificationReceived function does not have "self" variable. - In default module currentWeather/currentWeather.js line 296, 300, self.config.animationSpeed can not be found because the notificationReceived function does not have "self" variable.
- Fixed browser-side code to work on the Midori browser. - Fixed browser-side code to work on the Midori browser.
- Fixed issue where heat index was reporting incorrect values in Celsius and Fahrenheit. [#1263](https://github.com/MichMich/MagicMirror/issues/1263)
### Updated ### Updated
- Updated Italian translation - Updated Italian translation

4
modules/default/currentweather/currentweather.js
View File

@ -432,9 +432,9 @@ Module.register("currentweather",{
- 1.99*Math.pow(10,-6)*tempInF*tempInF*this.humidity*this.humidity; - 1.99*Math.pow(10,-6)*tempInF*tempInF*this.humidity*this.humidity;
switch (this.config.units){ switch (this.config.units){
case "metric": this.feelsLike = Hindex.toFixed(0); case "metric": this.feelsLike = parseFloat((Hindex - 32) / 1.8).toFixed(0);
break; break;
case "imperial": this.feelsLike = parseFloat(Hindex * 1.8 + 32).toFixed(0); case "imperial": this.feelsLike = Hindex.toFixed(0);
break; break;
case "default": case "default":
var tc = Hindex - 273.15; var tc = Hindex - 273.15;