Skip to content

Commit 445b5da

Browse files
committed
Merge remote-tracking branch 'origin/main' into wait_for_transitions
2 parents 9cc3954 + d768a1e commit 445b5da

File tree

3 files changed

+87
-84
lines changed

3 files changed

+87
-84
lines changed

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @basnijholt

custom_components/adaptive_lighting/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"iot_class": "calculated",
99
"issue_tracker": "https://github.com/basnijholt/adaptive-lighting/issues",
1010
"requirements": [],
11-
"version": "1.9.0"
11+
"version": "1.9.1"
1212
}

custom_components/adaptive_lighting/services.yaml

100644100755
+85-83
Original file line numberDiff line numberDiff line change
@@ -2,249 +2,251 @@ apply:
22
description: Applies the current Adaptive Lighting settings to lights.
33
fields:
44
entity_id:
5-
description: "Entity ID of the switch. \U0001F4DD"
5+
description: entity_id of the Adaptive Lighting switch. If not specified, the current Adaptive Lighting switch will be used.
66
selector:
77
entity:
88
integration: adaptive_lighting
99
domain: switch
1010
multiple: false
1111
lights:
12-
description: "List of light entities to be controlled by Adaptive Lighting (may be empty). \U0001F31F"
12+
description: entity_id(s) of lights, if not specified, all lights in the switch are selected.
1313
selector:
1414
entity:
1515
domain: light
1616
multiple: true
1717
transition:
18-
description: "Duration of transition when lights change, in seconds. \U0001F551"
18+
description: Transition of the lights.
1919
example: 10
2020
selector:
21-
text: null
21+
text:
2222
adapt_brightness:
23-
description: "Whether to adapt the brightness of the light. \U0001F31E"
23+
description: "Adapt the 'brightness', default: true"
2424
example: true
2525
selector:
26-
boolean: null
26+
boolean:
2727
adapt_color:
28-
description: "Whether to adapt the color of the light. \U0001F308"
28+
description: "Adapt the color_temp/color_rgb, default: true"
2929
example: true
3030
selector:
31-
boolean: null
31+
boolean:
3232
prefer_rgb_color:
33-
description: "Use RGB color adjustment instead of native light color temperature. \U0001F308"
33+
description: "Prefer to use color_rgb over color_temp if possible, default: false"
3434
example: false
3535
selector:
36-
boolean: null
36+
boolean:
3737
turn_on_lights:
38-
description: "Whether to turn on lights if they are off. \U0001F506"
38+
description: "Turn on the lights that are off, default: false"
3939
example: false
4040
selector:
41-
boolean: null
41+
boolean:
42+
4243
set_manual_control:
4344
description: Mark whether a light is 'manually controlled'.
4445
fields:
4546
entity_id:
46-
description: "Entity ID of the switch. \U0001F4DD"
47+
description: entity_id of the Adaptive Lighting switch. If not specified, the current Adaptive Lighting switch will be used.
4748
selector:
4849
entity:
4950
integration: adaptive_lighting
5051
domain: switch
5152
multiple: false
5253
lights:
53-
description: "List of light entities to be controlled by Adaptive Lighting (may be empty). \U0001F31F"
54+
description: entity_id(s) of lights, if not specified, all lights in the switch are selected.
5455
selector:
5556
entity:
5657
domain: light
5758
multiple: true
5859
manual_control:
59-
description: "Whether to manually control the lights. \U0001F512"
60+
description: "Whether to add ('true') or remove ('false') the light from the 'manual_control' list, default: true"
6061
example: true
6162
default: true
6263
selector:
63-
boolean: null
64+
boolean:
65+
6466
change_switch_settings:
65-
description: Change any settings you'd like in the switch. All options here are the same as in the config flow.
67+
description: "Change any settings you'd like in the switch. All options here are the same as in the config flow."
6668
fields:
6769
entity_id:
68-
description: "Entity ID of the switch. \U0001F4DD"
70+
description: "entity_id of the Adaptive Lighting switch."
6971
required: true
7072
selector:
7173
entity:
7274
domain: switch
7375
use_defaults:
74-
description: "Whether to use default settings for the switches. \u2699\uFE0F"
75-
example: current
76+
description: "(default: 'current' for current settings) You can set this to 'factory', 'configuration', or 'current' to reset the variables not being set with this service call. 'current' leaves them as is, 'configuration' resets to whatever already initializes at startup, 'factory' resets to the default values listed in the documentation."
77+
example: "current"
7678
required: false
77-
default: current
79+
default: "current"
7880
selector:
7981
select:
8082
options:
81-
- current
82-
- configuration
83-
- factory
83+
- "current"
84+
- "configuration"
85+
- "factory"
8486
include_config_in_attributes:
85-
description: "Show all options as attributes on the switch in Home Assistant when set to `true`. \U0001F4DD"
87+
description: "include_config_in_attributes: All config options will be listed as attributes under the adaptive-lighting switch this integration creates. (default: false)"
8688
required: false
8789
selector:
88-
boolean: null
90+
boolean:
8991
turn_on_lights:
90-
description: "Whether to turn on lights if they are off. \U0001F506"
92+
description: "Turn on the lights that are off, default: false"
9193
example: false
9294
required: false
9395
selector:
94-
boolean: null
96+
boolean:
9597
initial_transition:
96-
description: "Duration of the first transition when lights turn from `off` to `on` in seconds. \u23F2\uFE0F"
98+
description: "initial_transition: When lights turn 'off' to 'on'. (seconds)"
9799
example: 1
98100
required: false
99101
selector:
100-
text: null
102+
text:
101103
sleep_transition:
102-
description: "Duration of transition when 'sleep mode' is toggled in seconds. \U0001F634"
104+
description: "sleep_transition: When 'sleep_state' changes. (seconds)"
103105
example: 1
104106
required: false
105107
selector:
106-
text: null
108+
text:
107109
max_brightness:
108-
description: "Maximum brightness percentage. \U0001F4A1"
110+
description: "max_brightness: Highest brightness of lights during a cycle. (%)"
109111
required: false
110112
example: 100
111113
selector:
112-
text: null
114+
text:
113115
max_color_temp:
114-
description: "Coldest color temperature in Kelvin. \u2744\uFE0F"
116+
description: "max_color_temp: Coldest hue of the color temperature cycle. (Kelvin)"
115117
required: false
116118
example: 5500
117119
selector:
118-
text: null
120+
text:
119121
min_brightness:
120-
description: "Minimum brightness percentage. \U0001F4A1"
122+
description: "min_brightness: Lowest brightness of lights during a cycle. (%)"
121123
required: false
122124
example: 1
123125
selector:
124-
text: null
126+
text:
125127
min_color_temp:
126-
description: "Warmest color temperature in Kelvin. \U0001F525"
128+
description: "min_color_temp, Warmest hue of the color temperature cycle. (Kelvin)"
127129
required: false
128130
example: 2000
129131
selector:
130-
text: null
132+
text:
131133
only_once:
132-
description: "Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). \U0001F504"
134+
description: "only_once: Only adapt the lights when turning them on."
133135
example: false
134136
required: false
135137
selector:
136-
boolean: null
138+
boolean:
137139
prefer_rgb_color:
138-
description: "Use RGB color adjustment instead of native light color temperature. \U0001F308"
140+
description: "prefer_rgb_color: Use 'rgb_color' rather than 'color_temp' when possible."
139141
required: false
140142
example: false
141143
selector:
142-
boolean: null
144+
boolean:
143145
separate_turn_on_commands:
144-
description: "Use separate `light.turn_on` calls for color and brightness, needed for some light types. \U0001F500"
146+
description: "separate_turn_on_commands: Separate the commands for each attribute (color, brightness, etc.) in 'light.turn_on' (required for some lights)."
145147
required: false
146148
example: false
147149
selector:
148-
boolean: null
150+
boolean:
149151
send_split_delay:
150-
description: "Wait time (milliseconds) between commands when using `separate_turn_on_commands`. Helps ensure correct handling. \u23F2\uFE0F"
152+
description: "send_split_delay: wait between commands (milliseconds), when separate_turn_on_commands is used. May ensure that both commands are handled by the bulb correctly."
151153
required: false
152154
example: 0
153155
selector:
154-
boolean: null
156+
boolean:
155157
sleep_brightness:
156-
description: "Brightness percentage of lights in sleep mode. \U0001F634"
158+
description: "sleep_brightness, Brightness setting for Sleep Mode. (%)"
157159
required: false
158160
example: 1
159161
selector:
160-
text: null
162+
text:
161163
sleep_rgb_or_color_temp:
162-
description: "Use either `'rgb_color'` or `'color_temp'` in sleep mode. \U0001F319"
164+
description: "sleep_rgb_or_color_temp, use 'rgb_color' or 'color_temp'"
163165
required: false
164-
example: color_temp
166+
example: "color_temp"
165167
selector:
166168
select:
167169
options:
168-
- rgb_color
169-
- color_temp
170+
- "rgb_color"
171+
- "color_temp"
170172
sleep_rgb_color:
171-
description: "RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is 'rgb_color'). \U0001F308"
173+
description: "sleep_rgb_color, in RGB"
172174
required: false
173175
selector:
174-
color_rgb: null
176+
color_rgb:
175177
sleep_color_temp:
176-
description: "Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. \U0001F634"
178+
description: "sleep_color_temp: Color temperature setting for Sleep Mode. (Kelvin)"
177179
required: false
178180
example: 1000
179181
selector:
180-
text: null
182+
text:
181183
sunrise_offset:
182-
description: "Adjust sunrise time with a positive or negative offset in seconds. \u23F0"
184+
description: sunrise_offset, in +/- seconds (integer)
183185
required: false
184186
example: 0
185187
selector:
186188
number:
187189
min: 0
188190
max: 86300
189191
sunrise_time:
190-
description: "Set a fixed time (HH:MM:SS) for sunrise. \U0001F305"
192+
description: sunrise_time, in 'HH:MM:SS' format (if 'None', it uses the actual sunrise time at your location)
191193
required: false
192-
example: ''
194+
example: ""
193195
selector:
194-
time: null
196+
time:
195197
sunset_offset:
196-
description: "Adjust sunset time with a positive or negative offset in seconds. \u23F0"
198+
description: sunset_offset, in +/- seconds (integer)
197199
required: false
198-
example: ''
200+
example: ""
199201
selector:
200202
number:
201203
min: 0
202204
max: 86300
203205
sunset_time:
204-
description: "Set a fixed time (HH:MM:SS) for sunset. \U0001F307"
205-
example: ''
206+
description: sunset_time, in 'HH:MM:SS' format (if 'None', it uses the actual sunset time at your location)
207+
example: ""
206208
required: false
207209
selector:
208-
time: null
210+
time:
209211
max_sunrise_time:
210-
description: "Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier real sunrises. \U0001F305"
211-
example: ''
212+
description: "max_sunrise_time: Manual override of the maximum sunrise time, if 'None', it uses the actual sunrise time at your location (HH:MM:SS)"
213+
example: ""
212214
required: false
213215
selector:
214-
time: null
216+
time:
215217
min_sunset_time:
216-
description: "Set the earliest virtual sunset time (HH:MM:SS), allowing for later real sunsets. \U0001F307"
217-
example: ''
218+
description: "min_sunset_time: Manual override of the minimum sunset time, if 'None', it uses the actual sunset time at your location (HH:MM:SS)"
219+
example: ""
218220
required: false
219221
selector:
220-
time: null
222+
time:
221223
take_over_control:
222-
description: "Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! \U0001F512"
224+
description: "take_over_control: If anything but Adaptive Lighting calls 'light.turn_on' when a light is already on, stop adapting that light until it (or the switch) toggles off -> on."
223225
required: false
224226
example: true
225227
selector:
226-
boolean: null
228+
boolean:
227229
detect_non_ha_changes:
228-
description: "Detect non-`light.turn_on` state changes and stop adapting lights. Requires `take_over_control`. \U0001F575\uFE0F"
230+
description: "detect_non_ha_changes: detects all >10% changes made to the lights (also outside of HA), requires 'take_over_control' to be enabled (calls 'homeassistant.update_entity' every 'interval'!)"
229231
required: false
230232
example: false
231233
selector:
232-
boolean: null
234+
boolean:
233235
transition:
234-
description: "Duration of transition when lights change, in seconds. \U0001F551"
236+
description: "Transition time when applying a change to the lights (seconds)"
235237
required: false
236238
example: 45
237239
selector:
238-
text: null
240+
text:
239241
adapt_delay:
240-
description: "Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Helps avoid flickering. \u23F2\uFE0F"
242+
description: "adapt_delay: wait time between light turn on (seconds), and Adaptive Lights applying changes to the light state. May avoid flickering."
241243
required: false
242244
example: 0
243245
selector:
244-
text: null
246+
text:
245247
autoreset_control_seconds:
246-
description: "Automatically reset the manual control after a number of seconds. Set to 0 to disable. \u23F2\uFE0F"
248+
description: "autoreset_control_seconds: wait time (seconds) before Adaptive Lighting resets `manual_control` status of any light (default: 0)"
247249
required: false
248250
example: 0
249251
selector:
250-
text: null
252+
text:

0 commit comments

Comments
 (0)