iconTable |
The conversion table to convert the weather conditions to weather-icons.
diff --git a/modules/default/currentweather/currentweather.css b/modules/default/currentweather/currentweather.css
index 9e9d9ed3..a40be878 100644
--- a/modules/default/currentweather/currentweather.css
+++ b/modules/default/currentweather/currentweather.css
@@ -6,3 +6,11 @@
-webkit-transform: translate(0, -3px); /* Safari */
transform: translate(0, -3px);
}
+
+.currentweather .humidityIcon {
+ padding-right: 4px;
+}
+
+.currentweather .humidity-padding {
+ padding-bottom: 6px;
+}
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index db3d5de2..39db3f09 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -11,8 +11,8 @@ Module.register("currentweather",{
// Default module config.
defaults: {
- location: "",
- locationID: "",
+ location: false,
+ locationID: false,
appid: "",
units: config.units,
updateInterval: 10 * 60 * 1000, // every 10 minutes
@@ -23,6 +23,7 @@ Module.register("currentweather",{
showWindDirection: true,
useBeaufort: true,
lang: config.language,
+ showHumidity: false,
initialLoadDelay: 0, // 0 seconds delay
retryDelay: 2500,
@@ -31,6 +32,9 @@ Module.register("currentweather",{
apiBase: "http://api.openweathermap.org/data/",
weatherEndpoint: "weather",
+ appendLocationNameToHeader: true,
+ calendarClass: "calendar",
+
iconTable: {
"01d": "wi-day-sunny",
"02d": "wi-day-cloudy",
@@ -53,6 +57,12 @@ Module.register("currentweather",{
},
},
+ // create a variable for the first upcoming calendaar event. Used if no location is specified.
+ firstEvent: false,
+
+ // create a variable to hold the location name based on the API result.
+ fetchedLocatioName: "",
+
// Define required scripts.
getScripts: function() {
return ["moment.js"];
@@ -102,12 +112,6 @@ Module.register("currentweather",{
return wrapper;
}
- if (this.config.location === "") {
- wrapper.innerHTML = "Please set the openweather location in the config for module: " + this.name + ".";
- wrapper.className = "dimmed light small";
- return wrapper;
- }
-
if (!this.loaded) {
wrapper.innerHTML = this.translate('LOADING');
wrapper.className = "dimmed light small";
@@ -117,6 +121,7 @@ Module.register("currentweather",{
var small = document.createElement("div");
small.className = "normal medium";
+
var windIcon = document.createElement("span");
windIcon.className = "wi wi-strong-wind dimmed";
small.appendChild(windIcon);
@@ -134,6 +139,22 @@ Module.register("currentweather",{
spacer.innerHTML = " ";
small.appendChild(spacer);
+ if (this.config.showHumidity) {
+ var humidity = document.createElement("span");
+ humidity.innerHTML = this.humidity;
+
+ var spacer = document.createElement("sup");
+ spacer.innerHTML = " ";
+
+ var humidityIcon = document.createElement("sup");
+ humidityIcon.className = "wi wi-humidity humidityIcon";
+ humidityIcon.innerHTML = " ";
+
+ small.appendChild(humidity);
+ small.appendChild(spacer);
+ small.appendChild(humidityIcon);
+ }
+
var sunriseSunsetIcon = document.createElement("span");
sunriseSunsetIcon.className = "wi dimmed " + this.sunriseSunsetIcon;
small.appendChild(sunriseSunsetIcon);
@@ -142,6 +163,8 @@ Module.register("currentweather",{
sunriseSunsetTime.innerHTML = " " + this.sunriseSunsetTime;
small.appendChild(sunriseSunsetTime);
+ wrapper.appendChild(small);
+
var large = document.createElement("div");
large.className = "large light";
@@ -154,17 +177,55 @@ Module.register("currentweather",{
temperature.innerHTML = " " + this.temperature + "°";
large.appendChild(temperature);
- wrapper.appendChild(small);
wrapper.appendChild(large);
return wrapper;
},
+ // Override getHeader method.
+ getHeader: function() {
+ if (this.config.appendLocationNameToHeader) {
+ return this.data.header + " " + this.fetchedLocatioName;
+ }
+
+ return this.data.header;
+ },
+
+ // Override notification handler.
+ notificationReceived: function(notification, payload, sender) {
+ if (notification === "DOM_OBJECTS_CREATED") {
+ if (this.config.appendLocationNameToHeader) {
+ this.hide(0, {lockString: this.identifier});
+ }
+ }
+ if (notification === "CALENDAR_EVENTS") {
+ var senderClasses = sender.data.classes.toLowerCase().split(" ");
+ if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
+ var lastEvent = this.firstEvent;
+ this.firstEvent = false;
+
+ for (e in payload) {
+ var event = payload[e];
+ if (event.location || event.geo) {
+ this.firstEvent = event;
+ //Log.log("First upcoming event with location: ", event);
+ break;
+ }
+ }
+ }
+ }
+ },
+
/* updateWeather(compliments)
* Requests new data from openweather.org.
* Calls processWeather on succesfull response.
*/
updateWeather: function() {
- var url = this.config.apiBase + this.config.apiVersion + "/" + this.config.weatherEndpoint + '/' + this.getParams();
+ if (this.config.appid === "") {
+ Log.error("CurrentWeather: APPID not set!");
+ return;
+ }
+
+ var url = this.config.apiBase + this.config.apiVersion + "/" + this.config.weatherEndpoint + this.getParams();
var self = this;
var retry = true;
@@ -175,11 +236,10 @@ Module.register("currentweather",{
if (this.status === 200) {
self.processWeather(JSON.parse(this.response));
} else if (this.status === 401) {
- self.config.appid = "";
self.updateDom(self.config.animationSpeed);
Log.error(self.name + ": Incorrect APPID.");
- retry = false;
+ retry = true;
} else {
Log.error(self.name + ": Could not load weather.");
}
@@ -199,11 +259,19 @@ Module.register("currentweather",{
*/
getParams: function() {
var params = "?";
- if(this.config.locationID !== "") {
+ if(this.config.locationID !== false) {
params += "id=" + this.config.locationID;
- } else {
+ } else if(this.config.location !== false) {
params += "q=" + this.config.location;
+ } else if (this.firstEvent && this.firstEvent.geo) {
+ params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon
+ } else if (this.firstEvent && this.firstEvent.location) {
+ params += "q=" + this.firstEvent.location;
+ } else {
+ this.hide(this.config.animationSpeed, {lockString:this.identifier});
+ return;
}
+
params += "&units=" + this.config.units;
params += "&lang=" + this.config.lang;
params += "&APPID=" + this.config.appid;
@@ -224,6 +292,7 @@ Module.register("currentweather",{
return;
}
+ this.humidity = parseFloat(data.main.humidity);
this.temperature = this.roundValue(data.main.temp);
if (this.config.useBeaufort){
@@ -265,7 +334,7 @@ Module.register("currentweather",{
this.sunriseSunsetIcon = (sunrise < now && sunset > now) ? "wi-sunset" : "wi-sunrise";
-
+ this.show(this.config.animationSpeed, {lockString:this.identifier});
this.loaded = true;
this.updateDom(this.config.animationSpeed);
},
diff --git a/modules/default/defaultmodules.js b/modules/default/defaultmodules.js
index 42e89ee0..fccf3c52 100644
--- a/modules/default/defaultmodules.js
+++ b/modules/default/defaultmodules.js
@@ -15,7 +15,8 @@ var defaultModules = [
"currentweather",
"helloworld",
"newsfeed",
- "weatherforecast"
+ "weatherforecast",
+ "updatenotification"
];
/*************** DO NOT EDIT THE LINE BELOW ***************/
diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md
index 882ef94a..951fa51c 100644
--- a/modules/default/newsfeed/README.md
+++ b/modules/default/newsfeed/README.md
@@ -98,7 +98,7 @@ The following properties can be configured:
| animationSpeed |
Speed of the update animation. (Milliseconds)
Possible values:0 - 5000
-
Default value: 2000 (2.5 seconds)
+
Default value: 2000 (2 seconds)
|
- 
+ 
@@ -24,17 +24,17 @@ MagicMirror² focuses on a modular plugin system and uses [Electron](http://elec
## Usage
-#### Raspberry Pi Support
+### Raspberry Pi Support
Electron, the app wrapper around MagicMirror², only supports the Raspberry Pi 2 & 3. The Raspberry Pi 1 is currently **not** supported. If you want to run this on a Raspberry Pi 1, use the [server only](#server-only) feature and setup a fullscreen browser yourself.
-#### Automatic Installer (Raspberry Pi Only!)
+### Automatic Installer (Raspberry Pi Only!)
Execute the following command on your Raspberry Pi to install MagicMirror²:
````
curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh | bash
````
-#### Manual Installation
+### Manual Installation
1. Download and install the latest Node.js version.
2. Clone the repository and check out the beta branch: `git clone https://github.com/MichMich/MagicMirror`
@@ -45,23 +45,23 @@ curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installer
**Note:** if you want to debug on Raspberry Pi you can use `npm start dev` which will start the MagicMirror app with Dev Tools enabled.
-#### Server Only
+### Server Only
In some cases, you want to start the application without an actual app window. In this case, execute the following command from the MagicMirror folder: `node serveronly`. This will start the server, after which you can open the application in your browser of choice.
-#### Raspberry Configuration & Auto Start.
+### Raspberry Configuration & Auto Start.
The following wiki links are helpful in the configuration of your MagicMirror² operating system:
- [Configuring the Raspberry Pi](https://github.com/MichMich/MagicMirror/wiki/Configuring-the-Raspberry-Pi)
- [Auto Starting MagicMirror](https://github.com/MichMich/MagicMirror/wiki/Auto-Starting-MagicMirror)
-#### Updating you MagicMirror²
+### Updating your MagicMirror²
If you want to update your MagicMirror² to the latest version, use your terminal to go to your Magic Mirror folder and type the following command:
-````
-git pull
-````
+```bash
+git pull && npm install
+```
If you changed nothing more than the config or the modules, this should work without any problems.
Type `git status` to see your changes, if there are any, you can reset them with `git reset --hard`. After that, git pull should be possible.
@@ -73,16 +73,17 @@ Type `git status` to see your changes, if there are any, you can reset them with
The following properties can be configured:
-
| **Option** | **Description** |
| --- | --- |
| `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. |
+| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`. It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`).|
| `kioskmode` | This allows MagicMirror² to run in Kiosk Mode. It protects from other programs popping on top of your screen. The default value is `false`|
| `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. |
| `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. |
| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
| `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
+
Module configuration:
| **Option** | **Description** |
@@ -129,3 +130,8 @@ Please keep the following in mind:
- **New Features**: please please discuss in a GitHub issue before you start to alter a big part of the code. Without discussion upfront, the pull request will not be accepted / merged.
Thanks for your help in making MagicMirror² better!
+
+