diff --git a/atom.xml b/atom.xml index f7d3961f39..017c4019bd 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/architecture/atom.xml b/blog/categories/architecture/atom.xml index 12d683106b..15109b6c45 100644 --- a/blog/categories/architecture/atom.xml +++ b/blog/categories/architecture/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: architecture | Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/branding/atom.xml b/blog/categories/branding/atom.xml index a14b246f10..defec8d1eb 100644 --- a/blog/categories/branding/atom.xml +++ b/blog/categories/branding/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: branding | Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/component/atom.xml b/blog/categories/component/atom.xml index c570633d88..6483951ac7 100644 --- a/blog/categories/component/atom.xml +++ b/blog/categories/component/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: component | Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/core/atom.xml b/blog/categories/core/atom.xml index 359cf0dcbf..639b9c9ed5 100644 --- a/blog/categories/core/atom.xml +++ b/blog/categories/core/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: core | Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/frontend/atom.xml b/blog/categories/frontend/atom.xml index aa0370b91b..56e11cb50c 100644 --- a/blog/categories/frontend/atom.xml +++ b/blog/categories/frontend/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: frontend | Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 059f7c310a..1296d8135f 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]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index d432347470..7e3eb266a6 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: website | Home Assistant]]> - 2015-05-14T22:51:27-07:00 + 2015-05-21T21:49:22-07:00 https://home-assistant.io/ diff --git a/components/index.html b/components/index.html index 2b70898b2c..bf5946fe21 100644 --- a/components/index.html +++ b/components/index.html @@ -125,7 +125,7 @@ SABnzbd clients - Monitor queue and download speeds + Monitor queue and download speeds. @@ -197,7 +197,7 @@ Google Cast devices - Track what is being played and control playback. (temporarely disabled awaiting protobuf 3 release) + Track what is being played and control playback. (temporarely disabled awaiting protobuf 3 release). @@ -292,37 +292,37 @@ the manufacturers of these devices. Notify My Android (NMA) -Allow sending messages using Notify My Android (NMA) +Allow sending messages using Notify My Android (NMA). Instapush -Allow sending messages using Instapush +Allow sending messages using Instapush. PushBullet -Allow sending messages using PushBullet +Allow sending messages using PushBullet. PushOver -Allow sending messages using PushOver +Allow sending messages using PushOver. Jabber (XMPP) -Allow sending messages using Jabber (XMPP) +Allow sending messages using Jabber (XMPP). Browser -Open URLs on the host machine +Open URLs on the host machine. @@ -334,13 +334,22 @@ the manufacturers of these devices. Keyboard -Simulate key presses on the host machine +Simulate key presses on the host machine. OpenWeatherMap -Display current meteorological data from your location +Display current meteorological data from your location. +<<<<<<< HEAD + + + + +Bitcoin +Display details about the Bitcoin Network and your Blockchain.info online wallet. +======= +>>>>>>> f9261e70a652b2bcd1f852f2cdc93ad21184e594 diff --git a/components/notify.instapush.html b/components/notify.instapush.html index 739242ed70..5c594ec92d 100644 --- a/components/notify.instapush.html +++ b/components/notify.instapush.html @@ -9,7 +9,7 @@ - Instapush otification support - Home Assistant + Instapush notification support - Home Assistant @@ -18,7 +18,7 @@ - + @@ -98,7 +98,7 @@

- Instapush Otification Support + Instapush Notification Support

diff --git a/components/notify.pushover.html b/components/notify.pushover.html index 4d3fe945e7..a7f9646c2c 100644 --- a/components/notify.pushover.html +++ b/components/notify.pushover.html @@ -105,7 +105,7 @@

-James Cole has contributed support for the PushOver service as a platform for the notify component. This allows components to send messages to the user using PushOver.

+James Cole has contributed support for the PushOver service as a platform for the notify component. This allows components to send messages to the user using PushOver.

1
 2
diff --git a/components/notify.xmpp.html b/components/notify.xmpp.html
index ec55b8b8d3..a92d88a152 100644
--- a/components/notify.xmpp.html
+++ b/components/notify.xmpp.html
@@ -105,7 +105,7 @@
   
 
   

-The xmpp platform allows you to deliver notifications from Home Assistant to a Jabber (XMPP) account.

+The xmpp platform allows you to deliver notifications from Home Assistant to a Jabber (XMPP) account.

 
 
1
 2
diff --git a/components/sensor.bitcoin.html b/components/sensor.bitcoin.html
new file mode 100644
index 0000000000..6cdebb8cfe
--- /dev/null
+++ b/components/sensor.bitcoin.html
@@ -0,0 +1,218 @@
+
+  
+  
+  
+    
+
+  
+    
+  
+    
+    
+    Bitcoin support - Home Assistant
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+
+  
+
+    

+      

+  

+
+    

+  
+     Home Assistant
+  
+

+
+

+  
+

+
+
+  

+

+    

+
+    
+
+    

+      

+        
+        

+        
+
+          

+
+  
+  

+    

+      Bitcoin Support
+    

+  

+  

+  
+
+  

+The bitcoin platform displays various details about the Bitcoin network.

+
+
If you have an online wallet from Blockchain.info the sensor is capable to show your current balance.

+
+
To add the Bitcoin sensor to your installation, add a selection of the available display options to your configuration.yaml file:

+
+
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+
# Example configuration.yaml entry
+sensor:
+  platform: bitcoin
+  wallet: 'YOUR WALLET_ID'
+  password: YOUR_ACCOUNT_PASSWORD
+  currency: YOUR CURRENCY
+  display_options:
+    - exchangerate
+    - trade_volume_btc
+    - miners_revenue_usd
+    - btc_mined
+    - trade_volume_usd
+    - difficulty
+    - minutes_between_blocks
+    - number_of_transactions
+    - hash_rate
+    - timestamp
+    - mined_blocks
+    - blocks_size
+    - total_fees_btc
+    - total_btc_sent
+    - estimated_btc_sent
+    - total_btc
+    - total_blocks
+    - next_retarget
+    - estimated_transaction_volume_usd
+    - miners_revenue_btc
+    - market_price_usd
+

+
+
+
+
+
+

+
+
+        

+
+        
+      

+    

+
+    
+
+    
+
+    
+
+
+
+
+
+
+
+
+
+  
+
\ No newline at end of file
diff --git a/components/sensor.sabnzbd.html b/components/sensor.sabnzbd.html
index f00b02bbbf..89e221e507 100644
--- a/components/sensor.sabnzbd.html
+++ b/components/sensor.sabnzbd.html
@@ -105,7 +105,7 @@
   
 
   

-James Cole has contributed support to integrate SABnzbd. This will allow you to monitor your downloads from within Home Assistant and setup automation based on the information.

+James Cole has contributed support to integrate SABnzbd. This will allow you to monitor your downloads from within Home Assistant and setup automation based on the information.

 
 

-
+
diff --git a/images/supported_brands/bitcoin.png b/images/supported_brands/bitcoin.png
new file mode 100644
index 0000000000..cf55a4be07
Binary files /dev/null and b/images/supported_brands/bitcoin.png differ
diff --git a/sitemap.xml b/sitemap.xml
index abb92e5f2d..79f552cf30 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -77,391 +77,397 @@
   
     https://home-assistant.io/developers/add_new_platform.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/getting-started/android.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/developers/api.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/developers/architecture.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/automation.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/browser.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/getting-started/configuration.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/configurator.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/conversation.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/developers/creating_components.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_sun_light_trigger.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_tracker.ddwrt.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_tracker.luci.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_tracker.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_tracker.netgear.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_tracker.nmap_scanner.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/device_tracker.tomato.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/discovery.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/downloader.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/developers/frontend.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/group.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/history.html
-    2015-05-14T22:51:27-07:00
-    weekly
-    0.7
-  
-  
-    https://home-assistant.io/blog/
-    2015-05-14T22:51:27-07:00
-    weekly
-    0.7
-  
-  
-    https://home-assistant.io/blog/archives/
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     1.0
   
-    https://home-assistant.io/getting-started/
-    2015-05-14T22:51:27-07:00
+    https://home-assistant.io/blog/
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
-    https://home-assistant.io/developers/
-    2015-05-14T22:51:27-07:00
+    https://home-assistant.io/blog/archives/
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
+    weekly
+    0.7
+  
+  
+    https://home-assistant.io/developers/
+    2015-05-21T21:49:22-07:00
+    weekly
+    0.7
+  
+  
+    https://home-assistant.io/getting-started/
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/isy994.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/keyboard.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/light.hue.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/light.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/logbook.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/media_player.cast.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/media_player.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/modbus.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/notify.instapush.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/notify.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/notify.nma.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/notify.pushbullet.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/notify.pushover.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/notify.xmpp.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/developers/python_api.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/developers/rest_api.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/scene.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/scheduler.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/script.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
+    weekly
+    0.7
+  
+  
+    https://home-assistant.io/components/sensor.bitcoin.html
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sensor.mysensors.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sensor.openweathermap.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sensor.sabnzbd.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sensor.systemmonitor.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sensor.time_date.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sensor.transmission.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/simple_alarm.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/sun.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/switch.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/switch.wemo.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/tellstick.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/thermostat.heat_control.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/thermostat.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/thermostat.nest.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/getting-started/troubleshooting.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/vera.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/wink.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
     https://home-assistant.io/components/zwave.html
-    2015-05-14T22:51:27-07:00
+    2015-05-21T21:49:22-07:00
     weekly
     0.7
   
1
 2
diff --git a/components/sensor.time_date.html b/components/sensor.time_date.html
index db4033d688..0d90637085 100644
--- a/components/sensor.time_date.html
+++ b/components/sensor.time_date.html
@@ -104,7 +104,7 @@
   

   
 
-  
The time and date platform simple displays the time, the date, or both.

+  
The time and date platform simple displays the time in various formats, the date, or both.

 
 
1
 2
@@ -114,6 +114,8 @@
 6
 7
 8
+9
+10
 
# Example configuration.yaml entry
 sensor:
   platform: time_date
@@ -122,10 +124,12 @@
     - type: 'date'
     - type: 'date_time'
     - type: 'time_date'
+    - type: 'time_utc'
+    - type: 'beat'
 

 
 
-
The types date_time and time_date shows the date and the time. The other two types just the time or the date.

+
The types date_time and time_date shows the date and the time. The other types just the time or the date. beat shows the Swatch Internet Time.

 
 

   
diff --git a/developers/add_new_platform.html b/developers/add_new_platform.html
index b3778ec1d6..785a2c754f 100644
--- a/developers/add_new_platform.html
+++ b/developers/add_new_platform.html
@@ -208,10 +208,10 @@ This abstract class contains logic for integrating most standard features into
 your entities, such as visibility, entity IDs, updates, and many more. That is
 why it is best practice to reference the existing class.

 
-
A list of entities can be registered with Home Assitant using the add_devices
+
A list of entities can be registered with Home Assistant using the add_devices
 function that is provided as an input to setup_platform. Once entities are
 registered with with Home Assistant their updates will be provided to the core
-and the core will have control over them. For more information on how Entites
+and the core will have control over them. For more information on how Entities
 can be customized, take a look at the Entity Abstract
 Class.

 
diff --git a/developers/architecture.html b/developers/architecture.html
index b4454979fe..f9f00f1701 100644
--- a/developers/architecture.html
+++ b/developers/architecture.html
@@ -164,7 +164,7 @@ components within Home Assistant.

     Turn on the lights
 

 
-
+
 
 
 
In the event that the combined state of all tracked devices changes to 'Not Home':
@@ -172,7 +172,7 @@ components within Home Assistant.

     Turn off the lights
 

 
-
+
 
 
 
In the event of the sun setting:
@@ -184,7 +184,7 @@ components within Home Assistant.

 
 
 The full picture

 
-
When we put all the different pieces of Home Assistant together we see that we match pretty close to the initial sketched home automation overview. The smart home AI is not implemented yet and therefor ommitted from the following picture.

+
When we put all the different pieces of Home Assistant together we see that we match pretty close to the initial sketched home automation overview. The smart home AI is not implemented yet and therefor omitted from the following picture.

 
 

   
diff --git a/developers/creating_components.html b/developers/creating_components.html
index 32818bbd15..e50430709e 100644
--- a/developers/creating_components.html
+++ b/developers/creating_components.html
@@ -185,7 +185,7 @@ Home Assistant will use the directory that contains your config file as the dire
 

 

  hass.states  This is the StateMachine. It allows you to set states and trach when they are changed. See available methods.  This is the StateMachine. It allows you to set states and track when they are changed. See available methods. 
 

 

  hass.events