Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion homeassistant/components/hdmi_cec.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
ICON_UNKNOWN = 'mdi:help'
ICON_AUDIO = 'mdi:speaker'
ICON_PLAYER = 'mdi:play'
ICON_TUNER = 'mdi:nest-thermostat'
ICON_TUNER = 'mdi:radio'
ICON_RECORDER = 'mdi:microphone'
ICON_TV = 'mdi:television'
ICONS_BY_TYPE = {
Expand Down
1 change: 0 additions & 1 deletion homeassistant/components/vacuum/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
}

DEFAULT_NAME = 'Vacuum cleaner robot'
DEFAULT_ICON = 'mdi:roomba'

SUPPORT_TURN_ON = 1
SUPPORT_TURN_OFF = 2
Expand Down
7 changes: 1 addition & 6 deletions homeassistant/components/vacuum/demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import logging

from homeassistant.components.vacuum import (
ATTR_CLEANED_AREA, DEFAULT_ICON, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT,
ATTR_CLEANED_AREA, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT,
SUPPORT_FAN_SPEED, SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME,
SUPPORT_SEND_COMMAND, SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF,
SUPPORT_TURN_ON, VacuumDevice)
Expand Down Expand Up @@ -66,11 +66,6 @@ def name(self):
"""Return the name of the vacuum."""
return self._name

@property
def icon(self):
"""Return the icon for the vacuum."""
return DEFAULT_ICON

@property
def should_poll(self):
"""No polling needed for a demo vacuum."""
Expand Down
8 changes: 0 additions & 8 deletions homeassistant/components/vacuum/dyson.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

DYSON_360_EYE_DEVICES = "dyson_360_eye_devices"

ICON = 'mdi:roomba'

SUPPORT_DYSON = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PAUSE | \
SUPPORT_RETURN_HOME | SUPPORT_FAN_SPEED | SUPPORT_STATUS | \
SUPPORT_BATTERY | SUPPORT_STOP
Expand Down Expand Up @@ -56,7 +54,6 @@ def __init__(self, device):
"""Dyson 360 Eye robot vacuum device."""
_LOGGER.debug("Creating device %s", device.name)
self._device = device
self._icon = ICON

@asyncio.coroutine
def async_added_to_hass(self):
Expand All @@ -82,11 +79,6 @@ def name(self):
"""Return the name of the device."""
return self._device.name

@property
def icon(self):
"""Return the icon to use for device."""
return self._icon

@property
def status(self):
"""Return the status of the vacuum cleaner."""
Expand Down
7 changes: 1 addition & 6 deletions homeassistant/components/vacuum/mqtt.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import homeassistant.components.mqtt as mqtt
from homeassistant.components.mqtt import MqttAvailability
from homeassistant.components.vacuum import (
DEFAULT_ICON, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED,
SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED,
SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, SUPPORT_SEND_COMMAND,
SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
VacuumDevice)
Expand Down Expand Up @@ -340,11 +340,6 @@ def name(self):
"""Return the name of the vacuum."""
return self._name

@property
def icon(self):
"""Return the icon for the vacuum."""
return DEFAULT_ICON

@property
def should_poll(self):
"""No polling needed for an MQTT vacuum."""
Expand Down
7 changes: 0 additions & 7 deletions homeassistant/components/vacuum/neato.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
SUPPORT_STOP | SUPPORT_TURN_OFF | SUPPORT_TURN_ON | \
SUPPORT_STATUS | SUPPORT_MAP

ICON = 'mdi:roomba'

ATTR_CLEAN_START = 'clean_start'
ATTR_CLEAN_STOP = 'clean_stop'
ATTR_CLEAN_AREA = 'clean_area'
Expand Down Expand Up @@ -131,11 +129,6 @@ def name(self):
"""Return the name of the device."""
return self._name

@property
def icon(self):
"""Return the icon to use for device."""
return ICON

@property
def supported_features(self):
"""Flag vacuum cleaner robot features that are supported."""
Expand Down
6 changes: 0 additions & 6 deletions homeassistant/components/vacuum/roomba.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
DEFAULT_CONTINUOUS = True
DEFAULT_NAME = 'Roomba'

ICON = 'mdi:roomba'
PLATFORM = 'roomba'

FAN_SPEED_AUTOMATIC = 'Automatic'
Expand Down Expand Up @@ -165,11 +164,6 @@ def name(self):
"""Return the name of the device."""
return self._name

@property
def icon(self):
"""Return the icon to use for device."""
return ICON

@property
def device_state_attributes(self):
"""Return the state attributes of the device."""
Expand Down
7 changes: 0 additions & 7 deletions homeassistant/components/vacuum/xiaomi_miio.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
_LOGGER = logging.getLogger(__name__)

DEFAULT_NAME = 'Xiaomi Vacuum cleaner'
ICON = 'mdi:roomba'
DATA_KEY = 'vacuum.xiaomi_miio'

PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
Expand Down Expand Up @@ -142,7 +141,6 @@ class MiroboVacuum(VacuumDevice):
def __init__(self, name, vacuum):
"""Initialize the Xiaomi vacuum cleaner robot handler."""
self._name = name
self._icon = ICON
self._vacuum = vacuum

self.vacuum_state = None
Expand All @@ -158,11 +156,6 @@ def name(self):
"""Return the name of the device."""
return self._name

@property
def icon(self):
"""Return the icon to use for device."""
return self._icon

@property
def status(self):
"""Return the status of the vacuum cleaner."""
Expand Down
1 change: 0 additions & 1 deletion tests/components/vacuum/test_dyson.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ def test_properties(self):
component3 = Dyson360EyeDevice(device3)
self.assertEqual(component.name, "Device_Vacuum")
self.assertTrue(component.is_on)
self.assertEqual(component.icon, "mdi:roomba")
self.assertEqual(component.status, "Cleaning")
self.assertEqual(component2.status, "Unknown")
self.assertEqual(component.battery_level, 85)
Expand Down