Skip to content

Commit 24b5888

Browse files
committed
Merge branch 'current' into rc
2 parents e880592 + 2eca986 commit 24b5888

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ group :development do
1212
gem 'sassc', '2.1.0'
1313
gem 'sass-embedded', '1.87.0'
1414
gem 'rubocop', '1.75.5'
15-
gem 'ruby-lsp', '0.23.16'
15+
gem 'ruby-lsp', '0.23.17'
1616
gem 'rackup', '2.2.1'
1717
end
1818

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ GEM
9999
prism (1.4.0)
100100
public_suffix (6.0.2)
101101
racc (1.8.1)
102-
rack (3.1.13)
102+
rack (3.1.14)
103103
rack-protection (4.1.1)
104104
base64 (>= 0.1.0)
105105
logger (>= 1.6.0)
106106
rack (>= 3.0.0, < 4)
107-
rack-session (2.1.0)
107+
rack-session (2.1.1)
108108
base64 (>= 0.1.0)
109109
rack (>= 3.0.0)
110110
rackup (2.2.1)
@@ -133,7 +133,7 @@ GEM
133133
rubocop-ast (1.44.1)
134134
parser (>= 3.3.7.2)
135135
prism (~> 1.4)
136-
ruby-lsp (0.23.16)
136+
ruby-lsp (0.23.17)
137137
language_server-protocol (~> 3.17.0)
138138
prism (>= 1.2, < 2.0)
139139
rbs (>= 3, < 4)
@@ -159,7 +159,7 @@ GEM
159159
rack-protection (= 4.1.1)
160160
rack-session (>= 2.0.0, < 3)
161161
tilt (~> 2.0)
162-
sorbet-runtime (0.5.12067)
162+
sorbet-runtime (0.5.12070)
163163
stringex (2.8.6)
164164
terminal-table (3.0.2)
165165
unicode-display_width (>= 1.1.1, < 3)
@@ -186,7 +186,7 @@ DEPENDENCIES
186186
rackup (= 2.2.1)
187187
rake (= 13.2.1)
188188
rubocop (= 1.75.5)
189-
ruby-lsp (= 0.23.16)
189+
ruby-lsp (= 0.23.17)
190190
sass-embedded (= 1.87.0)
191191
sass-globbing (= 1.1.5)
192192
sassc (= 2.1.0)

source/_docs/automation/action.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Automation actions"
33
description: "Automations result in action."
44
---
55

6-
The action of an automation rule is what is being executed when a rule fires. The action part follows the [script syntax](/docs/scripts/) which can be used to interact with anything via other actions or events.
6+
The action of an automation is what is being executed when an automation fires. The action part follows the [script syntax](/docs/scripts/) which can be used to interact with anything via other actions or events.
77

88
For actions, you can specify the `entity_id` that it should apply to and optional parameters (to specify for example the brightness).
99

source/_docs/automation/basics.markdown

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,31 @@ We can break up this automation into the following three parts:
1515
(action) Turn the lights on in the living room
1616
```
1717

18-
The first part is the [trigger](/docs/automation/trigger/) of the automation rule. Triggers describe {% term events %} that should trigger the automation rule. In this case, it is a person arriving home, which can be observed in Home Assistant using {% term devices %}/{% term sensors %} by observing the state of Paulus changing from `not_home` to `home`.
18+
The first part is the [trigger](/docs/automation/trigger/) of the automation. Triggers describe {% term events %} that should trigger the automation. In this case, it is a person arriving home, which can be observed in Home Assistant using {% term devices %}/{% term sensors %} by observing the state of Paulus changing from `not_home` to `home`.
1919

20-
The second part is the [condition](/docs/automation/condition/). Conditions are optional tests that can limit an automation rule to only work in your specific use cases. A condition will test against the current state of the system. This includes the current time, devices, people and other things like the sun. In this case, we only want to act when the sun has set.
20+
The second part is the [condition](/docs/automation/condition/). Conditions are optional tests that can limit an automation to only work in your specific use cases. A condition will test against the current state of the system. This includes the current time, devices, people and other things like the sun. In this case, we only want to act when the sun has set.
2121

22-
The third part is the [action](/docs/automation/action/), which will be performed when a rule is triggered and all conditions are met. For example, it can turn a light on, set the temperature on your thermostat or activate a scene.
22+
The third part is the [action](/docs/automation/action/), which will be performed when an automation is triggered and all conditions are met. For example, it can turn a light on, set the temperature on your thermostat or activate a scene.
2323

2424
{% note %}
25-
The difference between a condition and a trigger can be confusing as they are very similar. Triggers look at the actions, while conditions look at the current state: turning a light on versus a light being on.
25+
The difference between a trigger and a condition can be confusing as they are very similar.
26+
27+
Triggers require an event to happen for the conditions to be evaluated using current state information.
28+
29+
Event: Arrive home \
30+
Condition: After Sunset? \
31+
Action: Turn lights on
32+
2633
{% endnote %}
2734

2835
## Exploring the internal state
2936

30-
Automation rules interact directly with the internal state of Home Assistant, so you'll need to familiarize yourself with it. Home Assistant exposes its current state via the developer tools. These are available at the bottom of the sidebar in the frontend. **{% my developer_states title="Developer Tools > States" %}** will show all currently available states. An entity can be anything. A light, a switch, a person and even the sun. A state consists of the following parts:
37+
Automations interact directly with the internal state of Home Assistant, so you'll need to familiarize yourself with it. Home Assistant exposes its current state via the developer tools. These are available at the bottom of the sidebar in the frontend. **{% my developer_states title="Developer Tools > States" %}** will show all currently available states. An entity can be anything. A light, a switch, a person and even the sun. A state consists of the following parts:
3138

3239
| Name | Description | Example |
3340
| ---- | ----- | ---- |
34-
| Entity ID | Unique identifier for the entity. | `light.kitchen`
35-
| State | The current state of the device. | `home`
41+
| Entity ID | Unique identifier for the entity. | `light.living_room`
42+
| State | The current state of the device. | `off`
3643
| Attributes | Extra data related to the device and/or current state. | `brightness`
3744

3845
State changes can be used as the source of triggers and the current state can be used in conditions.

0 commit comments

Comments
 (0)