diff --git a/atom.xml b/atom.xml index 728624cba7..042e4de61c 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index bbc2c2c6ec..88884a58c3 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 44e15310e7..ca1f627bfa 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index b3cfb0da93..122101ddf7 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 605007df5f..8281816daf 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 73bca4bdc8..c1052f4934 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index d327547f84..69b9687df9 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 6ce6e38a96..a81c0993f4 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index b519b06f8e..01f97edd73 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 1e5d6e3825..1888591282 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index ca1e21184f..4f88a56db9 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index c1c671e83b..ebdf80f29b 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index b5334b5fde..7bdc4779f4 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index e802a1f3b3..5941bfb901 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index e0ba8c07d5..82b54d0a15 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 92140afd90..7f1c59cdcb 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 103311d5e1..f2da9ea6a3 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 0b4806c280..db3b024306 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index cba398b67f..dcb9553f54 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 85a97b2c98..3bb2732d28 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 5d43ed92aa..cd0240b2ea 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-10-19T15:41:02+00:00 + 2016-10-20T20:59:08+00:00 https://home-assistant.io/ diff --git a/components/sensor.emoncms/index.html b/components/sensor.emoncms/index.html index 96d9975903..005ed95674 100644 --- a/components/sensor.emoncms/index.html +++ b/components/sensor.emoncms/index.html @@ -9,7 +9,7 @@ Emoncms Sensor - Home Assistant - + @@ -19,14 +19,14 @@ - + - + @@ -89,14 +89,14 @@
-

The emoncms sensor platform creates sensors for the feeds available in your local or cloud based version of emoncms.

+

The emoncms sensor platform creates sensors for the feeds available in your local or cloud based version of Emoncms.

To enable this sensor, add the following lines to your configuration.yaml, it will list all feeds as a sensor:

-
# Example configuration.yaml entry using cloud based emoncms
+
# Example configuration.yaml entry using cloud based Emoncms
 sensor:
   platform: emoncms
-  api_key: put your emoncms read api key here
+  api_key: API_KEY
   url: https://emoncms.org
   id: 1
 

@@ -105,12 +105,12 @@
 
 Configuration variables

 
 
    
-  
  • api_key (Required): The read api key for your emoncms user.
    • 
-  
  • url (Required): The base url of emoncms, use “https://emoncms.org” for the cloud based version.
    • 
-  
  • id (Required): Positive Integer identifier for the sensor. Must be unique if you specify multiple emoncms sensors.
    • 
-  
  • include_only_feed_id (optional): Positive integer list of emoncms feed id’s. Only the feeds with feed id’s specified here will be displayed. Can not be specified if exclude_feed_id is specified.
    • 
-  
  • exclude_feed_id (optional): Positive integer list of emoncms feed id’s. All the feeds will be displayed as sensors except the ones listed here. Can not be specified if include_only_feed_id is specified.
    • 
-  
  • sensor_names (optional): Dictionary of names for the sensors created that are created based on feedid. The dictionary consists of feedid:name pairs. Sensors for feeds with their feedid mentioned here will get the chosen name instead of the default name
    • 
+  
  • api_key (Required): The read API key for your Emoncms user.
    • 
+  
  • url (Required): The base URL of Emoncms, use “https://emoncms.org” for the cloud based version.
    • 
+  
  • id (Required): Positive integer identifier for the sensor. Must be unique if you specify multiple Emoncms sensors.
    • 
+  
  • include_only_feed_id (Optional): Positive integer list of Emoncms feed IDs. Only the feeds with feed IDs specified here will be displayed. Can not be specified if exclude_feed_id is specified.
    • 
+  
  • exclude_feed_id (Optional): Positive integer list of Emoncms feed IDs. All the feeds will be displayed as sensors except the ones listed here. Can not be specified if include_only_feed_id is specified.
    • 
+  
  • sensor_names (Optional): Dictionary of names for the sensors created that are created based on feed ID. The dictionary consists of feedid: name pairs. Sensors for feeds with their feed ID mentioned here will get the chosen name instead of the default name
    • 
   
  • value_template (Optional): Defines a template to alter the feed value.
    • 
   
  • scan_interval (Optional): Defines the update interval of the sensor in seconds.
    • 
   
  • unit_of_measurement (Optional): Defines the unit of measurement of for all the sensors. default is “W”.
    • 
@@ -118,71 +118,68 @@
 
 
     Default naming scheme
    
 
-
    The names of the sensors created by this component, will be a combination of static text, id from the config and feedid from the emoncms feed, unless sensor_names is used.
-An example name would be “emoncms1_feedid_10”
    
+
    The names of the sensors created by this component, will be a combination of static text, id from the config and feedid from the Emoncms feed, unless sensor_names is used. An example name would be emoncms1_feedid_10.
    
 
-
     Examples
    
+
     Examples
    
 
 
    In this section you find some more examples of how this sensor can be used.
    
 
-
    # Display only feeds with their feed id's specified in "include_only_feed_id"
+
    Display only feeds with their feed IDs specified in include_only_feed_id.
    
+
+
    # Example configuration.yaml entry
 sensor:
   - platform: emoncms
-    api_key: put your emoncms read api key here
+    api_key: API_KEY
     url: https://emoncms.org
     id: 1
     unit_of_measurement: "W"
     include_only_feed_id:
       - 107
-      - 106
       - 105
 
    
 
    
 
-
    # Display all feeds except feeds with their feed id specified in "exclude_feed_id" 
+
    Display all feeds except feeds with their feed id specified in exclude_feed_id.
    
+
+
    # Example configuration.yaml entry
 sensor:
   - platform: emoncms
-    api_key: put your emoncms read api key here
+    api_key: API_KEY
     url: https://emoncms.org
     id: 1
     unit_of_measurement: "KWH" 
     exclude_feed_id:
       - 107
-      - 106
       - 105
 
    
 
    
 
-
    # Display only feeds with their feed id's specified in "include_only_feed_id" and give the feed sensors a name using "sensor_names". You don't have to specify all feeds names in "sensor_names", the remaining sensor names will be chosen based on "id" and the emoncms feedid
+
    Display only feeds with their feed id’s specified in include_only_feed_id and give the feed sensors a name using “sensor_names”. You don’t have to specify all feeds names in “sensor_names”, the remaining sensor names will be chosen based on “id” and the Emoncms feedid.
    
+
+
    # Example configuration.yaml entry
 sensor:
   - platform: emoncms
-    api_key: put your emoncms read api key here
-    url: https://emoncms.org   
+    api_key: API_KEY
+    url: https://emoncms.org
     id: 1
     unit_of_measurement: "KW" 
     include_only_feed_id:
       - 5
-      - 18
-      - 29
-      - 48
-      - 61
-      - 110
-      - 116
       - 120
     sensor_names:
       5: "feed 1"
-      18: "feed 2"
-      29: "feed 3"
       48: "kwh feed"
       61: "amp feed"
       110: "watt feed"
 
    
 
    
 
-
    # Use a "value_template" to add 1500 to the feed value for all specified feed id's in "include_feed_id"
+
    Use a value_template to add 1500 to the feed value for all specified feed IDs in include_feed_id.
    
+
+
    # Example configuration.yaml entry
 sensor:
   - platform: emoncms
-    api_key: put your emoncms read api key here
+    api_key: API_KEY
     url: https://emoncms.org
     scan_interval: 15
     id: 1
@@ -190,15 +187,15 @@ An example name would be “emoncms1_feedid_10”
    
     include_only_feed_id:
       - 107
       - 106
-      - 105
-      - 61
 
    
 
    
 
-
    # Display feeds from the same emoncms instance with 2 groups of feeds, diffrent scan_interval and a diffrent unit_of_measurement
+
    Display feeds from the same Emoncms instance with 2 groups of feeds, diffrent scan_interval and a diffrent unit_of_measurement.
    
+
+
    # Example configuration.yaml entry
 sensor:
   - platform: emoncms
-    api_key: put your emoncms read api key here
+    api_key: API_KEY
     url: https://emoncms.org
     scan_interval: 30
     id: 1
@@ -206,7 +203,6 @@ An example name would be “emoncms1_feedid_10”
    
     include_only_feed_id:
       - 107
       - 106
-      - 105
   - platform: emoncms
     api_key:  put your emoncms read api key here
     url: https://emoncms.org
@@ -215,8 +211,6 @@ An example name would be “emoncms1_feedid_10”
    
     unit_of_measurement: "A" 
     include_only_feed_id:
       - 108
-      - 109
-      - 110
       - 61
 
    
 
    
diff --git a/sitemap.xml b/sitemap.xml
index 29101d05f1..88f0a996f4 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2180,62 +2180,62 @@
 
 
 https://home-assistant.io/demo/frontend.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/index.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-event.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-info.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-service.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-state.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-template.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-history.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-iframe.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-logbook.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-map.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/googlef4f3693c209fe788.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00
 
 
 https://home-assistant.io/static/mdi-demo.html
-2016-10-19T15:40:21+00:00
+2016-10-20T20:58:24+00:00