diff --git a/CHANGELOG.md b/CHANGELOG.md index 451107f2a..6d1a53499 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ Versions from 0.40 and up -## Ongoing +## v0.63.0 +- Remove climate home-kit emulation option via PR [#1023](https://github.com/plugwise/plugwise-beta/pull/1023) - Implement Core PR [#159626](https://github.com/home-assistant/core/pull/159626) via PR [#994](https://github.com/plugwise/plugwise-beta/pull/994) - Chores - Introduce prek (for pre-commit) & align with v2 gh-actions diff --git a/custom_components/plugwise/climate.py b/custom_components/plugwise/climate.py index 1aa76921c..a362170ee 100644 --- a/custom_components/plugwise/climate.py +++ b/custom_components/plugwise/climate.py @@ -9,8 +9,6 @@ ATTR_HVAC_MODE, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, - PRESET_AWAY, # pw-beta homekit emulation - PRESET_HOME, # pw-beta homekit emulation ClimateEntity, ClimateEntityFeature, HVACAction, @@ -32,7 +30,6 @@ ACTIVE_PRESET, AVAILABLE_SCHEDULES, CLIMATE_MODE, - CONF_HOMEKIT_EMULATION, # pw-beta homekit emulation CONTROL_STATE, DEV_CLASS, DOMAIN, @@ -65,9 +62,6 @@ async def async_setup_entry( ) -> None: """Set up Plugwise thermostats from a config entry.""" coordinator = entry.runtime_data - homekit_enabled: bool = entry.options.get( - CONF_HOMEKIT_EMULATION, False - ) # pw-beta homekit emulation @callback def _add_entities() -> None: @@ -82,16 +76,12 @@ def _add_entities() -> None: if gateway_name == "Adam": if device[DEV_CLASS] == "climate": entities.append( - PlugwiseClimateEntity( - coordinator, device_id, homekit_enabled - ) # pw-beta homekit emulation + PlugwiseClimateEntity(coordinator, device_id) ) LOGGER.debug("Add climate %s", device[ATTR_NAME]) elif device[DEV_CLASS] in MASTER_THERMOSTATS: entities.append( - PlugwiseClimateEntity( - coordinator, device_id, homekit_enabled - ) # pw-beta homekit emulation + PlugwiseClimateEntity(coordinator, device_id) ) LOGGER.debug("Add climate %s", device[ATTR_NAME]) @@ -135,7 +125,6 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity, RestoreEntity): _last_active_schedule: str | None = None _previous_action_mode: str | None = HVACAction.HEATING.value # Upstream - _homekit_mode: HVACMode | None = None # pw-beta homekit emulation + intentional unsort async def async_added_to_hass(self) -> None: """Run when entity about to be added.""" @@ -152,14 +141,12 @@ def __init__( self, coordinator: PlugwiseDataUpdateCoordinator, device_id: str, - homekit_enabled: bool, # pw-beta homekit emulation ) -> None: """Set up the Plugwise API.""" super().__init__(coordinator, device_id) gateway_id: str = coordinator.api.gateway_id self._gateway_data = coordinator.data[gateway_id] - self._homekit_enabled = homekit_enabled # pw-beta homekit emulation self._location = device_id if (location := self.device.get(LOCATION)) is not None: self._location = location @@ -239,9 +226,6 @@ def hvac_mode(self) -> HVACMode: return HVACMode.HEAT # pragma: no cover if hvac not in self.hvac_modes: return HVACMode.HEAT # pragma: no cover - # pw-beta homekit emulation - if self._homekit_enabled and self._homekit_mode == HVACMode.OFF: - return HVACMode.OFF # pragma: no cover return hvac @@ -249,10 +233,7 @@ def hvac_mode(self) -> HVACMode: def hvac_modes(self) -> list[HVACMode]: """Return a list of available HVACModes.""" hvac_modes: list[HVACMode] = [] - if ( - self._homekit_enabled # pw-beta homekit emulation - or REGULATION_MODES in self._gateway_data - ): + if REGULATION_MODES in self._gateway_data: hvac_modes.append(HVACMode.OFF) if self.device.get(AVAILABLE_SCHEDULES, []): @@ -319,10 +300,11 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: if hvac_mode == self.hvac_mode: return - if hvac_mode != HVACMode.OFF: + if hvac_mode == HVACMode.OFF: + await self.coordinator.api.set_regulation_mode(hvac_mode.value) + else: current = self.device.get("select_schedule") desired = current - # Capture the last valid schedule if desired and desired != "off": self._last_active_schedule = desired @@ -341,27 +323,10 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: STATE_ON if hvac_mode == HVACMode.AUTO else STATE_OFF, desired, ) - - await self._homekit_translate_or_not(hvac_mode) # pw-beta - - async def _homekit_translate_or_not(self, mode: HVACMode) -> None: - """Mimic HomeKit by setting a suitable preset, when homekit mode is enabled.""" - if ( - not self._homekit_enabled # pw-beta - ): - if mode == HVACMode.OFF: - await self.coordinator.api.set_regulation_mode(mode.value) - elif self.hvac_mode == HVACMode.OFF and self._previous_action_mode: - await self.coordinator.api.set_regulation_mode(self._previous_action_mode) - else: # pw-beta - self._homekit_mode = mode # pragma: no cover - if self._homekit_mode == HVACMode.OFF: # pragma: no cover - await self.async_set_preset_mode(PRESET_AWAY) # pragma: no cover - if ( - self._homekit_mode in [HVACMode.HEAT, HVACMode.HEAT_COOL] - and self.device.get(ACTIVE_PRESET) == PRESET_AWAY - ): # pragma: no cover - await self.async_set_preset_mode(PRESET_HOME) # pragma: no cover + if self.hvac_mode == HVACMode.OFF and self._previous_action_mode: + await self.coordinator.api.set_regulation_mode( + self._previous_action_mode + ) @plugwise_command async def async_set_preset_mode(self, preset_mode: str) -> None: diff --git a/custom_components/plugwise/config_flow.py b/custom_components/plugwise/config_flow.py index ba33abcd8..29d404d7d 100644 --- a/custom_components/plugwise/config_flow.py +++ b/custom_components/plugwise/config_flow.py @@ -45,7 +45,6 @@ from .const import ( ANNA_WITH_ADAM, - CONF_HOMEKIT_EMULATION, # pw-beta option CONF_REFRESH_INTERVAL, # pw-beta option DEFAULT_PORT, DEFAULT_UPDATE_INTERVAL, @@ -308,7 +307,6 @@ def async_get_options_flow( # pw-beta - change the scan-interval via CONFIGURE -# pw-beta - add homekit emulation via CONFIGURE # pw-beta - change the frontend refresh interval via CONFIGURE class PlugwiseOptionsFlowHandler(OptionsFlow): # pw-beta options """Plugwise option flow.""" @@ -330,10 +328,6 @@ def _create_options_schema(self, coordinator: PlugwiseDataUpdateCoordinator) -> if coordinator.api.smile.type == THERMOSTAT: schema.update({ - vol.Optional( - CONF_HOMEKIT_EMULATION, - default=self.options.get(CONF_HOMEKIT_EMULATION, False), - ): vol.All(cv.boolean), vol.Optional( CONF_REFRESH_INTERVAL, default=self.options.get(CONF_REFRESH_INTERVAL, 1.5), diff --git a/custom_components/plugwise/manifest.json b/custom_components/plugwise/manifest.json index a4c39bc3a..825e0d762 100644 --- a/custom_components/plugwise/manifest.json +++ b/custom_components/plugwise/manifest.json @@ -8,6 +8,6 @@ "iot_class": "local_polling", "loggers": ["plugwise"], "requirements": ["plugwise==1.11.2"], - "version": "0.62.2", + "version": "0.63.0", "zeroconf": ["_plugwise._tcp.local."] } diff --git a/custom_components/plugwise/strings.json b/custom_components/plugwise/strings.json index 2ccdc118e..6c0ff827d 100644 --- a/custom_components/plugwise/strings.json +++ b/custom_components/plugwise/strings.json @@ -327,7 +327,6 @@ "init": { "data": { "cooling_on": "Anna: cooling-mode is on", - "homekit_emulation": "Homekit emulation (i.e. on hvac_off => Away) *) beta-only option", "refresh_interval": "Frontend refresh-time (1.5 - 5 seconds) *) beta-only option", "scan_interval": "Scan Interval (seconds) *) beta-only option" }, diff --git a/custom_components/plugwise/translations/en.json b/custom_components/plugwise/translations/en.json index 2ccdc118e..6c0ff827d 100644 --- a/custom_components/plugwise/translations/en.json +++ b/custom_components/plugwise/translations/en.json @@ -327,7 +327,6 @@ "init": { "data": { "cooling_on": "Anna: cooling-mode is on", - "homekit_emulation": "Homekit emulation (i.e. on hvac_off => Away) *) beta-only option", "refresh_interval": "Frontend refresh-time (1.5 - 5 seconds) *) beta-only option", "scan_interval": "Scan Interval (seconds) *) beta-only option" }, diff --git a/custom_components/plugwise/translations/nl.json b/custom_components/plugwise/translations/nl.json index f447aa3c3..e6751c80e 100644 --- a/custom_components/plugwise/translations/nl.json +++ b/custom_components/plugwise/translations/nl.json @@ -327,7 +327,6 @@ "init": { "data": { "cooling_on": "Anna: koelmodus is aan", - "homekit_emulation": "Homekit emulatie (bij hvac_off => Afwezig) *) optie alleen in beta", "refresh_interval": "Frontend ververs-tijd (1,5 - 5 seconden) *) optie alleen in beta", "scan_interval": "Scan Interval (seconden) *) optie alleen in beta" }, diff --git a/pyproject.toml b/pyproject.toml index 36c525f47..5be9f8167 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "plugwise-beta" -version = "0.62.2" +version = "0.63.0" description = "Plugwise beta custom-component" readme = "README.md" requires-python = ">=3.13" diff --git a/tests/components/plugwise/snapshots/test_binary_sensor.ambr b/tests/components/plugwise/snapshots/test_binary_sensor.ambr index ff18fb11b..c2408fbf4 100644 --- a/tests/components/plugwise/snapshots/test_binary_sensor.ambr +++ b/tests/components/plugwise/snapshots/test_binary_sensor.ambr @@ -20,6 +20,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Plugwise notification', 'options': dict({ }), 'original_device_class': None, @@ -71,6 +72,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -120,6 +122,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -169,6 +172,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Heating', 'options': dict({ }), 'original_device_class': None, @@ -217,6 +221,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -266,6 +271,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -315,6 +321,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -364,6 +371,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -413,6 +421,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -462,6 +471,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -511,6 +521,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Compressor state', 'options': dict({ }), 'original_device_class': None, @@ -559,6 +570,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Cooling', 'options': dict({ }), 'original_device_class': None, @@ -607,6 +619,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Cooling enabled', 'options': dict({ }), 'original_device_class': None, @@ -655,6 +668,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'DHW state', 'options': dict({ }), 'original_device_class': None, @@ -703,6 +717,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Flame state', 'options': dict({ }), 'original_device_class': None, @@ -751,6 +766,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Heating', 'options': dict({ }), 'original_device_class': None, @@ -799,6 +815,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Secondary boiler state', 'options': dict({ }), 'original_device_class': None, @@ -847,6 +864,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Plugwise notification', 'options': dict({ }), 'original_device_class': None, @@ -895,6 +913,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Plugwise notification', 'options': dict({ }), 'original_device_class': None, diff --git a/tests/components/plugwise/snapshots/test_button.ambr b/tests/components/plugwise/snapshots/test_button.ambr index 900d85db5..3f06d95a4 100644 --- a/tests/components/plugwise/snapshots/test_button.ambr +++ b/tests/components/plugwise/snapshots/test_button.ambr @@ -20,6 +20,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Reboot', 'options': dict({ }), 'original_device_class': , diff --git a/tests/components/plugwise/snapshots/test_climate.ambr b/tests/components/plugwise/snapshots/test_climate.ambr index 368f13946..8dda24e2c 100644 --- a/tests/components/plugwise/snapshots/test_climate.ambr +++ b/tests/components/plugwise/snapshots/test_climate.ambr @@ -36,6 +36,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -120,6 +121,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -203,6 +205,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -285,6 +288,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -366,6 +370,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -447,6 +452,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -529,6 +535,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -611,6 +618,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -694,6 +702,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, @@ -776,6 +785,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': None, 'options': dict({ }), 'original_device_class': None, diff --git a/tests/components/plugwise/snapshots/test_number.ambr b/tests/components/plugwise/snapshots/test_number.ambr index 922cbb1e2..ea54e5615 100644 --- a/tests/components/plugwise/snapshots/test_number.ambr +++ b/tests/components/plugwise/snapshots/test_number.ambr @@ -25,6 +25,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -84,6 +85,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -143,6 +145,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -202,6 +205,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -261,6 +265,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -320,6 +325,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -379,6 +385,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -438,6 +445,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -497,6 +505,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -556,6 +565,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature offset', 'options': dict({ }), 'original_device_class': , @@ -615,6 +625,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Domestic hot water setpoint', 'options': dict({ }), 'original_device_class': , @@ -674,6 +685,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Maximum boiler temperature setpoint', 'options': dict({ }), 'original_device_class': , diff --git a/tests/components/plugwise/snapshots/test_select.ambr b/tests/components/plugwise/snapshots/test_select.ambr index 90ace520e..afe46a818 100644 --- a/tests/components/plugwise/snapshots/test_select.ambr +++ b/tests/components/plugwise/snapshots/test_select.ambr @@ -26,6 +26,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Gateway mode', 'options': dict({ }), 'original_device_class': None, @@ -87,6 +88,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Regulation mode', 'options': dict({ }), 'original_device_class': None, @@ -150,6 +152,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Thermostat schedule', 'options': dict({ }), 'original_device_class': None, @@ -211,6 +214,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Zone profile', 'options': dict({ }), 'original_device_class': None, @@ -272,6 +276,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Thermostat schedule', 'options': dict({ }), 'original_device_class': None, @@ -333,6 +338,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Zone profile', 'options': dict({ }), 'original_device_class': None, @@ -395,6 +401,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Thermostat schedule', 'options': dict({ }), 'original_device_class': None, @@ -460,6 +467,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Thermostat schedule', 'options': dict({ }), 'original_device_class': None, @@ -525,6 +533,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Thermostat schedule', 'options': dict({ }), 'original_device_class': None, @@ -590,6 +599,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Thermostat schedule', 'options': dict({ }), 'original_device_class': None, diff --git a/tests/components/plugwise/snapshots/test_sensor.ambr b/tests/components/plugwise/snapshots/test_sensor.ambr index 6e79ca599..6d87e04b4 100644 --- a/tests/components/plugwise/snapshots/test_sensor.ambr +++ b/tests/components/plugwise/snapshots/test_sensor.ambr @@ -22,6 +22,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Outdoor temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -78,6 +79,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -134,6 +136,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -190,6 +193,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -246,6 +250,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -302,6 +307,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -358,6 +364,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -411,6 +418,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Humidity', 'options': dict({ }), 'original_device_class': , @@ -464,6 +472,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -520,6 +529,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -576,6 +586,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -629,6 +640,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Humidity', 'options': dict({ }), 'original_device_class': , @@ -682,6 +694,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -738,6 +751,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -794,6 +808,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -847,6 +862,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -903,6 +919,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -959,6 +976,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -1015,6 +1033,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -1071,6 +1090,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1127,6 +1147,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Intended boiler temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1183,6 +1204,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Water temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1239,6 +1261,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Battery', 'options': dict({ }), 'original_device_class': , @@ -1292,6 +1315,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1348,6 +1372,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1404,6 +1429,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature difference', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1460,6 +1486,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Valve position', 'options': dict({ }), 'original_device_class': None, @@ -1512,6 +1539,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -1568,6 +1596,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -1624,6 +1653,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1680,6 +1710,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Illuminance', 'options': dict({ }), 'original_device_class': , @@ -1733,6 +1764,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1789,6 +1821,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1845,6 +1878,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Intended boiler temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -1901,6 +1935,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Modulation level', 'options': dict({ }), 'original_device_class': None, @@ -1953,6 +1988,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Water pressure', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -2009,6 +2045,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Water temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -2065,6 +2102,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -2121,6 +2159,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2177,6 +2216,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2233,6 +2273,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -2289,6 +2330,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2345,6 +2387,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2401,6 +2444,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase one consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2457,6 +2501,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase one produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2513,6 +2558,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -2569,6 +2615,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2625,6 +2672,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2681,6 +2729,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -2737,6 +2786,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2793,6 +2843,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -2849,6 +2900,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Gas consumed cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -2905,6 +2957,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Gas consumed interval', 'options': dict({ }), 'original_device_class': None, @@ -2957,6 +3010,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Net electricity cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -3013,6 +3067,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Net electricity point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -3069,6 +3124,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Voltage phase one', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -3125,6 +3181,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Outdoor temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3181,6 +3238,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Cooling setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3237,6 +3295,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Heating setpoint', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3293,6 +3352,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Illuminance', 'options': dict({ }), 'original_device_class': , @@ -3346,6 +3406,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3402,6 +3463,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'DHW temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3458,6 +3520,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Intended boiler temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3514,6 +3577,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Modulation level', 'options': dict({ }), 'original_device_class': None, @@ -3566,6 +3630,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Outdoor air temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3622,6 +3687,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Return temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3678,6 +3744,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Water pressure', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -3734,6 +3801,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Water temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3790,6 +3858,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Outdoor temperature', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 1, @@ -3846,6 +3915,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -3902,6 +3972,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -3958,6 +4029,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4014,6 +4086,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -4070,6 +4143,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4126,6 +4200,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4182,6 +4257,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase one consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4238,6 +4314,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase one produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4294,6 +4371,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase three consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4350,6 +4428,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase three produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4406,6 +4485,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase two consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4462,6 +4542,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase two produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4518,6 +4599,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -4574,6 +4656,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4630,6 +4713,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4686,6 +4770,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -4742,6 +4827,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4798,6 +4884,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -4854,6 +4941,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Gas consumed cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -4910,6 +4998,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Gas consumed interval', 'options': dict({ }), 'original_device_class': None, @@ -4962,6 +5051,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Net electricity cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -5018,6 +5108,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Net electricity point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5074,6 +5165,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Voltage phase one', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5130,6 +5222,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Voltage phase three', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5186,6 +5279,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Voltage phase two', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5242,6 +5336,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -5298,6 +5393,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5354,6 +5450,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed off-peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5410,6 +5507,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -5466,6 +5564,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5522,6 +5621,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5578,6 +5678,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase one consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5634,6 +5735,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity phase one produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5690,6 +5792,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -5746,6 +5849,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5802,6 +5906,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced off-peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5858,6 +5963,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -5914,6 +6020,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -5970,6 +6077,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced peak point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6026,6 +6134,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Net electricity cumulative', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 2, @@ -6082,6 +6191,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Net electricity point', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6138,6 +6248,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6194,6 +6305,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6250,6 +6362,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6306,6 +6419,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6362,6 +6476,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6418,6 +6533,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6474,6 +6590,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6530,6 +6647,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6586,6 +6704,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6642,6 +6761,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6698,6 +6818,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6754,6 +6875,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6810,6 +6932,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6866,6 +6989,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity consumed interval', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, @@ -6922,6 +7046,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Electricity produced', 'options': dict({ 'sensor': dict({ 'suggested_display_precision': 0, diff --git a/tests/components/plugwise/snapshots/test_switch.ambr b/tests/components/plugwise/snapshots/test_switch.ambr index 72dbf5d46..5945a5071 100644 --- a/tests/components/plugwise/snapshots/test_switch.ambr +++ b/tests/components/plugwise/snapshots/test_switch.ambr @@ -20,6 +20,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -69,6 +70,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -118,6 +120,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -167,6 +170,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -216,6 +220,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -265,6 +270,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -314,6 +320,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -363,6 +370,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -412,6 +420,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -461,6 +470,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -510,6 +520,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -559,6 +570,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -608,6 +620,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -657,6 +670,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -706,6 +720,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -755,6 +770,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -804,6 +820,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -853,6 +870,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -902,6 +920,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -951,6 +970,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -1000,6 +1020,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , @@ -1049,6 +1070,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Lock', 'options': dict({ }), 'original_device_class': , @@ -1098,6 +1120,7 @@ 'labels': set({ }), 'name': None, + 'object_id_base': 'Relay', 'options': dict({ }), 'original_device_class': , diff --git a/tests/components/plugwise/test_config_flow.py b/tests/components/plugwise/test_config_flow.py index 8f4eb3213..1751f232d 100644 --- a/tests/components/plugwise/test_config_flow.py +++ b/tests/components/plugwise/test_config_flow.py @@ -13,7 +13,6 @@ import pytest from homeassistant.components.plugwise.const import ( - CONF_HOMEKIT_EMULATION, CONF_REFRESH_INTERVAL, DEFAULT_PORT, DOMAIN, @@ -431,7 +430,6 @@ async def test_options_flow_thermo( }, minor_version=2, options={ - CONF_HOMEKIT_EMULATION: False, CONF_REFRESH_INTERVAL: 1.5, CONF_SCAN_INTERVAL: 60, }, @@ -455,7 +453,6 @@ async def test_options_flow_thermo( assert result["type"] == FlowResultType.CREATE_ENTRY assert result["data"] == { - CONF_HOMEKIT_EMULATION: False, CONF_REFRESH_INTERVAL: 3.0, CONF_SCAN_INTERVAL: 60, }