jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 03:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid breaking change for BMW ConnectedDrive sensors in #12591 (#13380)

Browse Source
This commit is contained in:
Gerard 2018-03-23 07:32:33 +01:00 committed by Martin Hjelmare
parent fb1fafefab
commit c50b00226c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/binary_sensor/bmw_connected_drive.py
View File

@ -15,8 +15,8 @@ DEPENDENCIES = ['bmw_connected_drive']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
SENSOR_TYPES = { SENSOR_TYPES = {
'all_lids_closed': ['Doors', 'opening'], 'lids': ['Doors', 'opening'],
'all_windows_closed': ['Windows', 'opening'], 'windows': ['Windows', 'opening'],
'door_lock_state': ['Door lock state', 'safety'] 'door_lock_state': ['Door lock state', 'safety']
} }
@ -45,7 +45,8 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
self._account = account self._account = account
self._vehicle = vehicle self._vehicle = vehicle
self._attribute = attribute self._attribute = attribute
self._name = sensor_name self._name = '{} {}'.format(self._vehicle.modelName, self._attribute)
self._sensor_name = sensor_name
self._device_class = device_class self._device_class = device_class
self._state = None self._state = None
@ -77,10 +78,10 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
'car': self._vehicle.modelName 'car': self._vehicle.modelName
} }
if self._attribute == 'all_lids_closed': if self._attribute == 'lids':
for lid in vehicle_state.lids: for lid in vehicle_state.lids:
result[lid.name] = lid.state.value result[lid.name] = lid.state.value
elif self._attribute == 'all_windows_closed': elif self._attribute == 'windows':
for window in vehicle_state.windows: for window in vehicle_state.windows:
result[window.name] = window.state.value result[window.name] = window.state.value
elif self._attribute == 'door_lock_state': elif self._attribute == 'door_lock_state':
@ -93,10 +94,10 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
vehicle_state = self._vehicle.state vehicle_state = self._vehicle.state
# device class opening: On means open, Off means closed # device class opening: On means open, Off means closed
if self._attribute == 'all_lids_closed': if self._attribute == 'lids':
_LOGGER.debug("Status of lid: %s", vehicle_state.all_lids_closed) _LOGGER.debug("Status of lid: %s", vehicle_state.all_lids_closed)
self._state = not vehicle_state.all_lids_closed self._state = not vehicle_state.all_lids_closed
if self._attribute == 'all_windows_closed': if self._attribute == 'windows':
self._state = not vehicle_state.all_windows_closed self._state = not vehicle_state.all_windows_closed
# device class safety: On means unsafe, Off means safe # device class safety: On means unsafe, Off means safe
if self._attribute == 'door_lock_state': if self._attribute == 'door_lock_state':

3
homeassistant/components/lock/bmw_connected_drive.py
View File

@ -37,7 +37,8 @@ class BMWLock(LockDevice):
self._account = account self._account = account
self._vehicle = vehicle self._vehicle = vehicle
self._attribute = attribute self._attribute = attribute
self._name = sensor_name self._name = '{} {}'.format(self._vehicle.modelName, self._attribute)
self._sensor_name = sensor_name
self._state = None self._state = None
@property @property

3
homeassistant/components/sensor/bmw_connected_drive.py
View File

@ -51,7 +51,8 @@ class BMWConnectedDriveSensor(Entity):
self._attribute = attribute self._attribute = attribute
self._state = None self._state = None
self._unit_of_measurement = None self._unit_of_measurement = None
self._name = sensor_name self._name = '{} {}'.format(self._vehicle.modelName, self._attribute)
self._sensor_name = sensor_name
self._icon = icon self._icon = icon
@property @property