mirror of
https://github.com/XiaoMi/ha_xiaomi_home.git
synced 2026-01-16 06:30:44 +08:00
Merge remote-tracking branch 'upstream/main' into add-command-sending-mode-for-lights
This commit is contained in:
commit
819be56bd8
@ -649,15 +649,18 @@ class MIoTClient:
|
|||||||
"group_id" in device_gw):
|
"group_id" in device_gw):
|
||||||
mips = self._mips_local.get(device_gw["group_id"], None)
|
mips = self._mips_local.get(device_gw["group_id"], None)
|
||||||
if mips is None:
|
if mips is None:
|
||||||
_LOGGER.error('no gw route, %s, try control through cloud',
|
_LOGGER.error(
|
||||||
device_gw)
|
'no gateway route, %s, try control through cloud',
|
||||||
|
device_gw)
|
||||||
else:
|
else:
|
||||||
result = await mips.set_prop_async(did=did,
|
result = await mips.set_prop_async(did=did,
|
||||||
siid=siid,
|
siid=siid,
|
||||||
piid=piid,
|
piid=piid,
|
||||||
value=value)
|
value=value)
|
||||||
|
_LOGGER.debug('gateway set prop, %s.%d.%d, %s -> %s', did,
|
||||||
|
siid, piid, value, result)
|
||||||
rc = (result or
|
rc = (result or
|
||||||
{}).get("code",
|
{}).get('code',
|
||||||
MIoTErrorCode.CODE_MIPS_INVALID_RESULT.value)
|
MIoTErrorCode.CODE_MIPS_INVALID_RESULT.value)
|
||||||
if rc in [0, 1]:
|
if rc in [0, 1]:
|
||||||
return True
|
return True
|
||||||
@ -687,14 +690,8 @@ class MIoTClient:
|
|||||||
"piid": piid,
|
"piid": piid,
|
||||||
"value": value
|
"value": value
|
||||||
}])
|
}])
|
||||||
_LOGGER.debug(
|
_LOGGER.debug('cloud set prop, %s.%d.%d, %s -> %s', did, siid, piid,
|
||||||
"set prop response, %s.%d.%d, %s, result, %s",
|
value, result)
|
||||||
did,
|
|
||||||
siid,
|
|
||||||
piid,
|
|
||||||
value,
|
|
||||||
result,
|
|
||||||
)
|
|
||||||
if result and len(result) == 1:
|
if result and len(result) == 1:
|
||||||
rc = result[0].get("code",
|
rc = result[0].get("code",
|
||||||
MIoTErrorCode.CODE_MIPS_INVALID_RESULT.value)
|
MIoTErrorCode.CODE_MIPS_INVALID_RESULT.value)
|
||||||
|
|||||||
@ -261,6 +261,17 @@
|
|||||||
"service:004:property:007": "минимальная температура цели "
|
"service:004:property:007": "минимальная температура цели "
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"urn:miot-spec-v2:device:thermostat:0000A031:tofan-wk01": {
|
||||||
|
"en": {
|
||||||
|
"service:002": "Thermostat",
|
||||||
|
"service:002:property:002": "Air Conditioner Mode",
|
||||||
|
"service:004": "Air Conditioner"
|
||||||
|
},
|
||||||
|
"zh_cn": {
|
||||||
|
"service:002": "地暖",
|
||||||
|
"service:004": "空调"
|
||||||
|
}
|
||||||
|
},
|
||||||
"urn:miot-spec-v2:device:vacuum:0000A006:ijai-v1": {
|
"urn:miot-spec-v2:device:vacuum:0000A006:ijai-v1": {
|
||||||
"zh_cn": {
|
"zh_cn": {
|
||||||
"service:007:property:005:valuelist:000": "安静",
|
"service:007:property:005:valuelist:000": "安静",
|
||||||
|
|||||||
@ -19,6 +19,165 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"urn:miot-spec-v2:device:thermostat:0000A031:tofan-wk01:1:0000C822": [
|
||||||
|
{
|
||||||
|
"iid": 2,
|
||||||
|
"type": "urn:miot-spec-v2:service:thermostat:0000784A:tofan-wk01:1",
|
||||||
|
"description": "Thermostat",
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"iid": 1,
|
||||||
|
"type": "urn:miot-spec-v2:property:on:00000006:tofan-wk01:1",
|
||||||
|
"description": "Switch Status",
|
||||||
|
"format": "bool",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"write",
|
||||||
|
"notify"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iid": 2,
|
||||||
|
"type": "urn:miot-spec-v2:property:mode-a:00000008:tofan-wk01:1",
|
||||||
|
"description": "Mode",
|
||||||
|
"format": "uint8",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"write",
|
||||||
|
"notify"
|
||||||
|
],
|
||||||
|
"value-list": [
|
||||||
|
{
|
||||||
|
"value": 0,
|
||||||
|
"description": "Auto"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 1,
|
||||||
|
"description": "Cool"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 2,
|
||||||
|
"description": "Heat"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 3,
|
||||||
|
"description": "Fan"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 4,
|
||||||
|
"description": "Dry"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iid": 3,
|
||||||
|
"type": "urn:miot-spec-v2:property:fault:00000009:tofan-wk01:1",
|
||||||
|
"description": "Device Fault",
|
||||||
|
"format": "uint8",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"notify"
|
||||||
|
],
|
||||||
|
"value-list": [
|
||||||
|
{
|
||||||
|
"value": 0,
|
||||||
|
"description": "No Faults"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iid": 4,
|
||||||
|
"type": "urn:miot-spec-v2:property:target-temperature:00000021:tofan-wk01:1",
|
||||||
|
"description": "Target Temperature",
|
||||||
|
"format": "uint8",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"write",
|
||||||
|
"notify"
|
||||||
|
],
|
||||||
|
"unit": "celsius",
|
||||||
|
"value-range": [
|
||||||
|
16,
|
||||||
|
35,
|
||||||
|
1
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"iid": 1,
|
||||||
|
"type": "urn:miot-spec-v2:action:toggle:00002811:tofan-wk01:1",
|
||||||
|
"description": "Toggle",
|
||||||
|
"in": [],
|
||||||
|
"out": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iid": 4,
|
||||||
|
"type": "urn:miot-spec-v2:service:air-conditioner:0000780F:tofan-wk01:1",
|
||||||
|
"description": "Air Conditioner",
|
||||||
|
"properties": [
|
||||||
|
{
|
||||||
|
"iid": 1,
|
||||||
|
"type": "urn:miot-spec-v2:property:on:00000006:tofan-wk01:1",
|
||||||
|
"description": "Switch Status",
|
||||||
|
"format": "bool",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"write",
|
||||||
|
"notify"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iid": 2,
|
||||||
|
"type": "urn:miot-spec-v2:property:target-temperature:00000021:tofan-wk01:1",
|
||||||
|
"description": "Target Temperature",
|
||||||
|
"format": "uint8",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"write",
|
||||||
|
"notify"
|
||||||
|
],
|
||||||
|
"unit": "celsius",
|
||||||
|
"value-range": [
|
||||||
|
16,
|
||||||
|
32,
|
||||||
|
1
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iid": 3,
|
||||||
|
"type": "urn:miot-spec-v2:property:fan-level:00000016:tofan-wk01:1",
|
||||||
|
"description": "Fan Level",
|
||||||
|
"format": "uint8",
|
||||||
|
"access": [
|
||||||
|
"read",
|
||||||
|
"write",
|
||||||
|
"notify"
|
||||||
|
],
|
||||||
|
"value-list": [
|
||||||
|
{
|
||||||
|
"value": 0,
|
||||||
|
"description": "Auto"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 2,
|
||||||
|
"description": "Low"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 3,
|
||||||
|
"description": "Medium"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": 4,
|
||||||
|
"description": "High"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
"urn:miot-spec-v2:device:water-heater:0000A02A:xiaomi-yms2:1": [
|
"urn:miot-spec-v2:device:water-heater:0000A02A:xiaomi-yms2:1": [
|
||||||
{
|
{
|
||||||
"iid": 2,
|
"iid": 2,
|
||||||
|
|||||||
@ -44,3 +44,7 @@ urn:miot-spec-v2:device:motion-sensor:0000A014:xiaomi-pir1:
|
|||||||
urn:miot-spec-v2:device:router:0000A036:xiaomi-rd03:
|
urn:miot-spec-v2:device:router:0000A036:xiaomi-rd03:
|
||||||
services:
|
services:
|
||||||
- '*'
|
- '*'
|
||||||
|
urn:miot-spec-v2:device:thermostat:0000A031:tofan-wk01:
|
||||||
|
services:
|
||||||
|
- '2'
|
||||||
|
- '4'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user