Skip to content

Commit aa39ded

Browse files
balloobballoob
authored
Merge pull request home-assistant#37668 from home-assistant/rc
2 parents a773534 + 81af0e2 commit aa39ded

File tree

17 files changed

+206
-76
lines changed

17 files changed

+206
-76
lines changed

‎homeassistant/bootstrap.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ async def _async_log_pending_setups(
351351
remaining = [domain for domain in domains if domain in setup_started]
352352

353353
if remaining:
354-
_LOGGER.info(
354+
_LOGGER.warning(
355355
"Waiting on integrations to complete setup: %s", ", ".join(remaining),
356356
)
357357

‎homeassistant/components/denonavr/config_flow.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
DOMAIN = "denonavr"
2121

22-
SUPPORTED_MANUFACTURERS = ["Denon", "DENON", "Marantz"]
22+
SUPPORTED_MANUFACTURERS = ["Denon", "DENON", "DENON PROFESSIONAL", "Marantz"]
2323
IGNORED_MODELS = ["HEOS 1", "HEOS 3", "HEOS 5", "HEOS 7"]
2424

2525
CONF_SHOW_ALL_SOURCES = "show_all_sources"

‎homeassistant/components/denonavr/manifest.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "Denon AVR Network Receivers",
44
"config_flow": true,
55
"documentation": "https://www.home-assistant.io/integrations/denonavr",
6-
"requirements": ["denonavr==0.9.3", "getmac==0.8.2"],
6+
"requirements": ["denonavr==0.9.4", "getmac==0.8.2"],
77
"codeowners": ["@scarface-4711", "@starkillerOG"],
88
"ssdp": [
99
{
@@ -14,6 +14,10 @@
1414
"manufacturer": "DENON",
1515
"deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1"
1616
},
17+
{
18+
"manufacturer": "DENON PROFESSIONAL",
19+
"deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1"
20+
},
1721
{
1822
"manufacturer": "Marantz",
1923
"deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1"
@@ -26,6 +30,10 @@
2630
"manufacturer": "DENON",
2731
"deviceType": "urn:schemas-upnp-org:device:MediaServer:1"
2832
},
33+
{
34+
"manufacturer": "DENON PROFESSIONAL",
35+
"deviceType": "urn:schemas-upnp-org:device:MediaServer:1"
36+
},
2937
{
3038
"manufacturer": "Marantz",
3139
"deviceType": "urn:schemas-upnp-org:device:MediaServer:1"
@@ -38,6 +46,10 @@
3846
"manufacturer": "DENON",
3947
"deviceType": "urn:schemas-denon-com:device:AiosDevice:1"
4048
},
49+
{
50+
"manufacturer": "DENON PROFESSIONAL",
51+
"deviceType": "urn:schemas-denon-com:device:AiosDevice:1"
52+
},
4153
{
4254
"manufacturer": "Marantz",
4355
"deviceType": "urn:schemas-denon-com:device:AiosDevice:1"

‎homeassistant/components/dunehd/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"domain": "dunehd",
33
"name": "Dune HD",
44
"documentation": "https://www.home-assistant.io/integrations/dunehd",
5-
"requirements": ["pdunehd==1.3.1"],
5+
"requirements": ["pdunehd==1.3.2"],
66
"codeowners": ["@bieniu"],
77
"config_flow": true
88
}

‎homeassistant/components/kef/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"name": "KEF",
44
"documentation": "https://www.home-assistant.io/integrations/kef",
55
"codeowners": ["@basnijholt"],
6-
"requirements": ["aiokef==0.2.12", "getmac==0.8.2"]
6+
"requirements": ["aiokef==0.2.13", "getmac==0.8.2"]
77
}

‎homeassistant/components/smappee/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"documentation": "https://www.home-assistant.io/integrations/smappee",
66
"dependencies": ["http"],
77
"requirements": [
8-
"pysmappee==0.1.2"
8+
"pysmappee==0.1.4"
99
],
1010
"codeowners": [
1111
"@bsmappee"

‎homeassistant/components/smappee/sensor.py‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
"total_power",
1717
DEVICE_CLASS_POWER,
1818
],
19-
"total_reactive_power": [
20-
"Total consumption - Reactive power",
21-
None,
22-
POWER_WATT,
23-
"total_reactive_power",
24-
DEVICE_CLASS_POWER,
25-
],
2619
"alwayson": [
2720
"Always on - Active power",
2821
None,
@@ -59,6 +52,15 @@
5952
None,
6053
],
6154
}
55+
REACTIVE_SENSORS = {
56+
"total_reactive_power": [
57+
"Total consumption - Reactive power",
58+
None,
59+
POWER_WATT,
60+
"total_reactive_power",
61+
DEVICE_CLASS_POWER,
62+
]
63+
}
6264
SOLAR_SENSORS = {
6365
"solar_power": [
6466
"Total production - Active power",
@@ -88,48 +90,48 @@
8890
"mdi:flash",
8991
VOLT,
9092
"phase_voltage_a",
91-
["ONE", "TWO", "THREE_STAR", "THREE_DELTA"],
9293
None,
94+
["ONE", "TWO", "THREE_STAR", "THREE_DELTA"],
9395
],
9496
"phase_voltages_b": [
9597
"Phase voltages - B",
9698
"mdi:flash",
9799
VOLT,
98100
"phase_voltage_b",
99-
["TWO", "THREE_STAR", "THREE_DELTA"],
100101
None,
102+
["TWO", "THREE_STAR", "THREE_DELTA"],
101103
],
102104
"phase_voltages_c": [
103105
"Phase voltages - C",
104106
"mdi:flash",
105107
VOLT,
106108
"phase_voltage_c",
107-
["THREE_STAR"],
108109
None,
110+
["THREE_STAR"],
109111
],
110112
"line_voltages_a": [
111113
"Line voltages - A",
112114
"mdi:flash",
113115
VOLT,
114116
"line_voltage_a",
115-
["ONE", "TWO", "THREE_STAR", "THREE_DELTA"],
116117
None,
118+
["ONE", "TWO", "THREE_STAR", "THREE_DELTA"],
117119
],
118120
"line_voltages_b": [
119121
"Line voltages - B",
120122
"mdi:flash",
121123
VOLT,
122124
"line_voltage_b",
123-
["TWO", "THREE_STAR", "THREE_DELTA"],
124125
None,
126+
["TWO", "THREE_STAR", "THREE_DELTA"],
125127
],
126128
"line_voltages_c": [
127129
"Line voltages - C",
128130
"mdi:flash",
129131
VOLT,
130132
"line_voltage_c",
131-
["THREE_STAR", "THREE_DELTA"],
132133
None,
134+
["THREE_STAR", "THREE_DELTA"],
133135
],
134136
}
135137

@@ -151,6 +153,17 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
151153
)
152154
)
153155

156+
if service_location.has_reactive_value:
157+
for reactive_sensor in REACTIVE_SENSORS:
158+
entities.append(
159+
SmappeeSensor(
160+
smappee_base=smappee_base,
161+
service_location=service_location,
162+
sensor=reactive_sensor,
163+
attributes=REACTIVE_SENSORS[reactive_sensor],
164+
)
165+
)
166+
154167
# Add solar sensors
155168
if service_location.has_solar_production:
156169
for sensor in SOLAR_SENSORS:
@@ -180,17 +193,18 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
180193
)
181194
)
182195

183-
# Add phase- and line voltages
184-
for sensor_name, sensor in VOLTAGE_SENSORS.items():
185-
if service_location.phase_type in sensor[4]:
186-
entities.append(
187-
SmappeeSensor(
188-
smappee_base=smappee_base,
189-
service_location=service_location,
190-
sensor=sensor_name,
191-
attributes=sensor,
196+
# Add phase- and line voltages if available
197+
if service_location.has_voltage_values:
198+
for sensor_name, sensor in VOLTAGE_SENSORS.items():
199+
if service_location.phase_type in sensor[5]:
200+
entities.append(
201+
SmappeeSensor(
202+
smappee_base=smappee_base,
203+
service_location=service_location,
204+
sensor=sensor_name,
205+
attributes=sensor,
206+
)
192207
)
193-
)
194208

195209
# Add Gas and Water sensors
196210
for sensor_id, sensor in service_location.sensors.items():

‎homeassistant/components/sonarr/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "Sonarr",
44
"documentation": "https://www.home-assistant.io/integrations/sonarr",
55
"codeowners": ["@ctalkington"],
6-
"requirements": ["sonarr==0.2.2"],
6+
"requirements": ["sonarr==0.2.3"],
77
"config_flow": true,
88
"quality_scale": "silver"
99
}

‎homeassistant/components/wake_on_lan/__init__.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ async def send_magic_packet(call):
3131
mac_address = call.data.get(CONF_MAC)
3232
broadcast_address = call.data.get(CONF_BROADCAST_ADDRESS)
3333
broadcast_port = call.data.get(CONF_BROADCAST_PORT)
34+
35+
service_kwargs = {}
36+
if broadcast_address is not None:
37+
service_kwargs["ip_address"] = broadcast_address
38+
if broadcast_port is not None:
39+
service_kwargs["port"] = broadcast_port
40+
3441
_LOGGER.info(
3542
"Send magic packet to mac %s (broadcast: %s, port: %s)",
3643
mac_address,
3744
broadcast_address,
3845
broadcast_port,
3946
)
40-
if broadcast_address is not None:
41-
await hass.async_add_job(
42-
partial(
43-
wakeonlan.send_magic_packet,
44-
mac_address,
45-
ip_address=broadcast_address,
46-
port=broadcast_port,
47-
)
48-
)
49-
else:
50-
await hass.async_add_job(partial(wakeonlan.send_magic_packet, mac_address))
47+
48+
await hass.async_add_job(
49+
partial(wakeonlan.send_magic_packet, mac_address, **service_kwargs)
50+
)
5151

5252
hass.services.async_register(
5353
DOMAIN,

‎homeassistant/components/wake_on_lan/switch.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,20 @@ def name(self):
9696

9797
def turn_on(self, **kwargs):
9898
"""Turn the device on."""
99-
if self._broadcast_address:
100-
wakeonlan.send_magic_packet(
101-
self._mac_address,
102-
ip_address=self._broadcast_address,
103-
port=self._broadcast_port,
104-
)
105-
else:
106-
wakeonlan.send_magic_packet(self._mac_address)
99+
service_kwargs = {}
100+
if self._broadcast_address is not None:
101+
service_kwargs["ip_address"] = self._broadcast_address
102+
if self._broadcast_port is not None:
103+
service_kwargs["port"] = self._broadcast_port
104+
105+
_LOGGER.info(
106+
"Send magic packet to mac %s (broadcast: %s, port: %s)",
107+
self._mac_address,
108+
self._broadcast_address,
109+
self._broadcast_port,
110+
)
111+
112+
wakeonlan.send_magic_packet(self._mac_address, **service_kwargs)
107113

108114
def turn_off(self, **kwargs):
109115
"""Turn the device off if an off action is present."""

0 commit comments

Comments
 (0)