From 4a3cad39cde5fe0e90232b3adc79555fa8bd78ea Mon Sep 17 00:00:00 2001 From: Mick Vleeshouwer Date: Tue, 8 Feb 2022 05:34:15 -0800 Subject: [PATCH] Extend enums for various devices (mainly alarm) (#362) --- pyoverkiz/enums/command.py | 21 +++++++++++++++++++++ pyoverkiz/enums/state.py | 10 ++++++++++ 2 files changed, 31 insertions(+) diff --git a/pyoverkiz/enums/command.py b/pyoverkiz/enums/command.py index a3e21a0c..642d8693 100644 --- a/pyoverkiz/enums/command.py +++ b/pyoverkiz/enums/command.py @@ -10,6 +10,7 @@ class OverkizCommand(str, Enum): ALARM_ON = "alarmOn" ALARM_PARTIAL_1 = "alarmPartial1" ALARM_PARTIAL_2 = "alarmPartial2" + ALARM_ZONE_ON = "alarmZoneOn" ARM = "arm" ARM_PARTIAL_DAY = "armPartialDay" ARM_PARTIAL_NIGHT = "armPartialNight" @@ -19,13 +20,17 @@ class OverkizCommand(str, Enum): DEPLOY = "deploy" DISARM = "disarm" DOWN = "down" + GET_NAME = "getName" GLOBAL_CONTROL = "globalControl" + GO_TO_ALIAS = "goToAlias" IDENTIFY = "identify" LOCK = "lock" MEMORIZED_VOLUME = "memorizedVolume" MY = "my" OFF = "off" + OFFLINE = "offline" ON = "on" + ONLINE = "online" OPEN = "open" OPEN_SLATS = "openSlats" PARTIAL = "partial" @@ -67,6 +72,7 @@ class OverkizCommand(str, Enum): STOP = "stop" STOP_IDENTIFY = "stopIdentify" UNDEPLOY = "undeploy" + UNINSTALLED = "uninstalled" UNLOCK = "unlock" UP = "up" WINK = "wink" @@ -76,6 +82,7 @@ class OverkizCommand(str, Enum): class OverkizCommandParam(str, Enum): """Parameter used by Overkiz commands and/or states.""" + A = "A" ABSENCE = "absence" ARMED = "armed" ARMED_DAY = "armedDay" @@ -84,8 +91,11 @@ class OverkizCommandParam(str, Enum): AUTO = "auto" AUTO_MODE = "autoMode" AVAILABLE = "available" + B = "B" BOOST = "boost" COMFORT = "comfort" + C = "C" + CLOSE = "close" CLOSED = "closed" COOLING = "cooling" DEAD = "dead" @@ -93,6 +103,7 @@ class OverkizCommandParam(str, Enum): DISARMED = "disarmed" ECO = "eco" ENERGY_DEMAND_STATUS = "energyDemandStatus" + EXTERNAL_GATEWAY = "externalGateway" FREE = "free" FROSTPROTECTION = "frostprotection" FULL = "full" @@ -102,27 +113,37 @@ class OverkizCommandParam(str, Enum): HIGH_DEMAND = "high demand" # not a typo... HIGHEST = "highest" LOW = "low" + LOW_BATTERY = "lowBattery" + LOCAL_USER = "localUser" LOCKED = "locked" + LSC = "LSC" + MAINTENANCE_REQUIRED = "maintenanceRequired" MANU = "manu" MANUAL = "manual" MANUAL_ECO_ACTIVE = "manualEcoActive" MANUAL_ECO_INACTIVE = "manualEcoInactive" MEMORIZED_VOLUME = "memorizedVolume" NORMAL = "normal" + NO_DEFECT = "noDefect" + NOT_DETECTED = "notDetected" ON = "on" OFF = "off" OPEN = "open" + OPENED = "opened" PARTIAL = "partial" PENDING = "pending" PEDESTRIAN = "pedestrian" PERSON_INSIDE = "personInside" PROG = "prog" RELAUNCH = "relaunch" + SAAC = "SAAC" + SFC = "SFC" SECURED = "secured" STANDARD = "standard" STOP = "stop" TOTAL = "total" UNDETECTED = "undetected" + UPS = "UPS" VERY_LOW = "verylow" ZONE_1 = "zone1" ZONE_2 = "zone2" diff --git a/pyoverkiz/enums/state.py b/pyoverkiz/enums/state.py index 7da7386e..346563ed 100644 --- a/pyoverkiz/enums/state.py +++ b/pyoverkiz/enums/state.py @@ -14,11 +14,13 @@ class OverkizAttribute(str, Enum): class OverkizState(str, Enum): """Device states used by Overkiz.""" + CORE_ACTIVE_ZONES = "core:ActiveZonesState " CORE_ASSEMBLY = "core:AssemblyState" CORE_AVAILABILITY = "core:AvailabilityState" CORE_BATTERY = "core:BatteryState" CORE_BATTERY_LEVEL = "core:BatteryLevelState" CORE_BLUE_COLOR_INTENSITY = "core:BlueColorIntensityState" + CORE_CLOUD_DEVICE_STATUS = "core:CloudDeviceStatusState" CORE_CLOSURE = "core:ClosureState" CORE_CLOSURE_OR_ROCKER_POSITION = "core:ClosureOrRockerPositionState" CORE_CO2_CONCENTRATION = "core:CO2ConcentrationState" @@ -68,6 +70,7 @@ class OverkizState(str, Enum): CORE_OPEN_CLOSED_UNKNOWN = "core:OpenClosedUnknownState" CORE_OPERATING_MODE = "core:OperatingModeState" CORE_PEDESTRIAN_POSITION = "core:PedestrianPositionState" + CORE_POWER_SUPPLY_UP_DOWN = "core:PowerSupplyUpDownState" CORE_PRIORITY_LOCK_TIMER = "core:PriorityLockTimerState" CORE_PRODUCT_MODEL_NAME = "core:ProductModelNameState" CORE_RAIN = "core:RainState" @@ -131,6 +134,7 @@ class OverkizState(str, Enum): MODBUSLINK_DHW_MODE = "modbuslink:DHWModeState" MODBUSLINK_MIDDLE_WATER_TEMPERATURE = "modbuslink:MiddleWaterTemperatureState" MYFOX_ALARM_STATUS = "myfox:AlarmStatusState" + MYFOX_ALERT_TRESPASS = "myfox:AlertTrespassState" MYFOX_SHUTTER_STATUS = "myfox:ShutterStatusState" OVP_FAN_SPEED = "ovp:FanSpeedState" OVP_HEATING_TEMPERATURE_INTERFACE_ACTIVE_MODE = ( @@ -147,4 +151,10 @@ class OverkizState(str, Enum): OVP_MODE_CHANGE = "ovp:ModeChangeState" OVP_ROOM_TEMPERATURE = "ovp:RoomTemperatureState" OVP_SWING = "ovp:SwingState" + RTDS_CONTROLLER_BATTERY = "rtds:ControllerBatteryState" + RTDS_CONTROLLER_BIP = "rtds:ControllerBipState" + RTDS_CONTROLLER_ORDER_TYPE = "rtds:ControllerOrderTypeState" + RTDS_CONTROLLER_ORIGINATOR = "rtds:ControllerOriginatorState" + RTDS_CONTROLLER_SENSING = "rtds:ControllerSensingState" + RTDS_CONTROLLER_SIREN = "rtds:ControllerSirenState" VERISURE_ALARM_PANEL_MAIN_ARM_TYPE = "verisure:AlarmPanelMainArmTypeState"