Skip to content

Commit 9e4330b

Browse files
robbiet480robbiet480
committed
Merge remote-tracking branch 'upstream/current' into next
2 parents e5ef5e7 + 3e84f46 commit 9e4330b

File tree

108 files changed

+3083
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+3083
-105
lines changed

‎CNAME renamed to ‎CNAME_old

File renamed without changes.

‎_config.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,32 +46,6 @@ kramdown:
4646
smart_quotes: lsquo,rsquo,ldquo,rdquo
4747
parse_block_html: true
4848

49-
# enable_coderay: true
50-
51-
# coderay:
52-
# coderay_wrap: div
53-
# coderay_line_numbers: nil
54-
# coderay_line_number_start: 1
55-
# coderay_tab_width: 4
56-
# coderay_bold_every: 10
57-
# coderay_css: class
58-
59-
# syntax_highlighter_opts:
60-
# wrap: div
61-
# line_numbers: nil
62-
# line_number_start: 1
63-
# tab_width: 4
64-
# bold_every: 10
65-
# css: class
66-
67-
# block:
68-
# wrap: div
69-
# line_numbers: nil
70-
# line_number_start: 1
71-
# tab_width: 4
72-
# bold_every: 10
73-
# css: class
74-
7549
highlighter: rouge
7650

7751
gems:

‎architecture/index.html

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
<!doctype html>
2+
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
3+
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
4+
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
5+
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
6+
7+
8+
9+
<head>
10+
<meta charset="utf-8">
11+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
12+
<title>architecture - Home Assistant</title>
13+
<meta name="author" content="Paulus Schoutsen">
14+
15+
<meta name="description" content="Home Assistant is an open-source home automation platform running on Python 3.">
16+
17+
<meta name="viewport" content="width=device-width">
18+
<link rel="canonical" href="http://balloob.github.io/home-assistant/architecture">
19+
20+
<link href="/home-assistant/favicon.png" rel="icon">
21+
<link href="/home-assistant/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
22+
<link href="/home-assistant/github/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
23+
</head>
24+
25+
26+
<body >
27+
28+
<header>
29+
<div class="grid-wrapper">
30+
<div class="grid">
31+
32+
<div class="grid__item three-tenths lap-four-sixths palm-one-whole">
33+
<a href="/home-assistant/" class="site-title">Home Assistant</a>
34+
</div>
35+
36+
<div class="grid__item seven-tenths lap-two-sixths palm-one-whole">
37+
<nav>
38+
<input type="checkbox" id="toggle">
39+
<label for="toggle" class="toggle" data-open="Main Menu" data-close="Close Menu"></label>
40+
<ul class="menu pull-right">
41+
<li><a href="/home-assistant/getting-started">Getting started</a></li>
42+
<li><a href="/home-assistant/architecture">Architecture</a></li>
43+
<li><a href="/home-assistant/contributing">Contributing</a></li>
44+
<li><a href="/home-assistant/blog/2014/12/18/website-launched/">Blog</a></li>
45+
<li><a href="https://groups.google.com/forum/#!forum/home-assistant-dev">Need help?</a></li>
46+
</ul>
47+
</nav>
48+
</div>
49+
50+
51+
</div>
52+
</div>
53+
</header>
54+
55+
56+
57+
<div class="grid-wrapper">
58+
<div class="grid grid-center">
59+
60+
<div class="grid__item two-thirds lap-one-whole palm-one-whole">
61+
62+
63+
<article class="page">
64+
65+
66+
<header>
67+
<h1 class="title indent">
68+
Architecture
69+
</h1>
70+
</header>
71+
<hr class="divider">
72+
73+
74+
<p><img src='/home-assistant/images/ha_architecture.png' style='background-color: white'/></p>
75+
76+
<p>The core of Home Assistant exists of the following parts.</p>
77+
78+
<p>The <b>Event Bus</b> facilitates the firing and listening of events. This is the beating heart of Home Assistant.</p>
79+
80+
<p>The <b>State Machine</b> keeps track of the states of things. Fires a state_changed event when a state has been changed.</p>
81+
82+
<p>The <b>Service Registry</b> listens on the event bus for call_service events and allows other code to register services.</p>
83+
84+
<p>The <b>Timer</b> will send every 10 seconds a time_changed event on the event bus.</p>
85+
86+
<p>Take for example the device_tracker component. This component is responsible for keeping track which devices are home. It checks which devices are home every time a time_changed event is fired on the event bus. It will then update the state machine with the information for each device.</p>
87+
88+
<p>This setup allows us to create simple yet powerful logic for controlling your home:</p>
89+
90+
<pre><code>In the event that the state of device 'Paulus Nexus 5' changes to the 'Home' state:
91+
If the sun has set and the lights are not on:
92+
Turn on the lights
93+
94+
In the event that the combined state of all tracked devices changes to 'Not Home':
95+
If the lights are on:
96+
Turn off the lights
97+
98+
In the event of the sun setting:
99+
If the lights are off and the combined state of all tracked device equals 'Home':
100+
Turn on the lights
101+
</code></pre>
102+
103+
<p>By using the Bus as a central communication hub between components it is easy to replace components or add functionality. If you would want to change the way devices are detected you only have to write a component that updates the device states in the State Machine.</p>
104+
105+
106+
</article>
107+
108+
109+
</div>
110+
111+
112+
</div>
113+
</div>
114+
115+
<footer>
116+
<div class="grid-wrapper">
117+
<div class="grid">
118+
<div class="grid__item">
119+
<p class="copyright">
120+
All content by Paulus Schoutsen and licenced under <a href="//creativecommons.org/licenses/by-nc-sa/3.0/ie/">Creative Commons</a>.<br>
121+
Code under <a href="//github.com/coogie/oscailte/blob/master/README.md">MIT Licence</a>. <span class="credit">Site powered by <a href="http://octopress.org">Octopress</a></span>
122+
</p>
123+
</div>
124+
</div>
125+
</div>
126+
127+
</footer>
128+
129+
<!--[if lt IE 7]>
130+
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
131+
<![endif]-->
132+
133+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
134+
<script src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
135+
<script defer src="/home-assistant/javascripts/octopress.js"></script>
136+
137+
138+
139+
140+
141+
142+
143+
</body>
144+
</html>

‎assets/jwplayer/glow/controlbar/background.png

141 Bytes

‎assets/jwplayer/glow/controlbar/blankButton.png

82 Bytes

‎assets/jwplayer/glow/controlbar/divider.png

118 Bytes

‎assets/jwplayer/glow/controlbar/fullscreenButton.png

203 Bytes

‎assets/jwplayer/glow/controlbar/fullscreenButtonOver.png

636 Bytes

‎assets/jwplayer/glow/controlbar/muteButton.png

343 Bytes

‎assets/jwplayer/glow/controlbar/muteButtonOver.png

835 Bytes

‎assets/jwplayer/glow/controlbar/normalscreenButton.png

210 Bytes

‎assets/jwplayer/glow/controlbar/normalscreenButtonOver.png

664 Bytes

‎assets/jwplayer/glow/controlbar/pauseButton.png

170 Bytes

‎assets/jwplayer/glow/controlbar/pauseButtonOver.png

442 Bytes

‎assets/jwplayer/glow/controlbar/playButton.png

251 Bytes

‎assets/jwplayer/glow/controlbar/playButtonOver.png

553 Bytes

‎assets/jwplayer/glow/controlbar/timeSliderBuffer.png

112 Bytes

‎assets/jwplayer/glow/controlbar/timeSliderCapLeft.png

94 Bytes

‎assets/jwplayer/glow/controlbar/timeSliderCapRight.png

103 Bytes

‎assets/jwplayer/glow/controlbar/timeSliderProgress.png

114 Bytes

‎assets/jwplayer/glow/controlbar/timeSliderRail.png

116 Bytes

‎assets/jwplayer/glow/controlbar/unmuteButton.png

264 Bytes

‎assets/jwplayer/glow/controlbar/unmuteButtonOver.png

649 Bytes

‎assets/jwplayer/glow/display/background.png

686 Bytes

‎assets/jwplayer/glow/display/bufferIcon.png

816 Bytes

‎assets/jwplayer/glow/display/muteIcon.png

334 Bytes

‎assets/jwplayer/glow/display/playIcon.png

465 Bytes

‎assets/jwplayer/glow/dock/button.png

686 Bytes

‎assets/jwplayer/glow/glow.xml

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
<?xml version="1.0"?>
2+
<skin version="1.1" name="Glow" author="LongTail Video">
3+
4+
<settings>
5+
<setting name="backcolor" value="0x000000" />
6+
<setting name="frontcolor" value="0xeeeeee" />
7+
<setting name="lightcolor" value="0xeeeeee" />
8+
<setting name="screencolor" value="0x000000" />
9+
</settings>
10+
11+
<components>
12+
<component name="controlbar">
13+
<settings>
14+
<setting name="margin" value="0" />
15+
<setting name="fontsize" value="11" />
16+
<setting name="fontcolor" value="0xEEEEEE" />
17+
<setting name="buttoncolor" value="0xEEEEEE" />
18+
</settings>
19+
20+
<layout>
21+
<group position="left">
22+
<button name="play" />
23+
<text name="elapsed" />
24+
</group>
25+
<group position="center">
26+
<slider name="time" />
27+
</group>
28+
<group position="right">
29+
<text name="duration" />
30+
<button name="blank" />
31+
<button name="mute" />
32+
<button name="fullscreen" />
33+
</group>
34+
</layout>
35+
36+
<elements>
37+
<element name="background" src="background.png" />
38+
<element name="capLeft" src="divider.png" />
39+
<element name="capRight" src="divider.png" />
40+
<element name="divider" src="divider.png" />
41+
<element name="blankButton" src="blankButton.png" />
42+
<element name="fullscreenButton" src="fullscreenButton.png" />
43+
<element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
44+
<element name="muteButton" src="muteButton.png" />
45+
<element name="muteButtonOver" src="muteButtonOver.png" />
46+
<element name="pauseButton" src="pauseButton.png" />
47+
<element name="pauseButtonOver" src="pauseButtonOver.png" />
48+
<element name="playButton" src="playButton.png" />
49+
<element name="playButtonOver" src="playButtonOver.png" />
50+
<element name="timeSliderBuffer" src="timeSliderBuffer.png" />
51+
<element name="timeSliderCapLeft" src="timeSliderCapLeft.png" />
52+
<element name="timeSliderCapRight" src="timeSliderCapRight.png" />
53+
<element name="timeSliderProgress" src="timeSliderProgress.png" />
54+
<element name="timeSliderRail" src="timeSliderRail.png" />
55+
<element name="normalscreenButton" src="normalscreenButton.png" />
56+
<element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
57+
<element name="unmuteButton" src="unmuteButton.png" />
58+
<element name="unmuteButtonOver" src="unmuteButtonOver.png" />
59+
<element name="volumeSliderRail" src="divider.png" />
60+
<element name="volumeSliderProgress" src="divider.png" />
61+
</elements>
62+
</component>
63+
64+
<component name="display">
65+
<settings>
66+
<setting name="bufferinterval" value="250" />
67+
<setting name="bufferrotation" value="90" />
68+
</settings>
69+
<elements>
70+
<element name="background" src="background.png" />
71+
<element name="playIcon" src="playIcon.png" />
72+
<element name="muteIcon" src="muteIcon.png" />
73+
<element name="errorIcon" src="bufferIcon.png" />
74+
<element name="bufferIcon" src="bufferIcon.png" />
75+
</elements>
76+
</component>
77+
78+
<component name="dock">
79+
<settings>
80+
<setting name="fontcolor" value="0xFFFFFF" />
81+
</settings>
82+
<elements>
83+
<element name="button" src="button.png" />
84+
</elements>
85+
</component>
86+
87+
<component name="playlist">
88+
<settings>
89+
<setting name="fontcolor" value="0xEEEEEE" />
90+
<setting name="overcolor" value="0xFFFFFF" />
91+
<setting name="activecolor" value="0xFFFFFF" />
92+
<setting name="backgroundcolor" value="0x333333" />
93+
</settings>
94+
<elements>
95+
<element name="item" src="item.png" />
96+
<element name="itemOver" src="itemOver.png" />
97+
<element name="sliderCapBottom" src="sliderCapBottom.png" />
98+
<element name="sliderCapTop" src="sliderCapTop.png" />
99+
<element name="sliderRail" src="sliderRail.png" />
100+
<element name="sliderThumb" src="sliderThumb.png" />
101+
</elements>
102+
</component>
103+
104+
<component name="sharing">
105+
<elements>
106+
<element name="embedIcon" src="embedIcon.png" />
107+
<element name="embedScreen" src="embedScreen.png" />
108+
<element name="shareIcon" src="shareIcon.png" />
109+
<element name="shareScreen" src="shareScreen.png" />
110+
</elements>
111+
</component>
112+
113+
</components>
114+
115+
</skin>

‎assets/jwplayer/glow/playlist/item.png

172 Bytes

‎assets/jwplayer/glow/playlist/itemOver.png

171 Bytes

‎assets/jwplayer/glow/playlist/sliderCapBottom.png

108 Bytes

‎assets/jwplayer/glow/playlist/sliderCapTop.png

105 Bytes

‎assets/jwplayer/glow/playlist/sliderRail.png

100 Bytes

‎assets/jwplayer/glow/playlist/sliderThumb.png

97 Bytes

‎assets/jwplayer/glow/sharing/embedIcon.png

749 Bytes

‎assets/jwplayer/glow/sharing/embedScreen.png

2.52 KB

‎assets/jwplayer/glow/sharing/shareIcon.png

589 Bytes

‎assets/jwplayer/glow/sharing/shareScreen.png

4.47 KB

‎assets/jwplayer/player.swf

89.2 KB
Binary file not shown.

‎atom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<feed xmlns="http://www.w3.org/2005/Atom">
3+
4+
<title><![CDATA[Home Assistant]]></title>
5+
<link href="http://balloob.github.io/home-assistant/atom.xml" rel="self"/>
6+
<link href="http://balloob.github.io/home-assistant/"/>
7+
<updated>2014-12-19T07:49:58-08:00</updated>
8+
<id>http://balloob.github.io/home-assistant/</id>
9+
<author>
10+
<name><![CDATA[Paulus Schoutsen]]></name>
11+
12+
</author>
13+
<generator uri="http://octopress.org/">Octopress</generator>
14+
15+
16+
<entry>
17+
<title type="html"><![CDATA[Website launched!]]></title>
18+
<link href="http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched/"/>
19+
<updated>2014-12-18T23:24:45-08:00</updated>
20+
<id>http://balloob.github.io/home-assistant/blog/2014/12/18/website-launched</id>
21+
<content type="html"><![CDATA[<p>I finally took the time to setup a simple website to help people getting started with Home Assistant. This will make sure that the README on GitHub can be purely focussed on developers.</p>
22+
]]></content>
23+
</entry>
24+
25+
</feed>

0 commit comments

Comments
 (0)