Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maintaining the Cover entity #177

Merged
merged 3 commits into from
Apr 1, 2024
Merged

Maintaining the Cover entity #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
722e9f1
Support CONF_DISABLED_DEFAULT
nao-pon Mar 22, 2024
5c9cef9
Maintaining the Cover entity
nao-pon Mar 22, 2024
c0304d1
Bump pychonet 2.6.8
nao-pon Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions custom_components/echonetlite/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
DOMAIN,
ENABLE_SUPER_ENERGY_DEFAULT,
ENL_OP_CODES,
ENL_SUPER_CODES,
ENL_TIMER_SETTING,
EPC_CODES_FOR_UPDATE,
USER_OPTIONS,
Expand Down Expand Up @@ -547,6 +548,7 @@ def _make_update_flags_full_list(self):
# Some classes use predefined data (Narrowed down items)
flags = EPC_CODES_FOR_UPDATE.get(self._eojgc, {}).get(self._eojcc, None)
if flags != None:
flags = list(set(flags) | {ENL_STATUS} | set(ENL_SUPER_CODES.keys()))
if not _enabled_super_energy:
flags = list(
set(flags) - {ENL_INSTANTANEOUS_POWER, ENL_CUMULATIVE_POWER}
Expand Down
155 changes: 142 additions & 13 deletions custom_components/echonetlite/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
CONF_MAXIMUM,
PERCENTAGE,
UnitOfEnergy,
UnitOfTime,
UnitOfVolume,
UnitOfVolumeFlowRate,
)
Expand All @@ -33,6 +34,11 @@
ENL_DPM_INSTANT_ENG,
ENL_DPM_INSTANT_VOL,
)
from pychonet.ElectricBlind import (
ENL_OPENING_LEVEL,
ENL_BLIND_ANGLE,
ENL_OPENCLOSE_STATUS,
)
from pychonet.GeneralLighting import ENL_BRIGHTNESS, ENL_COLOR_TEMP
from pychonet.HomeAirConditioner import (
ENL_HVAC_MODE,
Expand Down Expand Up @@ -224,6 +230,132 @@
},
},
0x02: { # Housing/Facilities-related Device
0x60: { # Electrically operated blind/shade
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:roller-shade",
CONF_ICONS: {
OPEN: "mdi:roller-shade",
CLOSE: "mdi:roller-shade-closed",
STOP: "mdi:roller-shade",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x61: { # Electrically operated shutter
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:window-shutter-open",
CONF_ICONS: {
OPEN: "mdi:window-shutter-open",
CLOSE: "mdi:window-shutter",
STOP: "mdi:window-shutter-open",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x62: { # Electrically operated curtain
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:curtains",
CONF_ICONS: {
OPEN: "mdi:curtains",
CLOSE: "mdi:curtains-closed",
STOP: "mdi:curtains",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x63: { # Electrically operated rain sliding door/shutter
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:door-sliding-open",
CONF_ICONS: {
OPEN: "mdi:door-sliding-open",
CLOSE: "mdi:door-sliding",
STOP: "mdi:door-sliding-open",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x64: { # Electrically operated gate
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:boom-gate-up-outline",
CONF_ICONS: {
OPEN: "mdi:boom-gate-up-outline",
CLOSE: "mdi:boom-gate-outline",
STOP: "mdi:boom-gate-up-outline",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x65: { # Electrically operated window
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:window-open-variant",
CONF_ICONS: {
OPEN: "mdi:window-open-variant",
CLOSE: "mdi:window-closed-variant",
STOP: "mdi:window-open-variant",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x66: { # Automatically operated entrance door/sliding door
0xE0: { # Configured as Cover but left for backward compatibility
CONF_ICON: "mdi:door-sliding-open",
CONF_ICONS: {
OPEN: "mdi:door-sliding-open",
CLOSE: "mdi:door-sliding",
STOP: "mdi:door-sliding-open",
},
CONF_DISABLED_DEFAULT: True,
},
0xD2: {
CONF_UNIT_OF_MEASUREMENT: UnitOfTime.SECONDS,
TYPE_NUMBER: {
CONF_MAXIMUM: 0x00,
CONF_MAXIMUM: 0xFD,
},
}, # Operation time
},
0x6B: { # Electric water heater
# 0xB0: , # "Automatic water heating setting",
# 0xB1: , # "Automatic water temperature control setting",
Expand Down Expand Up @@ -886,13 +1018,13 @@
0x30: {ENL_HVAC_MODE, ENL_HVAC_SET_TEMP, ENL_HVAC_SILENT_MODE},
},
0x02: {
0x60: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x61: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x62: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x63: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x64: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x65: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x66: {0xE0, 0xE1, 0xE2, 0xE9, 0xEA},
0x60: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
0x61: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
0x62: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
0x63: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
0x64: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
0x65: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
0x66: {ENL_OPENING_LEVEL, ENL_BLIND_ANGLE, ENL_OPENCLOSE_STATUS},
# General Lighting
0x90: {ENL_BRIGHTNESS, ENL_COLOR_TEMP},
# Single Function Lighting
Expand Down Expand Up @@ -922,7 +1054,6 @@
},
0x02: {
0x7D: [
ENL_STATUS,
0xA0,
0xA1,
0xA8,
Expand All @@ -938,7 +1069,6 @@
0xE6,
],
0x87: [
ENL_STATUS,
ENL_DPM_ENG_NOR,
ENL_DPM_ENG_REV,
ENL_DPM_ENG_UNIT,
Expand All @@ -950,17 +1080,16 @@
ENL_DPM_CHANNEL_SIMPLEX_INSTANT_ENG,
],
0x88: [
ENL_STATUS,
ENL_LVSEEM_ENG_NOR,
ENL_LVSEEM_ENG_REV,
ENL_LVSEEM_INSTANT_ENG,
ENL_LVSEEM_INSTANT_CUR,
ENL_LVSEEM_COEF,
ENL_LVSEEM_ENG_UNIT,
],
0x90: [ENL_STATUS, ENL_BRIGHTNESS, ENL_COLOR_TEMP],
0x91: [ENL_STATUS, ENL_BRIGHTNESS],
0xA3: [ENL_STATUS, ENL_SCENE, ENL_SCENE_MAX],
0x90: [ENL_BRIGHTNESS, ENL_COLOR_TEMP],
0x91: [ENL_BRIGHTNESS],
0xA3: [ENL_SCENE, ENL_SCENE_MAX],
},
}

Expand Down
Loading
Loading