mirror of
https://github.com/home-assistant/core.git
synced 2025-07-26 14:47:38 +00:00
Add support for power data from Koogeek SW2 via homekit_controller (#53378)
This commit is contained in:
Jc2k
GitHub
parent
d8887a97e3
commit
91018d0451
@ -46,5 +46,6 @@ HOMEKIT_ACCESSORY_DISPATCH = {
|
|||||||
CHARACTERISTIC_PLATFORMS = {
|
CHARACTERISTIC_PLATFORMS = {
|
||||||
CharacteristicsTypes.Vendor.EVE_ENERGY_WATT: "sensor",
|
CharacteristicsTypes.Vendor.EVE_ENERGY_WATT: "sensor",
|
||||||
CharacteristicsTypes.Vendor.KOOGEEK_REALTIME_ENERGY: "sensor",
|
CharacteristicsTypes.Vendor.KOOGEEK_REALTIME_ENERGY: "sensor",
|
||||||
|
CharacteristicsTypes.Vendor.KOOGEEK_REALTIME_ENERGY_2: "sensor",
|
||||||
CharacteristicsTypes.get_uuid(CharacteristicsTypes.TEMPERATURE_CURRENT): "sensor",
|
CharacteristicsTypes.get_uuid(CharacteristicsTypes.TEMPERATURE_CURRENT): "sensor",
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
"name": "HomeKit Controller",
|
"name": "HomeKit Controller",
|
||||||
"config_flow": true,
|
"config_flow": true,
|
||||||
"documentation": "https://www.home-assistant.io/integrations/homekit_controller",
|
"documentation": "https://www.home-assistant.io/integrations/homekit_controller",
|
||||||
"requirements": ["aiohomekit==0.5.1"],
|
"requirements": ["aiohomekit==0.6.0"],
|
||||||
"zeroconf": ["_hap._tcp.local."],
|
"zeroconf": ["_hap._tcp.local."],
|
||||||
"after_dependencies": ["zeroconf"],
|
"after_dependencies": ["zeroconf"],
|
||||||
"codeowners": ["@Jc2k", "@bdraco"],
|
"codeowners": ["@Jc2k", "@bdraco"],
|
||||||
|
|||||||
@ -37,6 +37,12 @@ SIMPLE_SENSOR = {
|
|||||||
"state_class": STATE_CLASS_MEASUREMENT,
|
"state_class": STATE_CLASS_MEASUREMENT,
|
||||||
"unit": "watts",
|
"unit": "watts",
|
||||||
},
|
},
|
||||||
|
CharacteristicsTypes.Vendor.KOOGEEK_REALTIME_ENERGY_2: {
|
||||||
|
"name": "Real Time Energy",
|
||||||
|
"device_class": DEVICE_CLASS_POWER,
|
||||||
|
"state_class": STATE_CLASS_MEASUREMENT,
|
||||||
|
"unit": "watts",
|
||||||
|
},
|
||||||
CharacteristicsTypes.get_uuid(CharacteristicsTypes.TEMPERATURE_CURRENT): {
|
CharacteristicsTypes.get_uuid(CharacteristicsTypes.TEMPERATURE_CURRENT): {
|
||||||
"name": "Current Temperature",
|
"name": "Current Temperature",
|
||||||
"device_class": DEVICE_CLASS_TEMPERATURE,
|
"device_class": DEVICE_CLASS_TEMPERATURE,
|
||||||
|
|||||||
@ -178,7 +178,7 @@ aioguardian==1.0.8
|
|||||||
aioharmony==0.2.7
|
aioharmony==0.2.7
|
||||||
|
|
||||||
# homeassistant.components.homekit_controller
|
# homeassistant.components.homekit_controller
|
||||||
aiohomekit==0.5.1
|
aiohomekit==0.6.0
|
||||||
|
|
||||||
# homeassistant.components.emulated_hue
|
# homeassistant.components.emulated_hue
|
||||||
# homeassistant.components.http
|
# homeassistant.components.http
|
||||||
|
|||||||
@ -115,7 +115,7 @@ aioguardian==1.0.8
|
|||||||
aioharmony==0.2.7
|
aioharmony==0.2.7
|
||||||
|
|
||||||
# homeassistant.components.homekit_controller
|
# homeassistant.components.homekit_controller
|
||||||
aiohomekit==0.5.1
|
aiohomekit==0.6.0
|
||||||
|
|
||||||
# homeassistant.components.emulated_hue
|
# homeassistant.components.emulated_hue
|
||||||
# homeassistant.components.http
|
# homeassistant.components.http
|
||||||
|
|||||||
@ -0,0 +1,64 @@
|
|||||||
|
"""
|
||||||
|
Make sure that existing Koogeek SW2 is enumerated correctly.
|
||||||
|
|
||||||
|
This Koogeek device has a custom power sensor that extra handling.
|
||||||
|
|
||||||
|
It should have 2 entities - the actual switch and a sensor for power usage.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from homeassistant.helpers import device_registry as dr, entity_registry as er
|
||||||
|
|
||||||
|
from tests.components.homekit_controller.common import (
|
||||||
|
Helper,
|
||||||
|
setup_accessories_from_file,
|
||||||
|
setup_test_accessories,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def test_koogeek_ls1_setup(hass):
|
||||||
|
"""Test that a Koogeek LS1 can be correctly setup in HA."""
|
||||||
|
accessories = await setup_accessories_from_file(hass, "koogeek_sw2.json")
|
||||||
|
config_entry, pairing = await setup_test_accessories(hass, accessories)
|
||||||
|
|
||||||
|
entity_registry = er.async_get(hass)
|
||||||
|
|
||||||
|
# Assert that the switch entity is correctly added to the entity registry
|
||||||
|
entry = entity_registry.async_get("switch.koogeek_sw2_187a91")
|
||||||
|
assert entry.unique_id == "homekit-CNNT061751001372-8"
|
||||||
|
|
||||||
|
helper = Helper(
|
||||||
|
hass, "switch.koogeek_sw2_187a91", pairing, accessories[0], config_entry
|
||||||
|
)
|
||||||
|
state = await helper.poll_and_get_state()
|
||||||
|
|
||||||
|
# Assert that the friendly name is detected correctly
|
||||||
|
assert state.attributes["friendly_name"] == "Koogeek-SW2-187A91"
|
||||||
|
|
||||||
|
device_registry = dr.async_get(hass)
|
||||||
|
|
||||||
|
device = device_registry.async_get(entry.device_id)
|
||||||
|
assert device.manufacturer == "Koogeek"
|
||||||
|
assert device.name == "Koogeek-SW2-187A91"
|
||||||
|
assert device.model == "KH02CN"
|
||||||
|
assert device.sw_version == "1.0.3"
|
||||||
|
assert device.via_device_id is None
|
||||||
|
|
||||||
|
# Assert that the power sensor entity is correctly added to the entity registry
|
||||||
|
entry = entity_registry.async_get("sensor.koogeek_sw2_187a91_real_time_energy")
|
||||||
|
assert entry.unique_id == "homekit-CNNT061751001372-aid:1-sid:14-cid:14"
|
||||||
|
|
||||||
|
helper = Helper(
|
||||||
|
hass,
|
||||||
|
"sensor.koogeek_sw2_187a91_real_time_energy",
|
||||||
|
pairing,
|
||||||
|
accessories[0],
|
||||||
|
config_entry,
|
||||||
|
)
|
||||||
|
state = await helper.poll_and_get_state()
|
||||||
|
|
||||||
|
# Assert that the friendly name is detected correctly
|
||||||
|
assert state.attributes["friendly_name"] == "Koogeek-SW2-187A91 - Real Time Energy"
|
||||||
|
|
||||||
|
device_registry = dr.async_get(hass)
|
||||||
|
|
||||||
|
assert device.id == entry.device_id
|
||||||
265
tests/fixtures/homekit_controller/koogeek_sw2.json
vendored
Normal file
265
tests/fixtures/homekit_controller/koogeek_sw2.json
vendored
Normal file
@ -0,0 +1,265 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"aid": 1,
|
||||||
|
"services": [
|
||||||
|
{
|
||||||
|
"characteristics": [
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 2,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000023-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "Koogeek-SW2-187A91"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 3,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000020-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "Koogeek"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 4,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000021-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "KH02CN"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 5,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000030-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "CNNT061751001372"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "bool",
|
||||||
|
"iid": 6,
|
||||||
|
"perms": [
|
||||||
|
"pw"
|
||||||
|
],
|
||||||
|
"type": "00000014-0000-1000-8000-0026BB765291"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 7,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000052-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "1.0.3"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"iid": 1,
|
||||||
|
"stype": "accessory-information",
|
||||||
|
"type": "0000003E-0000-1000-8000-0026BB765291"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"characteristics": [
|
||||||
|
{
|
||||||
|
"ev": true,
|
||||||
|
"format": "bool",
|
||||||
|
"iid": 9,
|
||||||
|
"perms": [
|
||||||
|
"pr",
|
||||||
|
"pw",
|
||||||
|
"ev"
|
||||||
|
],
|
||||||
|
"type": "00000025-0000-1000-8000-0026BB765291",
|
||||||
|
"value": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 10,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000023-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "Switch 1"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"iid": 8,
|
||||||
|
"primary": true,
|
||||||
|
"stype": "switch",
|
||||||
|
"type": "00000049-0000-1000-8000-0026BB765291"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"characteristics": [
|
||||||
|
{
|
||||||
|
"ev": true,
|
||||||
|
"format": "bool",
|
||||||
|
"iid": 12,
|
||||||
|
"perms": [
|
||||||
|
"pr",
|
||||||
|
"pw",
|
||||||
|
"ev"
|
||||||
|
],
|
||||||
|
"type": "00000025-0000-1000-8000-0026BB765291",
|
||||||
|
"value": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 13,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000023-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "Switch 2"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"iid": 11,
|
||||||
|
"primary": true,
|
||||||
|
"stype": "switch",
|
||||||
|
"type": "00000049-0000-1000-8000-0026BB765291"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"characteristics": [
|
||||||
|
{
|
||||||
|
"format": "string",
|
||||||
|
"iid": 15,
|
||||||
|
"maxLen": 64,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "00000023-0000-1000-8000-0026BB765291",
|
||||||
|
"value": "custom service"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Current Time",
|
||||||
|
"format": "int",
|
||||||
|
"iid": 16,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "7BBBA961-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"value": 1599731035
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Time Zone",
|
||||||
|
"format": "int",
|
||||||
|
"iid": 17,
|
||||||
|
"perms": [
|
||||||
|
"pr",
|
||||||
|
"pw"
|
||||||
|
],
|
||||||
|
"type": "7BBBA980-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"value": 16
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Current Power",
|
||||||
|
"ev": false,
|
||||||
|
"format": "int",
|
||||||
|
"iid": 18,
|
||||||
|
"perms": [
|
||||||
|
"pr",
|
||||||
|
"ev"
|
||||||
|
],
|
||||||
|
"type": "7BBBA96E-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"value": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Power Consumption Today",
|
||||||
|
"format": "data",
|
||||||
|
"iid": 19,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "7BBBA96F-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"value": "9pcBAL4GAAC1BgAAtgYAAELhAABXIwAAtgYAAKcGAABHOQAA1aMAAP//////////////////////////////////////////////////////////////////////////"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Power Consumption last 2 Month",
|
||||||
|
"format": "data",
|
||||||
|
"iid": 20,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "7BBBA972-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"value": "/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCFAEA5HkIADGbAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Power Consumption last 12 Month",
|
||||||
|
"format": "data",
|
||||||
|
"iid": 21,
|
||||||
|
"perms": [
|
||||||
|
"pr"
|
||||||
|
],
|
||||||
|
"type": "7BBBA970-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"value": "//////////////////////////////////////////+XKQ0A////////////////"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"hidden": true,
|
||||||
|
"iid": 14,
|
||||||
|
"stype": "Unknown Service: 7BBBA977-EB2D-11E5-A837-0800200C9A66",
|
||||||
|
"type": "7BBBA977-EB2D-11E5-A837-0800200C9A66"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"characteristics": [
|
||||||
|
{
|
||||||
|
"description": "FW Upgrade supported types",
|
||||||
|
"format": "string",
|
||||||
|
"iid": 23,
|
||||||
|
"perms": [
|
||||||
|
"pr",
|
||||||
|
"hd"
|
||||||
|
],
|
||||||
|
"type": "151909D2-3802-11E4-916C-0800200C9A66",
|
||||||
|
"value": "url,data"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "FW Upgrade URL",
|
||||||
|
"format": "string",
|
||||||
|
"iid": 24,
|
||||||
|
"maxLen": 256,
|
||||||
|
"perms": [
|
||||||
|
"pw",
|
||||||
|
"hd"
|
||||||
|
],
|
||||||
|
"type": "151909D1-3802-11E4-916C-0800200C9A66"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "FW Upgrade Status",
|
||||||
|
"ev": false,
|
||||||
|
"format": "int",
|
||||||
|
"iid": 25,
|
||||||
|
"perms": [
|
||||||
|
"pr",
|
||||||
|
"ev",
|
||||||
|
"hd"
|
||||||
|
],
|
||||||
|
"type": "151909D6-3802-11E4-916C-0800200C9A66",
|
||||||
|
"value": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "FW Upgrade Data",
|
||||||
|
"format": "data",
|
||||||
|
"iid": 26,
|
||||||
|
"perms": [
|
||||||
|
"pw",
|
||||||
|
"hd"
|
||||||
|
],
|
||||||
|
"type": "151909D7-3802-11E4-916C-0800200C9A66"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"hidden": true,
|
||||||
|
"iid": 22,
|
||||||
|
"stype": "Unknown Service: 151909D0-3802-11E4-916C-0800200C9A66",
|
||||||
|
"type": "151909D0-3802-11E4-916C-0800200C9A66"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
Loading…
x
Reference in New Issue
Block a user