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

fixed merge error

Browse Source
This commit is contained in:
Per Sandström 2015-09-13 07:48:34 +02:00
parent ab6cb43d5b
commit c9bccadc40
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/alarm/verisure.py
View File

@ -9,12 +9,8 @@ import homeassistant.components.verisure as verisure
import homeassistant.components.alarm as alarm import homeassistant.components.alarm as alarm
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
<<<<<<< HEAD
from homeassistant.const import (STATE_UNKNOWN, from homeassistant.const import (STATE_UNKNOWN,
STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY) STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
=======
from homeassistant.const import STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY
>>>>>>> 614caa33ae4b9fd13bd26436dd4c1dd09ff01119
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -26,40 +22,24 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
_LOGGER.error('A connection has not been made to Verisure mypages.') _LOGGER.error('A connection has not been made to Verisure mypages.')
return False return False
<<<<<<< HEAD
alarms = [] alarms = []
alarms.extend([ alarms.extend([
=======
sensors = []
sensors.extend([
>>>>>>> 614caa33ae4b9fd13bd26436dd4c1dd09ff01119
VerisureAlarm(value) VerisureAlarm(value)
for value in verisure.get_alarm_status().values() for value in verisure.get_alarm_status().values()
if verisure.SHOW_ALARM if verisure.SHOW_ALARM
]) ])
<<<<<<< HEAD
add_devices(alarms) add_devices(alarms)
class VerisureAlarm(alarm.AlarmControl): class VerisureAlarm(alarm.AlarmControl):
=======
add_devices(sensors)
class VerisureAlarm(Entity):
>>>>>>> 614caa33ae4b9fd13bd26436dd4c1dd09ff01119
""" represents a Verisure alarm status within home assistant. """ """ represents a Verisure alarm status within home assistant. """
def __init__(self, alarm_status): def __init__(self, alarm_status):
self._id = alarm_status.id self._id = alarm_status.id
self._device = verisure.MY_PAGES.DEVICE_ALARM self._device = verisure.MY_PAGES.DEVICE_ALARM
<<<<<<< HEAD
self._state = STATE_UNKNOWN self._state = STATE_UNKNOWN
=======
>>>>>>> 614caa33ae4b9fd13bd26436dd4c1dd09ff01119
@property @property
def name(self): def name(self):
@ -70,7 +50,6 @@ class VerisureAlarm(Entity):
def state(self): def state(self):
""" Returns the state of the device. """ """ Returns the state of the device. """
if verisure.STATUS[self._device][self._id].status == 'unarmed': if verisure.STATUS[self._device][self._id].status == 'unarmed':
<<<<<<< HEAD
self._state = STATE_ALARM_DISARMED self._state = STATE_ALARM_DISARMED
elif verisure.STATUS[self._device][self._id].status == 'armedhome': elif verisure.STATUS[self._device][self._id].status == 'armedhome':
self._state = STATE_ALARM_ARMED_HOME self._state = STATE_ALARM_ARMED_HOME
@ -79,18 +58,10 @@ class VerisureAlarm(Entity):
elif verisure.STATUS[self._device][self._id].status != 'pending': elif verisure.STATUS[self._device][self._id].status != 'pending':
_LOGGER.error('Unknown alarm state ' + verisure.STATUS[self._device][self._id].status) _LOGGER.error('Unknown alarm state ' + verisure.STATUS[self._device][self._id].status)
return self._state return self._state
=======
return STATE_ALARM_DISARMED
if verisure.STATUS[self._device][self._id].status == 'armed_home':
return STATE_ALARM_ARMED_HOME
if verisure.STATUS[self._device][self._id].status == 'armed_away':
return STATE_ALARM_ARMED_AWAY
>>>>>>> 614caa33ae4b9fd13bd26436dd4c1dd09ff01119
def update(self): def update(self):
''' update alarm status ''' ''' update alarm status '''
verisure.update() verisure.update()
<<<<<<< HEAD
def alarm_disarm(self, code): def alarm_disarm(self, code):
""" Send disarm command. """ """ Send disarm command. """
@ -106,5 +77,3 @@ class VerisureAlarm(Entity):
""" Send arm away command. """ """ Send arm away command. """
verisure.MY_PAGES.set_alarm_status(code, verisure.MY_PAGES.ALARM_ARMED_AWAY) verisure.MY_PAGES.set_alarm_status(code, verisure.MY_PAGES.ALARM_ARMED_AWAY)
_LOGGER.warning('arming away') _LOGGER.warning('arming away')
=======
>>>>>>> 614caa33ae4b9fd13bd26436dd4c1dd09ff01119